Fix onboardingInitialPath in mobile

Author: VickyStash

src/hooks/useOnboardingFlow.ts

@@ -23,6 +23,8 @@ function useOnboardingFlowRouter() {
     });
     const [currentOnboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
     const [currentOnboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE, {canBeMissing: true});
+    const [onboardingInitialPath, onboardingInitialPathResult] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, {canBeMissing: true});
+    const isOnboardingInitialPathLoading = isLoadingOnyxValue(onboardingInitialPathResult);
 
     const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
     const startedOnboardingFlowRef = useRef(false);
@@ -39,7 +41,7 @@ function useOnboardingFlowRouter() {
     useEffect(() => {
         // This should delay opening the onboarding modal so it does not interfere with the ongoing ReportScreen params changes
         InteractionManager.runAfterInteractions(() => {
-            if (isLoadingApp !== false) {
+            if (isLoadingApp !== false || isOnboardingInitialPathLoading) {
                 return;
             }
 
@@ -85,6 +87,7 @@ function useOnboardingFlowRouter() {
                         hasAccessiblePolicies: !!account?.hasAccessibleDomainPolicies,
                         currentOnboardingCompanySize,
                         currentOnboardingPurposeSelected,
+                        onboardingInitialPath,
                     });
                 }
             }
@@ -98,6 +101,7 @@ function useOnboardingFlowRouter() {
                     hasAccessiblePolicies: !!account?.hasAccessibleDomainPolicies,
                     currentOnboardingCompanySize,
                     currentOnboardingPurposeSelected,
+                    onboardingInitialPath,
                 });
             }
         });
@@ -117,6 +121,8 @@ function useOnboardingFlowRouter() {
         account?.hasAccessibleDomainPolicies,
         currentOnboardingCompanySize,
         currentOnboardingPurposeSelected,
+        onboardingInitialPath,
+        isOnboardingInitialPathLoading,
     ]);
 
     return {isOnboardingCompleted: hasCompletedGuidedSetupFlowSelector(onboardingValues), isHybridAppOnboardingCompleted};

src/libs/Navigation/NavigationRoot.tsx

@@ -106,6 +106,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
     const [hasNonPersonalPolicy] = useOnyx(ONYXKEYS.HAS_NON_PERSONAL_POLICY, {canBeMissing: true});
     const [currentOnboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
     const [currentOnboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE, {canBeMissing: true});
+    const [onboardingInitialPath] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, {canBeMissing: true});
 
     const previousAuthenticated = usePrevious(authenticated);
 
@@ -139,6 +140,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
                     hasAccessiblePolicies: !!account.hasAccessibleDomainPolicies,
                     currentOnboardingPurposeSelected,
                     currentOnboardingCompanySize,
+                    onboardingInitialPath,
                 }),
                 linkingConfig.config,
             );

src/libs/actions/Report.ts

@@ -380,6 +380,14 @@ Onyx.connect({
     },
 });
 
+let onboardingInitialPath: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.ONBOARDING_LAST_VISITED_PATH,
+    callback: (value) => {
+        onboardingInitialPath = value;
+    },
+});
+
 const typingWatchTimers: Record<string, NodeJS.Timeout> = {};
 
 let reportIDDeeplinkedFromOldDot: string | undefined;
@@ -3472,6 +3480,7 @@ function openReportFromDeepLink(url: string) {
                                     isUserFromPublicDomain: !!account?.isFromPublicDomain,
                                     currentOnboardingPurposeSelected,
                                     currentOnboardingCompanySize,
+                                    onboardingInitialPath,
                                 }),
                             onCompleted: handleDeeplinkNavigation,
                             onCanceled: handleDeeplinkNavigation,

src/libs/actions/Welcome/OnboardingFlow.ts

@@ -16,18 +16,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Locale, Onboarding} from '@src/types/onyx';
 
