Improve seed restore

src/components/TxtInput.tsx

@@ -17,6 +17,7 @@ interface ITxtInputProps {
 	multiline?: boolean
 	numberOfLines?: number
 	style?: StyleProp<TextStyle>
+	autoCapitalize?: 'none' | 'sentences' | 'words' | 'characters'
 }
 
 export default function TxtInput({
@@ -31,7 +32,8 @@ export default function TxtInput({
 	value,
 	multiline,
 	numberOfLines,
-	style
+	style,
+	autoCapitalize
 }: ITxtInputProps) {
 	const { color, highlight } = useThemeContext()
 	const inputRef = createRef<TextInput>()
@@ -58,6 +60,7 @@ export default function TxtInput({
 			value={value}
 			multiline={multiline}
 			numberOfLines={numberOfLines}
+			autoCapitalize={autoCapitalize}
 			style={[globals(color).input, { marginBottom: vs(20) }, style]}
 		/>
 	)

src/components/nav/Navigator.tsx

@@ -38,7 +38,9 @@ import RecoverScreen from '@screens/Restore/Recover'
 import RecoveringScreen from '@screens/Restore/Recovering'
 import RestoreWarningScreen from '@screens/Restore/RestoreWarning'
 import SeedScreen from '@screens/Restore/Seed'
+import SelectKeysetScreen from '@screens/Restore/SelectKeyset'
 import SelectRecoveryMintScreen from '@screens/Restore/SelectRecoveryMint'
+import RestoreOverviewScreen from '@screens/Restore/Success'
 import Settings from '@screens/Settings'
 import AboutSettings from '@screens/Settings/About'
 import ContactsSettings from '@screens/Settings/Contacts'
@@ -197,6 +199,8 @@ export default function Navigator({
 				<Stack.Screen name='Recovering' component={RecoveringScreen} />
 				<Stack.Screen name='Select recovery mint' component={SelectRecoveryMintScreen} />
 				<Stack.Screen name='Restore warning' component={RestoreWarningScreen} />
+				<Stack.Screen name='restoreOverview' component={RestoreOverviewScreen} />
+				<Stack.Screen name='selectKeyset' component={SelectKeysetScreen} />
 			</Stack.Navigator>
 		</View>
 	)

src/model/nav.ts

@@ -178,7 +178,6 @@ export type RootStackParamList = {
 		isZap?: boolean
 		nostr?: INostrSendData
 		isScanned?: boolean
-		isRestored?: boolean
 		change?: number
 		comingFromOnboarding?: boolean
 	}
@@ -236,13 +235,33 @@ export type RootStackParamList = {
 		comingFromOnboarding?: boolean
 	}
 	Recovering: {
+		from: number
+		to: number
 		mintUrl: string
+		keysetId: string
 		mnemonic: string
 		comingFromOnboarding?: boolean
+		shouldOvershoot?: boolean
 	}
 	'Restore warning': {
 		comingFromOnboarding?: boolean
 	}
+	restoreOverview: {
+		mnemonic: string
+		amount: number
+		mint: string
+		keysetID: string
+		cycle: {
+			start: number
+			end: number
+		}
+		comingFromOnboarding?: boolean
+	}
+	selectKeyset: {
+		mnemonic: string
+		mintUrl: string
+		comingFromOnboarding?: boolean
+	}
 }
 
 export type TRouteString = 'dashboard' | 'mints' | 'Address book' | 'Settings'
@@ -294,6 +313,8 @@ export type IDerivingPageProps = NativeStackScreenProps<RootStackParamList, 'Der
 export type IRecoveringPageProps = NativeStackScreenProps<RootStackParamList, 'Recovering'>
 export type ISelectRecoveryMintPageProps = NativeStackScreenProps<RootStackParamList, 'Select recovery mint'>
 export type IRestoreWarningPageProps = NativeStackScreenProps<RootStackParamList, 'Restore warning'>
+export type IRestoreSuccessPageProps = NativeStackScreenProps<RootStackParamList, 'restoreOverview'>
+export type ISelectKeysetPageProps = NativeStackScreenProps<RootStackParamList, 'selectKeyset'>
 export type TBottomNavProps =
 	TNostrOnboardingPageProps |
 	TDashboardPageProps |

src/screens/Dashboard.tsx

@@ -308,6 +308,13 @@ export default function Dashboard({ navigation, route }: TDashboardPageProps) {
 						color={hi[highlight]}
 						onPress={() => {
 							setModal(prev => ({ ...prev, sendOpts: true }))
+							// navigation.navigate('restoreSuccess', {
+							// 	mint: 'https://testnut.cashu.space',
+							// 	keysetID: 'jkasfhgkjg',
+							// 	cycle: { start: 300, end: 350 },
+							// 	amount: 100,
+							// 	comingFromOnboarding: true,
+							// })
 						}}
 					/>
 					:
@@ -317,6 +324,13 @@ export default function Dashboard({ navigation, route }: TDashboardPageProps) {
 						color={hi[highlight]}
 						onPress={() => {
 							navigation.navigate('mints')
+							// navigation.navigate('restoreSuccess', {
+							// 	mint: 'https://testnut.cashu.space',
+							// 	keysetID: 'jkasfhgkjg',
+							// 	cycle: { start: 300, end: 350 },
+							// 	amount: 100,
+							// 	comingFromOnboarding: true,
+							// })
 						}}
 					/>
 				}

src/screens/Mints/index.tsx

@@ -229,6 +229,7 @@ export default function Mints({ navigation }: TMintsPageProps) {
 						value={input}
 						onChangeText={setInput}
 						onSubmitEditing={() => void handleMintInput()}
+						autoCapitalize='none'
 						style={[{ paddingRight: s(55) }]}
 					/>
 					{/* scan icon */}

src/screens/Payment/Send/Inputfield.tsx

@@ -172,17 +172,11 @@ export default function InputfieldScreen({ navigation, route }: TMeltInputfieldP
 						keyboardType='email-address'
 						placeholder={t('invoiceOrLnurl')}
 						value={input}
-						onChangeText={text => {
-							setInput(text)
-							/* Handle when the continue button is pressed
-							if (isLnInvoice(text)) {
-								void handleInvoicePaste(text)
-							}
-							*/
-						}}
+						onChangeText={text => setInput(text)}
 						onSubmitEditing={() => void handleBtnPress()}
 						autoFocus
 						ms={200}
+						autoCapitalize='none'
 						style={{ paddingRight: s(90) }}
 					/>
 					{/* Paste / Clear Input */}

src/screens/Payment/Success.tsx

@@ -7,7 +7,6 @@ import { preventBack } from '@nav/utils'
 import ProfilePic from '@screens/Addressbook/ProfilePic'
 import { useThemeContext } from '@src/context/Theme'
 import { NS } from '@src/i18n'
-import { l } from '@src/logger'
 import { formatSatStr, isNum, vib } from '@util'
 import LottieView from 'lottie-react-native'
 import { useEffect } from 'react'
@@ -29,7 +28,7 @@ export default function SuccessPage({ navigation, route }: TSuccessPageProps) {
 		isZap,
 		nostr,
 		isScanned,
-		isRestored,
+		comingFromOnboarding
 	} = route.params
 	const { t } = useTranslation([NS.common])
 	const { color } = useThemeContext()
@@ -44,8 +43,6 @@ export default function SuccessPage({ navigation, route }: TSuccessPageProps) {
 		return () => navigation.removeListener('beforeRemove', backHandler)
 	}, [navigation])
 
-	l({ amount, memo, fee, mint, isClaim, isMelt, nostr, isScanned })
-
 	return (
 		<View style={[styles.container, { backgroundColor: color.BACKGROUND }]}>
 			{nostr && nostr.contact && nostr.contact.picture ?
@@ -71,13 +68,10 @@ export default function SuccessPage({ navigation, route }: TSuccessPageProps) {
 							isAutoSwap ?
 								t('autoSwapSuccess')
 								:
-								isRestored ?
-									<>{formatSatStr(amount || 0)} {t('restored')}!</>
+								!nostr ?
+									<>{formatSatStr(amount || 0)} {isClaim ? t('claimed') : t('minted')}!</>
 									:
-									!nostr ?
-										<>{formatSatStr(amount || 0)} {isClaim ? t('claimed') : t('minted')}!</>
-										:
-										null
+									null
 					}
 				</Text>
 				{memo &&
@@ -123,7 +117,7 @@ export default function SuccessPage({ navigation, route }: TSuccessPageProps) {
 				<Button
 					txt={t('backToDashboard')}
 					onPress={() => {
-						if (route.params?.comingFromOnboarding) {
+						if (comingFromOnboarding) {
 							return navigation.navigate('auth', { pinHash: '' })
 						}
 						const routes = navigation.getState()?.routes

src/screens/Restore/ConfirmMnemonic.tsx

@@ -17,19 +17,6 @@ import { useTranslation } from 'react-i18next'
 import { KeyboardAvoidingView, type TextInput, View } from 'react-native'
 import { ScaledSheet } from 'react-native-size-matters'
 
-/*
-
-manual test cases:
----
-[OK] * Start new seed wallet: confirm mnemonic, set pin, add mint, mint, send, receive, melt, restore
-[OK] * Start new quick wallet: skip pin, add mint, activate seed, mint, send, receive, restore
-[OK] * Start new recovery wallet: paste seed, restore, set pin, send, receive, melt, mint, restore
-[OK] * Start new quick wallet, skip pin, skip mint, restore, send, receive, melt, mint, restore
-[  ] * ...
-[  ] * ...
-
-*/
-
 export default function ConfirmMnemonicScreen({ navigation, route }: IConfirmMnemonicPageProps) {
 
 	const { t } = useTranslation([NS.common])
@@ -103,6 +90,7 @@ export default function ConfirmMnemonicScreen({ navigation, route }: IConfirmMne
 						placeholder={`Seed (${randomInt + 1}.)`}
 						onChangeText={text => setInput(text)}
 						onSubmitEditing={() => void handleConfirm()}
+						autoCapitalize='none'
 						autoFocus
 						ms={200}
 					/>