Fix app start navigation logic (#3261)

MetaMask · Oct 5, 2021 · d8a85ab · d8a85ab
1 parent d502f24
commit d8a85ab
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js
@@ -85,18 +85,8 @@ const Entry = (props) => {
 			useNativeDriver: true,
 			isInteraction: false,
 		}).start(() => {
-			if (viewToGo === 'OptinMetrics') {
-				props.navigation.navigate('OnboardingRootNav', {
-					screen: 'OnboardingNav',
-					params: { screen: 'OptinMetrics' },
-				});
-			} else if (viewToGo && (viewToGo !== 'WalletView' || viewToGo !== 'Onboarding')) {
-				props.navigation.navigate(viewToGo);
-			} else if (viewToGo === 'Onboarding') {
-				props.navigation.navigate('OnboardingRootNav');
-			} else {
-				props.navigation.navigate('HomeNav');
-			}
+			const screen = viewToGo || 'OnboardingRootNav';
+			props.navigation.navigate(screen);
 		});
 	}, [opacity, viewToGo, props.navigation]);
 
@@ -130,12 +120,10 @@ const Entry = (props) => {
 				}
 				// Get onboarding wizard state
 				const onboardingWizard = await DefaultPreference.get(ONBOARDING_WIZARD);
-				if (onboardingWizard) {
-					animateAndGoTo('HomeNav');
-				} else {
+				if (!onboardingWizard) {
 					props.setOnboardingWizardStep(1);
-					animateAndGoTo('WalletView');
 				}
+				animateAndGoTo('HomeNav');
 			} else if (props.passwordSet) {
 				animateAndGoTo('Login');
 			} else {