diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx index 15b314007c43..b3ee0cb60f87 100644 --- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx +++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx @@ -362,7 +362,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles, route}: BaseOnboardingW {/* This screen normally opens onboarding, so there is nothing to go back to unless the intent list sent us here. */} Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute())} + onBackButtonPress={() => Navigation.goBack()} shouldShowCloseButton={isConciergeTaskFlow} onCloseButtonPress={onboardingValues?.isMergingAccountBlocked ? handleConciergeTaskErrorConfirm : returnToOriginReport} /> diff --git a/tests/ui/WorkEmailOnboardingNavigation.tsx b/tests/ui/WorkEmailOnboardingNavigation.tsx index 3c777bdcd92b..9f5097b61342 100644 --- a/tests/ui/WorkEmailOnboardingNavigation.tsx +++ b/tests/ui/WorkEmailOnboardingNavigation.tsx @@ -105,26 +105,6 @@ function OnboardingModalNavigatorWithRealWorkspaces() { ); } -// Stands in for the intent list; only whether Back lands on it matters. -function OnboardingPurposeStub() { - return ; -} - -function OnboardingModalNavigatorWithPurpose() { - return ( - - - - - ); -} - // The back button is what is under test in the second-visit case, so that one navigator renders the real screen. function OnboardingModalNavigatorWithWorkspaces() { return ( @@ -336,37 +316,6 @@ describe('Onboarding work email navigation', () => { expect(onboardingValues?.shouldValidate).toBeUndefined(); }); - it('should return to the intent list when Back is pressed on the work email screen after a refresh', async () => { - await TestHelper.signInWithTestUser(); - - await act(async () => { - await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, { - hasCompletedGuidedSetupFlow: false, - }); - await Onyx.merge(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE); - await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true}); - }); - - // Given a refresh rebuilt the stack from the URL, so the intent list is no longer behind the work email screen - renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithPurpose); - - await waitForBatchedUpdatesWithAct(); - - // When the user presses Back - await waitFor(() => { - expect(screen.getByLabelText(TestHelper.translateLocal('common.back'))).toBeOnTheScreen(); - }); - fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back'))); - - await waitForBatchedUpdatesWithAct(); - - // Then the explicit ONBOARDING_PURPOSE fallback replaces the work email screen inside the modal instead of - // popping the whole onboarding modal - await waitFor(() => { - expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]); - }); - }); - it('should keep Back working on a later visit to Join a workspace after the merge', async () => { await TestHelper.signInWithTestUser();