diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts index a7dd787666c5..846ca15cb1ea 100644 --- a/src/libs/actions/Welcome/OnboardingFlow.ts +++ b/src/libs/actions/Welcome/OnboardingFlow.ts @@ -122,6 +122,9 @@ function getOnboardingInitialPath(getOnboardingInitialPathParams: GetOnboardingI } if (!isUserFromPublicDomain && hasAccessiblePolicies) { + if (onboardingInitialPath.includes(ROUTES.ONBOARDING_PRIVATE_DOMAIN.route) || onboardingInitialPath.includes(ROUTES.ONBOARDING_PERSONAL_DETAILS.route)) { + return onboardingInitialPath; + } return `/${ROUTES.ONBOARDING_PERSONAL_DETAILS.route}`; } diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx index f4ac1bd9c843..c5602dc65d76 100644 --- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx +++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx @@ -16,6 +16,7 @@ import {resendValidateCode} from '@userActions/User'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import type {Route} from '@src/ROUTES'; import type {BaseOnboardingPrivateDomainProps} from './types'; function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboardingPrivateDomainProps) { @@ -72,7 +73,10 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard { + const routeToNavigate = (route.params?.backTo as Route) ?? ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(); + Navigation.goBack(routeToNavigate); + }} />