diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index 9fd7e12d5ded..256810f7fe7c 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -103,10 +103,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE, {canBeMissing: true}); const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false}); - const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true}); - const [onboardingUserReportedIntegration] = useOnyx(ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION, {canBeMissing: true}); - const isPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && !!account?.hasAccessibleDomainPolicies; const [userReportedIntegration, setUserReportedIntegration] = useState(onboardingUserReportedIntegration ?? undefined); const [error, setError] = useState(''); @@ -197,12 +194,10 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding } setOnboardingUserReportedIntegration(userReportedIntegration); - // Navigate to Interested Features if personal details have already been provided. - const nextRoute = isPrivateDomainAndHasAccessiblePolicies - ? ROUTES.ONBOARDING_INTERESTED_FEATURES.getRoute(route.params?.backTo) - : ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(route.params?.backTo); - Navigation.navigate(nextRoute); - }, [translate, userReportedIntegration, route.params?.backTo, isPrivateDomainAndHasAccessiblePolicies]); + + // Navigate to the next onboarding step interested features with the selected integration + Navigation.navigate(ROUTES.ONBOARDING_INTERESTED_FEATURES.getRoute(route.params?.backTo)); + }, [translate, userReportedIntegration, route.params?.backTo]); const handleIntegrationSelect = useCallback((integrationKey: OnboardingAccounting | null) => { setUserReportedIntegration(integrationKey); diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx index 165e1b9230ad..5cdd900da72b 100644 --- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx +++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx @@ -36,6 +36,7 @@ import CONFIG from '@src/CONFIG'; import CONST, {FEATURE_IDS} from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; import type {BaseOnboardingInterestedFeaturesProps, Feature, SectionObject} from './types'; function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardingInterestedFeaturesProps) { @@ -349,7 +350,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin Navigation.goBack()} + onBackButtonPress={() => Navigation.goBack(ROUTES.ONBOARDING_ACCOUNTING.getRoute())} /> {translate('onboarding.interestedFeatures.title')} diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx index da088f213efa..3945b15405fb 100644 --- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx +++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx @@ -106,11 +106,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat return; } - if (!isPrivateDomainAndHasAccessiblePolicies && onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) { - Navigation.navigate(ROUTES.ONBOARDING_INTERESTED_FEATURES.getRoute(route.params?.backTo)); - return; - } - completeOnboarding(firstName, lastName); }, [isPrivateDomainAndHasAccessiblePolicies, onboardingPurposeSelected, isValidated, route.params?.backTo, completeOnboarding, isVsb, isSmb, formatPhoneNumber],