From c7ef5a17dbdeebe2676807c956dfbe534da0edf6 Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Fri, 20 Jun 2025 11:23:11 +0530
Subject: [PATCH 1/9] show blocking screen for work email which has 2FA enabled

---
 src/CONST/index.ts                            |   2 +
 .../OnboardingMergingAccountBlocked.tsx       |  48 +++++
 .../BaseOnboardingWorkEmail.tsx               | 196 ++++++++++--------
 .../BaseOnboardingWorkEmailValidation.tsx     |  29 +--
 4 files changed, 158 insertions(+), 117 deletions(-)
 create mode 100644 src/components/OnboardingMergingAccountBlocked.tsx

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 9ac5ef673e9a..80fc2b41cec3 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -7226,6 +7226,8 @@ const CONST = {
         REGISTER_FOR_WEBINAR: 'registerForWebinar',
     },
 
+    ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE: '401 work account uses 2FA',
+
     SCHEDULE_CALL_STATUS: {
         CREATED: 'created',
         RESCHEDULED: 'rescheduled',
diff --git a/src/components/OnboardingMergingAccountBlocked.tsx b/src/components/OnboardingMergingAccountBlocked.tsx
new file mode 100644
index 000000000000..f06ee73aa337
--- /dev/null
+++ b/src/components/OnboardingMergingAccountBlocked.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import {setOnboardingErrorMessage} from '@userActions/Welcome';
+import ROUTES from '@src/ROUTES';
+import BlockingView from './BlockingViews/BlockingView';
+import Button from './Button';
+import {ToddBehindCloud} from './Icon/Illustrations';
+
+type OnboardingMergingAccountBlockedProps = {
+    // Work email to display in the subtitle
+    workEmail: string | undefined;
+    isVsb: boolean | undefined;
+};
+function OnboardingMergingAccountBlocked({workEmail, isVsb}: OnboardingMergingAccountBlockedProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    return (
+        <>
+            <BlockingView
+                icon={ToddBehindCloud}
+                iconWidth={variables.modalTopIconWidth}
+                iconHeight={variables.modalTopIconHeight}
+                title={translate('onboarding.mergeBlockScreen.title')}
+                subtitle={translate('onboarding.mergeBlockScreen.subtitle', {workEmail})}
+                subtitleStyle={[styles.colorMuted]}
+            />
+            <Button
+                success
+                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());
+                }}
+            />
+        </>
+    );
+}
+
+export default OnboardingMergingAccountBlocked;
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 1b1bea532631..3c00bfa80900 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -12,6 +12,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Illustrations from '@components/Icon/Illustrations';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import OnboardingMergingAccountBlocked from '@components/OnboardingMergingAccountBlocked';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
@@ -122,6 +123,8 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         },
     ];
 
+    const isMergingAccountBlocked = onboardingErrorMessage === CONST.ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE;
+
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
@@ -133,103 +136,112 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                 progressBarPercentage={10}
                 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}>
-                        <OfflineWithFeedback
-                            shouldDisplayErrorAbove
-                            errors={onboardingErrorMessage ? {addWorkEmailError: onboardingErrorMessage} : undefined}
-                            errorRowStyles={[styles.mt2, styles.textWrap]}
-                            onClose={() => setOnboardingErrorMessage('')}
-                        >
-                            <Button
-                                large
-                                text={translate('common.skip')}
-                                testID="onboardingPrivateEmailSkipButton"
-                                onPress={() => {
-                                    setOnboardingErrorMessage('');
-
-                                    setOnboardingMergeAccountStepValue(true);
-                                    // Once we skip the private email step, we need to force replace the screen
-                                    // so that we don't navigate back on back button press
-                                    if (isVsb) {
-                                        Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(), {forceReplace: true});
-                                        return;
-                                    }
-                                    Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(), {forceReplace: true});
-                                }}
-                            />
-                        </OfflineWithFeedback>
-                    </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>
+            {isMergingAccountBlocked ? (
+                <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
+                    <OnboardingMergingAccountBlocked
+                        workEmail={workEmail}
+                        isVsb={isVsb}
+                    />
+                </View>
+            ) : (
+                <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}>
+                            <OfflineWithFeedback
+                                shouldDisplayErrorAbove
+                                errors={onboardingErrorMessage ? {addWorkEmailError: onboardingErrorMessage} : undefined}
+                                errorRowStyles={[styles.mt2, styles.textWrap]}
+                                onClose={() => setOnboardingErrorMessage('')}
+                            >
+                                <Button
+                                    large
+                                    text={translate('common.skip')}
+                                    testID="onboardingPrivateEmailSkipButton"
+                                    onPress={() => {
+                                        setOnboardingErrorMessage('');
+
+                                        setOnboardingMergeAccountStepValue(true);
+                                        // Once we skip the private email step, we need to force replace the screen
+                                        // so that we don't navigate back on back button press
+                                        if (isVsb) {
+                                            Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(), {forceReplace: true});
+                                            return;
+                                        }
+                                        Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(), {forceReplace: true});
+                                    }}
+                                />
+                            </OfflineWithFeedback>
+                        </View>
+                    }
+                    shouldRenderFooterAboveSubmit
+                    shouldHideFixErrorsAlert
+                >
                     <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 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>
