diff --git a/src/CONST.ts b/src/CONST.ts
index 4af1d3c79a45..14fe136d8b83 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5615,6 +5615,9 @@ const CONST = {
             DEBUG: 'DEBUG',
         },
     },
+
+    // We need to store this server side error in order to not show the blocking screen when the error is for invalid code
+    MERGE_ACCOUNT_INVALID_CODE_ERROR: '401 Not authorized - Invalid validateCode',
     REIMBURSEMENT_ACCOUNT: {
         DEFAULT_DATA: {
             achData: {
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 0dae8c858939..b74ba884bd41 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -786,6 +786,8 @@ const ONYXKEYS = {
         RULES_CUSTOM_FORM_DRAFT: 'rulesCustomFormDraft',
         DEBUG_DETAILS_FORM: 'debugDetailsForm',
         DEBUG_DETAILS_FORM_DRAFT: 'debugDetailsFormDraft',
+        ONBOARDING_WORK_EMAIL_FORM: 'onboardingWorkEmailForm',
+        ONBOARDING_WORK_EMAIL_FORM_DRAFT: 'onboardingWorkEmailFormDraft',
         MERGE_ACCOUNT_DETAILS_FORM: 'mergeAccountDetailsForm',
         MERGE_ACCOUNT_DETAILS_FORM_DRAFT: 'mergeAccountDetailsFormDraft',
         WORKSPACE_PER_DIEM_FORM: 'workspacePerDiemForm',
@@ -890,6 +892,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.RULES_CUSTOM_FORM]: FormTypes.RulesCustomForm;
     [ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM]: FormTypes.SearchSavedSearchRenameForm;
     [ONYXKEYS.FORMS.DEBUG_DETAILS_FORM]: FormTypes.DebugReportForm | FormTypes.DebugReportActionForm | FormTypes.DebugTransactionForm | FormTypes.DebugTransactionViolationForm;
+    [ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM]: FormTypes.OnboardingWorkEmailForm;
     [ONYXKEYS.FORMS.MERGE_ACCOUNT_DETAILS_FORM]: FormTypes.MergeAccountDetailsForm;
     [ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM]: FormTypes.InternationalBankAccountForm;
     [ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM]: FormTypes.WorkspacePerDiemForm;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 1aced37e8fd0..aa43ac7c7ffb 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -1879,6 +1879,14 @@ const ROUTES = {
         route: 'onboarding/join-workspaces',
         getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/join-workspaces`, backTo),
     },
+    ONBOARDING_WORK_EMAIL: {
+        route: 'onboarding/work-email',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/work-email`, backTo),
+    },
+    ONBOARDING_WORK_EMAIL_VALIDATION: {
+        route: 'onboarding/work-email-validation',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/work-email-validation`, backTo),
+    },
     WELCOME_VIDEO_ROOT: 'onboarding/welcome-video',
     EXPLANATION_MODAL_ROOT: 'onboarding/explanation',
     WORKSPACE_CONFIRMATION: {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index aa8d07ff7147..bbb1b7f8b721 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -641,6 +641,8 @@ const SCREENS = {
         EMPLOYEES: 'Onboarding_Employees',
         ACCOUNTING: 'Onboarding_Accounting',
         WORKSPACES: 'Onboarding_Workspaces',
+        WORK_EMAIL: 'Onboarding_Work_Email',
+        WORK_EMAIL_VALIDATION: 'Onboarding_Work_Email_Validation',
     },
 
     WELCOME_VIDEO: {
diff --git a/src/components/AutoEmailLink.tsx b/src/components/AutoEmailLink.tsx
index d64c665a020f..56eb7d57ac00 100644
--- a/src/components/AutoEmailLink.tsx
+++ b/src/components/AutoEmailLink.tsx
@@ -18,32 +18,43 @@ type AutoEmailLinkProps = {
 
 function AutoEmailLink({text, style}: AutoEmailLinkProps) {
     const styles = useThemeStyles();
+    const emailRegex = COMMON_CONST.REG_EXP.EXTRACT_EMAIL;
+    const matches = [...text.matchAll(emailRegex)];
+
+    if (matches.length === 0) {
+        return <Text style={style}>{text}</Text>;
+    }
+
+    let lastIndex = 0;
+
     return (
         <Text style={style}>
-            {text.split(COMMON_CONST.REG_EXP.EXTRACT_EMAIL).map((str, index) => {
-                if (COMMON_CONST.REG_EXP.EMAIL.test(str)) {
-                    return (
-                        <TextLink
-                            // eslint-disable-next-line react/no-array-index-key
-                            key={`${index}-${str}`}
-                            href={`mailto:${str}`}
-                            style={styles.link}
-                        >
-                            {str}
-                        </TextLink>
-                    );
+            {matches.flatMap((match, index) => {
+                const email = match[0];
+                const startIndex = match.index ?? 0;
+                const elements = [];
+
+                // Push plain text before email
+                if (startIndex > lastIndex) {
+                    elements.push(text.slice(lastIndex, startIndex));
                 }
 
-                return (
-                    <Text
-                        style={style}
+                // Push email as a link
+                elements.push(
+                    <TextLink
                         // eslint-disable-next-line react/no-array-index-key
-                        key={`${index}-${str}`}
+                        key={`email-${index}`}
+                        href={`mailto:${email}`}
+                        style={styles.link}
                     >
-                        {str}
-                    </Text>
+                        {email}
+                    </TextLink>,
                 );
+
+                lastIndex = startIndex + email.length;
+                return elements;
             })}
+            {lastIndex < text.length && text.slice(lastIndex)}
         </Text>
     );
 }
diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx
index 2d1eaaf39b18..26e6c7307e6b 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -73,6 +73,9 @@ type FormProviderProps<TFormID extends OnyxFormKey = OnyxFormKey> = FormProps<TF
     /** Whether HTML is allowed in form inputs */
     allowHTML?: boolean;
 
+    /** Whether to render the submit button above the footer. */
+    shouldRenderFooterAboveSubmit?: boolean;
+
     /** Whether the form is loading */
     isLoading?: boolean;
 
@@ -98,13 +101,14 @@ function FormProvider(
         shouldTrimValues = true,
         allowHTML = false,
         isLoading = false,
+        shouldRenderFooterAboveSubmit = false,
         ...rest
     }: FormProviderProps,
     forwardedRef: ForwardedRef<FormRef>,
 ) {
-    const [network] = useOnyx(ONYXKEYS.NETWORK);
-    const [formState] = useOnyx<OnyxFormKey, Form>(`${formID}`);
-    const [draftValues] = useOnyx<OnyxFormDraftKey, Form>(`${formID}Draft`);
+    const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true});
+    const [formState] = useOnyx<OnyxFormKey, Form>(`${formID}`, {canBeMissing: true});
+    const [draftValues] = useOnyx<OnyxFormDraftKey, Form>(`${formID}Draft`, {canBeMissing: true});
     const {preferredLocale, translate} = useLocalize();
     const inputRefs = useRef<InputRefs>({});
     const touchedInputs = useRef<Record<string, boolean>>({});
@@ -432,6 +436,7 @@ function FormProvider(
                 errors={errors}
                 isLoading={isLoading}
                 enabledWhenOffline={enabledWhenOffline}
+                shouldRenderFooterAboveSubmit={shouldRenderFooterAboveSubmit}
             >
                 {typeof children === 'function' ? children({inputValues}) : children}
             </FormWrapper>
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index e3dd5da85aba..aca6a0ef1a66 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -38,6 +38,9 @@ type FormWrapperProps = ChildrenProps &
         /** Callback to submit the form */
         onSubmit: () => void;
 
+        /** should render the extra button above submit button */
+        shouldRenderFooterAboveSubmit?: boolean;
+
         /** Whether the form is loading */
         isLoading?: boolean;
 
@@ -76,6 +79,7 @@ function FormWrapper({
     shouldHideFixErrorsAlert = false,
     disablePressOnEnter = false,
     isSubmitDisabled = false,
+    shouldRenderFooterAboveSubmit = false,
     isLoading = false,
     shouldScrollToEnd = false,
     addBottomSafeAreaPadding,
@@ -87,7 +91,7 @@ function FormWrapper({
     const formRef = useRef<RNScrollView>(null);
     const formContentRef = useRef<View>(null);
 
-    const [formState] = useOnyx<OnyxFormKey, Form>(`${formID}`);
+    const [formState] = useOnyx<OnyxFormKey, Form>(`${formID}`, {canBeMissing: true});
 
     const errorMessage = useMemo(() => (formState ? getLatestErrorMessage(formState) : undefined), [formState]);
 
@@ -168,6 +172,7 @@ function FormWrapper({
                     isSubmitActionDangerous={isSubmitActionDangerous}
                     disablePressOnEnter={disablePressOnEnter}
                     enterKeyEventListenerPriority={1}
+                    shouldRenderFooterAboveSubmit={shouldRenderFooterAboveSubmit}
                     shouldBlendOpacity={shouldSubmitButtonBlendOpacity}
                 />
             ),
@@ -196,6 +201,7 @@ function FormWrapper({
             submitButtonStylesWithBottomSafeAreaPadding,
             submitButtonText,
             submitFlexEnabled,
+            shouldRenderFooterAboveSubmit,
         ],
     );
 
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index 97e30eb9753b..8f835e36d518 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -164,6 +164,8 @@ type FormProps<TFormID extends OnyxFormKey = OnyxFormKey> = {
     /** Disable press on enter for submit button */
     disablePressOnEnter?: boolean;
 
+    /** Render extra button above submit button */
+    shouldRenderFooterAboveSubmit?: boolean;
     /**
      * Determines whether the form should automatically scroll to the end upon rendering or when the value changes.
      * If `true`, the form will smoothly scroll to the bottom after interactions have completed.
diff --git a/src/components/FormAlertWithSubmitButton.tsx b/src/components/FormAlertWithSubmitButton.tsx
index 0c2d28e70c99..9198aa04e63e 100644
--- a/src/components/FormAlertWithSubmitButton.tsx
+++ b/src/components/FormAlertWithSubmitButton.tsx
@@ -63,6 +63,9 @@ type FormAlertWithSubmitButtonProps = {
     /** The priority to assign the enter key event listener to buttons. 0 is the highest priority. */
     enterKeyEventListenerPriority?: number;
 
+    /** should render the extra button above submit button */
+    shouldRenderFooterAboveSubmit?: boolean;
+
     /**
      * Whether the button should have a background layer in the color of theme.appBG.
      * This is needed for buttons that allow content to display under them.
@@ -92,6 +95,7 @@ function FormAlertWithSubmitButton({
     useSmallerSubmitButtonSize = false,
     errorMessageStyle,
     enterKeyEventListenerPriority = 0,
+    shouldRenderFooterAboveSubmit = false,
     shouldBlendOpacity = false,
     addButtonBottomPadding = true,
 }: FormAlertWithSubmitButtonProps) {
@@ -115,6 +119,7 @@ function FormAlertWithSubmitButton({
         >
             {(isOffline: boolean | undefined) => (
                 <View>
+                    {shouldRenderFooterAboveSubmit && footerContent}
                     {isOffline && !enabledWhenOffline ? (
                         <Button
                             success
@@ -143,7 +148,7 @@ function FormAlertWithSubmitButton({
                             large={!useSmallerSubmitButtonSize}
                         />
                     )}
-                    {footerContent}
+                    {!shouldRenderFooterAboveSubmit && footerContent}
                 </View>
             )}
         </FormAlertWrapper>
diff --git a/src/components/ValidateCodeActionForm/type.ts b/src/components/ValidateCodeActionForm/type.ts
index a6a089215a4d..035c8f7142ff 100644
--- a/src/components/ValidateCodeActionForm/type.ts
+++ b/src/components/ValidateCodeActionForm/type.ts
@@ -33,6 +33,12 @@ type ValidateCodeActionFormProps = {
     /** Ref for validate code form */
     forwardedRef: ForwardedRef<ValidateCodeFormHandle>;
 
+    /** Whether to show the skip button */
+    shouldShowSkipButton?: boolean;
+
+    /** Function to call when the skip button is pressed */
+    handleSkipButtonPress?: () => void;
+
     /** Text for submit button */
     submitButtonText?: string;
 
diff --git a/src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx
index 1c68eb459e0c..1ec4164b3d17 100644
--- a/src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -75,6 +75,12 @@ type ValidateCodeFormProps = {
 
     /** Whether the form is loading or not */
     isLoading?: boolean;
+
+    /** Whether to show skip button */
+    shouldShowSkipButton?: boolean;
+
+    /** Function to call when skip button is pressed */
+    handleSkipButtonPress?: () => void;
 };
 
 function BaseValidateCodeForm({
@@ -91,6 +97,8 @@ function BaseValidateCodeForm({
     hideSubmitButton,
     submitButtonText,
     isLoading,
+    shouldShowSkipButton = false,
+    handleSkipButtonPress,
 }: ValidateCodeFormProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -100,7 +108,7 @@ function BaseValidateCodeForm({
     const [formError, setFormError] = useState<ValidateCodeFormError>({});
     const [validateCode, setValidateCode] = useState('');
     const inputValidateCodeRef = useRef<MagicCodeInputHandle>(null);
-    const [account = {}] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [account = {}] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- nullish coalescing doesn't achieve the same result in this case
     const shouldDisableResendValidateCode = !!isOffline || account?.isLoading;
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
@@ -277,14 +285,23 @@ function BaseValidateCodeForm({
                     messages={{0: translate('validateCodeModal.successfulNewCodeRequest')}}
                 />
             )}
+
             <OfflineWithFeedback
                 shouldDisplayErrorAbove
                 pendingAction={validatePendingAction}
                 errors={canShowError ? validateError : undefined}
-                errorRowStyles={[styles.mt2]}
+                errorRowStyles={[styles.mt2, styles.textWrap]}
                 onClose={() => clearError()}
                 style={buttonStyles}
             >
+                {shouldShowSkipButton && (
+                    <Button
+                        text={translate('common.skip')}
+                        onPress={handleSkipButtonPress}
+                        success={false}
+                        large
+                    />
+                )}
                 {!hideSubmitButton && (
                     <Button
                         isDisabled={isOffline}
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6a3dab0c0532..f309935ba68a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -227,6 +227,8 @@ import type {
     WelcomeEnterMagicCodeParams,
     WelcomeToRoomParams,
     WeSentYouMagicSignInLinkParams,
+    WorkEmailMergingBlockedParams,
+    WorkEmailResendCodeParams,
     WorkspaceLockedPlanTypeParams,
     WorkspaceMemberList,
     WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
@@ -532,6 +534,7 @@ const translations = {
         skip: 'Skip',
         chatWithAccountManager: ({accountManagerDisplayName}: ChatWithAccountManagerParams) => `Need something specific? Chat with your account manager, ${accountManagerDisplayName}.`,
         chatNow: 'Chat now',
+        workEmail: 'Work email',
         destination: 'Destination',
         subrate: 'Subrate',
         perDiem: 'Per diem',
@@ -2021,6 +2024,28 @@ const translations = {
         error: {
             requiredFirstName: 'Please input your first name to continue',
         },
+        workEmail: {
+            title: 'What’s your work email?',
+            subtitle: 'Expensify works best when you connect your work email.',
+            explanationModal: {
+                descriptionOne: 'Forward to receipts@expensify.com for scanning',
+                descriptionTwo: 'Join your colleagues already using Expensify',
+                descriptionThree: 'Enjoy a more customized experience',
+            },
+            addWorkEmail: 'Add work email',
+        },
+        workEmailValidation: {
+            title: 'Verify your work email',
+            magicCodeSent: ({workEmail}: WorkEmailResendCodeParams) => `Please enter the magic code sent to ${workEmail}. It should arrive in a minute or two.`,
+        },
+        workEmailValidationError: {
+            publicEmail: 'Please enter a valid work email from a private domain e.g. mitch@company.com',
+            offline: 'We couldn’t add your work email as you appear to be offline',
+        },
+        mergeBlockScreen: {
+            title: 'Couldn’t add work email',
+            subtitle: ({workEmail}: WorkEmailMergingBlockedParams) => `We couldn’t add ${workEmail}. Please try again later in Settings or chat with Concierge for guidance.`,
+        },
     },
     featureTraining: {
         doNotShowAgain: "Don't show me this again",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 77c910a4cf76..d8d7f0bbbdbc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -227,6 +227,8 @@ import type {
     WelcomeEnterMagicCodeParams,
     WelcomeToRoomParams,
     WeSentYouMagicSignInLinkParams,
+    WorkEmailMergingBlockedParams,
+    WorkEmailResendCodeParams,
     WorkspaceLockedPlanTypeParams,
     WorkspaceMemberList,
     WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
@@ -523,6 +525,7 @@ const translations = {
         minuteAbbreviation: 'm',
         chatWithAccountManager: ({accountManagerDisplayName}: ChatWithAccountManagerParams) => `¿Necesitas algo específico? Habla con tu gerente de cuenta, ${accountManagerDisplayName}.`,
         chatNow: 'Chatear ahora',
+        workEmail: 'correo electrónico de trabajo',
         destination: 'Destino',
         subrate: 'Subtasa',
         perDiem: 'Per diem',
@@ -2023,6 +2026,29 @@ const translations = {
         error: {
             requiredFirstName: 'Introduce tu nombre para continuar',
         },
+        workEmail: {
+            title: 'Cuál es tu correo electrónico de trabajo',
+            subtitle: 'Expensify funciona mejor cuando conectas tu correo electrónico de trabajo.',
+            explanationModal: {
+                descriptionOne: 'Reenvía a receipts@expensify.com para escanear',
+                descriptionTwo: 'Únete a tus compañeros de trabajo que ya están usando Expensify',
+                descriptionThree: 'Disfruta de una experiencia más personalizada',
+            },
+            addWorkEmail: 'Añadir correo electrónico de trabajo',
+        },
+        workEmailValidation: {
+            title: 'Verifica tu correo electrónico de trabajo',
+            magicCodeSent: ({workEmail}: WorkEmailResendCodeParams) => `Por favor, introduce el código mágico enviado a ${workEmail}. Debería llegar en uno o dos minutos.`,
+        },
+        workEmailValidationError: {
+            publicEmail: 'Por favor, introduce un correo electrónico laboral válido de un dominio privado, por ejemplo: mitch@company.com',
+            offline: 'No pudimos añadir tu correo electrónico laboral porque parece que estás sin conexión.',
+        },
+        mergeBlockScreen: {
+            title: 'No se pudo añadir el correo electrónico de trabajo',
+            subtitle: ({workEmail}: WorkEmailMergingBlockedParams) =>
+                `No pudimos añadir ${workEmail}. Por favor, inténtalo de nuevo más tarde en Configuración o chatea con Concierge para obtener ayuda.`,
+        },
     },
     featureTraining: {
         doNotShowAgain: 'No muestres esto otra vez',
diff --git a/src/languages/params.ts b/src/languages/params.ts
index bc2ea2f647f4..6d0ef7b27239 100644
--- a/src/languages/params.ts
+++ b/src/languages/params.ts
@@ -621,6 +621,14 @@ type WorkspaceYouMayJoin = {
     email: string;
 };
 
+type WorkEmailResendCodeParams = {
+    workEmail: string | undefined;
+};
+
+type WorkEmailMergingBlockedParams = {
+    workEmail: string | undefined;
+};
+
 type WorkspaceMemberList = {
     employeeCount: number;
     policyOwner: string;
@@ -912,6 +920,8 @@ export type {
     UpdatedPolicyDescriptionParams,
     EditDestinationSubtitleParams,
     FlightLayoverParams,
+    WorkEmailResendCodeParams,
+    WorkEmailMergingBlockedParams,
     NewWorkspaceNameParams,
     AddedOrDeletedPolicyReportFieldParams,
     AddedPolicyCustomUnitRateParams,
diff --git a/src/libs/API/parameters/AddWorkEmailParams.ts b/src/libs/API/parameters/AddWorkEmailParams.ts
new file mode 100644
index 000000000000..5e09c390e13e
--- /dev/null
+++ b/src/libs/API/parameters/AddWorkEmailParams.ts
@@ -0,0 +1,5 @@
+type AddWorkEmailParams = {
+    workEmail: string;
+};
+
+export default AddWorkEmailParams;
diff --git a/src/libs/API/parameters/MergeIntoAccountAndLogInParams.ts b/src/libs/API/parameters/MergeIntoAccountAndLogInParams.ts
new file mode 100644
index 000000000000..df25e1a7abb9
--- /dev/null
+++ b/src/libs/API/parameters/MergeIntoAccountAndLogInParams.ts
@@ -0,0 +1,7 @@
+type MergeIntoAccountAndLogInParams = {
+    workEmail: string | undefined;
+    validateCode: string;
+    accountID: number | undefined;
+};
+
+export default MergeIntoAccountAndLogInParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index a7c44812f120..bedbac49a56f 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -367,6 +367,8 @@ export type {default as ExportPerDiemCSVParams} from './ExportPerDiemCSVParams';
 export type {default as ExportReportPDFParams} from './ExportReportPDFParams';
 export type {default as UpdateWorkspaceCustomUnitParams} from './UpdateWorkspaceCustomUnitParams';
 export type {default as DismissProductTrainingParams} from './DismissProductTraining';
+export type {default as AddWorkEmailParams} from './AddWorkEmailParams';
+export type {default as MergeIntoAccountAndLogInParams} from './MergeIntoAccountAndLogInParams';
 export type {default as GetValidateCodeForAccountMergeParams} from './GetValidateCodeForAccountMerge';
 export type {default as MergeWithValidateCodeParams} from './MergeWithValidateCode';
 export type {default as OpenWorkspacePlanPageParams} from './OpenWorkspacePlanPage';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 054cc2a64ff2..93ec36daab45 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -463,6 +463,7 @@ const WRITE_COMMANDS = {
     RESET_SMS_DELIVERY_FAILURE_STATUS: 'ResetSMSDeliveryFailureStatus',
     SAVE_CORPAY_ONBOARDING_COMPANY_DETAILS: 'SaveCorpayOnboardingCompanyDetails',
     SAVE_CORPAY_ONBOARDING_BENEFICIAL_OWNER: 'SaveCorpayOnboardingBeneficialOwner',
+    ADD_WORK_EMAIL: 'AddWorkEmail',
     SAVE_CORPAY_ONBOARDING_DIRECTOR_INFORMATION: 'SaveCorpayOnboardingDirectorInformation',
     CHANGE_REPORT_POLICY: 'ChangeReportPolicy',
     CHANGE_TRANSACTIONS_REPORT: 'ChangeTransactionsReport',
@@ -947,6 +948,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.JOIN_ACCESSIBLE_POLICY]: Parameters.JoinAccessiblePolicyParams;
     // Dismis Product Training
     [WRITE_COMMANDS.DISMISS_PRODUCT_TRAINING]: Parameters.DismissProductTrainingParams;
+    [WRITE_COMMANDS.ADD_WORK_EMAIL]: Parameters.AddWorkEmailParams;
 
     // Merge accounts API
     [WRITE_COMMANDS.GET_VALIDATE_CODE_FOR_ACCOUNT_MERGE]: Parameters.GetValidateCodeForAccountMergeParams;
@@ -1111,6 +1113,7 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     COMPLETE_HYBRID_APP_ONBOARDING: 'CompleteHybridAppOnboarding',
     CONNECT_POLICY_TO_QUICKBOOKS_DESKTOP: 'ConnectPolicyToQuickbooksDesktop',
     BANK_ACCOUNT_CREATE_CORPAY: 'BankAccount_CreateCorpay',
+    MERGE_INTO_ACCOUNT_AND_LOGIN: 'MergeIntoAccountAndLogIn',
     GET_EMPHEMERAL_TOKEN: 'GetEmphemeralToken',
 
     // PayMoneyRequestOnSearch only works online (pattern C) and we need to play the success sound only when the request is successful
@@ -1135,6 +1138,7 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_DESKTOP]: Parameters.ConnectPolicyToQuickBooksDesktopParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.BANK_ACCOUNT_CREATE_CORPAY]: Parameters.BankAccountCreateCorpayParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.PAY_MONEY_REQUEST_ON_SEARCH]: Parameters.PayMoneyRequestOnSearchParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.MERGE_INTO_ACCOUNT_AND_LOGIN]: Parameters.MergeIntoAccountAndLogInParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.LOG_OUT]: Parameters.LogOutParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GET_EMPHEMERAL_TOKEN]: Parameters.GetEmphemeralTokenParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.CREATE_DIGITAL_WALLET]: Parameters.CreateAppleDigitalWalletParams;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
index 0b23c671b2ad..6fc61e5a7efd 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
@@ -17,6 +17,8 @@ import OnboardingEmployees from '@pages/OnboardingEmployees';
 import OnboardingPersonalDetails from '@pages/OnboardingPersonalDetails';
 import OnboardingPrivateDomain from '@pages/OnboardingPrivateDomain';
 import OnboardingPurpose from '@pages/OnboardingPurpose';
+import OnboardingWorkEmail from '@pages/OnboardingWorkEmail';
+import OnboardingWorkEmailValidation from '@pages/OnboardingWorkEmailValidation';
 import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -36,7 +38,7 @@ function OnboardingModalNavigator() {
     const styles = useThemeStyles();
     const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
     const outerViewRef = React.useRef<View>(null);
-    const [accountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID ?? 0});
+    const [accountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID ?? CONST.DEFAULT_NUMBER_ID, canBeMissing: true});
 
     // Publish a sign_up event when we start the onboarding flow. This should track basic sign ups
     // as well as Google and Apple SSO.
@@ -76,6 +78,14 @@ function OnboardingModalNavigator() {
                                 name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
                                 component={OnboardingPersonalDetails}
                             />
+                            <Stack.Screen
+                                name={SCREENS.ONBOARDING.WORK_EMAIL}
+                                component={OnboardingWorkEmail}
+                            />
+                            <Stack.Screen
+                                name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                                component={OnboardingWorkEmailValidation}
+                            />
                             <Stack.Screen
                                 name={SCREENS.ONBOARDING.PRIVATE_DOMAIN}
                                 component={OnboardingPrivateDomain}
diff --git a/src/libs/Navigation/helpers/isNavigatorName.ts b/src/libs/Navigation/helpers/isNavigatorName.ts
index c4e8ec1cac6f..2cb7e8668b10 100644
--- a/src/libs/Navigation/helpers/isNavigatorName.ts
+++ b/src/libs/Navigation/helpers/isNavigatorName.ts
@@ -11,6 +11,8 @@ const ONBOARDING_SCREENS = [
     SCREENS.ONBOARDING.ACCOUNTING,
     SCREENS.ONBOARDING.PRIVATE_DOMAIN,
     SCREENS.ONBOARDING.WORKSPACES,
+    SCREENS.ONBOARDING.WORK_EMAIL,
+    SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION,
 ];
 
 const FULL_SCREENS_SET = new Set([...Object.values(SIDEBAR_TO_SPLIT), NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]);
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index b412681b34ad..21b53050c1f8 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -88,6 +88,14 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
             // the onboarding purpose page will be briefly visible.
             path: ROUTES.ONBOARDING_ROOT.route,
             screens: {
+                [SCREENS.ONBOARDING.WORK_EMAIL]: {
+                    path: ROUTES.ONBOARDING_WORK_EMAIL.route,
+                    exact: true,
+                },
+                [SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]: {
+                    path: ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.route,
+                    exact: true,
+                },
                 [SCREENS.ONBOARDING.PURPOSE]: {
                     path: ROUTES.ONBOARDING_PURPOSE.route,
                     exact: true,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 06db845c3bf3..7602f9d487b1 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -1755,6 +1755,12 @@ type OnboardingModalNavigatorParamList = {
     [SCREENS.ONBOARDING.ACCOUNTING]: {
         backTo?: string;
     };
+    [SCREENS.ONBOARDING.WORK_EMAIL]: {
+        backTo?: string;
+    };
+    [SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]: {
+        backTo?: string;
+    };
 };
 
 type WelcomeVideoModalNavigatorParamList = {
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index ffb736d13d16..d13dcb06abe8 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -31,12 +31,14 @@ import * as Authentication from '@libs/Authentication';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Fullstory from '@libs/Fullstory';
 import HttpUtils from '@libs/HttpUtils';
+import {translateLocal} from '@libs/Localize';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
 import * as MainQueue from '@libs/Network/MainQueue';
 import * as NetworkStore from '@libs/Network/NetworkStore';
 import {getCurrentUserEmail} from '@libs/Network/NetworkStore';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import NetworkConnection from '@libs/NetworkConnection';
 import Pusher from '@libs/Pusher';
 import {getReportIDFromLink, parseReportRouteParams as parseReportRouteParamsReportUtils} from '@libs/ReportUtils';
@@ -1322,6 +1324,135 @@ function isUserOnPrivateDomain() {
     return false;
 }
 
+function AddWorkEmail(workEmail: string) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM,
+            value: {
+                onboardingWorkEmail: workEmail,
+                isLoading: true,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM,
+            value: {
+                onboardingWorkEmail: workEmail,
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM,
+            value: {
+                onboardingWorkEmail: null,
+                isLoading: false,
+            },
+        },
+    ];
+
+    API.write(
+        WRITE_COMMANDS.ADD_WORK_EMAIL,
+        {workEmail},
+        {
+            optimisticData,
+            successData,
+            failureData,
+        },
+    );
+}
+
+function MergeIntoAccountAndLogin(workEmail: string | undefined, validateCode: string, accountID: number | undefined) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE,
+            value: '',
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: true,
+                loadingForm: CONST.FORMS.VALIDATE_CODE_FORM,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE,
+            value: '',
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_ONBOARDING,
+            value: {
+                isMergeAccountStepCompleted: true,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+                loadingForm: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+                loadingForm: null,
+            },
+        },
+    ];
+
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects(
+        SIDE_EFFECT_REQUEST_COMMANDS.MERGE_INTO_ACCOUNT_AND_LOGIN,
+        {workEmail, validateCode, accountID},
+        {
+            optimisticData,
+            successData,
+            failureData,
+        },
+    ).then((response) => {
+        if (response?.jsonCode === CONST.JSON_CODE.EXP_ERROR) {
+            // If the error other than invalid code, we show a blocking screen
+            if (response?.message === CONST.MERGE_ACCOUNT_INVALID_CODE_ERROR) {
+                Onyx.merge(ONYXKEYS.ONBOARDING_ERROR_MESSAGE, translateLocal('contacts.genericFailureMessages.validateSecondaryLogin'));
+            } else {
+                Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {isMergingAccountBlocked: true});
+            }
+            return;
+        }
+
+        // When the action is successful, we need to update the new authToken and encryptedAuthToken
+        // This action needs to be synchronous as the user will be logged out due to middleware if old authToken is used
+        // For more information see the slack discussion: https://expensify.slack.com/archives/C08CZDJFJ77/p1742838796040369
+        return SequentialQueue.waitForIdle().then(() => {
+            if (!response?.authToken || !response?.encryptedAuthToken) {
+                return;
+            }
+
+            updateAuthTokenAndOpenApp(response.authToken, response.encryptedAuthToken);
+        });
+    });
+}
+
 /**
  * To reset SMS delivery failure
  */
@@ -1408,6 +1539,8 @@ export {
     signInAfterTransitionFromOldDot,
     validateUserAndGetAccessiblePolicies,
     isUserOnPrivateDomain,
+    AddWorkEmail,
+    MergeIntoAccountAndLogin,
     resetSMSDeliveryFailureStatus,
     clearDisableTwoFactorAuthErrors,
 };
diff --git a/src/libs/actions/Welcome/OnboardingFlow.ts b/src/libs/actions/Welcome/OnboardingFlow.ts
index 151e45844d08..c00aa5abf934 100644
--- a/src/libs/actions/Welcome/OnboardingFlow.ts
+++ b/src/libs/actions/Welcome/OnboardingFlow.ts
@@ -10,6 +10,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type Onboarding from '@src/types/onyx/Onboarding';
+import type User from '@src/types/onyx/User';
 
 let onboardingInitialPath = '';
 const onboardingLastVisitedPathConnection = Onyx.connect({
@@ -34,6 +35,17 @@ Onyx.connect({
     },
 });
 
+let user: User;
+Onyx.connect({
+    key: ONYXKEYS.USER,
+    callback: (value) => {
+        if (value === undefined) {
+            return;
+        }
+        user = value;
+    },
+});
+
 /**
  * Start a new onboarding flow or continue from the last visited onboarding page.
  */
@@ -53,11 +65,22 @@ function startOnboardingFlow(isPrivateDomain?: boolean) {
 
 function getOnboardingInitialPath(isPrivateDomain?: boolean): string {
     const state = getStateFromPath(onboardingInitialPath, linkingConfig.config);
+    const isUserFromPublicDomain = user?.isFromPublicDomain;
     const isVsb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
+    const isIndividual = onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL;
 
     if (isVsb) {
         Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, CONST.ONBOARDING_CHOICES.MANAGE_TEAM);
         Onyx.set(ONYXKEYS.ONBOARDING_COMPANY_SIZE, CONST.ONBOARDING_COMPANY_SIZE.MICRO);
+    }
+
+    if (isIndividual) {
+        Onyx.set(ONYXKEYS.ONBOARDING_CUSTOM_CHOICES, [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND, CONST.ONBOARDING_CHOICES.EMPLOYER, CONST.ONBOARDING_CHOICES.CHAT_SPLIT]);
+    }
+    if (isUserFromPublicDomain && !onboardingInitialPath) {
+        return `/${ROUTES.ONBOARDING_WORK_EMAIL.route}`;
+    }
+    if (isVsb) {
         return `/${ROUTES.ONBOARDING_ACCOUNTING.route}`;
     }
 
@@ -65,10 +88,6 @@ function getOnboardingInitialPath(isPrivateDomain?: boolean): string {
         return `/${ROUTES.ONBOARDING_PERSONAL_DETAILS.route}`;
     }
 
-    const isIndividual = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL;
-    if (isIndividual) {
-        Onyx.set(ONYXKEYS.ONBOARDING_CUSTOM_CHOICES, [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND, CONST.ONBOARDING_CHOICES.EMPLOYER, CONST.ONBOARDING_CHOICES.CHAT_SPLIT]);
-    }
     if (state?.routes?.at(-1)?.name !== NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR) {
         return `/${ROUTES.ONBOARDING_ROOT.route}`;
     }
diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
index e959d84c9c13..f2bf52d5b5b2 100644
--- a/src/libs/actions/Welcome/index.ts
+++ b/src/libs/actions/Welcome/index.ts
@@ -5,9 +5,11 @@ import * as API from '@libs/API';
 import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import DateUtils from '@libs/DateUtils';
 import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
 import CONFIG from '@src/CONFIG';
 import type {OnboardingCompanySize} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type {OnboardingPurpose} from '@src/types/onyx';
 import type Onboarding from '@src/types/onyx/Onboarding';
 import type TryNewDot from '@src/types/onyx/TryNewDot';
@@ -122,6 +124,19 @@ function updateOnboardingLastVisitedPath(path: string) {
     Onyx.merge(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, path);
 }
 
+function updateOnboardingValuesAndNavigation(onboardingValues: Onboarding | undefined) {
+    Onyx.set(ONYXKEYS.NVP_ONBOARDING, {...onboardingValues, shouldValidate: undefined});
+
+    // We need to have the Onyx values updated before navigating back
+    // Because we navigate based no useEffect logic and we need to clear `shouldValidate` value before going back
+    Navigation.setNavigationActionToMicrotaskQueue(() => {
+        Navigation.goBack(ROUTES.ONBOARDING_WORK_EMAIL.getRoute());
+    });
+}
+
+function setOnboardingMergeAccountStepValue(value: boolean) {
+    Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {isMergeAccountStepCompleted: value});
+}
 function completeHybridAppOnboarding() {
     if (!CONFIG.IS_HYBRID_APP) {
         return;
@@ -240,4 +255,6 @@ export {
     setOnboardingErrorMessage,
     setOnboardingCompanySize,
     setSelfTourViewed,
+    setOnboardingMergeAccountStepValue,
+    updateOnboardingValuesAndNavigation,
 };
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
new file mode 100644
index 000000000000..35b291d2a1ac
--- /dev/null
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -0,0 +1,229 @@
+import {useIsFocused} from '@react-navigation/native';
+import {PUBLIC_DOMAINS, Str} from 'expensify-common';
+import React, {useCallback, useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import AutoEmailLink from '@components/AutoEmailLink';
+import Button from '@components/Button';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import OfflineIndicator from '@components/OfflineIndicator';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {addErrorMessage} from '@libs/ErrorUtils';
+import getOperatingSystem from '@libs/getOperatingSystem';
+import Navigation from '@libs/Navigation/Navigation';
+import {AddWorkEmail} from '@userActions/Session';
+import {setOnboardingErrorMessage, setOnboardingMergeAccountStepValue} from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm';
+import type IconAsset from '@src/types/utils/IconAsset';
+import type {BaseOnboardingWorkEmailProps} from './types';
+
+type Item = {
+    icon: IconAsset;
+    titleTranslationKey: TranslationPaths;
+    shouldRenderEmail?: boolean;
+};
+
+function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmailProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
+    const [formValue] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {canBeMissing: true});
+    const workEmail = formValue?.[INPUT_IDS.ONBOARDING_WORK_EMAIL];
+    const isVsb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
+    // We need to use isSmallScreenWidth, see navigateAfterOnboarding function comment
+    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
+    const {onboardingIsMediumOrLargerScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [shouldValidateOnChange, setShouldValidateOnChange] = useState(false);
+    const {isOffline} = useNetwork();
+    const ICON_SIZE = 48;
+    const operatingSystem = getOperatingSystem();
+    const isFocused = useIsFocused();
+
+    useEffect(() => {
+        setOnboardingErrorMessage('');
+    }, []);
+
+    useEffect(() => {
+        if (onboardingValues?.shouldValidate === undefined && onboardingValues?.isMergeAccountStepCompleted === undefined) {
+            return;
+        }
+
+        if (onboardingValues?.shouldValidate) {
+            Navigation.navigate(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
+            return;
+        }
+
+        if (isVsb) {
+            Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute());
+            return;
+        }
+
+        Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
+    }, [onboardingValues?.shouldValidate, isVsb, isFocused, onboardingValues?.isMergeAccountStepCompleted]);
+
+    const submitWorkEmail = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM>) => {
+        AddWorkEmail(values[INPUT_IDS.ONBOARDING_WORK_EMAIL]);
+    }, []);
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM>) => {
+        if (!shouldValidateOnChange) {
+            setShouldValidateOnChange(true);
+        }
+        const userEmail = values[INPUT_IDS.ONBOARDING_WORK_EMAIL];
+
+        const errors = {};
+        const emailParts = userEmail.split('@');
+        const domain = emailParts.at(1) ?? '';
+
+        if ((PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase()) || !Str.isValidEmail(userEmail)) && !isOffline) {
+            addErrorMessage(errors, INPUT_IDS.ONBOARDING_WORK_EMAIL, translate('onboarding.workEmailValidationError.publicEmail'));
+        }
+
+        if (isOffline ?? false) {
+            addErrorMessage(errors, INPUT_IDS.ONBOARDING_WORK_EMAIL, translate('onboarding.workEmailValidationError.offline'));
+        }
+
+        return errors;
+    };
+
+    const section: Item[] = [
+        {
+            icon: Illustrations.EnvelopeReceipt,
+            titleTranslationKey: 'onboarding.workEmail.explanationModal.descriptionOne',
+            shouldRenderEmail: true,
+        },
+        {
+            icon: Illustrations.Profile,
+            titleTranslationKey: 'onboarding.workEmail.explanationModal.descriptionTwo',
+        },
+        {
+            icon: Illustrations.Gears,
+            titleTranslationKey: 'onboarding.workEmail.explanationModal.descriptionThree',
+        },
+    ];
+
+    return (
+        <ScreenWrapper
+            shouldEnableMaxHeight
+            shouldShowOfflineIndicator={false}
+            includeSafeAreaPaddingBottom={isOffline}
+            testID="BaseOnboardingWorkEmail"
+            style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
+        >
+            <HeaderWithBackButton
+                progressBarPercentage={1}
+                shouldShowBackButton={false}
+            />
+            <FormProvider
+                style={[styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}
+                formID={ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM}
+                validate={validate}
+                onSubmit={submitWorkEmail}
+                submitButtonText={translate('onboarding.workEmail.addWorkEmail')}
+                enabledWhenOffline
+                submitFlexEnabled
+                shouldValidateOnBlur={false}
+                shouldValidateOnChange={shouldValidateOnChange}
+                shouldTrimValues={false}
+                footerContent={
+                    <View style={styles.mb2}>
+                        <Button
+                            large
+                            text={translate('common.skip')}
+                            testID="onboardingPrivateEmailSkipButton"
+                            onPress={() => {
+                                setOnboardingErrorMessage('');
+
+                                setOnboardingMergeAccountStepValue(true);
+                                if (isVsb) {
+                                    Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute());
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
+                            }}
+                        />
+                    </View>
+                }
+                shouldRenderFooterAboveSubmit
+                shouldHideFixErrorsAlert
+            >
+                <View>
+                    <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
+                        <Text style={styles.textHeadlineH1}>{translate('onboarding.workEmail.title')}</Text>
+                    </View>
+                    <View style={styles.mb2}>
+                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.workEmail.subtitle')}</Text>
+                    </View>
+                    <View>
+                        {section.map((item) => {
+                            return (
+                                <View
+                                    key={item.titleTranslationKey}
+                                    style={[styles.mt2, styles.mb3]}
+                                >
+                                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}>
+                                        <Icon
+                                            src={item.icon}
+                                            height={ICON_SIZE}
+                                            width={ICON_SIZE}
+                                            additionalStyles={[styles.mr3]}
+                                        />
+                                        <View style={[styles.flexColumn, styles.flex1]}>
+                                            {item.shouldRenderEmail ? (
+                                                <AutoEmailLink
+                                                    style={[styles.textStrong, styles.lh20]}
+                                                    text={translate(item.titleTranslationKey)}
+                                                />
+                                            ) : (
+                                                <Text style={[styles.textStrong, styles.lh20]}>{translate(item.titleTranslationKey)}</Text>
+                                            )}
+                                        </View>
+                                    </View>
+                                </View>
+                            );
+                        })}
+                    </View>
+                </View>
+
+                <View style={[styles.mb4, styles.pt3]}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        // We do not want to auto-focus for mobile platforms
+                        ref={operatingSystem !== CONST.OS.ANDROID && operatingSystem !== CONST.OS.IOS ? inputCallbackRef : undefined}
+                        name="fname"
+                        inputID={INPUT_IDS.ONBOARDING_WORK_EMAIL}
+                        label={translate('common.workEmail')}
+                        aria-label={translate('common.workEmail')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue={workEmail ?? ''}
+                        shouldSaveDraft
+                        maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
+                        spellCheck={false}
+                    />
+                </View>
+            </FormProvider>
+            {isSmallScreenWidth && <OfflineIndicator />}
+        </ScreenWrapper>
+    );
+}
+
+BaseOnboardingWorkEmail.displayName = 'BaseOnboardingWorkEmail';
+
+export default BaseOnboardingWorkEmail;
diff --git a/src/pages/OnboardingWorkEmail/index.native.tsx b/src/pages/OnboardingWorkEmail/index.native.tsx
new file mode 100644
index 000000000000..71450834238d
--- /dev/null
+++ b/src/pages/OnboardingWorkEmail/index.native.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import BaseOnboardingWorkEmail from './BaseOnboardingWorkEmail';
+import type {OnboardingWorkEmailProps} from './types';
+
+function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
+    return (
+        <BaseOnboardingWorkEmail
+            shouldUseNativeStyles
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
+}
+
+OnboardingWorkEmail.displayName = 'OnboardingWorkEmail';
+
+export default OnboardingWorkEmail;
diff --git a/src/pages/OnboardingWorkEmail/index.tsx b/src/pages/OnboardingWorkEmail/index.tsx
new file mode 100644
index 000000000000..3f35a6b3c048
--- /dev/null
+++ b/src/pages/OnboardingWorkEmail/index.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import OnboardingWrapper from '@components/OnboardingWrapper';
+import BaseOnboardingWorkEmail from './BaseOnboardingWorkEmail';
+import type {OnboardingWorkEmailProps} from './types';
+
+function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
+    return (
+        <OnboardingWrapper>
+            <BaseOnboardingWorkEmail
+                shouldUseNativeStyles={false}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+            />
+        </OnboardingWrapper>
+    );
+}
+
+OnboardingWorkEmail.displayName = 'OnboardingWorkEmail';
+
+export default OnboardingWorkEmail;
diff --git a/src/pages/OnboardingWorkEmail/types.ts b/src/pages/OnboardingWorkEmail/types.ts
new file mode 100644
index 000000000000..250fb37b96d6
--- /dev/null
+++ b/src/pages/OnboardingWorkEmail/types.ts
@@ -0,0 +1,15 @@
+import type {RouteProp} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+import type SCREENS from '@src/SCREENS';
+
+type OnboardingWorkEmailProps = Record<string, unknown> & StackScreenProps<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORK_EMAIL>;
+
+type BaseOnboardingWorkEmailProps = {
+    /* Whether to use native styles tailored for native devices */
+    shouldUseNativeStyles: boolean;
+
+    route: RouteProp<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORK_EMAIL>;
+};
+
+export type {OnboardingWorkEmailProps, BaseOnboardingWorkEmailProps};
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
new file mode 100644
index 000000000000..982eca616ffa
--- /dev/null
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -0,0 +1,146 @@
+import {useIsFocused} from '@react-navigation/native';
+import React, {useCallback, useEffect} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import AccountUtils from '@libs/AccountUtils';
+import {openOldDotLink} from '@libs/actions/Link';
+import {setOnboardingErrorMessage, setOnboardingMergeAccountStepValue, updateOnboardingValuesAndNavigation} from '@libs/actions/Welcome';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import {MergeIntoAccountAndLogin} from '@userActions/Session';
+import {resendValidateCode} from '@userActions/User';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {BaseOnboardingWorkEmailValidationProps} from './types';
+
+function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardingWorkEmailValidationProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
+    const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true});
+    const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS, {canBeMissing: true});
+    const [onboardingEmail] = useOnyx(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {canBeMissing: true});
+    const workEmail = onboardingEmail?.onboardingWorkEmail;
+
+    const [validateCodeAction] = useOnyx(ONYXKEYS.VALIDATE_ACTION_CODE, {canBeMissing: true});
+    const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
+    const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
+    const isVsb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
+    const [onboardingErrorMessage] = useOnyx(ONYXKEYS.ONBOARDING_ERROR_MESSAGE, {canBeMissing: true});
+    const isValidateCodeFormSubmitting = AccountUtils.isValidateCodeFormSubmitting(account);
+    const isFocused = useIsFocused();
+
+    useEffect(() => {
+        if (onboardingValues?.isMergeAccountStepCompleted === undefined) {
+            return;
+        }
+
+        if (onboardingValues?.shouldRedirectToClassicAfterMerge) {
+            openOldDotLink(CONST.OLDDOT_URLS.INBOX, true);
+            return;
+        }
+
+        if (isVsb) {
+            Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute());
+            return;
+        }
+
+        Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
+    }, [onboardingValues, isVsb, isFocused]);
+
+    const sendValidateCode = useCallback(() => {
+        if (!credentials?.login) {
+            return;
+        }
+        resendValidateCode(credentials.login);
+    }, [credentials?.login]);
+
+    const validateAccountAndMerge = useCallback(
+        (validateCode: string) => {
+            setOnboardingErrorMessage('');
+            MergeIntoAccountAndLogin(workEmail, validateCode, session?.accountID);
+        },
+        [workEmail, session?.accountID],
+    );
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID="BaseOnboardingWorkEmailValidation"
+            style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
+        >
+            <HeaderWithBackButton
+                shouldShowBackButton={!onboardingValues?.isMergingAccountBlocked}
+                progressBarPercentage={40}
+                onBackButtonPress={() => {
+                    updateOnboardingValuesAndNavigation(onboardingValues);
+                }}
+            />
+            {onboardingValues?.isMergingAccountBlocked ? (
+                <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
+                    <BlockingView
+                        icon={Illustrations.ToddBehindCloud}
+                        iconWidth={variables.modalTopIconWidth}
+                        iconHeight={variables.modalTopIconHeight}
+                        title={translate('onboarding.mergeBlockScreen.title')}
+                        subtitle={translate('onboarding.mergeBlockScreen.subtitle', {workEmail})}
+                        subtitleStyle={[styles.colorMuted]}
+                    />
+                    <Button
+                        success={onboardingValues?.isMergingAccountBlocked}
+                        large
+                        style={[styles.mb5]}
+                        text={translate('common.buttonConfirm')}
+                        onPress={() => {
+                            setOnboardingErrorMessage('');
+                            if (isVsb) {
+                                Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute());
+                                return;
+                            }
+                            Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
+                        }}
+                    />
+                </View>
+            ) : (
+                <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
+                    <Text style={styles.textHeadlineH1}>{translate('onboarding.workEmailValidation.title')}</Text>
+                    <Text style={[styles.textNormal, styles.colorMuted, styles.textAlignLeft, styles.mt5]}>{translate('onboarding.workEmailValidation.magicCodeSent', {workEmail})}</Text>
+                    <ValidateCodeForm
+                        validateCodeAction={validateCodeAction}
+                        handleSubmitForm={validateAccountAndMerge}
+                        sendValidateCode={sendValidateCode}
+                        clearError={() => setOnboardingErrorMessage('')}
+                        buttonStyles={[styles.flex2, styles.justifyContentEnd, styles.mb5]}
+                        shouldShowSkipButton
+                        handleSkipButtonPress={() => {
+                            setOnboardingErrorMessage('');
+                            setOnboardingMergeAccountStepValue(true);
+                            if (isVsb) {
+                                Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute());
+                                return;
+                            }
+                            Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute());
+                        }}
+                        isLoading={isValidateCodeFormSubmitting}
+                        validateError={onboardingErrorMessage ? {invalidCodeError: onboardingErrorMessage} : undefined}
+                    />
+                </View>
+            )}
+        </ScreenWrapper>
+    );
+}
+
+BaseOnboardingWorkEmailValidation.displayName = 'BaseOnboardingWorkEmailValidation';
+
+export default BaseOnboardingWorkEmailValidation;
diff --git a/src/pages/OnboardingWorkEmailValidation/index.native.tsx b/src/pages/OnboardingWorkEmailValidation/index.native.tsx
new file mode 100644
index 000000000000..c1c4cc6b26cf
--- /dev/null
+++ b/src/pages/OnboardingWorkEmailValidation/index.native.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import BaseOnboardingWorkEmailValidation from './BaseOnboardingWorkEmailValidation';
+import type {OnboardingWorkEmailValidationProps} from './types';
+
+function OnboardingWorkEmailValidation(props: OnboardingWorkEmailValidationProps) {
+    return (
+        <BaseOnboardingWorkEmailValidation
+            shouldUseNativeStyles
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
+}
+
+OnboardingWorkEmailValidation.displayName = 'OnboardingWorkEmailValidation';
+
+export default OnboardingWorkEmailValidation;
diff --git a/src/pages/OnboardingWorkEmailValidation/index.tsx b/src/pages/OnboardingWorkEmailValidation/index.tsx
new file mode 100644
index 000000000000..a484fb9e5ab8
--- /dev/null
+++ b/src/pages/OnboardingWorkEmailValidation/index.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import OnboardingWrapper from '@components/OnboardingWrapper';
+import BaseOnboardingWorkEmailValidation from './BaseOnboardingWorkEmailValidation';
+import type {OnboardingWorkEmailValidationProps} from './types';
+
+function OnboardingWorkEmailValidation(props: OnboardingWorkEmailValidationProps) {
+    return (
+        <OnboardingWrapper>
+            <BaseOnboardingWorkEmailValidation
+                shouldUseNativeStyles={false}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+            />
+        </OnboardingWrapper>
+    );
+}
+
+OnboardingWorkEmailValidation.displayName = 'OnboardingWorkEmailValidation';
+
+export default OnboardingWorkEmailValidation;
diff --git a/src/pages/OnboardingWorkEmailValidation/types.ts b/src/pages/OnboardingWorkEmailValidation/types.ts
new file mode 100644
index 000000000000..e88ff89020cf
--- /dev/null
+++ b/src/pages/OnboardingWorkEmailValidation/types.ts
@@ -0,0 +1,15 @@
+import type {RouteProp} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+import type SCREENS from '@src/SCREENS';
+
+type OnboardingWorkEmailValidationProps = Record<string, unknown> & StackScreenProps<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION>;
+
+type BaseOnboardingWorkEmailValidationProps = {
+    /* Whether to use native styles tailored for native devices */
+    shouldUseNativeStyles: boolean;
+
+    route: RouteProp<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION>;
+};
+
+export type {OnboardingWorkEmailValidationProps, BaseOnboardingWorkEmailValidationProps};
diff --git a/src/types/form/OnboardingWorkEmailForm.ts b/src/types/form/OnboardingWorkEmailForm.ts
new file mode 100644
index 000000000000..4e9b7caba5e1
--- /dev/null
+++ b/src/types/form/OnboardingWorkEmailForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    ONBOARDING_WORK_EMAIL: 'onboardingWorkEmail',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type OnboardingWorkEmailForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.ONBOARDING_WORK_EMAIL]: string;
+    }
+>;
+
+export type {OnboardingWorkEmailForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index 1399e0b0a87a..0b017fe9be36 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -87,6 +87,7 @@ export type {WorkspaceCompanyCardFeedName} from './WorkspaceCompanyCardFeedName'
 export type {SearchSavedSearchRenameForm} from './SearchSavedSearchRenameForm';
 export type {WorkspaceCompanyCardEditName} from './WorkspaceCompanyCardEditName';
 export type {PersonalDetailsForm} from './PersonalDetailsForm';
+export type {OnboardingWorkEmailForm} from './OnboardingWorkEmailForm';
 export type {MergeAccountDetailsForm} from './MergeAccountDetailsForm';
 export type {WorkspaceConfirmationForm} from './WorkspaceConfirmationForm';
 export type {MoneyRequestTimeForm} from './MoneyRequestTimeForm';
diff --git a/src/types/onyx/Onboarding.ts b/src/types/onyx/Onboarding.ts
index fae578d3fb95..e7909782ef75 100644
--- a/src/types/onyx/Onboarding.ts
+++ b/src/types/onyx/Onboarding.ts
@@ -15,6 +15,18 @@ type Onboarding = {
     /** A Boolean that tells whether the user has seen navattic tour  */
     selfTourViewed?: boolean;
 
+    /** A Boolean that tells whether the user should be redirected to OD after merging work email  */
+    shouldRedirectToClassicAfterMerge?: boolean;
+
+    /** A Boolean that informs whether the user needs to validate their work email */
+    shouldValidate?: boolean;
+
+    /** A Boolean that informs whether merging accounts has been blocked */
+    isMergingAccountBlocked?: boolean;
+
+    /** A Boolean that informs whether the user has completed merge account step */
+    isMergeAccountStepCompleted?: boolean;
+
     /** A Boolean that tells whether the onboarding flow is loading */
     isLoading?: boolean;
 };
diff --git a/tests/ui/WorkEmailOnboarding.tsx b/tests/ui/WorkEmailOnboarding.tsx
new file mode 100644
index 000000000000..66cf1051481a
--- /dev/null
+++ b/tests/ui/WorkEmailOnboarding.tsx
@@ -0,0 +1,512 @@
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxProvider from '@components/OnyxProvider';
+import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
+import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
+import {openOldDotLink} from '@libs/actions/Link';
+import {AddWorkEmail} from '@libs/actions/Session';
+import HttpUtils from '@libs/HttpUtils';
+import {translateLocal} from '@libs/Localize';
+import Navigation from '@libs/Navigation/Navigation';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+import type {OnboardingModalNavigatorParamList} from '@navigation/types';
+import OnboardingWorkEmail from '@pages/OnboardingWorkEmail';
+import OnboardingWorkEmailValidation from '@pages/OnboardingWorkEmailValidation';
+import CONST from '@src/CONST';
+import {MergeIntoAccountAndLogin} from '@src/libs/actions/Session';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {Response as OnyxResponse} from '@src/types/onyx';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@libs/actions/Link', () => ({
+    openOldDotLink: jest.fn(),
+}));
+
+jest.mock('@rnmapbox/maps', () => {
+    return {
+        default: jest.fn(),
+        MarkerView: jest.fn(),
+        setAccessToken: jest.fn(),
+    };
+});
+
+jest.mock('@react-native-community/geolocation', () => ({
+    setRNConfiguration: jest.fn(),
+}));
+
+TestHelper.setupGlobalFetchMock();
+
+const Stack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
+const workEmail = 'testprivateemail@privateEmail.com';
+
+const renderOnboardingWorkEmailPage = (initialRouteName: typeof SCREENS.ONBOARDING.WORK_EMAIL, initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.WORK_EMAIL]) => {
+    return render(
+        <ComposeProviders components={[OnyxProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer>
+                    <Stack.Navigator initialRouteName={initialRouteName}>
+                        <Stack.Screen
+                            name={SCREENS.ONBOARDING.WORK_EMAIL}
+                            component={OnboardingWorkEmail}
+                            initialParams={initialParams}
+                        />
+                    </Stack.Navigator>
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+};
+
+const renderOnboardingWorkEmailValidationPage = (
+    initialRouteName: typeof SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION,
+    initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION],
+) => {
+    return render(
+        <ComposeProviders components={[OnyxProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer>
+                    <Stack.Navigator initialRouteName={initialRouteName}>
+                        <Stack.Screen
+                            name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                            component={OnboardingWorkEmailValidation}
+                            initialParams={initialParams}
+                        />
+                    </Stack.Navigator>
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+};
+
+const navigate = jest.spyOn(Navigation, 'navigate');
+
+function MergeIntoAccountAndLoginBlockMerge() {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse = {
+            jsonCode: 501,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value: {
+                        isMergeAccountStepCompleted: true,
+                        shouldRedirectToClassicAfterMerge: false,
+                        isMergingAccountBlocked: true,
+                    },
+                },
+            ],
+        };
+
+        // Return a Promise that resolves with the mocked response
+        return Promise.resolve(mockedResponse);
+    });
+    MergeIntoAccountAndLogin(workEmail, '123456', 1);
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
+}
+
+function MergeIntoAccountAndLoginSuccessful() {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse = {
+            jsonCode: 401,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value: {
+                        isMergeAccountStepCompleted: true,
+                    },
+                },
+            ],
+        };
+
+        // Return a Promise that resolves with the mocked response
+        return Promise.resolve(mockedResponse);
+    });
+    MergeIntoAccountAndLogin(workEmail, '123456', 1);
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
+}
+
+function MergeIntoAccountAndLoginRedirectToClassic() {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse = {
+            jsonCode: 200,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value: {
+                        isMergeAccountStepCompleted: true,
+                        shouldRedirectToClassicAfterMerge: true,
+                    },
+                },
+            ],
+        };
+
+        // Return a Promise that resolves with the mocked response
+        return Promise.resolve(mockedResponse);
+    });
+    MergeIntoAccountAndLogin(workEmail, '123456', 1);
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
+}
+
+function AddWorkEmailShouldValidateFailure() {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse = {
+            jsonCode: 200,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value: {
+                        shouldValidate: false,
+                    },
+                },
+            ],
+        };
+
+        // Return a Promise that resolves with the mocked response
+        return Promise.resolve(mockedResponse);
+    });
+    AddWorkEmail(workEmail);
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
+}
+
+function AddWorkEmailShouldValidate() {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse = {
+            jsonCode: 200,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value: {
+                        shouldValidate: true,
+                    },
+                },
+            ],
+        };
+
+        // Return a Promise that resolves with the mocked response
+        return Promise.resolve(mockedResponse);
+    });
+    AddWorkEmail(workEmail);
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
+}
+
+describe('OnboardingWorkEmail Page', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(() => {
+        jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue({
+            isSmallScreenWidth: false,
+            shouldUseNarrowLayout: false,
+        } as ResponsiveLayoutResult);
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+        jest.clearAllMocks();
+    });
+
+    it('should display onboarding work email screen content correctly', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByText(translateLocal('onboarding.workEmail.title'))).toBeOnTheScreen();
+        });
+        await waitFor(() => {
+            expect(screen.getByText(translateLocal('onboarding.workEmail.addWorkEmail'))).toBeOnTheScreen();
+        });
+
+        await waitFor(() => {
+            expect(screen.getByText(translateLocal('common.skip'))).toBeOnTheScreen();
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should navigate to Onboarding purpose page when skip is pressed and there is no signupQualifier', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        const skipButton = screen.getByTestId('onboardingPrivateEmailSkipButton');
+
+        const mockEvent = {
+            nativeEvent: {},
+            type: 'press',
+            target: skipButton,
+            currentTarget: skipButton,
+        };
+
+        fireEvent.press(skipButton, mockEvent);
+
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PURPOSE.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should navigate to Onboarding purpose page when email is entered but shouldValidate is set to false', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        AddWorkEmailShouldValidateFailure();
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PURPOSE.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should navigate to Onboarding work email validation page when email is entered and shouldValidate is set to true', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        AddWorkEmailShouldValidate();
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+});
+
+describe('OnboardingWorkEmailValidation Page', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(() => {
+        jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue({
+            isSmallScreenWidth: false,
+            shouldUseNarrowLayout: false,
+        } as ResponsiveLayoutResult);
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+
+        jest.clearAllMocks();
+    });
+
+    it('should display onboarding work email screen content correctly', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByText(translateLocal('onboarding.workEmailValidation.magicCodeSent', {workEmail}))).toBeOnTheScreen();
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should display onboarding merge block screen content correctly', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        await MergeIntoAccountAndLoginBlockMerge();
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByText(translateLocal('onboarding.mergeBlockScreen.subtitle', {workEmail}))).toBeOnTheScreen();
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should navigate to Onboarding purpose page when skip is pressed and there is no signupQualifier', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        const skipButton = screen.getByText(translateLocal('common.skip'));
+
+        const mockEvent = {
+            nativeEvent: {},
+            type: 'press',
+            target: skipButton,
+            currentTarget: skipButton,
+        };
+
+        fireEvent.press(skipButton, mockEvent);
+
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PURPOSE.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should navigate to Onboarding purpose page when validate code step is successful and there is no signupQualifier', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        MergeIntoAccountAndLoginSuccessful();
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PURPOSE.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should redirect to classic when merging is completed and shouldRedirectToClassicAfterMerge is returned as `true` by the API', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        MergeIntoAccountAndLoginRedirectToClassic();
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(openOldDotLink).toHaveBeenCalledWith(CONST.OLDDOT_URLS.INBOX, true);
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+});