Merge pull request Expensify#92646 from KJ21-ENG/KJ21-ENG/92417-onboarding-null-path

Fix onboarding null initial path crash

Author: mountiny

src/libs/actions/Welcome/OnboardingFlow.ts

@@ -27,7 +27,7 @@ type GetOnboardingInitialPathParamsType = {
     onboardingValuesParam?: Onboarding;
     currentOnboardingPurposeSelected: OnyxEntry<OnboardingPurpose>;
     currentOnboardingCompanySize: OnyxEntry<OnboardingCompanySize>;
-    onboardingInitialPath: OnyxEntry<string>;
+    onboardingInitialPath: OnyxEntry<string> | null;
     onboardingValues: OnyxEntry<Onboarding>;
     isAccountValidated?: boolean;
 };
@@ -106,11 +106,12 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
         onboardingValuesParam,
         currentOnboardingPurposeSelected,
         currentOnboardingCompanySize,
-        onboardingInitialPath = '',
+        onboardingInitialPath,
         onboardingValues,
         isAccountValidated,
     } = getOnboardingInitialPathParams;
-    const state = getStateFromPath(onboardingInitialPath, linkingConfig.config);
+    const initialPath = onboardingInitialPath ?? '';
+    const state = getStateFromPath(initialPath, linkingConfig.config);
     const currentOnboardingValues = onboardingValuesParam ?? onboardingValues;
     const isVsb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
     const isSmb = currentOnboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
@@ -134,7 +135,7 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
 
     // PRIVATE_DOMAIN ("People you may know are already here") only makes sense for users on a private domain. Only redirect
     // validated accounts; unvalidated users mid-AddWorkEmail can legitimately land here while isFromPublicDomain is stale.
-    if (isUserFromPublicDomain && isAccountValidated && onboardingInitialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route)) {
+    if (isUserFromPublicDomain && isAccountValidated && initialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route)) {
         if (isVsb) {
             return `/${ROUTES.ONBOARDING_ACCOUNTING.route}`;
         }
@@ -145,8 +146,8 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
     }
 
     if (!isUserFromPublicDomain && hasAccessiblePolicies) {
-        if (onboardingInitialPath) {
-            return onboardingInitialPath;
+        if (initialPath) {
+            return initialPath;
         }
         return `/${ROUTES.ONBOARDING_PERSONAL_DETAILS.route}`;
     }
@@ -162,18 +163,18 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
         return `/${ROUTES.ONBOARDING_ROOT.route}`;
     }
 
-    if (onboardingInitialPath.includes(ROUTES.ONBOARDING_EMPLOYEES.route) && currentOnboardingPurposeSelected !== null && !isCurrentOnboardingPurposeManageTeam) {
+    if (initialPath.includes(ROUTES.ONBOARDING_EMPLOYEES.route) && currentOnboardingPurposeSelected !== null && !isCurrentOnboardingPurposeManageTeam) {
         return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
     }
 
     if (
-        onboardingInitialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) &&
+        initialPath.includes(ROUTES.ONBOARDING_ACCOUNTING.route) &&
         ((currentOnboardingPurposeSelected !== null && !isCurrentOnboardingPurposeManageTeam) || (currentOnboardingCompanySize === null && currentOnboardingPurposeSelected !== null))
     ) {
         return `/${ROUTES.ONBOARDING_PURPOSE.route}`;
     }
 
-    return onboardingInitialPath;
+    return initialPath;
 }
 
 const getOnboardingMessages = (locale?: Locale) => {

tests/unit/OnboardingFlowTest.ts

@@ -4,6 +4,23 @@ import CONST from '@src/CONST';
 
 describe('OnboardingFlow', () => {
     describe('getOnboardingInitialPath', () => {
+        it('should return the onboarding fallback path when the last visited path is null', () => {
+            const params: GetOnboardingInitialPathParamsType = {
+                isUserFromPublicDomain: false,
+                hasAccessiblePolicies: false,
+                currentOnboardingPurposeSelected: CONST.ONBOARDING_CHOICES.PERSONAL_SPEND,
+                currentOnboardingCompanySize: CONST.ONBOARDING_COMPANY_SIZE.SMALL,
+                onboardingInitialPath: null,
+                onboardingValues: undefined,
+            };
+
+            let path = '';
+            expect(() => {
+                path = getOnboardingInitialPath(params);
+            }).not.toThrow();
+            expect(path).toBe('/onboarding');
+        });
+
         it('should return the correct path for personal spend', () => {
             const params: GetOnboardingInitialPathParamsType = {
                 isUserFromPublicDomain: false,