Merge pull request Expensify#67017 from MobileMage/fix/onboarding-refresh-path-issue

lakchote · web-flow · commit 3edd54dcacb6 · 2025-07-29T11:36:45.000+02:00
Fix onboarding flow path changes after page refresh
diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -118,6 +118,11 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI
     if (isIndividual) {
         Onyx.set(ONYXKEYS.ONBOARDING_CUSTOM_CHOICES, [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND, CONST.ONBOARDING_CHOICES.EMPLOYER, CONST.ONBOARDING_CHOICES.CHAT_SPLIT]);
     }
+
+    if (onboardingInitialPath && state?.routes?.at(-1)?.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR) {
+        return onboardingInitialPath;
+    }
+
     if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted) {
         return `/${ROUTES.ONBOARDING_WORK_EMAIL.route}`;
     }

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,11 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI`
`118`	`118`	`if (isIndividual) {`
`119`	`119`	`Onyx.set(ONYXKEYS.ONBOARDING_CUSTOM_CHOICES, [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND, CONST.ONBOARDING_CHOICES.EMPLOYER, CONST.ONBOARDING_CHOICES.CHAT_SPLIT]);`
`120`	`120`	`}`
	`121`	`+`
	`122`	`+ if (onboardingInitialPath && state?.routes?.at(-1)?.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR) {`
	`123`	`+ return onboardingInitialPath;`
	`124`	`+ }`
	`125`	`+`
`121`	`126`	`if (isUserFromPublicDomain && !onboardingValuesParam?.isMergeAccountStepCompleted) {`
`122`	`127`	return `/${ROUTES.ONBOARDING_WORK_EMAIL.route}`;
`123`	`128`	`}`