From 99df6d735deffdf05cbf1a433bbcc2b1f7cd1acf Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 22 Feb 2023 17:54:37 -0800
Subject: [PATCH 01/25] Show error in workspace's bank account page

---
 .../resetFreePlanBankAccount.js               | 50 ++++++----
 src/pages/ReimbursementAccount/EnableStep.js  | 92 ++++++++++++-------
 2 files changed, 90 insertions(+), 52 deletions(-)

diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
index 94799fa6b3c6..98121d5db910 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
@@ -24,6 +24,26 @@ function resetFreePlanBankAccount(bankAccountID) {
         },
         {
             optimisticData: [
+                // This bank account is present in ONYXKEYS.BANK_ACCOUNT_LIST
+                {
+                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    key: ONYXKEYS.BANK_ACCOUNT_LIST,
+                    value: {[bankAccountID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
+                },
+                {
+                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                    value: {shouldShowResetModal: false},
+                },
+
+                // TODO: What is this loading state? doesn't seem to be used
+                // {
+                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
+                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                //     value: {isLoading: true},
+                // },
+            ],
+            successData: [
                 {
                     onyxMethod: CONST.ONYX.METHOD.SET,
                     key: ONYXKEYS.ONFIDO_TOKEN,
@@ -44,30 +64,26 @@ function resetFreePlanBankAccount(bankAccountID) {
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                     value: ReimbursementAccountProps.reimbursementAccountDefaultProps,
                 },
-                {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
-                    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                    value: {isLoading: true},
-                },
                 {
                     onyxMethod: CONST.ONYX.METHOD.SET,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
                     value: {},
                 },
-            ],
-            successData: [
-                {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
-                    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                    value: {isLoading: false},
-                },
+
+                // TODO: What is this loading state? doesn't seem to be used
+                // {
+                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
+                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                //     value: {isLoading: false},
+                // },
             ],
             failureData: [
-                {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
-                    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                    value: {isLoading: false},
-                },
+                // TODO: What is this loading state? doesn't seem to be used
+                // {
+                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
+                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                //     value: {isLoading: false},
+                // },
             ],
         });
 }
diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index b8b7dd1a029f..c6b2fb21a941 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import {ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -13,6 +14,8 @@ import CONST from '../../CONST';
 import Button from '../../components/Button';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import MenuItem from '../../components/MenuItem';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import bankAccountPropTypes from '../../components/bankAccountPropTypes';
 import getBankIcon from '../../components/Icon/BankIcons';
 import * as ReimbursementAccountProps from './reimbursementAccountPropTypes';
 import userPropTypes from '../settings/userPropTypes';
@@ -23,11 +26,15 @@ import * as User from '../../libs/actions/User';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import * as BankAccounts from '../../libs/actions/ReimbursementAccount';
 import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
+import * as PaymentMethods from '../../libs/actions/PaymentMethods';
 
 const propTypes = {
     /** Bank account currently in setup */
     reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes.isRequired,
 
+    /** List of bank accounts */
+    bankAccountList: PropTypes.objectOf(bankAccountPropTypes).isRequired,
+
     /* Onyx Props */
     user: userPropTypes.isRequired,
 
@@ -45,6 +52,8 @@ const EnableStep = (props) => {
         : '';
     const bankName = achData.addressName;
 
+    const errors = lodashGet(props.bankAccountList, [achData.bankAccountID, 'errors'], {});
+    const pendingAction = lodashGet(props.bankAccountList, [achData.bankAccountID, 'pendingAction'], {});
     return (
         <ScreenWrapper style={[styles.flex1, styles.justifyContentBetween]} includeSafeAreaPaddingBottom={false}>
             <HeaderWithCloseButton
@@ -60,42 +69,52 @@ const EnableStep = (props) => {
                     title={!isUsingExpensifyCard ? props.translate('workspace.bankAccount.oneMoreThing') : props.translate('workspace.bankAccount.allSet')}
                     icon={!isUsingExpensifyCard ? Illustrations.ConciergeNew : Illustrations.ThumbsUpStars}
                 >
-                    <MenuItem
-                        title={bankName}
-                        description={formattedBankAccountNumber}
-                        icon={icon}
-                        iconWidth={iconSize}
-                        iconHeight={iconSize}
-                        disabled
-                        interactive={false}
-                        wrapperStyle={[styles.cardMenuItem, styles.mv3]}
-                    />
-                    <Text style={[styles.mv3]}>
-                        {!isUsingExpensifyCard
-                            ? props.translate('workspace.bankAccount.accountDescriptionNoCards')
-                            : props.translate('workspace.bankAccount.accountDescriptionWithCards')}
-                    </Text>
-                    {!isUsingExpensifyCard && (
-                        <Button
-                            text={props.translate('workspace.bankAccount.addWorkEmail')}
-                            onPress={() => {
-                                Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
-                                User.subscribeToExpensifyCardUpdates();
-                            }}
-                            icon={Expensicons.Mail}
-                            style={[styles.mt4]}
-                            iconStyles={[styles.buttonCTAIcon]}
-                            shouldShowRightIcon
-                            large
-                            success
+
+                    <OfflineWithFeedback
+                        pendingAction={pendingAction}
+                        errors={errors}
+                        shouldShowErrorMessage
+                        onClose={() => {
+                            PaymentMethods.clearDeletePaymentMethodError(ONYXKEYS.BANK_ACCOUNT_LIST, achData.bankAccountID);
+                        }}
+                    >
+                        <MenuItem
+                            title={bankName}
+                            description={formattedBankAccountNumber}
+                            icon={icon}
+                            iconWidth={iconSize}
+                            iconHeight={iconSize}
+                            disabled
+                            interactive={false}
+                            wrapperStyle={[styles.cardMenuItem, styles.mv3]}
                         />
-                    )}
-                    <MenuItem
-                        title={props.translate('workspace.bankAccount.disconnectBankAccount')}
-                        icon={Expensicons.Close}
-                        onPress={BankAccounts.requestResetFreePlanBankAccount}
-                        wrapperStyle={[styles.cardMenuItem, styles.mv3]}
-                    />
+                        <Text style={[styles.mv3]}>
+                            {!isUsingExpensifyCard
+                                ? props.translate('workspace.bankAccount.accountDescriptionNoCards')
+                                : props.translate('workspace.bankAccount.accountDescriptionWithCards')}
+                        </Text>
+                        {!isUsingExpensifyCard && (
+                            <Button
+                                text={props.translate('workspace.bankAccount.addWorkEmail')}
+                                onPress={() => {
+                                    Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
+                                    User.subscribeToExpensifyCardUpdates();
+                                }}
+                                icon={Expensicons.Mail}
+                                style={[styles.mt4]}
+                                iconStyles={[styles.buttonCTAIcon]}
+                                shouldShowRightIcon
+                                large
+                                success
+                            />
+                        )}
+                        <MenuItem
+                            title={props.translate('workspace.bankAccount.disconnectBankAccount')}
+                            icon={Expensicons.Close}
+                            onPress={BankAccounts.requestResetFreePlanBankAccount}
+                            wrapperStyle={[styles.cardMenuItem, styles.mv3]}
+                        />
+                    </OfflineWithFeedback>
                 </Section>
                 {props.user.isCheckingDomain && (
                     <Text style={[styles.formError, styles.mh5]}>
@@ -121,5 +140,8 @@ export default compose(
         user: {
             key: ONYXKEYS.USER,
         },
+        bankAccountList: {
+            key: ONYXKEYS.BANK_ACCOUNT_LIST,
+        },
     }),
 )(EnableStep);

From 426694bfeb44b9ea688605c514b15539abe989bb Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 22 Feb 2023 18:35:49 -0800
Subject: [PATCH 02/25] Disable disconnect button on pending action

---
 src/pages/ReimbursementAccount/EnableStep.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index c6b2fb21a941..b8a8c1105881 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -113,6 +113,7 @@ const EnableStep = (props) => {
                             icon={Expensicons.Close}
                             onPress={BankAccounts.requestResetFreePlanBankAccount}
                             wrapperStyle={[styles.cardMenuItem, styles.mv3]}
+                            disabled={Boolean(pendingAction)}
                         />
                     </OfflineWithFeedback>
                 </Section>

From b64bfc342da91b1eb449c85886420c1c241fe846 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 23 Feb 2023 17:42:21 -0800
Subject: [PATCH 03/25] Move error to reimbursementAccount.errors

---
 .../actions/ReimbursementAccount/errors.js    |  5 ++-
 .../resetFreePlanBankAccount.js               | 37 +++++--------------
 src/pages/ReimbursementAccount/EnableStep.js  | 16 ++------
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/src/libs/actions/ReimbursementAccount/errors.js b/src/libs/actions/ReimbursementAccount/errors.js
index 3427524711c2..5969559f3f93 100644
--- a/src/libs/actions/ReimbursementAccount/errors.js
+++ b/src/libs/actions/ReimbursementAccount/errors.js
@@ -27,7 +27,10 @@ function setBankAccountFormValidationErrors(errorFields) {
  */
 function resetReimbursementAccount() {
     setBankAccountFormValidationErrors({});
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {errors: null});
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {
+        errors: null,
+        pendingAction: null,
+    });
 }
 
 /**
diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
index 98121d5db910..1e911997c3d5 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
@@ -24,24 +24,15 @@ function resetFreePlanBankAccount(bankAccountID) {
         },
         {
             optimisticData: [
-                // This bank account is present in ONYXKEYS.BANK_ACCOUNT_LIST
-                {
-                    onyxMethod: CONST.ONYX.METHOD.MERGE,
-                    key: ONYXKEYS.BANK_ACCOUNT_LIST,
-                    value: {[bankAccountID]: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}},
-                },
                 {
                     onyxMethod: CONST.ONYX.METHOD.MERGE,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                    value: {shouldShowResetModal: false},
+                    value: {
+                        shouldShowResetModal: false,
+                        isLoading: true,
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+                    },
                 },
-
-                // TODO: What is this loading state? doesn't seem to be used
-                // {
-                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
-                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                //     value: {isLoading: true},
-                // },
             ],
             successData: [
                 {
@@ -69,21 +60,13 @@ function resetFreePlanBankAccount(bankAccountID) {
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT,
                     value: {},
                 },
-
-                // TODO: What is this loading state? doesn't seem to be used
-                // {
-                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
-                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                //     value: {isLoading: false},
-                // },
             ],
             failureData: [
-                // TODO: What is this loading state? doesn't seem to be used
-                // {
-                //     onyxMethod: CONST.ONYX.METHOD.MERGE,
-                //     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                //     value: {isLoading: false},
-                // },
+                {
+                    onyxMethod: CONST.ONYX.METHOD.MERGE,
+                    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                    value: {isLoading: false},
+                },
             ],
         });
 }
diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index b8a8c1105881..b7735ba15c62 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -15,7 +15,6 @@ import Button from '../../components/Button';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import MenuItem from '../../components/MenuItem';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
-import bankAccountPropTypes from '../../components/bankAccountPropTypes';
 import getBankIcon from '../../components/Icon/BankIcons';
 import * as ReimbursementAccountProps from './reimbursementAccountPropTypes';
 import userPropTypes from '../settings/userPropTypes';
@@ -26,15 +25,11 @@ import * as User from '../../libs/actions/User';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import * as BankAccounts from '../../libs/actions/ReimbursementAccount';
 import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
-import * as PaymentMethods from '../../libs/actions/PaymentMethods';
 
 const propTypes = {
     /** Bank account currently in setup */
     reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes.isRequired,
 
-    /** List of bank accounts */
-    bankAccountList: PropTypes.objectOf(bankAccountPropTypes).isRequired,
-
     /* Onyx Props */
     user: userPropTypes.isRequired,
 
@@ -52,8 +47,8 @@ const EnableStep = (props) => {
         : '';
     const bankName = achData.addressName;
 
-    const errors = lodashGet(props.bankAccountList, [achData.bankAccountID, 'errors'], {});
-    const pendingAction = lodashGet(props.bankAccountList, [achData.bankAccountID, 'pendingAction'], {});
+    const errors = lodashGet(props.reimbursementAccount, 'errors', {});
+    const pendingAction = lodashGet(props.reimbursementAccount, 'pendingAction', null);
     return (
         <ScreenWrapper style={[styles.flex1, styles.justifyContentBetween]} includeSafeAreaPaddingBottom={false}>
             <HeaderWithCloseButton
@@ -74,9 +69,7 @@ const EnableStep = (props) => {
                         pendingAction={pendingAction}
                         errors={errors}
                         shouldShowErrorMessage
-                        onClose={() => {
-                            PaymentMethods.clearDeletePaymentMethodError(ONYXKEYS.BANK_ACCOUNT_LIST, achData.bankAccountID);
-                        }}
+                        onClose={BankAccounts.resetReimbursementAccount}
                     >
                         <MenuItem
                             title={bankName}
@@ -141,8 +134,5 @@ export default compose(
         user: {
             key: ONYXKEYS.USER,
         },
-        bankAccountList: {
-            key: ONYXKEYS.BANK_ACCOUNT_LIST,
-        },
     }),
 )(EnableStep);

From 814df4194d8654a8aa1d7d107dae0cd2b44d2029 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 23 Feb 2023 17:42:36 -0800
Subject: [PATCH 04/25] Don't clear errors when reloading VBA

---
 src/libs/actions/BankAccounts.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 6bc5e6d608d4..d4a037baeef1 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -266,7 +266,6 @@ function openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep) {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
-                    errors: null,
                     isLoading: true,
                 },
             },

From 5a2fb89c434b04c1614bc97f9517cf5cd4e56382 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 23 Feb 2023 17:43:45 -0800
Subject: [PATCH 05/25] Add red dot in avatar when error in
 reimbursementAccount.errors

---
 src/components/AvatarWithIndicator.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/AvatarWithIndicator.js b/src/components/AvatarWithIndicator.js
index 6430d463a712..4f3d86b01515 100644
--- a/src/components/AvatarWithIndicator.js
+++ b/src/components/AvatarWithIndicator.js
@@ -15,6 +15,7 @@ import {policyPropTypes} from '../pages/workspace/withPolicy';
 import walletTermsPropTypes from '../pages/EnablePayments/walletTermsPropTypes';
 import * as PolicyUtils from '../libs/PolicyUtils';
 import * as PaymentMethods from '../libs/actions/PaymentMethods';
+import * as ReimbursementAccountProps from '../pages/ReimbursementAccount/reimbursementAccountPropTypes';
 
 const propTypes = {
     /** URL for the avatar */
@@ -41,6 +42,9 @@ const propTypes = {
     /** The user's wallet (coming from Onyx) */
     userWallet: userWalletPropTypes,
 
+    /** Bank account attached to free plan */
+    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes,
+
     /** Information about the user accepting the terms for payments */
     walletTerms: walletTermsPropTypes,
 };
@@ -48,6 +52,7 @@ const propTypes = {
 const defaultProps = {
     size: 'default',
     tooltipText: '',
+    reimbursementAccount: {},
     policiesMemberList: {},
     policies: {},
     bankAccountList: {},
@@ -78,6 +83,7 @@ const AvatarWithIndicator = (props) => {
         () => _.some(cleanPolicies, PolicyUtils.hasPolicyError),
         () => _.some(cleanPolicies, PolicyUtils.hasCustomUnitsError),
         () => _.some(cleanPolicyMembers, PolicyUtils.hasPolicyMemberError),
+        () => !_.isEmpty(props.reimbursementAccount.errors),
 
         // Wallet term errors that are not caused by an IOU (we show the red brick indicator for those in the LHN instead)
         () => !_.isEmpty(props.walletTerms.errors) && !props.walletTerms.chatReportID,
@@ -114,6 +120,9 @@ export default withOnyx({
     bankAccountList: {
         key: ONYXKEYS.BANK_ACCOUNT_LIST,
     },
+    reimbursementAccount: {
+        key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+    },
     cardList: {
         key: ONYXKEYS.CARD_LIST,
     },

From c502f9078f2a1d38b5c914d5cb7f23b343f79aea Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 23 Feb 2023 18:20:45 -0800
Subject: [PATCH 06/25] Add red dot in Settings when error in
 reimbursementAccount.errors

---
 src/pages/settings/InitialSettingsPage.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index f10bca4c6037..4cad122935d5 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -34,6 +34,7 @@ import ConfirmModal from '../../components/ConfirmModal';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as Link from '../../libs/actions/Link';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import * as ReimbursementAccountProps from '../ReimbursementAccount/reimbursementAccountPropTypes';
 
 const propTypes = {
     /* Onyx Props */
@@ -74,6 +75,9 @@ const propTypes = {
     /** List of cards */
     cardList: PropTypes.objectOf(cardPropTypes),
 
+    /** Bank account attached to free plan */
+    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes,
+
     /** List of betas available to current user */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -90,6 +94,7 @@ const defaultProps = {
     userWallet: {
         currentBalance: 0,
     },
+    reimbursementAccount: {},
     betas: [],
     walletTerms: {},
     ...withCurrentUserPersonalDetailsDefaultProps,
@@ -136,10 +141,11 @@ class InitialSettingsPage extends React.Component {
             .sortBy(policy => policy.name)
             .pluck('avatar')
             .value();
-        const policyBrickRoadIndicator = _.chain(this.props.policies)
-            .filter(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN)
-            .find(policy => PolicyUtils.hasPolicyError(policy) || PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers))
-            .value() ? 'error' : null;
+        const policyBrickRoadIndicator = !_.isEmpty(this.props.reimbursementAccount.errors)
+            || _.chain(this.props.policies)
+                .filter(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN)
+                .some(policy => PolicyUtils.hasPolicyError(policy) || PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers))
+                .value() ? 'error' : null;
 
         return ([
             {
@@ -329,6 +335,9 @@ export default compose(
         bankAccountList: {
             key: ONYXKEYS.BANK_ACCOUNT_LIST,
         },
+        reimbursementAccount: {
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+        },
         cardList: {
             key: ONYXKEYS.CARD_LIST,
         },

From 5ef05fc13019b3cab8a3eee5cd07f8ad7401592d Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 23 Feb 2023 18:31:01 -0800
Subject: [PATCH 07/25] Add RBR error indicator in initial workspace page

---
 src/pages/settings/InitialSettingsPage.js   | 4 ++--
 src/pages/workspace/WorkspaceInitialPage.js | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index 4cad122935d5..d96293fa8471 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -141,11 +141,11 @@ class InitialSettingsPage extends React.Component {
             .sortBy(policy => policy.name)
             .pluck('avatar')
             .value();
-        const policyBrickRoadIndicator = !_.isEmpty(this.props.reimbursementAccount.errors)
+        const policyBrickRoadIndicator = (!_.isEmpty(this.props.reimbursementAccount.errors)
             || _.chain(this.props.policies)
                 .filter(policy => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN)
                 .some(policy => PolicyUtils.hasPolicyError(policy) || PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers))
-                .value() ? 'error' : null;
+                .value()) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : null;
 
         return ([
             {
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 0d25f4bffcb3..57413af397f5 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -28,6 +28,7 @@ import CONST from '../../CONST';
 import * as ReimbursementAccount from '../../libs/actions/ReimbursementAccount';
 import ONYXKEYS from '../../ONYXKEYS';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import * as ReimbursementAccountProps from '../ReimbursementAccount/reimbursementAccountPropTypes';
 
 const propTypes = {
     ...policyPropTypes,
@@ -36,10 +37,13 @@ const propTypes = {
     /** All reports shared with the user (coming from Onyx) */
     reports: PropTypes.objectOf(reportPropTypes),
 
+    /** Bank account attached to free plan */
+    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes,
 };
 
 const defaultProps = {
     ...policyDefaultProps,
+    reimbursementAccount: {},
 };
 
 class WorkspaceInitialPage extends React.Component {
@@ -143,6 +147,7 @@ class WorkspaceInitialPage extends React.Component {
                 translationKey: 'workspace.common.bankAccount',
                 icon: Expensicons.Bank,
                 action: () => ReimbursementAccount.navigateToBankAccountRoute(policy.id),
+                brickRoadIndicator: !_.isEmpty(this.props.reimbursementAccount.errors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '',
             },
         ];
 
@@ -279,5 +284,8 @@ export default compose(
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
         },
+        reimbursementAccount: {
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+        },
     }),
 )(WorkspaceInitialPage);

From 623e3a7af243550a54a17245185e96a4a38d4862 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Feb 2023 12:26:17 -0800
Subject: [PATCH 08/25] Add red dot to workspaces list

---
 src/pages/workspace/WorkspacesListPage.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js
index 5ef22eea7912..d0b0f17064c6 100755
--- a/src/pages/workspace/WorkspacesListPage.js
+++ b/src/pages/workspace/WorkspacesListPage.js
@@ -24,6 +24,7 @@ import Button from '../../components/Button';
 import FixedFooter from '../../components/FixedFooter';
 import BlockingView from '../../components/BlockingViews/BlockingView';
 import {withNetwork} from '../../components/OnyxProvider';
+import * as ReimbursementAccountProps from '../ReimbursementAccount/reimbursementAccountPropTypes';
 
 const propTypes = {
     /* Onyx Props */
@@ -46,6 +47,9 @@ const propTypes = {
         pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)),
     })),
 
+    /** Bank account attached to free plan */
+    reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes,
+
     /** List of policy members */
     policyMembers: PropTypes.objectOf(policyMemberPropType),
 
@@ -64,6 +68,7 @@ const propTypes = {
 const defaultProps = {
     policies: {},
     policyMembers: {},
+    reimbursementAccount: {},
     userWallet: {
         currentBalance: 0,
     },
@@ -115,6 +120,7 @@ class WorkspacesListPage extends Component {
      * @returns {Array} the menu item list
      */
     getWorkspaces() {
+        const reimbursementAccountBrickRoadIndicator = !_.isEmpty(this.props.reimbursementAccount.errors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
         return _.chain(this.props.policies)
             .filter(policy => PolicyUtils.shouldShowPolicy(policy, this.props.network.isOffline))
             .map(policy => ({
@@ -125,7 +131,7 @@ class WorkspacesListPage extends Component {
                 iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized],
                 iconFill: themeColors.textLight,
                 fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
-                brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers),
+                brickRoadIndicator: reimbursementAccountBrickRoadIndicator || PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers),
                 pendingAction: policy.pendingAction,
                 errors: policy.errors,
                 dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction),
@@ -217,6 +223,9 @@ export default compose(
         policyMembers: {
             key: ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST,
         },
+        reimbursementAccount: {
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+        },
         userWallet: {
             key: ONYXKEYS.USER_WALLET,
         },

From 8aea1c2d8104c4c21dc6d8cdef32c48b3bd9b911 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Feb 2023 13:00:13 -0800
Subject: [PATCH 09/25] Handle errors when restarting a VBBA setup

---
 .../resetFreePlanBankAccount.js               |   2 +-
 .../ContinueBankAccountSetup.js               | 110 ++++++++++--------
 .../ReimbursementAccountPage.js               |   1 -
 3 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
index 1e911997c3d5..59dc5ed3cef8 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
@@ -30,7 +30,7 @@ function resetFreePlanBankAccount(bankAccountID) {
                     value: {
                         shouldShowResetModal: false,
                         isLoading: true,
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                     },
                 },
             ],
diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index b7c102ecd5e6..7ceea01bff35 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -21,6 +21,7 @@ import withPolicy from '../workspace/withPolicy';
 import * as ReimbursementAccountProps from './reimbursementAccountPropTypes';
 import WorkspaceResetBankAccountModal from '../workspace/WorkspaceResetBankAccountModal';
 import * as BankAccounts from '../../libs/actions/BankAccounts';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 
 const propTypes = {
     /** Bank account currently in setup */
@@ -40,55 +41,68 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const ContinueBankAccountSetup = props => (
-    <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-        <FullPageNotFoundView shouldShow={_.isEmpty(props.policy)}>
-            <HeaderWithCloseButton
-                title={props.translate('workspace.common.bankAccount')}
-                subtitle={lodashGet(props.policy, 'name')}
-                onCloseButtonPress={Navigation.dismissModal}
-                onBackButtonPress={Navigation.goBack}
-                shouldShowGetAssistanceButton
-                guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT}
-                shouldShowBackButton
-            />
-            <ScrollView style={styles.flex1}>
-                <Section
-                    title={props.translate('workspace.bankAccount.almostDone')}
-                    icon={Illustrations.BankArrow}
-                >
-                    <Text>
-                        {props.translate('workspace.bankAccount.youreAlmostDone')}
-                    </Text>
-                    <Button
-                        text={props.translate('workspace.bankAccount.continueWithSetup')}
-                        onPress={props.continue}
-                        icon={Expensicons.Bank}
-                        style={[styles.mv4]}
-                        iconStyles={[styles.buttonCTAIcon]}
-                        shouldShowRightIcon
-                        large
-                        success
-                    />
-                    <MenuItem
-                        title={props.translate('workspace.bankAccount.startOver')}
-                        icon={Expensicons.RotateLeft}
-                        onPress={() => BankAccounts.requestResetFreePlanBankAccount()}
-                        shouldShowRightIcon
-                        wrapperStyle={[styles.cardMenuItem]}
-                    />
-                </Section>
-            </ScrollView>
-        </FullPageNotFoundView>
+const ContinueBankAccountSetup = (props) => {
+    const errors = lodashGet(props.reimbursementAccount, 'errors', {});
+    const pendingAction = lodashGet(props.reimbursementAccount, 'pendingAction', null);
+    return (
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <FullPageNotFoundView shouldShow={_.isEmpty(props.policy)}>
+                <HeaderWithCloseButton
+                    title={props.translate('workspace.common.bankAccount')}
+                    subtitle={lodashGet(props.policy, 'name')}
+                    onCloseButtonPress={Navigation.dismissModal}
+                    onBackButtonPress={Navigation.goBack}
+                    shouldShowGetAssistanceButton
+                    guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT}
+                    shouldShowBackButton
+                />
+                <ScrollView style={styles.flex1}>
+                    <Section
+                        title={props.translate('workspace.bankAccount.almostDone')}
+                        icon={Illustrations.BankArrow}
+                    >
+                        <OfflineWithFeedback
+                            pendingAction={pendingAction}
+                            errors={errors}
+                            shouldShowErrorMessage
+                            onClose={BankAccounts.resetReimbursementAccount}
+                        >
+                            <Text>
+                                {props.translate('workspace.bankAccount.youreAlmostDone')}
+                            </Text>
+                            <Button
+                                text={props.translate('workspace.bankAccount.continueWithSetup')}
+                                onPress={props.continue}
+                                icon={Expensicons.Bank}
+                                style={[styles.mv4]}
+                                iconStyles={[styles.buttonCTAIcon]}
+                                shouldShowRightIcon
+                                large
+                                success
+                                isDisabled={Boolean(pendingAction)}
+                            />
+                            <MenuItem
+                                title={props.translate('workspace.bankAccount.startOver')}
+                                icon={Expensicons.RotateLeft}
+                                onPress={() => BankAccounts.requestResetFreePlanBankAccount()}
+                                shouldShowRightIcon
+                                wrapperStyle={[styles.cardMenuItem]}
+                                disabled={Boolean(pendingAction)}
+                            />
+                        </OfflineWithFeedback>
+                    </Section>
+                </ScrollView>
+            </FullPageNotFoundView>
 
-        {props.reimbursementAccount.shouldShowResetModal && (
-            <WorkspaceResetBankAccountModal
-                reimbursementAccount={props.reimbursementAccount}
-                onConfirm={props.startOver}
-            />
-        )}
-    </ScreenWrapper>
-);
+            {props.reimbursementAccount.shouldShowResetModal && (
+                <WorkspaceResetBankAccountModal
+                    reimbursementAccount={props.reimbursementAccount}
+                    onConfirm={props.startOver}
+                />
+            )}
+        </ScreenWrapper>
+    );
+};
 
 ContinueBankAccountSetup.propTypes = propTypes;
 ContinueBankAccountSetup.displayName = 'ContinueBankAccountSetup';
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 4337292048bb..58ebdc84698b 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -276,7 +276,6 @@ class ReimbursementAccountPage extends React.Component {
                 <ContinueBankAccountSetup
                     reimbursementAccount={this.props.reimbursementAccount}
                     continue={this.continue}
-                    startOver={() => this.setState({shouldHideContinueSetupButton: true})}
                 />
             );
         }

From 654d5821a1402af16f587b5083e935334523b4e8 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Feb 2023 13:01:25 -0800
Subject: [PATCH 10/25] Remove unused prop

---
 .../ContinueBankAccountSetup.js                    |  4 ----
 .../workspace/WorkspaceResetBankAccountModal.js    | 14 +-------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index 7ceea01bff35..66efa4fe2a30 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -30,9 +30,6 @@ const propTypes = {
     /** Callback to continue to the next step of the setup */
     continue: PropTypes.func.isRequired,
 
-    /** Callback to reset the bank account */
-    startOver: PropTypes.func.isRequired,
-
     /** Policy values needed in the component */
     policy: PropTypes.shape({
         name: PropTypes.string,
@@ -97,7 +94,6 @@ const ContinueBankAccountSetup = (props) => {
             {props.reimbursementAccount.shouldShowResetModal && (
                 <WorkspaceResetBankAccountModal
                     reimbursementAccount={props.reimbursementAccount}
-                    onConfirm={props.startOver}
                 />
             )}
         </ScreenWrapper>
diff --git a/src/pages/workspace/WorkspaceResetBankAccountModal.js b/src/pages/workspace/WorkspaceResetBankAccountModal.js
index 91059b737494..835bb43ee9cd 100644
--- a/src/pages/workspace/WorkspaceResetBankAccountModal.js
+++ b/src/pages/workspace/WorkspaceResetBankAccountModal.js
@@ -1,5 +1,4 @@
 import lodashGet from 'lodash/get';
-import PropTypes from 'prop-types';
 import React from 'react';
 import ConfirmModal from '../../components/ConfirmModal';
 import * as BankAccounts from '../../libs/actions/BankAccounts';
@@ -13,16 +12,9 @@ const propTypes = {
     /** Reimbursement account data */
     reimbursementAccount: ReimbursementAccountProps.reimbursementAccountPropTypes.isRequired,
 
-    /** Callback when the user confirms resetting the workspace bank account */
-    onConfirm: PropTypes.func,
-
     ...withLocalizePropTypes,
 };
 
-const defaultProps = {
-    onConfirm: () => {},
-};
-
 const WorkspaceResetBankAccountModal = (props) => {
     const achData = lodashGet(props.reimbursementAccount, 'achData') || {};
     const isInOpenState = achData.state === BankAccount.STATE.OPEN;
@@ -45,10 +37,7 @@ const WorkspaceResetBankAccountModal = (props) => {
             ) : props.translate('workspace.bankAccount.clearProgress')}
             danger
             onCancel={BankAccounts.cancelResetFreePlanBankAccount}
-            onConfirm={() => {
-                BankAccounts.resetFreePlanBankAccount(bankAccountID);
-                props.onConfirm();
-            }}
+            onConfirm={() => BankAccounts.resetFreePlanBankAccount(bankAccountID)}
             shouldShowCancelButton
             isVisible
         />
@@ -57,6 +46,5 @@ const WorkspaceResetBankAccountModal = (props) => {
 
 WorkspaceResetBankAccountModal.displayName = 'WorkspaceResetBankAccountModal';
 WorkspaceResetBankAccountModal.propTypes = propTypes;
-WorkspaceResetBankAccountModal.defaultProps = defaultProps;
 
 export default withLocalize(WorkspaceResetBankAccountModal);

From 3e15034b5e768393e56e7b6bf884bd2e3e61b135 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 27 Feb 2023 15:33:19 -0800
Subject: [PATCH 11/25] Remove unused import

---
 src/pages/ReimbursementAccount/EnableStep.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index b7735ba15c62..a87ed55c939f 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import {ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';

From 5218695abfc3f2029c51e6e6cadeb72e2375e40f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 9 Mar 2023 18:46:37 -0800
Subject: [PATCH 12/25] Remove `pendingAction` on failure

---
 .../actions/ReimbursementAccount/resetFreePlanBankAccount.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
index 59dc5ed3cef8..ae7f26a9bfcd 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.js
@@ -65,7 +65,7 @@ function resetFreePlanBankAccount(bankAccountID) {
                 {
                     onyxMethod: CONST.ONYX.METHOD.MERGE,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                    value: {isLoading: false},
+                    value: {isLoading: false, pendingAction: null},
                 },
             ],
         });

From ed12f80b0aaccdedbf3552b64719334ca2735061 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 9 Mar 2023 18:47:07 -0800
Subject: [PATCH 13/25] Recalculate state.shouldHideContinueSetupButton after
 pendingAction=delete removed

---
 .../ReimbursementAccountPage.js               | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index c1a196d6b779..4817e7d1ae76 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -84,11 +84,8 @@ class ReimbursementAccountPage extends React.Component {
         this.continue = this.continue.bind(this);
         this.getDefaultStateForField = this.getDefaultStateForField.bind(this);
         this.goBack = this.goBack.bind(this);
-        const achData = lodashGet(this.props.reimbursementAccount, 'achData', {});
-        const hasInProgressVBBA = achData.bankAccountID && achData.state !== BankAccount.STATE.OPEN && achData.state !== BankAccount.STATE.LOCKED;
-
         this.state = {
-            shouldHideContinueSetupButton: !hasInProgressVBBA,
+            shouldHideContinueSetupButton: !this.hasInProgressVBBA(),
         };
     }
 
@@ -100,6 +97,13 @@ class ReimbursementAccountPage extends React.Component {
         if (prevProps.network.isOffline && !this.props.network.isOffline) {
             this.fetchData();
         }
+        if (prevProps.reimbursementAccount.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+            && this.props.reimbursementAccount.pendingAction !== prevProps.reimbursementAccount.pendingAction) {
+            // We are here after the use tried to delete the bank account. We will want to set
+            // this.state.shouldHideContinueSetupButton to `true` if the bank account was deleted.
+            this.setState({shouldHideContinueSetupButton: !this.hasInProgressVBBA()});
+        }
+
         const currentStep = lodashGet(this.props.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
         const previousStep = lodashGet(prevProps.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
         if (currentStep === previousStep) {
@@ -169,6 +173,15 @@ class ReimbursementAccountPage extends React.Component {
         }
     }
 
+    /**
+     * Returns true a VBBA exists in any state other than OPEN or LOCKED
+     * @returns {Boolean}
+     */
+    hasInProgressVBBA() {
+        const achData = lodashGet(this.props.reimbursementAccount, 'achData', {});
+        return achData.bankAccountID && achData.state !== BankAccount.STATE.OPEN && achData.state !== BankAccount.STATE.LOCKED;
+    }
+
     /**
      * Retrieve verified business bank account currently being set up.
      * @param {boolean} ignoreLocalCurrentStep Pass true if you want the last "updated" view (from db), not the last "viewed" view (from onyx).
@@ -198,10 +211,9 @@ class ReimbursementAccountPage extends React.Component {
         const currentStep = achData.currentStep || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
         const subStep = achData.subStep;
         const shouldShowOnfido = this.props.onfidoToken && !achData.isOnfidoSetupComplete;
-        const hasInProgressVBBA = achData.bankAccountID && achData.state !== BankAccount.STATE.OPEN && achData.state !== BankAccount.STATE.LOCKED;
         switch (currentStep) {
             case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
-                if (hasInProgressVBBA) {
+                if (this.hasInProgressVBBA()) {
                     this.setState({shouldHideContinueSetupButton: false});
                 }
                 if (subStep) {

From c1b12d098090154d79a841c8af937e9ececcd6a7 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 10 Mar 2023 16:15:22 -0800
Subject: [PATCH 14/25] Update misspell

---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 4817e7d1ae76..d96ddb554b5e 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -99,7 +99,7 @@ class ReimbursementAccountPage extends React.Component {
         }
         if (prevProps.reimbursementAccount.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
             && this.props.reimbursementAccount.pendingAction !== prevProps.reimbursementAccount.pendingAction) {
-            // We are here after the use tried to delete the bank account. We will want to set
+            // We are here after the user tried to delete the bank account. We will want to set
             // this.state.shouldHideContinueSetupButton to `true` if the bank account was deleted.
             this.setState({shouldHideContinueSetupButton: !this.hasInProgressVBBA()});
         }
@@ -174,7 +174,7 @@ class ReimbursementAccountPage extends React.Component {
     }
 
     /**
-     * Returns true a VBBA exists in any state other than OPEN or LOCKED
+     * Returns true if a VBBA exists in any state other than OPEN or LOCKED
      * @returns {Boolean}
      */
     hasInProgressVBBA() {

From f9a0e34465a0cb51320f66a976a9c9a8e3ccf576 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 10 Mar 2023 16:25:14 -0800
Subject: [PATCH 15/25] Disable button if there are errors

---
 src/pages/ReimbursementAccount/ContinueBankAccountSetup.js | 4 ++--
 src/pages/ReimbursementAccount/EnableStep.js               | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index 66efa4fe2a30..de93363a33b5 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -76,7 +76,7 @@ const ContinueBankAccountSetup = (props) => {
                                 shouldShowRightIcon
                                 large
                                 success
-                                isDisabled={Boolean(pendingAction)}
+                                isDisabled={Boolean(pendingAction) || !_.isEmpty(errors)}
                             />
                             <MenuItem
                                 title={props.translate('workspace.bankAccount.startOver')}
@@ -84,7 +84,7 @@ const ContinueBankAccountSetup = (props) => {
                                 onPress={() => BankAccounts.requestResetFreePlanBankAccount()}
                                 shouldShowRightIcon
                                 wrapperStyle={[styles.cardMenuItem]}
-                                disabled={Boolean(pendingAction)}
+                                disabled={Boolean(pendingAction) || !_.isEmpty(errors)}
                             />
                         </OfflineWithFeedback>
                     </Section>
diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index a87ed55c939f..9e5e0512e6c1 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import _ from 'underscore';
 import {ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -105,7 +106,7 @@ const EnableStep = (props) => {
                             icon={Expensicons.Close}
                             onPress={BankAccounts.requestResetFreePlanBankAccount}
                             wrapperStyle={[styles.cardMenuItem, styles.mv3]}
-                            disabled={Boolean(pendingAction)}
+                            disabled={Boolean(pendingAction) || !_.isEmpty(errors)}
                         />
                     </OfflineWithFeedback>
                 </Section>

From 2e0bc5d071941bbdedd7ff023ddfeb4fef3f92df Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 15 Mar 2023 10:38:51 -0700
Subject: [PATCH 16/25] Update continue with setup state

---
 .../ReimbursementAccountPage.js               | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index d96ddb554b5e..34dc5a8485ba 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -85,7 +85,7 @@ class ReimbursementAccountPage extends React.Component {
         this.getDefaultStateForField = this.getDefaultStateForField.bind(this);
         this.goBack = this.goBack.bind(this);
         this.state = {
-            shouldHideContinueSetupButton: !this.hasInProgressVBBA(),
+            shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue(),
         };
     }
 
@@ -100,13 +100,12 @@ class ReimbursementAccountPage extends React.Component {
         if (prevProps.reimbursementAccount.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
             && this.props.reimbursementAccount.pendingAction !== prevProps.reimbursementAccount.pendingAction) {
             // We are here after the user tried to delete the bank account. We will want to set
-            // this.state.shouldHideContinueSetupButton to `true` if the bank account was deleted.
-            this.setState({shouldHideContinueSetupButton: !this.hasInProgressVBBA()});
+            // this.state.shouldShowContinueSetupButton to `false` if the bank account was deleted.
+            this.setState({shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue()});
         }
 
         const currentStep = lodashGet(this.props.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
-        const previousStep = lodashGet(prevProps.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
-        if (currentStep === previousStep) {
+        if (this.state.shouldShowContinueSetupButton || this.getStepToOpenFromRouteParams() === currentStep) {
             return;
         }
 
@@ -117,6 +116,20 @@ class ReimbursementAccountPage extends React.Component {
         Navigation.navigate(ROUTES.getBankAccountRoute(this.getRouteForCurrentStep(currentStep)));
     }
 
+    /*
+     * Calculates the state used to show the "Continue with setup" view. If a bank account setup is already in progress and
+     * no specific further step was passed in the url we'll show the workspace bank account reset modal if the user wishes to start over
+     */
+    getShouldShowContinueSetupButtonInitialValue() {
+        if (!this.hasInProgressVBBA()) {
+            // Since there is no VBBA in progress, we won't need to show the component ContinueBankAccountSetup
+            return false;
+        }
+        const achData = lodashGet(this.props.reimbursementAccount, 'achData', {});
+        return achData.state === BankAccount.STATE.PENDING
+            || _.contains([CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT, ''], this.getStepToOpenFromRouteParams());
+    }
+
     /**
      * @param {String} fieldName
      * @param {*} defaultValue
@@ -201,7 +214,7 @@ class ReimbursementAccountPage extends React.Component {
 
     continue() {
         this.setState({
-            shouldHideContinueSetupButton: true,
+            shouldShowContinueSetupButton: false,
         });
         this.fetchData(true);
     }
@@ -214,7 +227,7 @@ class ReimbursementAccountPage extends React.Component {
         switch (currentStep) {
             case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
                 if (this.hasInProgressVBBA()) {
-                    this.setState({shouldHideContinueSetupButton: false});
+                    this.setState({shouldShowContinueSetupButton: true});
                 }
                 if (subStep) {
                     BankAccounts.setBankAccountSubStep(null);
@@ -241,7 +254,7 @@ class ReimbursementAccountPage extends React.Component {
                     BankAccounts.goToWithdrawalAccountSetupStep(CONST.BANK_ACCOUNT.STEP.ACH_CONTRACT);
                 } else if (achData.state === BankAccount.STATE.PENDING) {
                     this.setState({
-                        shouldHideContinueSetupButton: false,
+                        shouldShowContinueSetupButton: true,
                     });
                 } else {
                     Navigation.goBack();
@@ -275,16 +288,7 @@ class ReimbursementAccountPage extends React.Component {
             );
         }
 
-        // Show the "Continue with setup" button if a bank account setup is already in progress and no specific further step was passed in the url
-        // We'll show the workspace bank account reset modal if the user wishes to start over
-        if (!this.state.shouldHideContinueSetupButton
-            && Boolean(achData.bankAccountID)
-            && achData.state !== BankAccount.STATE.OPEN
-            && achData.state !== BankAccount.STATE.LOCKED
-            && (
-                _.contains([CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT, ''], this.getStepToOpenFromRouteParams())
-                || achData.state === BankAccount.STATE.PENDING
-            )) {
+        if (this.state.shouldShowContinueSetupButton) {
             return (
                 <ContinueBankAccountSetup
                     reimbursementAccount={this.props.reimbursementAccount}

From 777f08684a3b99e2e25728ce1c8329a66fe477ca Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 15 Mar 2023 11:04:50 -0700
Subject: [PATCH 17/25] Update route even when showing continue/starto over
 button

---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 34dc5a8485ba..94eef0ebcf16 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -101,11 +101,12 @@ class ReimbursementAccountPage extends React.Component {
             && this.props.reimbursementAccount.pendingAction !== prevProps.reimbursementAccount.pendingAction) {
             // We are here after the user tried to delete the bank account. We will want to set
             // this.state.shouldShowContinueSetupButton to `false` if the bank account was deleted.
-            this.setState({shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue()});
+            this.setState({shouldShowContinueSetupButton: this.hasInProgressVBBA()});
         }
 
         const currentStep = lodashGet(this.props.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
-        if (this.state.shouldShowContinueSetupButton || this.getStepToOpenFromRouteParams() === currentStep) {
+
+        if (this.getStepToOpenFromRouteParams() === currentStep) {
             return;
         }
 

From 332d464829c394a9ef8606c29da228287bf6ea12 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 15 Mar 2023 11:18:15 -0700
Subject: [PATCH 18/25] Fix initial step param

---
 src/libs/Navigation/AppNavigator/ModalStackNavigators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index fecb903eafd1..76cf7438beb9 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -468,7 +468,7 @@ const SettingsModalStackNavigator = createModalStackNavigator([
             return ReimbursementAccountPage;
         },
         name: 'ReimbursementAccount',
-        initialParams: {stepToOpen: CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT},
+        initialParams: {stepToOpen: ''},
     },
     {
         getComponent: () => {

From 81ab0f47986e3d8b6fe657f030e58cecf7237881 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 15 Mar 2023 11:31:43 -0700
Subject: [PATCH 19/25] Remove unused import

---
 src/libs/Navigation/AppNavigator/ModalStackNavigators.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 76cf7438beb9..7d2dfee32494 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -2,7 +2,6 @@ import _ from 'underscore';
 import React from 'react';
 import {createStackNavigator, CardStyleInterpolators} from '@react-navigation/stack';
 import styles from '../../../styles/styles';
-import CONST from '../../../CONST';
 
 const defaultSubRouteOptions = {
     cardStyle: styles.navigationScreenCardStyle,

From f51f032caceb4a5e40d7786416a02f39fb90f3a5 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 15 Mar 2023 16:00:39 -0700
Subject: [PATCH 20/25] Keep url /bank-account is we get choice to continue

---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 94eef0ebcf16..f1c8d8ae85cf 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -106,7 +106,10 @@ class ReimbursementAccountPage extends React.Component {
 
         const currentStep = lodashGet(this.props.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
 
-        if (this.getStepToOpenFromRouteParams() === currentStep) {
+        if (this.state.shouldShowContinueSetupButton || this.getStepToOpenFromRouteParams() === currentStep) {
+            // We don't want to update the route if we are showing the "Continue with setup" / "Start over" buttons
+            // in case the user reloads the page. If we update the route and the user reloads, we will take the user to the
+            // step set in the route.
             return;
         }
 

From 6914f4c3aca1e7db05bc73cbb821f57cfcc634fb Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 16 Mar 2023 18:39:10 -0700
Subject: [PATCH 21/25] Update logic clearing errors

---
 .../ReimbursementAccountPage.js               | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index f1c8d8ae85cf..526f173f8295 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -106,17 +106,28 @@ class ReimbursementAccountPage extends React.Component {
 
         const currentStep = lodashGet(this.props.reimbursementAccount, 'achData.currentStep') || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
 
-        if (this.state.shouldShowContinueSetupButton || this.getStepToOpenFromRouteParams() === currentStep) {
-            // We don't want to update the route if we are showing the "Continue with setup" / "Start over" buttons
-            // in case the user reloads the page. If we update the route and the user reloads, we will take the user to the
-            // step set in the route.
+        if (this.state.shouldShowContinueSetupButton) {
+            // If we are showing the "Continue with setup" / "Start over" buttons:
+            // - We don't want to update the route in case the user reloads the page. If we update the route and the user reloads, we will
+            //   take the user to the step set in the route and skip chosing the options.
+            // - We don't want to clear possible errors because we want to allow the user to clear them clicking the X
             return;
         }
 
+        const currentStepRouteParam = this.getStepToOpenFromRouteParams();
+        if (currentStepRouteParam === currentStep) {
+            // The route is showing the correct step, no need to update the route param or clear errors.
+            return;
+        }
+        if (currentStepRouteParam !== '') {
+            // When we click "Connect bank account", we load the page without the current step param, if there
+            // was an error when we tried to disconnect or start over, we want the user to be able to see the error,
+            // so we don't clear it. We only want to clear the errors if we are moving between steps.
+            BankAccounts.hideBankAccountErrors();
+        }
         // When the step changes we will navigate to update the route params. This is mostly cosmetic as we only use
         // the route params when the component first mounts to jump to a specific route instead of picking up where the
         // user left off in the flow.
-        BankAccounts.hideBankAccountErrors();
         Navigation.navigate(ROUTES.getBankAccountRoute(this.getRouteForCurrentStep(currentStep)));
     }
 

From c95761872229f725543d3f9075fb7b614e64a912 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 17 Mar 2023 17:04:34 -0700
Subject: [PATCH 22/25] Fix edge cases in relation to showing options
 continue/start over

---
 .../ReimbursementAccountPage.js               | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 526f173f8295..086cfa480a04 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -84,8 +84,14 @@ class ReimbursementAccountPage extends React.Component {
         this.continue = this.continue.bind(this);
         this.getDefaultStateForField = this.getDefaultStateForField.bind(this);
         this.goBack = this.goBack.bind(this);
+
+        // The first time we open this page, the props.reimbursementAccount has not been loaded from the server.
+        // Calculating shouldShowContinueSetupButton on the default data doesn't make sense, and we should recalculate
+        // it once we get the response from the server the first time in componentDidUpdate.
+        const hasACHDataBeenLoaded = this.props.reimbursementAccount !== ReimbursementAccountProps.reimbursementAccountDefaultProps;
         this.state = {
-            shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue(),
+            hasACHDataBeenLoaded: hasACHDataBeenLoaded,
+            shouldShowContinueSetupButton: hasACHDataBeenLoaded ? this.getShouldShowContinueSetupButtonInitialValue() : false,
         };
     }
 
@@ -97,6 +103,23 @@ class ReimbursementAccountPage extends React.Component {
         if (prevProps.network.isOffline && !this.props.network.isOffline) {
             this.fetchData();
         }
+        if (!this.state.hasACHDataBeenLoaded) {
+            // If the ACHData has not been loaded yet, and we are seeing the default data for props.reimbursementAccount
+            // We don't need to do anything yet
+            if (this.props.reimbursementAccount !== ReimbursementAccountProps.reimbursementAccountDefaultProps
+                && !this.props.reimbursementAccount.isLoading) {
+                // If we are here, it is because this is the first time we load the ACHData from the server and 
+                // this.props.reimbursementAccount.isLoading just changed to false. From now on, it makes sense to run the code
+                // below updating states and the route, and this will happen in the next react lifecycle.
+                this.hasACHDataBeenLoaded = true;
+                this.setState({
+                    shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue(),
+                    hasACHDataBeenLoaded: true,
+                });
+            }
+            return;
+        }
+
         if (prevProps.reimbursementAccount.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
             && this.props.reimbursementAccount.pendingAction !== prevProps.reimbursementAccount.pendingAction) {
             // We are here after the user tried to delete the bank account. We will want to set

From 7e36149b89bfd1a7e77e19706d96e3a6661acf52 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 17 Mar 2023 18:48:15 -0700
Subject: [PATCH 23/25] Style

---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 086cfa480a04..34bcc859b0bb 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -90,7 +90,7 @@ class ReimbursementAccountPage extends React.Component {
         // it once we get the response from the server the first time in componentDidUpdate.
         const hasACHDataBeenLoaded = this.props.reimbursementAccount !== ReimbursementAccountProps.reimbursementAccountDefaultProps;
         this.state = {
-            hasACHDataBeenLoaded: hasACHDataBeenLoaded,
+            hasACHDataBeenLoaded,
             shouldShowContinueSetupButton: hasACHDataBeenLoaded ? this.getShouldShowContinueSetupButtonInitialValue() : false,
         };
     }
@@ -108,7 +108,7 @@ class ReimbursementAccountPage extends React.Component {
             // We don't need to do anything yet
             if (this.props.reimbursementAccount !== ReimbursementAccountProps.reimbursementAccountDefaultProps
                 && !this.props.reimbursementAccount.isLoading) {
-                // If we are here, it is because this is the first time we load the ACHData from the server and 
+                // If we are here, it is because this is the first time we load the ACHData from the server and
                 // this.props.reimbursementAccount.isLoading just changed to false. From now on, it makes sense to run the code
                 // below updating states and the route, and this will happen in the next react lifecycle.
                 this.hasACHDataBeenLoaded = true;
@@ -148,6 +148,7 @@ class ReimbursementAccountPage extends React.Component {
             // so we don't clear it. We only want to clear the errors if we are moving between steps.
             BankAccounts.hideBankAccountErrors();
         }
+
         // When the step changes we will navigate to update the route params. This is mostly cosmetic as we only use
         // the route params when the component first mounts to jump to a specific route instead of picking up where the
         // user left off in the flow.

From 85888a73f1b09e148f3f4b0ae0ba58fe0945c71a Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:36:41 -0700
Subject: [PATCH 24/25] Remove unused variable

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 34bcc859b0bb..ce2c9cf8bcbb 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -111,7 +111,6 @@ class ReimbursementAccountPage extends React.Component {
                 // If we are here, it is because this is the first time we load the ACHData from the server and
                 // this.props.reimbursementAccount.isLoading just changed to false. From now on, it makes sense to run the code
                 // below updating states and the route, and this will happen in the next react lifecycle.
-                this.hasACHDataBeenLoaded = true;
                 this.setState({
                     shouldShowContinueSetupButton: this.getShouldShowContinueSetupButtonInitialValue(),
                     hasACHDataBeenLoaded: true,

From 270dc00d0f5d39d2bd03aab45657f6ea81884e7a Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 13 Apr 2023 18:05:22 -0700
Subject: [PATCH 25/25] Add new line at end of file (style)

---
 src/pages/ReimbursementAccount/ContinueBankAccountSetup.js | 2 +-
 src/pages/workspace/WorkspaceInitialPage.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index 0ac9a662121e..e7468b0209e7 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -112,4 +112,4 @@ ContinueBankAccountSetup.displayName = 'ContinueBankAccountSetup';
 export default compose(
     withPolicy,
     withLocalize,
-)(ContinueBankAccountSetup);
\ No newline at end of file
+)(ContinueBankAccountSetup);
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 6e1829def2c0..061e37f748cf 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -259,4 +259,4 @@ export default compose(
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
         },
     }),
-)(WorkspaceInitialPage);
\ No newline at end of file
+)(WorkspaceInitialPage);