Merge branch 'main' into preview

README.md

@@ -5,6 +5,7 @@
   <h2>eNuts – A Cashu wallet for Android and iOS</h2>
   <div style="display: flex; align-items: center; justify-content: center">
 
+  [![Website eNuts](https://img.shields.io/badge/Website-eNuts-%230088cc?style=plastic&logo=WebMoney&logoColor=white&labelColor=%23666&color=%235DB075)](https://www.enuts.cash)
   [![codecov](https://codecov.io/gh/cashubtc/eNuts/branch/main/graph/badge.svg?token=MGBC95KGHQ)](https://codecov.io/gh/cashubtc/eNuts)
   ![example workflow](https://github.com/cashubtc/eNuts/actions/workflows/node.js.yml/badge.svg)
   ![ts](https://badgen.net/badge/Built%20with/TypeScript/blue)
@@ -18,7 +19,7 @@
 ## 🐿️ Join the research and development groups
 
 [![Cashu R&D](https://img.shields.io/badge/Cashu_R&D-Telegram-0088cc.svg)](https://t.me/CashuBTC)
-[![Cashu R&D](https://img.shields.io/badge/eNuts_R&D-Telegram-0088cc.svg)](https://t.me/eNutsWallet)
+[![eNuts R&D](https://img.shields.io/badge/eNuts_R&D-Telegram-0088cc.svg)](https://t.me/eNutsWallet)
 
 ## Contents
 

assets/translations/de.json

@@ -214,7 +214,8 @@
 		"next": "Weiter",
 		"donateLn": "Spenden über Lightning",
 		"supportDev": "Zap die Entwicklung",
-		"supportHint": "Jeder Beitrag, ganz gleich in welcher Höhe, hat eine bedeutende Auswirkung. (Die eNuts Bestätigungsseite befindet sich in der Entwicklung)"
+		"supportHint": "Jeder Beitrag, ganz gleich in welcher Höhe, hat eine bedeutende Auswirkung. Die Zap Bestätigungsseite befindet sich in der Entwicklung",
+		"newToken": "Neuer Cashu Token"
 	},
 	"error": {
 		"addAllMintIdsErr": "Fehler beim Abrufen der Schlüsselsatz-IDs von Mint",

assets/translations/en.json

@@ -157,7 +157,7 @@
 		"scanTokenOrLn": "Scan Cashu token or Lightning invoice",
 		"scanLn": "Scan Lightning invoice",
 		"scan": "Scan",
-		"enutsBeta": "eNuts is beta software →",
+		"enutsBeta": "eNuts is beta software",
 		"seconds": "seconds",
 		"selectAmount": "Select amount",
 		"selected": "Selected",
@@ -214,7 +214,8 @@
 		"next": "Next",
 		"donateLn": "Donate via Lightning",
 		"supportDev": "Zap the devs",
-		"supportHint": "Every contribution, no matter the size, makes a significant impact. (eNuts confirmation screen is under development)"
+		"supportHint": "Every contribution, no matter the size, makes a significant impact. Zap confirmation screen is under development",
+		"newToken": "New Cashu token"
 	},
 	"error": {
 		"addAllMintIdsErr": "Error while getting keyset ids from mint",

assets/translations/fr.json

@@ -211,7 +211,8 @@
 		"next": "Suivant",
 		"donateLn": "Faire un don via Lightning",
 		"supportDev": "Zap le développement",
-		"supportHint": "Chaque contribution, quelle que soit sa taille, a un impact significatif. (L'écran de confirmation eNuts est en cours de développement)"
+		"supportHint": "Chaque contribution, quelle que soit sa taille, a un impact significatif. L'écran de confirmation est en cours de développement",
+		"newToken": "Nouveau Cashu Token"
 	},
 	"error": {
 		"addAllMintIdsErr": "Erreur lors de l'obtention de l'ensemble de clés de la mint",

package.json

@@ -158,7 +158,7 @@
 		"blind-signatures",
 		"lightning-network"
 	],
-	"version": "0.0.1-beta",
+	"version": "0.0.2",
 	"license": "AGPL-3.0-only",
 	"bugs": {
 		"url": "https://github.com/cashubtc/eNuts/issues"

src/components/Balance.tsx

@@ -1,4 +1,4 @@
-import { EcashIcon, SwapCurrencyIcon, ZapIcon } from '@comps/Icons'
+import { ChevronRightIcon, EcashIcon, HistoryIcon, SwapCurrencyIcon, ZapIcon } from '@comps/Icons'
 import { setPreferences } from '@db'
 import type { IHistoryEntry } from '@model'
 import type { RootStackParamList } from '@model/nav'
@@ -82,8 +82,14 @@ export default function Balance({ balance, nav }: IBalanceProps) {
 				</TouchableOpacity>
 			}
 			<Separator style={[styles.separator]} />
+			{/* No transactions yet */}
+			{!history.length &&
+				<View style={{ padding: 10 }}>
+					<Txt txt={t('noTX')} styles={[globals(color).pressTxt, { color: mainColors.WHITE }]} />
+				</View>
+			}
 			{/* latest 3 history entries */}
-			{history.length && !hidden.txs ?
+			{history.length > 0 && !hidden.txs ?
 				history.map(h => (
 					<HistoryEntry
 						key={h.timestamp}
@@ -99,19 +105,24 @@ export default function Balance({ balance, nav }: IBalanceProps) {
 					/>
 				))
 				:
-				!hidden.txs ?
-					<View style={{ padding: 10 }}>
-						<Txt txt={t('noTX')} styles={[globals(color).pressTxt, { color: mainColors.WHITE }]} />
-					</View>
+				hidden.txs ?
+					<>
+						<TouchableOpacity
+							style={styles.boardEntry}
+							onPress={() => nav?.navigate('history')}
+						>
+							<View style={styles.hiddenTxtWrap}>
+								<View style={styles.iconWrap}>
+									<HistoryIcon color={mainColors.WHITE} />
+								</View>
+								<Txt txt={t('hiddenTxs')} styles={[{ color: mainColors.WHITE }]} />
+							</View>
+							<ChevronRightIcon color={mainColors.WHITE} />
+						</TouchableOpacity>
+					</>
 					:
 					null
 			}
-			{hidden.txs &&
-				<Txt
-					txt={t('hiddenTxs')}
-					styles={[globals(color).pressTxt, { color: mainColors.WHITE, marginVertical: 50 }]}
-				/>
-			}
 			{history.length === 3 && !hidden.txs &&
 				<TxtButton
 					txt={t('seeFullHistory')}
@@ -193,6 +204,12 @@ const styles = StyleSheet.create({
 		minWidth: 45,
 		paddingTop: 3,
 	},
+	boardEntry: {
+		flexDirection: 'row',
+		alignItems: 'center',
+		justifyContent: 'space-between',
+		marginVertical: 10,
+	},
 	entry: {
 		flexDirection: 'row',
 		alignItems: 'center',
@@ -203,4 +220,8 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		alignItems: 'center',
 	},
+	hiddenTxtWrap: {
+		flexDirection: 'row',
+		alignItems: 'center',
+	},
 })

src/consts/env.ts

@@ -3,6 +3,8 @@ import type { IExpoConfig } from '@model'
 import { default as Consts, ExecutionEnvironment as ExecEnv } from 'expo-constants'
 import { Platform } from 'react-native'
 
+import { version } from '../../package.json'
+
 const { executionEnvironment: execEnv } = Consts
 // `true` when running in Expo Go.
 const isExpoDev = execEnv && ExecEnv?.StoreClient && execEnv === ExecEnv?.StoreClient
@@ -67,3 +69,4 @@ export const isTestMode = (typeof __TEST__ === 'boolean' && __TEST__)
 	|| process?.env?.NODE_ENV === 'test' || config?.extra?.NODE_ENV === 'test'
 
 export const isIOS = Platform.OS === 'ios'
+export const appVersion = `eNuts v${version}-beta`

src/model/nav.ts

@@ -19,6 +19,7 @@ export type RootStackParamList = {
 	disclaimer: undefined
 	history: undefined
 	mints: {
+		defaultMint?: boolean
 		newMint?: boolean
 	} | undefined
 	Settings: undefined

src/screens/Addressbook/index.tsx

@@ -34,6 +34,10 @@ import { StyleSheet, Text, View } from 'react-native'
 import ContactPreview from './ContactPreview'
 import UserProfile from './UserProfile'
 
+/****************************************************************************/
+/* State issues will occur while debugging Android and IOS at the same time */
+/****************************************************************************/
+
 const marginBottom = isIOS ? 100 : 75
 const marginBottomPayment = isIOS ? 25 : 0
 

src/screens/Dashboard.tsx

@@ -3,7 +3,7 @@ import Balance from '@comps/Balance'
 import { IconBtn } from '@comps/Button'
 import useLoading from '@comps/hooks/Loading'
 import useCashuToken from '@comps/hooks/Token'
-import { AboutIcon, ChevronRightIcon, ReceiveIcon, ScanQRIcon, SendIcon } from '@comps/Icons'
+import { AboutIcon, ChevronRightIcon, PlusIcon, ReceiveIcon, ScanQRIcon, SendIcon } from '@comps/Icons'
 import InitialModal from '@comps/InitialModal'
 import Txt from '@comps/Txt'
 import { _testmintUrl } from '@consts'
@@ -24,7 +24,7 @@ import { STORE_KEYS } from '@store/consts'
 import { addToHistory } from '@store/latestHistoryEntries'
 import { getCustomMintNames, saveDefaultOnInit } from '@store/mintStore'
 import { highlight as hi, mainColors } from '@styles'
-import { getStrFromClipboard, hasTrustedMint, isCashuToken } from '@util'
+import { getStrFromClipboard, hasTrustedMint, isCashuToken, isErr } from '@util'
 import { claimToken } from '@wallet'
 import { getTokenInfo } from '@wallet/proofs'
 import { useEffect, useState } from 'react'
@@ -85,11 +85,17 @@ export default function Dashboard({ navigation, route }: TDashboardPageProps) {
 	const handleMintModal = async (forEnutsMint = false) => {
 		setModal({ ...modal, mint: false })
 		await store.set(STORE_KEYS.explainer, '1')
-		navigation.navigate('mints', { newMint: forEnutsMint })
+		navigation.navigate('mints', { defaultMint: forEnutsMint, newMint: !forEnutsMint })
 	}
 
 	const handleEnutsMint = async () => {
-		await saveDefaultOnInit()
+		try {
+			await saveDefaultOnInit()
+		} catch (e) {
+			openPromptAutoClose({ msg: isErr(e) ? e.message : t('smthWrong') })
+			await handleMintModal(false)
+			return
+		}
 		await handleMintModal(true)
 	}
 
@@ -256,20 +262,22 @@ export default function Dashboard({ navigation, route }: TDashboardPageProps) {
 			{/* Balance, Disclaimer & History */}
 			<Balance balance={balance} nav={navigation} />
 			{/* Receive/send/mints buttons */}
-			<View style={[styles.actionWrap, { paddingHorizontal: !hasMint || balance < 1 ? 75 : 30 }]}>
-				{(hasMint && balance > 0) &&
+			<View style={[styles.actionWrap, { paddingHorizontal: 30 }]}>
+				{/* Send button or add first mint */}
+				{(hasMint && balance > 0) ?
 					<ActionBtn
-						icon={
-							<SendIcon
-								width={32}
-								height={32}
-								color={hi[highlight]}
-							/>
-						}
+						icon={<SendIcon width={32} height={32} color={hi[highlight]} />}
 						txt={t('send', { ns: NS.wallet })}
 						color={hi[highlight]}
 						onPress={() => setModal({ ...modal, sendOpts: true })}
 					/>
+					:
+					<ActionBtn
+						icon={<PlusIcon width={36} height={36} color={hi[highlight]} />}
+						txt='Mint'
+						color={hi[highlight]}
+						onPress={() => setModal({ ...modal, mint: true })}
+					/>
 				}
 				<ActionBtn
 					icon={<ScanQRIcon width={32} height={32} color={hi[highlight]} />}
@@ -284,7 +292,7 @@ export default function Dashboard({ navigation, route }: TDashboardPageProps) {
 					onPress={() => setModal({ ...modal, receiveOpts: true })}
 				/>
 			</View>
-			{/* scan QR */}
+			{/* beta warning */}
 			<View style={styles.hintWrap}>
 				<TouchableOpacity
 					onPress={() => navigation.navigate('disclaimer')}

src/screens/Mints/index.tsx

@@ -129,28 +129,37 @@ export default function Mints({ navigation, route }: TMintsPageProps) {
 		await handleMintInput(clipboard || '')
 	}
 
+	const handleInitialRender = async () => {
+		// user comes from dashboard and wants to add his own mint url, open prompt
+		if (route.params?.newMint) {
+			// timeout is needed on IOS only when different prompts are called synchronously
+			const t = setTimeout(() => {
+				setNewMintModal(true)
+				clearTimeout(t)
+			}, 200)
+			return
+		}
+		await handleMintsState()
+		const defaultt = await getDefaultMint()
+		setDefaultM(defaultt ?? '')
+		// this is the case when user adds the initial default mint
+		if (route.params?.defaultMint) {
+			// ask to mint new token
+			openTopUpModal()
+		}
+	}
+
 	// Show user mints with balances and default mint icon
 	useEffect(() => {
-		void (async () => {
-			await handleMintsState()
-			setDefaultM(await getDefaultMint() ?? '')
-			if (route.params?.newMint) {
-				openTopUpModal()
-			}
-		})()
+		void handleInitialRender()
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [])
 
 	// get mints balances and default mint after navigating to this page
 	useEffect(() => {
 		// eslint-disable-next-line @typescript-eslint/no-misused-promises
 		const focusHandler = navigation.addListener('focus', async () => {
-			await handleMintsState()
-			const defaultt = await getDefaultMint()
-			setDefaultM(defaultt ?? '')
-			if (route.params?.newMint) {
-				openTopUpModal()
-			}
+			await handleInitialRender()
 		})
 		return focusHandler
 		// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -269,12 +278,11 @@ export default function Mints({ navigation, route }: TMintsPageProps) {
 					topBtnTxt={t('yes')}
 					topBtnAction={() => {
 						setTopUpModal(false)
-						if (!selectedMint) {
-							openPromptAutoClose({ msg: '' })
-							return
-						}
+						l({ selectedMint })
 						navigation.navigate('selectAmount', {
-							mint: selectedMint,
+							// either for initial default mint (selectedMint->undefined & userMints.length == 1 (user has only the 1 initial mint))
+							// or mint via input (selectedMint->defined)
+							mint: !selectedMint ? { mintUrl: usertMints[0].mintUrl, customName: usertMints[0].customName } : selectedMint,
 							balance: 0,
 						})
 					}}

src/screens/Payment/Send/EncodedToken.tsx

@@ -54,6 +54,8 @@ export default function EncodedTokenPage({ navigation, route }: TEncodedTokenPag
 		<View style={[globals(color).container, styles.container, { paddingBottom: isIOS ? 50 : 20 }]}>
 			<TopNav
 				withBackBtn
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+				screenName={`${t('newToken')}  🥜🐿️`}
 				handlePress={() => navigation.navigate('dashboard')}
 			/>
 			{/* The amount of the created token */}
@@ -96,7 +98,7 @@ const styles = StyleSheet.create({
 	},
 	qrWrap: {
 		alignItems: 'center',
-		marginTop: 75,
+		marginTop: 90,
 	},
 	tokenAmount: {
 		fontSize: 36,