-                </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.LOGIN_CHARACTER_LIMIT}
-                        spellCheck={false}
-                    />
-                </View>
-            </FormProvider>
+                    <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.LOGIN_CHARACTER_LIMIT}
+                            spellCheck={false}
+                        />
+                    </View>
+                </FormProvider>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index 500e78f58c9e..b233e88ddd2f 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -2,10 +2,8 @@ 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 OnboardingMergingAccountBlocked from '@components/OnboardingMergingAccountBlocked';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm';
@@ -16,7 +14,6 @@ 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';
@@ -89,27 +86,9 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
             />
             {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());
-                        }}
+                    <OnboardingMergingAccountBlocked
+                        workEmail={workEmail}
+                        isVsb={isVsb}
                     />
                 </View>
             ) : (

From a6c67a4481cedb255bf2e82e96676248c43d4250 Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Wed, 25 Jun 2025 10:35:02 +0530
Subject: [PATCH 2/9] rename the blocked view file

---
 src/CONST/index.ts                                       | 3 +--
 ...ocked.tsx => OnboardingMergingAccountBlockedView.tsx} | 9 ++++++---
 .../OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx      | 6 +++---
 .../BaseOnboardingWorkEmailValidation.tsx                | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename src/components/{OnboardingMergingAccountBlocked.tsx => OnboardingMergingAccountBlockedView.tsx} (84%)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 6bd4b950d66d..3c34d7bc7cf7 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1792,6 +1792,7 @@ const CONST = {
         GATEWAY_TIMEOUT: 'Gateway Timeout',
         EXPENSIFY_SERVICE_INTERRUPTED: 'Expensify service interrupted',
         DUPLICATE_RECORD: 'A record already exists with this ID',
+        ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE: '401 work account uses 2FA',
 
         // The "Upgrade" is intentional as the 426 HTTP code means "Upgrade Required" and sent by the API. We use the "Update" language everywhere else in the front end when this gets returned.
         UPDATE_REQUIRED: 'Upgrade Required',
@@ -7358,8 +7359,6 @@ const CONST = {
         REGISTER_FOR_WEBINAR: 'registerForWebinar',
     },
 
-    ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE: '401 work account uses 2FA',
-
     SCHEDULE_CALL_STATUS: {
         CREATED: 'created',
         RESCHEDULED: 'rescheduled',
diff --git a/src/components/OnboardingMergingAccountBlocked.tsx b/src/components/OnboardingMergingAccountBlockedView.tsx
similarity index 84%
rename from src/components/OnboardingMergingAccountBlocked.tsx
rename to src/components/OnboardingMergingAccountBlockedView.tsx
index f06ee73aa337..58db9325a883 100644
--- a/src/components/OnboardingMergingAccountBlocked.tsx
+++ b/src/components/OnboardingMergingAccountBlockedView.tsx
@@ -9,12 +9,13 @@ import BlockingView from './BlockingViews/BlockingView';
 import Button from './Button';
 import {ToddBehindCloud} from './Icon/Illustrations';
 
-type OnboardingMergingAccountBlockedProps = {
+type OnboardingMergingAccountBlockedViewProps = {
     // Work email to display in the subtitle
     workEmail: string | undefined;
     isVsb: boolean | undefined;
 };
-function OnboardingMergingAccountBlocked({workEmail, isVsb}: OnboardingMergingAccountBlockedProps) {
+
+function OnboardingMergingAccountBlockedView({workEmail, isVsb}: OnboardingMergingAccountBlockedViewProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     return (
@@ -45,4 +46,6 @@ function OnboardingMergingAccountBlocked({workEmail, isVsb}: OnboardingMergingAc
     );
 }
 
-export default OnboardingMergingAccountBlocked;
+OnboardingMergingAccountBlockedView.displayName = 'OnboardingMergingAccountBlockedView';
+
+export default OnboardingMergingAccountBlockedView;
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 4904f3cbbf65..873a27fddeef 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -12,7 +12,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Illustrations from '@components/Icon/Illustrations';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import OnboardingMergingAccountBlocked from '@components/OnboardingMergingAccountBlocked';
+import OnboardingMergingAccountBlockedView from '@components/OnboardingMergingAccountBlockedView';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
@@ -129,7 +129,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         },
     ];
 
-    const isMergingAccountBlocked = onboardingErrorMessage === CONST.ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE;
+    const isMergingAccountBlocked = onboardingErrorMessage === CONST.ERROR.ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE;
 
     return (
         <ScreenWrapper
@@ -144,7 +144,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
             />
             {isMergingAccountBlocked ? (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                    <OnboardingMergingAccountBlocked
+                    <OnboardingMergingAccountBlockedView
                         workEmail={workEmail}
                         isVsb={isVsb}
                     />
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index c8d20a38cae3..2fcce113b164 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -3,7 +3,7 @@ import React, {useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import OnboardingMergingAccountBlocked from '@components/OnboardingMergingAccountBlocked';
+import OnboardingMergingAccountBlockedView from '@components/OnboardingMergingAccountBlockedView';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm';
@@ -92,7 +92,7 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
             />
             {onboardingValues?.isMergingAccountBlocked ? (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                    <OnboardingMergingAccountBlocked
+                    <OnboardingMergingAccountBlockedView
                         workEmail={workEmail}
                         isVsb={isVsb}
                     />

From adb1216bc3aa9b099513225c5f620d763c7a0ffd Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Wed, 25 Jun 2025 10:38:20 +0530
Subject: [PATCH 3/9] get back deleted code

---
 src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 873a27fddeef..2a6d7089551d 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -183,6 +183,12 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                                             Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(), {forceReplace: true});
                                             return;
                                         }
+
+                                        if (isSmb) {
+                                            Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(), {forceReplace: true});
+                                            return;
+                                        }
+
                                         Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(), {forceReplace: true});
                                     }}
                                 />

From dba4d8c058724019a2d43e74ba020b547af719b1 Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Fri, 27 Jun 2025 10:09:33 +0530
Subject: [PATCH 4/9] fix work email not persisting on block screen

---
 src/components/OnboardingMergingAccountBlockedView.tsx | 2 ++
 src/libs/actions/Session/index.ts                      | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/OnboardingMergingAccountBlockedView.tsx b/src/components/OnboardingMergingAccountBlockedView.tsx
index 58db9325a883..f1ef27d8f0d5 100644
--- a/src/components/OnboardingMergingAccountBlockedView.tsx
+++ b/src/components/OnboardingMergingAccountBlockedView.tsx
@@ -12,6 +12,8 @@ import {ToddBehindCloud} from './Icon/Illustrations';
 type OnboardingMergingAccountBlockedViewProps = {
     // Work email to display in the subtitle
     workEmail: string | undefined;
+
+    // Whether the user is a VSB
     isVsb: boolean | undefined;
 };
 
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index d3fe1afedb53..dca74c7db555 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -1275,7 +1275,6 @@ function AddWorkEmail(workEmail: string) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM,
             value: {
-                onboardingWorkEmail: workEmail,
                 isLoading: false,
             },
         },
@@ -1286,7 +1285,6 @@ function AddWorkEmail(workEmail: string) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM,
             value: {
-                onboardingWorkEmail: null,
                 isLoading: false,
             },
         },

From 67adc770546e7f89ed09552eef3d3bcc5d17e9cd Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Fri, 4 Jul 2025 11:48:14 +0530
Subject: [PATCH 5/9] show blocking screen for all failures of `addWorkEmail`

---
 src/CONST/index.ts                                        | 1 -
 src/libs/actions/Session/index.ts                         | 7 +++++++
 src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx | 4 +---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 3c34d7bc7cf7..b9fa7c953f5d 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -1792,7 +1792,6 @@ const CONST = {
         GATEWAY_TIMEOUT: 'Gateway Timeout',
         EXPENSIFY_SERVICE_INTERRUPTED: 'Expensify service interrupted',
         DUPLICATE_RECORD: 'A record already exists with this ID',
-        ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE: '401 work account uses 2FA',
 
         // The "Upgrade" is intentional as the 426 HTTP code means "Upgrade Required" and sent by the API. We use the "Update" language everywhere else in the front end when this gets returned.
         UPDATE_REQUIRED: 'Upgrade Required',
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index dca74c7db555..cf08d0c8b96b 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -1288,6 +1288,13 @@ function AddWorkEmail(workEmail: string) {
                 isLoading: false,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_ONBOARDING,
+            value: {
+                isMergingAccountBlocked: true,
+            },
+        },
     ];
 
     API.write(
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 2a6d7089551d..86543ab75bc1 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -129,8 +129,6 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         },
     ];
 
