diff --git a/app/init/launch.ts b/app/init/launch.ts index 54d429a92..6892135fc 100644 --- a/app/init/launch.ts +++ b/app/init/launch.ts @@ -107,8 +107,7 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => { hasCurrentUser = Boolean(currentUserId); } - // invert this logic for onboardingViewed - if ((LocalConfig.ShowOnboarding && onboardingViewed)) { + if (LocalConfig.ShowOnboarding && !onboardingViewed) { return resetToOnboarding({...props, goToLoginServerUrl: serverUrl}); } @@ -141,8 +140,7 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => { } } - // invert this logic for onboardingViewed - if (LocalConfig.ShowOnboarding && !onboardingViewed) { + if (!LocalConfig.ShowOnboarding || onboardingViewed) { return launchToServer(props, resetNavigation); } return resetToOnboarding(props); diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts index f2274f81e..0f5e2a14f 100644 --- a/app/screens/navigation.ts +++ b/app/screens/navigation.ts @@ -409,10 +409,6 @@ export function goToScreen(name: string, title: string, passProps = {}, options }, }; - if (name === Screens.SERVER) { - console.log('\n\n** screen pass props', passProps, componentId, name, '\n\n'); - } - return Navigation.push(componentId, { component: { id: name, diff --git a/package.json b/package.json index e793dfa26..6e845eea7 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,7 @@ "mmjstool": "mmjstool", "pod-install": "cd ios && bundle exec pod install", "postinstall": "patch-package && ./scripts/postinstall.sh", - "preinstall": "", + "preinstall": "npx solidarity", "prestorybook": "rnstl", "start": "react-native start", "storybook": "start-storybook -p 7007",