Add hasSeed parameter to initialParams

cashubtc · Feb 6, 2024 · 192e69f · 192e69f
1 parent 3e80007
commit 192e69f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/components/nav/Navigator.tsx b/src/components/nav/Navigator.tsx
@@ -194,6 +194,7 @@ export default function Navigator({
 					initialParams={{
 						sawSeedUpdate: sawSeedUpdate,
 						comingFromOnboarding: false,
+						hasSeed: hasSeed,
 					}}
 				/>
 				<Stack.Screen name='Recover' component={RecoverScreen} />

diff --git a/src/model/nav.ts b/src/model/nav.ts
@@ -211,6 +211,7 @@ export type RootStackParamList = {
 	Seed: {
 		comingFromOnboarding?: boolean
 		sawSeedUpdate?: boolean
+		hasSeed?: boolean
 	} | undefined
 	'Select recovery mint': {
 		comingFromOnboarding?: boolean

diff --git a/src/screens/Payment/Processing.tsx b/src/screens/Payment/Processing.tsx
@@ -281,7 +281,6 @@ export default function ProcessingScreen({ navigation, route }: TProcessingPageP
 			const { mints, highestBalance, highestBalanceMint } = await getHighestBalMint()
 			// if highest balance + estFee is sufficient, use it
 			if (highestBalanceMint) {
-				// TODO need to handle the case where the highest balance mint is not reachable?
 				const estFee = await checkFees(highestBalanceMint.mintUrl, recipient)
 				if (highestBalance + estFee >= amount) {
 					return navigation.navigate('coinSelection', {

diff --git a/src/screens/Restore/Seed.tsx b/src/screens/Restore/Seed.tsx
@@ -6,6 +6,7 @@ import Txt from '@comps/Txt'
 import type { ISeedPageProps } from '@model/nav'
 import { useThemeContext } from '@src/context/Theme'
 import { NS } from '@src/i18n'
+import { l } from '@src/logger'
 import { store } from '@store'
 import { STORE_KEYS } from '@store/consts'
 import { globals, mainColors } from '@styles'
@@ -21,6 +22,12 @@ export default function SeedScreen({ navigation, route: { params } }: ISeedPageP
 	const { color } = useThemeContext()
 	const [infoOpen, setInfoOpen] = useState(false)
 
+	l({
+		sawSeedUpdate: params?.sawSeedUpdate,
+		comingFromOnboarding: params?.comingFromOnboarding,
+		hasSeed: params?.hasSeed,
+	})
+
 	return (
 		<SafeAreaView style={{ flex: 1, backgroundColor: color.BACKGROUND }}>
 			<View style={styles.header}>
@@ -69,7 +76,7 @@ export default function SeedScreen({ navigation, route: { params } }: ISeedPageP
 				</TouchableOpacity>
 				<Separator style={[styles.separator]} />
 				{/* quick wallet */}
-				{params?.comingFromOnboarding &&
+				{params?.comingFromOnboarding && !params?.hasSeed &&
 					<>
 						<TouchableOpacity
 							onPress={() => {
@@ -114,7 +121,7 @@ export default function SeedScreen({ navigation, route: { params } }: ISeedPageP
 					</View>
 				</TouchableOpacity>
 				{/* skip seed setup */}
-				{!params?.sawSeedUpdate &&
+				{!params?.comingFromOnboarding && !params?.hasSeed &&
 					<>
 						<Separator style={[styles.separator]} />
 						<TouchableOpacity