-let onboardingInitialPath = '';
-const onboardingLastVisitedPathConnection = Onyx.connect({
-    key: ONYXKEYS.ONBOARDING_LAST_VISITED_PATH,
-    callback: (value) => {
-        if (value === undefined) {
-            return;
-        }
-        onboardingInitialPath = value;
-        Onyx.disconnect(onboardingLastVisitedPathConnection);
-    },
-});
-
 let onboardingValues: Onboarding;
 Onyx.connect({
     key: ONYXKEYS.NVP_ONBOARDING,
@@ -48,6 +36,7 @@ type GetOnboardingInitialPathParamsType = {
     onboardingValuesParam?: Onboarding;
     currentOnboardingPurposeSelected: OnyxEntry<OnboardingPurpose>;
     currentOnboardingCompanySize: OnyxEntry<OnboardingCompanySize>;
+    onboardingInitialPath: OnyxEntry<string>;
 };
 
 type OnboardingTaskLinks = Partial<{
@@ -103,14 +92,20 @@ function startOnboardingFlow(startOnboardingFlowParams: GetOnboardingInitialPath
 }
 
 function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingInitialPathParamsType): string {
-    const {isUserFromPublicDomain, hasAccessiblePolicies, onboardingValuesParam, currentOnboardingPurposeSelected, currentOnboardingCompanySize} = getOnboardingInitialPathParams;
+    const {
+        isUserFromPublicDomain,
+        hasAccessiblePolicies,
+        onboardingValuesParam,
+        currentOnboardingPurposeSelected,
+        currentOnboardingCompanySize,
+        onboardingInitialPath = '',
+    } = getOnboardingInitialPathParams;
     const state = getStateFromPath(onboardingInitialPath, linkingConfig.config);
     const currentOnboardingValues = onboardingValuesParam ?? onboardingValues;
     const isVsb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
     const isSmb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
     const isIndividual = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL;
     const isCurrentOnboardingPurposeManageTeam = currentOnboardingPurposeSelected === CONST.ONBOARDING_CHOICES.MANAGE_TEAM;
-    const isCurrentOnboardingCompanySizeMicro = currentOnboardingCompanySize === CONST.ONBOARDING_COMPANY_SIZE.MICRO;
 
     if (isVsb) {
         Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.MANAGE_TEAM);
@@ -146,7 +141,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
         return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
     }
 
-    if (onboardingInitialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) && (!isCurrentOnboardingPurposeManageTeam || !isCurrentOnboardingCompanySizeMicro)) {
+    if (onboardingInitialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) && (!isCurrentOnboardingPurposeManageTeam || !currentOnboardingCompanySize)) {
         return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
     }
 
@@ -395,8 +390,5 @@ const getOnboardingMessages = (locale?: Locale) => {
     };
 };
 
-function clearInitialPath() {
-    onboardingInitialPath = '';
-}
 export type {OnboardingMessage, OnboardingTask, OnboardingTaskLinks, OnboardingPurpose, OnboardingCompanySize};
-export {getOnboardingInitialPath, startOnboardingFlow, clearInitialPath, getOnboardingMessages};
+export {getOnboardingInitialPath, startOnboardingFlow, getOnboardingMessages};

src/libs/actions/Welcome/index.ts

@@ -13,7 +13,6 @@ import type {OnboardingPurpose} from '@src/types/onyx';
 import type Onboarding from '@src/types/onyx/Onboarding';
 import type TryNewDot from '@src/types/onyx/TryNewDot';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import {clearInitialPath} from './OnboardingFlow';
 import type {OnboardingCompanySize} from './OnboardingFlow';
 
 type OnboardingData = Onboarding | undefined;
@@ -195,7 +194,6 @@ function resetAllChecks() {
     });
     isLoadingReportData = true;
     isOnboardingInProgress = false;
-    clearInitialPath();
 }
 
 function setSelfTourViewed(shouldUpdateOnyxDataOnlyLocally = false) {