diff --git a/src/CONST.ts b/src/CONST.ts
index d3132b17a2ea..f3c3c05afc16 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -569,6 +569,7 @@ const CONST = {
     LICENSES_URL: `${USE_EXPENSIFY_URL}/licenses`,
     ACH_TERMS_URL: `${USE_EXPENSIFY_URL}/achterms`,
     WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/walletagreement`,
+    BANCORP_WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`,
     HELP_LINK_URL: `${USE_EXPENSIFY_URL}/usa-patriot-act`,
     ELECTRONIC_DISCLOSURES_URL: `${USE_EXPENSIFY_URL}/esignagreement`,
     GITHUB_RELEASE_URL: 'https://api.github.com/repos/expensify/app/releases/latest',
@@ -1429,6 +1430,7 @@ const CONST = {
         },
         STEP: {
             // In the order they appear in the Wallet flow
+            ADD_BANK_ACCOUNT: 'AddBankAccountStep',
             ADDITIONAL_DETAILS: 'AdditionalDetailsStep',
             ADDITIONAL_DETAILS_KBA: 'AdditionalDetailsKBAStep',
             ONFIDO: 'OnfidoStep',
@@ -1465,6 +1467,7 @@ const CONST = {
             CONCIERGE: 'CONCIERGE_NAVIGATE',
         },
         MTL_WALLET_PROGRAM_ID: '760',
+        BANCORP_WALLET_PROGRAM_ID: '660',
         PROGRAM_ISSUERS: {
             EXPENSIFY_PAYMENTS: 'Expensify Payments LLC',
             BANCORP_BANK: 'The Bancorp Bank',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ed20d388bb87..eb3b439ea1ff 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -140,12 +140,7 @@ const ROUTES = {
     },
     SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
     SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
-    SETTINGS_ADD_BANK_ACCOUNT_REFACTOR: 'settings/wallet/add-bank-account-refactor',
     SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments',
-    // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-    SETTINGS_ENABLE_PAYMENTS_REFACTOR: 'settings/wallet/enable-payments-refactor',
-    // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-    SETTINGS_ENABLE_PAYMENTS_TEMPORARY_TERMS: 'settings/wallet/enable-payments-temporary-terms',
     SETTINGS_WALLET_CARD_DIGITAL_DETAILS_UPDATE_ADDRESS: {
         route: 'settings/wallet/card/:domain/digital-details/update-address',
         getRoute: (domain: string) => `settings/wallet/card/${domain}/digital-details/update-address` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 9f7277a0ad0f..f884cca94ef5 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -42,7 +42,6 @@ const SCREENS = {
         APP_DOWNLOAD_LINKS: 'Settings_App_Download_Links',
         ADD_DEBIT_CARD: 'Settings_Add_Debit_Card',
         ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account',
-        ADD_BANK_ACCOUNT_REFACTOR: 'Settings_Add_Bank_Account_Refactor',
         CLOSE: 'Settings_Close',
         TWO_FACTOR_AUTH: 'Settings_TwoFactorAuth',
         REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged',
@@ -89,10 +88,6 @@ const SCREENS = {
             TRANSFER_BALANCE: 'Settings_Wallet_Transfer_Balance',
             CHOOSE_TRANSFER_ACCOUNT: 'Settings_Wallet_Choose_Transfer_Account',
             ENABLE_PAYMENTS: 'Settings_Wallet_EnablePayments',
-            // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-            ENABLE_PAYMENTS_REFACTOR: 'Settings_Wallet_EnablePayments_Refactor',
-            // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-            ENABLE_PAYMENTS_TEMPORARY_TERMS: 'Settings_Wallet_EnablePayments_Temporary_Terms',
             CARD_ACTIVATE: 'Settings_Wallet_Card_Activate',
             REPORT_VIRTUAL_CARD_FRAUD: 'Settings_Wallet_ReportVirtualCardFraud',
             CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS: 'Settings_Wallet_Cards_Digital_Details_Update_Address',
diff --git a/src/components/AddPlaidBankAccount.tsx b/src/components/AddPlaidBankAccount.tsx
index 366f14ec9780..eaefa3c5581c 100644
--- a/src/components/AddPlaidBankAccount.tsx
+++ b/src/components/AddPlaidBankAccount.tsx
@@ -18,7 +18,6 @@ import FullPageOfflineBlockingView from './BlockingViews/FullPageOfflineBlocking
 import FormHelpMessage from './FormHelpMessage';
 import Icon from './Icon';
 import getBankIcon from './Icon/BankIcons';
-import Picker from './Picker';
 import PlaidLink from './PlaidLink';
 import RadioButtons from './RadioButtons';
 import Text from './Text';
@@ -59,9 +58,6 @@ type AddPlaidBankAccountProps = AddPlaidBankAccountOnyxProps & {
     /** Are we adding a withdrawal account? */
     allowDebit?: boolean;
 
-    /** Is displayed in new VBBA */
-    isDisplayedInNewVBBA?: boolean;
-
     /** Is displayed in new enable wallet flow */
     isDisplayedInWalletFlow?: boolean;
 
@@ -84,7 +80,6 @@ function AddPlaidBankAccount({
     bankAccountID = 0,
     allowDebit = false,
     isPlaidDisabled,
-    isDisplayedInNewVBBA = false,
     errorText = '',
     onInputChange = () => {},
     isDisplayedInWalletFlow = false,
@@ -259,62 +254,32 @@ function AddPlaidBankAccount({
         return <FullPageOfflineBlockingView>{renderPlaidLink()}</FullPageOfflineBlockingView>;
     }
 
-    if (isDisplayedInNewVBBA || isDisplayedInWalletFlow) {
-        return (
-            <FullPageOfflineBlockingView>
-                <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(isDisplayedInWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}</Text>
-                {!!text && <Text style={[styles.mb6, styles.textSupporting]}>{text}</Text>}
-                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb6]}>
-                    <Icon
-                        src={icon}
-                        height={iconSize}
-                        width={iconSize}
-                        additionalStyles={iconStyles}
-                    />
-                    <View>
-                        <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
-                        {selectedPlaidAccountMask.length > 0 && (
-                            <Text style={[styles.ml3, styles.textLabelSupporting]}>{`${translate('bankAccount.accountEnding')} ${selectedPlaidAccountMask}`}</Text>
-                        )}
-                    </View>
-                </View>
-                <Text style={[styles.textLabelSupporting]}>{`${translate('bankAccount.chooseAnAccountBelow')}:`}</Text>
-                <RadioButtons
-                    items={options}
-                    defaultCheckedValue={defaultSelectedPlaidAccountID}
-                    onPress={handleSelectingPlaidAccount}
-                    radioButtonStyle={[styles.mb6]}
-                />
-                <FormHelpMessage message={errorText} />
-            </FullPageOfflineBlockingView>
-        );
-    }
-
-    // Plaid bank accounts view
     return (
         <FullPageOfflineBlockingView>
-            {!!text && <Text style={[styles.mb5]}>{text}</Text>}
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(isDisplayedInWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}</Text>
+            {!!text && <Text style={[styles.mb6, styles.textSupporting]}>{text}</Text>}
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb6]}>
                 <Icon
                     src={icon}
                     height={iconSize}
                     width={iconSize}
                     additionalStyles={iconStyles}
                 />
-                <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
-            </View>
-            <View>
-                <Picker
-                    label={translate('addPersonalBankAccountPage.chooseAccountLabel')}
-                    onInputChange={onSelect}
-                    items={options}
-                    placeholder={{
-                        value: '',
-                        label: translate('bankAccount.chooseAnAccount'),
-                    }}
-                    value={selectedPlaidAccountID}
-                />
+                <View>
+                    <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
+                    {selectedPlaidAccountMask.length > 0 && (
+                        <Text style={[styles.ml3, styles.textLabelSupporting]}>{`${translate('bankAccount.accountEnding')} ${selectedPlaidAccountMask}`}</Text>
+                    )}
+                </View>
             </View>
+            <Text style={[styles.textLabelSupporting]}>{`${translate('bankAccount.chooseAnAccountBelow')}:`}</Text>
+            <RadioButtons
+                items={options}
+                defaultCheckedValue={defaultSelectedPlaidAccountID}
+                onPress={handleSelectingPlaidAccount}
+                radioButtonStyle={[styles.mb6]}
+            />
+            <FormHelpMessage message={errorText} />
         </FullPageOfflineBlockingView>
     );
 }
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 7d96167559e8..5a03565f003e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1621,6 +1621,8 @@ export default {
         facialScan: 'Onfido’s Facial Scan Policy and Release',
         tryAgain: 'Try again',
         verifyIdentity: 'Verify identity',
+        letsVerifyIdentity: "Let's verify your identity.",
+        butFirst: `But first, the boring stuff. Read up on the legalese in the next step and click "Accept" when you're ready.`,
         genericError: 'There was an error while processing this step. Please try again.',
         cameraPermissionsNotGranted: 'Enable camera access',
         cameraRequestMessage: 'We need access to your camera to complete bank account verification. Please enable via Settings > New Expensify.',
@@ -1662,8 +1664,8 @@ export default {
         noOverdraftOrCredit: 'No overdraft/credit feature.',
         electronicFundsWithdrawal: 'Electronic funds withdrawal',
         standard: 'Standard',
-        takeALookAtSomeFees: 'Take a look at some fees.',
-        checkPlease: 'Check please.',
+        reviewTheFees: 'Please review the fees below.',
+        checkTheBoxes: 'Please check the boxes below.',
         agreeToTerms: 'Agree to the terms and you’ll be good to go!',
         shortTermsForm: {
             expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `The Expensify Wallet is issued by ${walletProgram}.`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 9b86a1bf0f78..f97437dc8165 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1641,6 +1641,8 @@ export default {
         facialScan: 'Política y lanzamiento de la exploración facial de Onfido',
         tryAgain: 'Intentar otra vez',
         verifyIdentity: 'Verificar identidad',
+        letsVerifyIdentity: '¡Vamos a verificar tu identidad!',
+        butFirst: 'Pero primero, lo aburrido. Lee la jerga legal en el siguiente paso y haz clic en "Aceptar" cuando estés listo.',
         genericError: 'Hubo un error al procesar este paso. Inténtalo de nuevo.',
         cameraPermissionsNotGranted: 'Permiso para acceder a la cámara',
         cameraRequestMessage: 'Necesitamos acceso a tu cámara para completar la verificación de tu cuenta de banco. Por favor habilita los permisos en Configuración > Nuevo Expensify.',
@@ -1684,8 +1686,8 @@ export default {
         noOverdraftOrCredit: 'Sin función de sobregiro/crédito',
         electronicFundsWithdrawal: 'Retiro electrónico de fondos',
         standard: 'Estándar',
-        takeALookAtSomeFees: 'Echa un vistazo a algunas tarifas.',
-        checkPlease: 'Por favor, revisa.',
+        reviewTheFees: 'Por favor, revisa las siguientes tarifas.',
+        checkTheBoxes: 'Por favor, marca las siguientes casillas.',
         agreeToTerms: 'Debes aceptar los términos y condiciones para continuar.',
         shortTermsForm: {
             expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `La billetera Expensify es emitida por ${walletProgram}.`,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 807c938e21dd..e49d083092ee 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -205,14 +205,9 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM]: () => require('../../../../pages/settings/Wallet/Card/GetPhysicalCardConfirm').default as React.ComponentType,
     [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: () => require('../../../../pages/settings/Wallet/TransferBalancePage').default as React.ComponentType,
     [SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT]: () => require('../../../../pages/settings/Wallet/ChooseTransferAccountPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/EnablePaymentsPage').default as React.ComponentType,
-    // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_REFACTOR]: () => require('../../../../pages/EnablePayments/PersonalInfo/PersonalInfo').default as React.ComponentType,
-    // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_TEMPORARY_TERMS]: () => require('../../../../pages/EnablePayments/FeesAndTerms/FeesAndTerms').default as React.ComponentType,
+    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/EnablePayments').default as React.ComponentType,
     [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default as React.ComponentType,
     [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_REFACTOR]: () => require('../../../../pages/EnablePayments/AddBankAccount/AddBankAccount').default as React.ComponentType,
     [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default as React.ComponentType,
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default as React.ComponentType,
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default as React.ComponentType,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index bb002ec2c01f..07dd45701029 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -166,16 +166,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_ENABLE_PAYMENTS,
                             exact: true,
                         },
-                        // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-                        [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_REFACTOR]: {
-                            path: ROUTES.SETTINGS_ENABLE_PAYMENTS_REFACTOR,
-                            exact: true,
-                        },
-                        // TODO: Added temporarily for testing purposes, remove after refactor - https://github.com/Expensify/App/issues/36648
-                        [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_TEMPORARY_TERMS]: {
-                            path: ROUTES.SETTINGS_ENABLE_PAYMENTS_TEMPORARY_TERMS,
-                            exact: true,
-                        },
                         [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: {
                             path: ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE,
                             exact: true,
@@ -204,10 +194,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_REFACTOR]: {
-                            path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_REFACTOR,
-                            exact: true,
-                        },
                         [SCREENS.SETTINGS.PROFILE.PRONOUNS]: {
                             path: ROUTES.SETTINGS_PRONOUNS,
                             exact: true,
diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
index cddb2c371a60..023358cff248 100644
--- a/src/libs/actions/BankAccounts.ts
+++ b/src/libs/actions/BankAccounts.ts
@@ -87,10 +87,9 @@ function openPersonalBankAccountSetupView(exitReportID?: string) {
 }
 
 /**
- * TODO: remove the previous function and rename this function to openPersonalBankAccountSetupView after migrating to the new flow
- * Open the personal bank account setup flow, with an optional exitReportID to redirect to once the flow is finished.
+ * Open the personal bank account setup flow using Plaid, with an optional exitReportID to redirect to once the flow is finished.
  */
-function openPersonalBankAccountSetupViewRefactor(exitReportID?: string) {
+function openPersonalBankAccountSetupWithPlaid(exitReportID?: string) {
     clearPlaid().then(() => {
         if (exitReportID) {
             Onyx.merge(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {exitReportID});
@@ -232,6 +231,13 @@ function addPersonalBankAccount(account: PlaidBankAccount) {
                     shouldShowSuccess: true,
                 },
             },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.USER_WALLET,
+                value: {
+                    currentStep: CONST.WALLET.STEP.ADDITIONAL_DETAILS,
+                },
+            },
         ],
         failureData: [
             {
@@ -562,7 +568,7 @@ export {
     validateBankAccount,
     verifyIdentityForBankAccount,
     setReimbursementAccountLoading,
-    openPersonalBankAccountSetupViewRefactor,
+    openPersonalBankAccountSetupWithPlaid,
     updateAddPersonalBankAccountDraft,
     clearPersonalBankAccountSetupType,
     validatePlaidSelection,
diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index 3dd3f01c0703..c12c44c1ed74 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -218,7 +218,7 @@ function openEnablePaymentsPage() {
     API.read(READ_COMMANDS.OPEN_ENABLE_PAYMENTS_PAGE, {});
 }
 
-function updateCurrentStep(currentStep: ValueOf<typeof CONST.WALLET.STEP>) {
+function updateCurrentStep(currentStep: ValueOf<typeof CONST.WALLET.STEP> | null) {
     Onyx.merge(ONYXKEYS.USER_WALLET, {currentStep});
 }
 
diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx
index ac02cd26879b..e306fa0550ac 100644
--- a/src/pages/AddPersonalBankAccountPage.tsx
+++ b/src/pages/AddPersonalBankAccountPage.tsx
@@ -89,7 +89,9 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona
                 >
                     <AddPlaidBankAccount
                         onSelect={setSelectedPlaidAccountId}
+                        text={translate('walletPage.chooseAccountBody')}
                         plaidData={plaidData}
+                        isDisplayedInWalletFlow
                         onExitPlaid={() => Navigation.goBack()}
                         receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
                         selectedPlaidAccountID={selectedPlaidAccountId}
diff --git a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
index 79c91af178c3..a274990ea6a7 100644
--- a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -12,6 +12,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as PaymentMethods from '@userActions/PaymentMethods';
+import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -44,7 +45,6 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
 
         if (selectedPlaidBankAccount) {
             BankAccounts.addPersonalBankAccount(selectedPlaidBankAccount);
-            Navigation.navigate(ROUTES.SETTINGS_ENABLE_PAYMENTS);
         }
     }, [personalBankAccountDraft?.plaidAccountID, plaidData?.bankAccounts]);
 
@@ -54,7 +54,6 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
 
     const exitFlow = (shouldContinue = false) => {
         const exitReportID = personalBankAccount?.exitReportID;
-        // TODO: https://github.com/Expensify/App/issues/36648 This should be updated to the correct route once the refactor is complete
         const onSuccessFallbackRoute = personalBankAccount?.onSuccessFallbackRoute ?? '';
 
         if (exitReportID) {
@@ -75,18 +74,19 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
         }
         if (screenIndex === 0) {
             BankAccounts.clearPersonalBankAccount();
+            Wallet.updateCurrentStep(null);
+            Navigation.goBack(ROUTES.SETTINGS_WALLET);
             return;
         }
         prevScreen();
     };
 
-    useEffect(() => BankAccounts.clearPersonalBankAccount, []);
-
     return (
         <ScreenWrapper
             testID={AddBankAccount.displayName}
             includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicator
         >
             <HeaderWithBackButton
                 shouldShowBackButton
diff --git a/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx b/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
index e70d5979e92e..9db52332d755 100644
--- a/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
@@ -28,7 +28,7 @@ type SetupMethodOnyxProps = {
 type SetupMethodProps = SetupMethodOnyxProps;
 
 const plaidDesktopMessage = getPlaidDesktopMessage();
-const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.SETTINGS_ADD_BANK_ACCOUNT_REFACTOR}`;
+const enablePayments = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.SETTINGS_ENABLE_PAYMENTS}`;
 
 function SetupMethod({isPlaidDisabled, user}: SetupMethodProps) {
     const styles = useThemeStyles();
@@ -46,13 +46,13 @@ function SetupMethod({isPlaidDisabled, user}: SetupMethodProps) {
                 </View>
                 {!!plaidDesktopMessage && (
                     <View style={[styles.mv3, styles.flexRow, styles.justifyContentBetween]}>
-                        <TextLink href={bankAccountRoute}>{translate(plaidDesktopMessage)}</TextLink>
+                        <TextLink href={enablePayments}>{translate(plaidDesktopMessage)}</TextLink>
                     </View>
                 )}
                 <Button
                     icon={Expensicons.Bank}
                     text={translate('bankAccount.addBankAccount')}
-                    onPress={() => BankAccounts.openPersonalBankAccountSetupViewRefactor()}
+                    onPress={() => BankAccounts.openPersonalBankAccountSetupWithPlaid()}
                     isDisabled={isPlaidDisabled ?? !user?.validated}
                     style={[styles.mt4, styles.mb2]}
                     iconStyles={styles.buttonCTAIcon}
diff --git a/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx b/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
index f274c0646c1a..b8bf26edcad8 100644
--- a/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
@@ -16,17 +16,14 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalBankAccountForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/PersonalBankAccountForm';
-import type {PlaidData, UserWallet} from '@src/types/onyx';
+import type {PersonalBankAccount} from '@src/types/onyx';
 
 type ConfirmationOnyxProps = {
     /** The draft values of the bank account being setup */
     personalBankAccountDraft: OnyxEntry<PersonalBankAccountForm>;
 
-    /** Contains plaid data */
-    plaidData: OnyxEntry<PlaidData>;
-
-    /** The user's wallet */
-    userWallet: OnyxEntry<UserWallet>;
+    /** The user's bank account */
+    personalBankAccount: OnyxEntry<PersonalBankAccount>;
 };
 
 type ConfirmationStepProps = ConfirmationOnyxProps & SubStepProps;
@@ -34,13 +31,13 @@ type ConfirmationStepProps = ConfirmationOnyxProps & SubStepProps;
 const BANK_INFO_STEP_KEYS = INPUT_IDS.BANK_INFO_STEP;
 const BANK_INFO_STEP_INDEXES = CONST.WALLET.SUBSTEP_INDEXES.BANK_ACCOUNT;
 
-function ConfirmationStep({personalBankAccountDraft, plaidData, onNext, onMove, userWallet}: ConfirmationStepProps) {
+function ConfirmationStep({personalBankAccount, personalBankAccountDraft, onNext, onMove}: ConfirmationStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
 
-    const isLoading = plaidData?.isLoading ?? false;
-    const error = ErrorUtils.getLatestErrorMessage(userWallet ?? {});
+    const isLoading = personalBankAccount?.isLoading ?? false;
+    const error = ErrorUtils.getLatestErrorMessage(personalBankAccount ?? {});
 
     const handleModifyAccountNumbers = () => {
         onMove(BANK_INFO_STEP_INDEXES.ACCOUNT_NUMBERS);
@@ -84,12 +81,13 @@ function ConfirmationStep({personalBankAccountDraft, plaidData, onNext, onMove,
 ConfirmationStep.displayName = 'ConfirmationStep';
 
 export default withOnyx<ConfirmationStepProps, ConfirmationOnyxProps>({
-    plaidData: {
-        key: ONYXKEYS.PLAID_DATA,
-    },
     personalBankAccountDraft: {
         key: ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM_DRAFT,
     },
+    // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM
+    personalBankAccount: {
+        key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
+    },
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
     },
diff --git a/src/pages/EnablePayments/EnablePayments.tsx b/src/pages/EnablePayments/EnablePayments.tsx
new file mode 100644
index 000000000000..8bbf4d83726b
--- /dev/null
+++ b/src/pages/EnablePayments/EnablePayments.tsx
@@ -0,0 +1,70 @@
+import React, {useEffect} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Wallet from '@userActions/Wallet';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import AddBankAccount from './AddBankAccount/AddBankAccount';
+import FailedKYC from './FailedKYC';
+import FeesAndTerms from './FeesAndTerms/FeesAndTerms';
+import PersonalInfo from './PersonalInfo/PersonalInfo';
+import VerifyIdentity from './VerifyIdentity/VerifyIdentity';
+
+function EnablePaymentsPage() {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+
+    useEffect(() => {
+        if (isOffline) {
+            return;
+        }
+
+        if (isEmptyObject(userWallet)) {
+            Wallet.openEnablePaymentsPage();
+        }
+    }, [isOffline, userWallet]);
+
+    if (isEmptyObject(userWallet)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
+    if (userWallet?.errorCode === CONST.WALLET.ERROR.KYC) {
+        return (
+            <>
+                <HeaderWithBackButton
+                    title={translate('additionalDetailsStep.headerTitle')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
+                />
+                <FailedKYC />
+            </>
+        );
+    }
+
+    const currentStep = isEmptyObject(bankAccountList) ? CONST.WALLET.STEP.ADD_BANK_ACCOUNT : userWallet?.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
+
+    switch (currentStep) {
+        case CONST.WALLET.STEP.ADD_BANK_ACCOUNT:
+            return <AddBankAccount />;
+        case CONST.WALLET.STEP.ADDITIONAL_DETAILS:
+        case CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA:
+            return <PersonalInfo />;
+        case CONST.WALLET.STEP.ONFIDO:
+            return <VerifyIdentity />;
+        case CONST.WALLET.STEP.TERMS:
+            return <FeesAndTerms />;
+        default:
+            return null;
+    }
+}
+
+EnablePaymentsPage.displayName = 'EnablePaymentsPage';
+
+export default EnablePaymentsPage;
diff --git a/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx b/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx
index b54564eff254..512abc57a990 100644
--- a/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx
+++ b/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -8,7 +9,10 @@ import useSubStep from '@hooks/useSubStep';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
+import * as BankAccounts from '@userActions/BankAccounts';
+import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import FeesStep from './substeps/FeesStep';
 import TermsStep from './substeps/TermsStep';
@@ -18,14 +22,22 @@ const termsAndFeesSubsteps: Array<React.ComponentType<SubStepProps>> = [FeesStep
 function FeesAndTerms() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
 
-    const submit = () => {};
+    const submit = () => {
+        BankAccounts.acceptWalletTerms({
+            hasAcceptedTerms: true,
+            reportID: walletTerms?.chatReportID ?? '',
+        });
+        BankAccounts.clearPersonalBankAccount();
+        Wallet.resetWalletAdditionalDetailsDraft();
+        Navigation.navigate(ROUTES.SETTINGS_WALLET);
+    };
     const {componentToRender: SubStep, isEditing, screenIndex, nextScreen, prevScreen, moveTo} = useSubStep({bodyContent: termsAndFeesSubsteps, startFrom: 0, onFinished: submit});
 
     const handleBackButtonPress = () => {
         if (screenIndex === 0) {
-            // TODO: temporary for refactor https://github.com/Expensify/App/issues/36648
-            Navigation.navigate(ROUTES.SETTINGS_WALLET);
+            Wallet.updateCurrentStep(CONST.WALLET.STEP.ONFIDO);
             return;
         }
         prevScreen();
diff --git a/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx b/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx
index c620768d2931..645abec9e750 100644
--- a/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx
+++ b/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx
@@ -18,7 +18,7 @@ function FeesStep({onNext}: SubStepProps) {
 
     return (
         <ScrollView style={styles.flex1}>
-            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('termsStep.takeALookAtSomeFees')}</Text>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('termsStep.reviewTheFees')}</Text>
             <View style={[styles.ph5]}>
                 <ShortTermsForm userWallet={userWallet} />
                 <LongTermsForm />
diff --git a/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
index 1dde89a2988a..edd01c35b9a7 100644
--- a/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
+++ b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
@@ -6,14 +6,11 @@ import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import Navigation from '@navigation/Navigation';
-// TODO: uncomment at the end of the refactor https://github.com/Expensify/App/issues/36648
-// import * as BankAccounts from '@userActions/BankAccounts';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 
 function HaveReadAndAgreeLabel() {
     const {translate} = useLocalize();
@@ -28,18 +25,22 @@ function HaveReadAndAgreeLabel() {
 
 function AgreeToTheLabel() {
     const {translate} = useLocalize();
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+
+    const walletAgreementUrl =
+        userWallet?.walletProgramID && userWallet?.walletProgramID === CONST.WALLET.BANCORP_WALLET_PROGRAM_ID ? CONST.BANCORP_WALLET_AGREEMENT_URL : CONST.WALLET_AGREEMENT_URL;
 
     return (
         <Text>
             {`${translate('termsStep.agreeToThe')} `}
             <TextLink href={CONST.PRIVACY_URL}>{`${translate('common.privacy')} `}</TextLink>
             {`${translate('common.and')} `}
-            <TextLink href={CONST.WALLET_AGREEMENT_URL}>{`${translate('termsStep.walletAgreement')}.`}</TextLink>
+            <TextLink href={walletAgreementUrl}>{`${translate('termsStep.walletAgreement')}.`}</TextLink>
         </Text>
     );
 }
 
-function TermsStep() {
+function TermsStep({onNext}: SubStepProps) {
     const styles = useThemeStyles();
     const [hasAcceptedDisclosure, setHasAcceptedDisclosure] = useState(false);
     const [hasAcceptedPrivacyPolicyAndWalletAgreement, setHasAcceptedPrivacyPolicyAndWalletAgreement] = useState(false);
@@ -58,6 +59,15 @@ function TermsStep() {
         setHasAcceptedPrivacyPolicyAndWalletAgreement(!hasAcceptedPrivacyPolicyAndWalletAgreement);
     };
 
+    const submit = () => {
+        if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
+            setError(true);
+            return;
+        }
+        setError(false);
+        onNext();
+    };
+
     /** clear error */
     useEffect(() => {
         if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
@@ -69,7 +79,7 @@ function TermsStep() {
 
     return (
         <View style={[styles.flexGrow1, styles.ph5]}>
-            <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('termsStep.checkPlease')}</Text>
+            <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('termsStep.checkTheBoxes')}</Text>
             <Text style={[styles.mt3, styles.mb3, styles.textSupporting]}>{translate('termsStep.agreeToTerms')}</Text>
             <View style={styles.flex1}>
                 <CheckboxWithLabel
@@ -86,20 +96,7 @@ function TermsStep() {
             </View>
             <FormAlertWithSubmitButton
                 buttonText={translate('termsStep.enablePayments')}
-                onSubmit={() => {
-                    if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
-                        setError(true);
-                        return;
-                    }
-
-                    setError(false);
-                    // TODO: uncomment at the end of the refactor https://github.com/Expensify/App/issues/36648
-                    // BankAccounts.acceptWalletTerms({
-                    //     hasAcceptedTerms: hasAcceptedDisclosure && hasAcceptedPrivacyPolicyAndWalletAgreement,
-                    //     reportID: walletTerms?.chatReportID ?? '',
-                    // });
-                    Navigation.navigate(ROUTES.SETTINGS_WALLET);
-                }}
+                onSubmit={submit}
                 message={errorMessage}
                 isAlertVisible={error || !!errorMessage}
                 isLoading={!!walletTerms?.isLoading}
diff --git a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
index c23b8bcb12fa..0162fb311a19 100644
--- a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
@@ -9,15 +9,12 @@ import useLocalize from '@hooks/useLocalize';
 import useSubStep from '@hooks/useSubStep';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
-// TODO: uncomment after connecting steps https://github.com/Expensify/App/issues/36648
-// import {parsePhoneNumber} from '@libs/PhoneNumber';
-import Navigation from '@navigation/Navigation';
+import {parsePhoneNumber} from '@libs/PhoneNumber';
 import getInitialSubstepForPersonalInfo from '@pages/EnablePayments/utils/getInitialSubstepForPersonalInfo';
 import getSubstepValues from '@pages/EnablePayments/utils/getSubstepValues';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {WalletAdditionalDetailsForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 import type {WalletAdditionalDetailsRefactor} from '@src/types/onyx/WalletAdditionalDetails';
@@ -47,22 +44,19 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
 
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
     const submit = () => {
-        // TODO: uncomment after connecting steps https://github.com/Expensify/App/issues/36648
-        // const personalDetails = {
-        //     phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
-        //     legalFirstName: values?.[PERSONAL_INFO_STEP_KEYS.FIRST_NAME] ?? '',
-        //     legalLastName: values?.[PERSONAL_INFO_STEP_KEYS.LAST_NAME] ?? '',
-        //     addressStreet: values?.[PERSONAL_INFO_STEP_KEYS.STREET] ?? '',
-        //     addressCity: values?.[PERSONAL_INFO_STEP_KEYS.CITY] ?? '',
-        //     addressState: values?.[PERSONAL_INFO_STEP_KEYS.STATE] ?? '',
-        //     addressZip: values?.[PERSONAL_INFO_STEP_KEYS.ZIP_CODE] ?? '',
-        //     dob: values?.[PERSONAL_INFO_STEP_KEYS.DOB] ?? '',
-        //     ssn: values?.[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4] ?? '',
-        // };
+        const personalDetails = {
+            phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
+            legalFirstName: values?.[PERSONAL_INFO_STEP_KEYS.FIRST_NAME] ?? '',
+            legalLastName: values?.[PERSONAL_INFO_STEP_KEYS.LAST_NAME] ?? '',
+            addressStreet: values?.[PERSONAL_INFO_STEP_KEYS.STREET] ?? '',
+            addressCity: values?.[PERSONAL_INFO_STEP_KEYS.CITY] ?? '',
+            addressState: values?.[PERSONAL_INFO_STEP_KEYS.STATE] ?? '',
+            addressZip: values?.[PERSONAL_INFO_STEP_KEYS.ZIP_CODE] ?? '',
+            dob: values?.[PERSONAL_INFO_STEP_KEYS.DOB] ?? '',
+            ssn: values?.[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4] ?? '',
+        };
         // Attempt to set the personal details
-        // Wallet.updatePersonalDetails(personalDetails);
-        Navigation.goBack(ROUTES.SETTINGS_WALLET);
-        Wallet.resetWalletAdditionalDetailsDraft();
+        Wallet.updatePersonalDetails(personalDetails);
     };
 
     const startFrom = useMemo(() => getInitialSubstepForPersonalInfo(values), [values]);
@@ -82,14 +76,12 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
     });
 
     const handleBackButtonPress = () => {
-        // TODO: connect to the fist step of the wallet setup https://github.com/Expensify/App/issues/36648
         if (isEditing) {
             goToTheLastStep();
             return;
         }
         if (screenIndex === 0) {
-            Navigation.goBack(ROUTES.SETTINGS_WALLET);
-            Wallet.resetWalletAdditionalDetailsDraft();
+            Wallet.updateCurrentStep(CONST.WALLET.STEP.ADD_BANK_ACCOUNT);
             return;
         }
         prevScreen();
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
index ad490fa2d7c9..b11fa3e9d725 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
@@ -68,7 +68,7 @@ function AddressStep({onNext, isEditing}: SubStepProps) {
         >
             <View>
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('personalInfoStep.whatsYourAddress')}</Text>
-                <Text style={[styles.textSupporting]}>{translate('common.noPO')}</Text>
+                <Text style={[styles.textSupporting]}>{translate('personalInfoStep.noPOBoxesPlease')}</Text>
                 <AddressFormFields
                     inputKeys={INPUT_KEYS}
                     streetTranslationKey="common.streetAddress"
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
index b24400face07..ea1b70cd6074 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
@@ -29,7 +29,7 @@ function ConfirmationStep({onNext, onMove}: SubStepProps) {
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
     const [walletAdditionalDetailsDraft] = useOnyx(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT);
 
-    const isLoading = walletAdditionalDetailsDraft?.isLoading ?? false;
+    const isLoading = walletAdditionalDetails?.isLoading ?? false;
     const error = ErrorUtils.getLatestErrorMessage(walletAdditionalDetails ?? {});
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
 
diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
index 3bba2012eecb..e324d203934b 100644
--- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
+++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
@@ -22,9 +22,9 @@ function ShortTermsForm(props: ShortTermsFormProps) {
             <Text style={[styles.mb5, styles.textSupporting]}>
                 {translate('termsStep.shortTermsForm.expensifyPaymentsAccount', {
                     walletProgram:
-                        props.userWallet?.walletProgramID === CONST.WALLET.MTL_WALLET_PROGRAM_ID
-                            ? CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS
-                            : CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK,
+                        props.userWallet && props.userWallet?.walletProgramID === CONST.WALLET.BANCORP_WALLET_PROGRAM_ID
+                            ? CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK
+                            : CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS,
                 })}
             </Text>
 
diff --git a/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx b/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx
new file mode 100644
index 000000000000..5b2eb962226c
--- /dev/null
+++ b/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx
@@ -0,0 +1,111 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import FixedFooter from '@components/FixedFooter';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import Onfido from '@components/Onfido';
+import type {OnfidoData} from '@components/Onfido/types';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Growl from '@libs/Growl';
+import * as BankAccounts from '@userActions/BankAccounts';
+import * as Wallet from '@userActions/Wallet';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+const ONFIDO_ERROR_DISPLAY_DURATION = 10000;
+
+function VerifyIdentity() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [walletOnfidoData] = useOnyx(ONYXKEYS.WALLET_ONFIDO, {initWithStoredValues: false});
+
+    const openOnfidoFlow = () => {
+        BankAccounts.openOnfidoFlow();
+    };
+
+    const handleOnfidoSuccess = useCallback(
+        (onfidoData: OnfidoData) => {
+            BankAccounts.verifyIdentity({
+                onfidoData: JSON.stringify({
+                    ...onfidoData,
+                    applicantID: walletOnfidoData?.applicantID,
+                }),
+            });
+            BankAccounts.updateAddPersonalBankAccountDraft({isOnfidoSetupComplete: true});
+        },
+        [walletOnfidoData?.applicantID],
+    );
+
+    const onfidoError = ErrorUtils.getLatestErrorMessage(walletOnfidoData) ?? '';
+
+    const handleOnfidoError = () => {
+        Growl.error(translate('onfidoStep.genericError'), ONFIDO_ERROR_DISPLAY_DURATION);
+    };
+
+    const goBack = () => {
+        Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS);
+    };
+
+    return (
+        <ScreenWrapper testID={VerifyIdentity.displayName}>
+            <HeaderWithBackButton
+                title={translate('onfidoStep.verifyIdentity')}
+                onBackButtonPress={goBack}
+            />
+            <View style={[styles.ph5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={2}
+                    stepNames={CONST.WALLET.STEP_NAMES}
+                />
+            </View>
+            <FullPageOfflineBlockingView>
+                <ScrollView contentContainerStyle={styles.flex1}>
+                    {walletOnfidoData?.hasAcceptedPrivacyPolicy ? (
+                        <Onfido
+                            sdkToken={walletOnfidoData?.sdkToken ?? ''}
+                            onUserExit={goBack}
+                            onError={handleOnfidoError}
+                            onSuccess={handleOnfidoSuccess}
+                        />
+                    ) : (
+                        <>
+                            <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.m5, styles.ph5]}>
+                                <Icon
+                                    src={Illustrations.ToddBehindCloud}
+                                    width={100}
+                                    height={100}
+                                />
+                                <Text style={[styles.textHeadline, styles.mb2]}>{translate('onfidoStep.letsVerifyIdentity')}</Text>
+                                <Text style={[styles.textAlignCenter, styles.textSupporting]}>{translate('onfidoStep.butFirst')}</Text>
+                            </View>
+                            <FixedFooter>
+                                <FormAlertWithSubmitButton
+                                    isAlertVisible={!!onfidoError}
+                                    onSubmit={openOnfidoFlow}
+                                    message={onfidoError}
+                                    isLoading={walletOnfidoData?.isLoading}
+                                    buttonText={onfidoError ? translate('onfidoStep.tryAgain') : translate('common.continue')}
+                                    containerStyles={[styles.mh0, styles.mv0, styles.mb0]}
+                                />
+                            </FixedFooter>
+                        </>
+                    )}
+                </ScrollView>
+            </FullPageOfflineBlockingView>
+        </ScreenWrapper>
+    );
+}
+
+VerifyIdentity.displayName = 'VerifyIdentity';
+
+export default VerifyIdentity;
diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
index c58c2f40aa07..03409e4adddf 100644
--- a/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
@@ -88,7 +88,6 @@ function Plaid({reimbursementAccount, reimbursementAccountDraft, onNext, plaidDa
                 allowDebit
                 bankAccountID={bankAccountID}
                 selectedPlaidAccountID={selectedPlaidAccountID}
-                isDisplayedInNewVBBA
                 inputID={BANK_INFO_STEP_KEYS.SELECTED_PLAID_ACCOUNT_ID}
                 defaultValue={selectedPlaidAccountID}
             />
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index c28a0f6649e4..cddba94dafa9 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -467,7 +467,7 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                         <Button
                                                             ref={buttonRef as ForwardedRef<View>}
                                                             text={translate('walletPage.enableWallet')}
-                                                            onPress={triggerKYCFlow}
+                                                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_ENABLE_PAYMENTS)}
                                                             isDisabled={network.isOffline}
                                                             success
                                                             large
diff --git a/src/types/form/PersonalBankAccountForm.ts b/src/types/form/PersonalBankAccountForm.ts
index 1a1922bf8013..a5b95b20e684 100644
--- a/src/types/form/PersonalBankAccountForm.ts
+++ b/src/types/form/PersonalBankAccountForm.ts
@@ -32,7 +32,11 @@ type PlaidAccountProps = {
     [INPUT_IDS.BANK_INFO_STEP.SELECTED_PLAID_ACCOUNT_ID]: string;
 };
 
-type PersonalBankAccountForm = Form<InputID, BankAccountStepProps & PlaidAccountProps>;
+type OnfidoStepProps = {
+    isOnfidoSetupComplete: boolean;
+};
+
+type PersonalBankAccountForm = Form<InputID, BankAccountStepProps & PlaidAccountProps> & OnfidoStepProps;
 
 export type {BankAccountStepProps, PlaidAccountProps, PersonalBankAccountForm};