From 26f15668fd0187325651f25418b14a59ccaf88fc Mon Sep 17 00:00:00 2001 From: "Abdelrahman Khattab (via MelvinBot)" Date: Wed, 14 Oct 2026 16:25:19 +0000 Subject: [PATCH 1/2] Clear the onboarding work email error when pressing Back to the intent list Co-authored-by: Abdelrahman Khattab --- .../BaseOnboardingWorkEmail.tsx | 6 ++- tests/ui/WorkEmailOnboardingNavigation.tsx | 54 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx index 15b314007c43..329d746e509c 100644 --- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx +++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx @@ -362,7 +362,11 @@ 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={() => { + // Clear any work email error so the purpose screen doesn't render it without its translation params. + clearOnboardingMergeAccountBlocked(); + Navigation.goBack(ROUTES.ONBOARDING_PURPOSE.getRoute()); + }} shouldShowCloseButton={isConciergeTaskFlow} onCloseButtonPress={onboardingValues?.isMergingAccountBlocked ? handleConciergeTaskErrorConfirm : returnToOriginReport} /> diff --git a/tests/ui/WorkEmailOnboardingNavigation.tsx b/tests/ui/WorkEmailOnboardingNavigation.tsx index 3c777bdcd92b..f246d87a36ad 100644 --- a/tests/ui/WorkEmailOnboardingNavigation.tsx +++ b/tests/ui/WorkEmailOnboardingNavigation.tsx @@ -367,6 +367,60 @@ describe('Onboarding work email navigation', () => { }); }); + it('should clear the work email error when Back is pressed so the intent list does not show it', async () => { + await TestHelper.signInWithTestUser(); + + // Given AddWorkEmail failed with the domain-controlled error while joining a company workspace + await act(async () => { + await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, { + hasCompletedGuidedSetupFlow: false, + isMergingAccountBlocked: true, + }); + await Onyx.merge(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.mergeBlockScreen.domainControlledSubtitle'); + await Onyx.merge(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.JOIN_WORKSPACE); + await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, { + onboardingWorkEmail: workEmail, + }); + await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true}); + }); + + renderOnboardingStack([SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithPurpose); + + await waitForBatchedUpdatesWithAct(); + + // When the user presses Back instead of confirming the blocked screen + await waitFor(() => { + expect(screen.getByLabelText(TestHelper.translateLocal('common.back'))).toBeOnTheScreen(); + }); + fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back'))); + + await waitForBatchedUpdatesWithAct(); + + await waitFor(() => { + expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PURPOSE]); + }); + + // Then the error is cleared, because the intent list translates it without the work email and would show + // "undefined is a domain controlled login" + let errorMessageTranslationKey: OnyxEntry; + await TestHelper.getOnyxData({ + key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, + callback: (value) => { + errorMessageTranslationKey = value ?? undefined; + }, + }); + expect(errorMessageTranslationKey).toBeFalsy(); + + let onboardingValues: OnyxEntry; + await TestHelper.getOnyxData({ + key: ONYXKEYS.NVP_ONBOARDING, + callback: (value) => { + onboardingValues = value; + }, + }); + expect(onboardingValues?.isMergingAccountBlocked).toBe(false); + }); + it('should keep Back working on a later visit to Join a workspace after the merge', async () => { await TestHelper.signInWithTestUser(); From d1b739a6c187d36b71a40fa1ef334351e250ce5a Mon Sep 17 00:00:00 2001 From: "Abdelrahman Khattab (via MelvinBot)" Date: Wed, 14 Oct 2026 17:14:19 +0000 Subject: [PATCH 2/2] Pass the work email when the purpose page translates merge-block errors Co-authored-by: Abdelrahman Khattab --- .../BaseOnboardingPurpose.tsx | 16 +++++++++++++- tests/ui/OnboardingPurpose.tsx | 21 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx index 40858a9131c5..bd66c16d645a 100644 --- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx +++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx @@ -32,6 +32,7 @@ import {clearOnboardingMergeAccountBlocked, setOnboardingErrorMessage, setOnboar import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; +import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm'; import type {OnboardingPurpose} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; @@ -86,6 +87,8 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID); const [adminsChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${onboardingAdminsChatReportID}`); const [personalDetailsForm] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_PERSONAL_DETAILS_FORM); + const [workEmailForm] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM); + const workEmail = workEmailForm?.[INPUT_IDS.ONBOARDING_WORK_EMAIL]; const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE); const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED); const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector}); @@ -220,6 +223,17 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro const onboardingLocalRef = useRef(null); useImperativeHandle(isFocused ? OnboardingRefManager.ref : onboardingLocalRef, () => ({handleOuterClick}), [handleOuterClick]); + const getErrorMessage = () => { + if (!onboardingErrorMessage) { + return undefined; + } + // These merge-block messages interpolate the work email, so translate them with the email explicitly. + if (onboardingErrorMessage === 'onboarding.mergeBlockScreen.domainControlledSubtitle' || onboardingErrorMessage === 'onboarding.mergeBlockScreen.validatedPublicDomainSubtitle') { + return translate(onboardingErrorMessage, workEmail); + } + return translate(onboardingErrorMessage); + }; + if (isLoadingOnyxValue(onboardingErrorMessageResult)) { return null; } @@ -250,7 +264,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro - + ); diff --git a/tests/ui/OnboardingPurpose.tsx b/tests/ui/OnboardingPurpose.tsx index 80b19514c7aa..ceda8a077186 100644 --- a/tests/ui/OnboardingPurpose.tsx +++ b/tests/ui/OnboardingPurpose.tsx @@ -226,6 +226,27 @@ describe('OnboardingPurpose Page', () => { await waitForBatchedUpdatesWithAct(); }); + it('should show the work email in a domain-controlled error that reaches the purpose page', async () => { + // Given a domain-controlled merge error left behind by the work email step, with the email still in the form + const workEmail = 'tester@applause.expensifail.com'; + await TestHelper.signInWithTestUser(1, 'test@gmail.com'); + await act(async () => { + await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {onboardingWorkEmail: workEmail}); + await Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.mergeBlockScreen.domainControlledSubtitle'); + }); + + // When the purpose page renders that error + const {unmount} = renderOnboardingPurposePage(SCREENS.ONBOARDING.PURPOSE, {backTo: ''}); + await waitForBatchedUpdatesWithAct(); + + // Then the message names the work email instead of "undefined", because the key interpolates the email + expect(screen.getByText(TestHelper.translateLocal('onboarding.mergeBlockScreen.domainControlledSubtitle', workEmail))).toBeOnTheScreen(); + expect(screen.queryByText(/undefined is a domain controlled login/)).not.toBeOnTheScreen(); + + unmount(); + await waitForBatchedUpdatesWithAct(); + }); + it('should navigate to personal details page when user selects EMPLOYER and is from public domain', async () => { await TestHelper.signInWithTestUser();