-    const isMergingAccountBlocked = onboardingErrorMessage === CONST.ERROR.ONBOARDING_2FA_REQUIRED_ERROR_MESSAGE;
-
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
@@ -142,7 +140,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                 progressBarPercentage={10}
                 shouldShowBackButton={false}
             />
-            {isMergingAccountBlocked ? (
+            {onboardingValues?.isMergingAccountBlocked ? (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
                     <OnboardingMergingAccountBlockedView
                         workEmail={workEmail}

From 05b54669685d49284cb5791f567f15080e460657 Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Sun, 13 Jul 2025 18:11:07 +0530
Subject: [PATCH 6/9] fix bottom padding for button

---
 src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx       | 2 +-
 .../BaseOnboardingWorkEmailValidation.tsx                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 86543ab75bc1..ba840b44d505 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -132,7 +132,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
-            includeSafeAreaPaddingBottom={isOffline}
+            includeSafeAreaPaddingBottom
             testID="BaseOnboardingWorkEmail"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index 2fcce113b164..5c63fad4cd42 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -79,7 +79,7 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
+            includeSafeAreaPaddingBottom
             testID="BaseOnboardingWorkEmailValidation"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >

From 2b5cf3566fba72a42ada93ade8e606041f2576cc Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Sun, 13 Jul 2025 18:19:46 +0530
Subject: [PATCH 7/9] revert all changes in base onboarding email

---
 .../BaseOnboardingWorkEmail.tsx               | 266 ++++++++++++------
 1 file changed, 179 insertions(+), 87 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 64cd9598c924..f2b7868eb098 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -1,53 +1,75 @@
 import {useIsFocused} from '@react-navigation/native';
-import React, {useCallback, useEffect} from 'react';
+import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
+import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
-import BlockingView from '@components/BlockingViews/BlockingView';
+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 OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
-import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 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 {isMobileSafari} from '@libs/Browser';
+import {addErrorMessage} from '@libs/ErrorUtils';
+import getOperatingSystem from '@libs/getOperatingSystem';
 import Navigation from '@libs/Navigation/Navigation';
-import variables from '@styles/variables';
-import {MergeIntoAccountAndLogin} from '@userActions/Session';
-import {resendValidateCode} from '@userActions/User';
+import {AddWorkEmail} from '@userActions/Session';
+import {setOnboardingErrorMessage, setOnboardingMergeAccountStepValue} from '@userActions/Welcome';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import Log from '@src/libs/Log';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {BaseOnboardingWorkEmailValidationProps} from './types';
+import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm';
+import type IconAsset from '@src/types/utils/IconAsset';
+import type {BaseOnboardingWorkEmailProps} from './types';
 
-function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardingWorkEmailValidationProps) {
+type Item = {
+    icon: IconAsset;
+    titleTranslationKey: TranslationPaths;
+    shouldRenderEmail?: boolean;
+};
+
+function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmailProps) {
     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 {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
     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 [onboardingErrorMessage] = useOnyx(ONYXKEYS.ONBOARDING_ERROR_MESSAGE, {canBeMissing: true});
     const isVsb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
     const isSmb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
-    const [onboardingErrorMessage] = useOnyx(ONYXKEYS.ONBOARDING_ERROR_MESSAGE, {canBeMissing: true});
-    const isValidateCodeFormSubmitting = AccountUtils.isValidateCodeFormSubmitting(account);
+    const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [shouldValidateOnChange, setShouldValidateOnChange] = useState(false);
+    const {isOffline} = useNetwork();
+    const ICON_SIZE = 48;
+    const operatingSystem = getOperatingSystem();
     const isFocused = useIsFocused();
 
     useEffect(() => {
-        if (onboardingValues?.isMergeAccountStepCompleted === undefined) {
+        setOnboardingErrorMessage('');
+    }, []);
+
+    useEffect(() => {
+        if (onboardingValues?.shouldValidate === undefined && onboardingValues?.isMergeAccountStepCompleted === undefined) {
             return;
         }
         setOnboardingErrorMessage('');
-        if (onboardingValues?.shouldRedirectToClassicAfterMerge) {
-            openOldDotLink(CONST.OLDDOT_URLS.INBOX, true);
+
+        if (onboardingValues?.shouldValidate) {
+            Navigation.navigate(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
             return;
         }
         // Once we verify that shouldValidate is false, we need to force replace the screen
@@ -63,90 +85,160 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
         }
 
         if (!onboardingValues?.isMergeAccountStepSkipped) {
-            Navigation.navigate(ROUTES.ONBOARDING_WORKSPACES.getRoute(), {forceReplace: true});
+            Navigation.navigate(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(), {forceReplace: true});
             return;
         }
 
         Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(), {forceReplace: true});
-    }, [onboardingValues, isVsb, isSmb, isFocused]);
+    }, [onboardingValues?.shouldValidate, isVsb, isSmb, isFocused, onboardingValues?.isMergeAccountStepCompleted, onboardingValues?.isMergeAccountStepSkipped]);
 
-    const sendValidateCode = useCallback(() => {
-        if (!credentials?.login) {
-            return;
+    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);
         }
-        resendValidateCode(credentials.login);
-    }, [credentials?.login]);
+        const userEmail = values[INPUT_IDS.ONBOARDING_WORK_EMAIL];
+
+        const errors = {};
+        const emailParts = userEmail.split('@');
+        const domain = emailParts.at(1) ?? '';
 
-    const validateAccountAndMerge = useCallback(
-        (validateCode: string) => {
-            setOnboardingErrorMessage('');
-            MergeIntoAccountAndLogin(workEmail, validateCode, session?.accountID);
+        if ((PUBLIC_DOMAINS_SET.has(domain.toLowerCase()) || !Str.isValidEmail(userEmail)) && !isOffline) {
+            Log.hmmm('User is trying to add an invalid work email', {userEmail, domain});
+            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,
         },
-        [workEmail, session?.accountID],
-    );
+        {
+            icon: Illustrations.Profile,
+            titleTranslationKey: 'onboarding.workEmail.explanationModal.descriptionTwo',
+        },
+        {
+            icon: Illustrations.Gears,
+            titleTranslationKey: 'onboarding.workEmail.explanationModal.descriptionThree',
+        },
+    ];
 
     return (
         <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID="BaseOnboardingWorkEmailValidation"
+            shouldEnableMaxHeight={!isMobileSafari()}
+            shouldAvoidScrollOnVirtualViewport={!isMobileSafari()}
+            includeSafeAreaPaddingBottom={isOffline}
+            testID="BaseOnboardingWorkEmail"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >
             <HeaderWithBackButton
-                shouldShowBackButton={!onboardingValues?.isMergingAccountBlocked}
-                progressBarPercentage={15}
-                onBackButtonPress={() => {
-                    updateOnboardingValuesAndNavigation(onboardingValues);
-                }}
+                progressBarPercentage={10}
+                shouldShowBackButton={false}
             />
-            {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());
-                        }}
-                    />
+            <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={
+                    <OfflineWithFeedback
+                        shouldDisplayErrorAbove
+                        style={styles.mb3}
+                        errors={onboardingErrorMessage ? {addWorkEmailError: onboardingErrorMessage} : undefined}
+                        errorRowStyles={[styles.mt2, styles.textWrap]}
+                        onClose={() => setOnboardingErrorMessage('')}
+                    >
+                        <Button
+                            large
+                            text={translate('common.skip')}
+                            testID="onboardingPrivateEmailSkipButton"
+                            onPress={() => {
+                                setOnboardingErrorMessage('');
+
+                                setOnboardingMergeAccountStepValue(true, true);
+                            }}
+                        />
+                    </OfflineWithFeedback>
+                }
+                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.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
-                        handleSubmitForm={validateAccountAndMerge}
-                        sendValidateCode={sendValidateCode}
-                        validateCodeActionErrorField="mergeIntoAccountAndLogIn"
-                        clearError={() => setOnboardingErrorMessage('')}
-                        buttonStyles={[styles.flex2, styles.justifyContentEnd, styles.mb5]}
-                        shouldShowSkipButton
-                        handleSkipButtonPress={() => {
-                            setOnboardingErrorMessage('');
-                            setOnboardingMergeAccountStepValue(true, true);
-                        }}
-                        isLoading={isValidateCodeFormSubmitting}
-                        validateError={onboardingErrorMessage ? {invalidCodeError: onboardingErrorMessage} : undefined}
+
+                <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.LOGIN_CHARACTER_LIMIT}
+                        spellCheck={false}
                     />
                 </View>
-            )}
+            </FormProvider>
         </ScreenWrapper>
     );
 }
 
-BaseOnboardingWorkEmailValidation.displayName = 'BaseOnboardingWorkEmailValidation';
+BaseOnboardingWorkEmail.displayName = 'BaseOnboardingWorkEmail';
 
-export default BaseOnboardingWorkEmailValidation;
\ No newline at end of file
+export default BaseOnboardingWorkEmail;
\ No newline at end of file

From a73480b385f3fa2e19dc3a5c149bdecc52cb652d Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Sun, 13 Jul 2025 18:20:43 +0530
Subject: [PATCH 8/9] fix onboarding work email blocking screen

---
 .../BaseOnboardingWorkEmail.tsx               | 180 +++++++++---------
 1 file changed, 95 insertions(+), 85 deletions(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index f2b7868eb098..462aae1ae2ef 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -11,6 +11,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Illustrations from '@components/Icon/Illustrations';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import OnboardingMergingAccountBlockedView from '@components/OnboardingMergingAccountBlockedView';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
@@ -146,99 +147,108 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                 progressBarPercentage={10}
                 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={
-                    <OfflineWithFeedback
-                        shouldDisplayErrorAbove
-                        style={styles.mb3}
-                        errors={onboardingErrorMessage ? {addWorkEmailError: onboardingErrorMessage} : undefined}
-                        errorRowStyles={[styles.mt2, styles.textWrap]}
-                        onClose={() => setOnboardingErrorMessage('')}
-                    >
-                        <Button
-                            large
-                            text={translate('common.skip')}
-                            testID="onboardingPrivateEmailSkipButton"
-                            onPress={() => {
-                                setOnboardingErrorMessage('');
-
-                                setOnboardingMergeAccountStepValue(true, true);
-                            }}
-                        />
-                    </OfflineWithFeedback>
-                }
-                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>
+            {onboardingValues?.isMergingAccountBlocked ? (
+                <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
+                    <OnboardingMergingAccountBlockedView
+                        workEmail={workEmail}
+                        isVsb={isVsb}
+                    />
+                </View>
+            ) : (
+                <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={
+                        <OfflineWithFeedback
+                            shouldDisplayErrorAbove
+                            style={styles.mb3}
+                            errors={onboardingErrorMessage ? {addWorkEmailError: onboardingErrorMessage} : undefined}
+                            errorRowStyles={[styles.mt2, styles.textWrap]}
+                            onClose={() => setOnboardingErrorMessage('')}
+                        >
+                            <Button
+                                large
+                                text={translate('common.skip')}
+                                testID="onboardingPrivateEmailSkipButton"
+                                onPress={() => {
+                                    setOnboardingErrorMessage('');
+
+                                    setOnboardingMergeAccountStepValue(true, true);
+                                }}
+                            />
+                        </OfflineWithFeedback>
+                    }
+                    shouldRenderFooterAboveSubmit
+                    shouldHideFixErrorsAlert
+                >
                     <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 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>
-                </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.LOGIN_CHARACTER_LIMIT}
-                        spellCheck={false}
-                    />
-                </View>
-            </FormProvider>
+                    <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.LOGIN_CHARACTER_LIMIT}
+                            spellCheck={false}
+                        />
+                    </View>
+                </FormProvider>
+            )}
         </ScreenWrapper>
     );
 }
 
 BaseOnboardingWorkEmail.displayName = 'BaseOnboardingWorkEmail';
 
-export default BaseOnboardingWorkEmail;
\ No newline at end of file
+export default BaseOnboardingWorkEmail;

From ac4b1a14df392ebce5509c9abf4d4460f52c6a12 Mon Sep 17 00:00:00 2001
From: allgandalf <whogandalf@gmail.com>
Date: Mon, 14 Jul 2025 01:31:43 +0530
Subject: [PATCH 9/9] fix button overlap issue

---
 src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 462aae1ae2ef..6a466bea4a63 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -139,7 +139,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         <ScreenWrapper
             shouldEnableMaxHeight={!isMobileSafari()}
             shouldAvoidScrollOnVirtualViewport={!isMobileSafari()}
-            includeSafeAreaPaddingBottom={isOffline}
+            includeSafeAreaPaddingBottom
             testID="BaseOnboardingWorkEmail"
             style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
         >