From 16546b5d55bfdf1c029567eaa03a6b0cd423d3ae Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 27 Aug 2021 12:17:24 -0700
Subject: [PATCH 01/15] Move error modal to ReimbursementAccountPage

---
 src/libs/actions/BankAccounts.js                 |  5 +++++
 src/pages/ReimbursementAccount/CompanyStep.js    | 16 +++-------------
 .../ReimbursementAccountPage.js                  | 11 ++++++++++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 4779cbbfbe0..84306adc8e3 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -803,6 +803,10 @@ function hideBankAccountErrors() {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {error: '', existingOwnersList: ''});
 }
 
+function setErrorModalVisible(isVisible) {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: isVisible});
+}
+
 export {
     activateWallet,
     addPersonalBankAccount,
@@ -816,5 +820,6 @@ export {
     setupWithdrawalAccount,
     validateBankAccount,
     hideBankAccountErrors,
+    setErrorModalVisible,
     showBankAccountFormValidationError,
 };
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 5bc7d8725ca..bf14fc8325f 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -5,11 +5,12 @@ import {View, ScrollView} from 'react-native';
 import Str from 'expensify-common/lib/str';
 import moment from 'moment';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
+import Onyx, {withOnyx} from 'react-native-onyx';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import CONST from '../../CONST';
 import {
     goToWithdrawalAccountSetupStep, hideBankAccountErrors,
+    setErrorModalVisible,
     setupWithdrawalAccount,
     showBankAccountFormValidationError,
 } from '../../libs/actions/BankAccounts';
@@ -28,7 +29,6 @@ import {
 } from '../../libs/ValidationUtils';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
-import ConfirmModal from '../../components/ConfirmModal';
 import ExpensiPicker from '../../components/ExpensiPicker';
 
 const propTypes = {
@@ -62,7 +62,6 @@ class CompanyStep extends React.Component {
             industryCode: lodashGet(props, ['achData', 'industryCode'], ''),
             hasNoConnectionToCannabis: lodashGet(props, ['achData', 'hasNoConnectionToCannabis'], false),
             password: '',
-            isConfirmModalOpen: false,
         };
 
         // These fields need to be filled out in order to submit the form
@@ -136,7 +135,7 @@ class CompanyStep extends React.Component {
 
     submit() {
         if (!this.validate()) {
-            this.setState({isConfirmModalOpen: true});
+            setErrorModalVisible(true);
             return;
         }
 
@@ -343,15 +342,6 @@ class CompanyStep extends React.Component {
                         />
                     </View>
                 </ScrollView>
-                <ConfirmModal
-                    title={this.props.translate('companyStep.confirmModalTitle')}
-                    onConfirm={() => this.setState({isConfirmModalOpen: false})}
-                    prompt={this.props.translate('companyStep.confirmModalPrompt')}
-                    isVisible={this.state.isConfirmModalOpen}
-                    confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
-                    shouldShowCancelButton={false}
-                />
-
                 <FixedFooter style={[styles.mt5]}>
                     <Button
                         success
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 0a964289f5f..24fad987b02 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -6,7 +6,7 @@ import Str from 'expensify-common/lib/str';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ScreenWrapper from '../../components/ScreenWrapper';
-import {fetchFreePlanVerifiedBankAccount} from '../../libs/actions/BankAccounts';
+import {fetchFreePlanVerifiedBankAccount, setErrorModalVisible} from '../../libs/actions/BankAccounts';
 import ONYXKEYS from '../../ONYXKEYS';
 import VBALoadingIndicator from '../../components/VBALoadingIndicator';
 import Permissions from '../../libs/Permissions';
@@ -27,6 +27,7 @@ import BeneficialOwnersStep from './BeneficialOwnersStep';
 import EnableStep from './EnableStep';
 import ROUTES from '../../ROUTES';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
+import ConfirmModal from '../../components/ConfirmModal';
 
 const propTypes = {
     /** List of betas */
@@ -238,6 +239,14 @@ class ReimbursementAccountPage extends React.Component {
                             achData={this.props.reimbursementAccount.achData}
                         />
                     )}
+                    <ConfirmModal
+                        title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
+                        onConfirm={() => setErrorModalVisible(false)}
+                        prompt={this.props.translate('companyStep.confirmModalPrompt')}
+                        isVisible={this.props.reimbursementAccount.isErrorModalVisible}
+                        confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
+                        shouldShowCancelButton={false}
+                    />
                 </KeyboardAvoidingView>
             </ScreenWrapper>
         );

From 688c73d872dd0c7411ba92eefdbb0a8cc936c8f0 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Fri, 27 Aug 2021 12:57:34 -0700
Subject: [PATCH 02/15] Pass strictly true false to ConfirmModal.isVisible

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

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 24fad987b02..9b8d2e9deb4 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -243,7 +243,7 @@ class ReimbursementAccountPage extends React.Component {
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
                         onConfirm={() => setErrorModalVisible(false)}
                         prompt={this.props.translate('companyStep.confirmModalPrompt')}
-                        isVisible={this.props.reimbursementAccount.isErrorModalVisible}
+                        isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
                         shouldShowCancelButton={false}
                     />

From da6049df1bb8d876c15394e7fa7fa1c8e3abea24 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 12:52:08 -0700
Subject: [PATCH 03/15] Replace growls with errors by modal

---
 src/libs/actions/BankAccounts.js              | 27 ++++++++++++-------
 .../BeneficialOwnersStep.js                   |  6 ++---
 .../ReimbursementAccountPage.js               |  2 +-
 .../ReimbursementAccount/RequestorStep.js     |  4 +--
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 84306adc8e3..b9f72578b8c 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -603,15 +603,26 @@ function validateBankAccount(bankAccountID, validateCode) {
 }
 
 /**
- * Set the current error message. Show Growl for errors which are not yet handled by the error Modal.
+ * Set visibility and error message of the error modal.
+ *
+ * @param {Boolean} isVisible
+ * @param {String} errorMessage The error message to be displayed in the modal's body. We show translate(companyStep.confirmModalPrompt) if not provided.
+ */
+
+function setErrorModalVisible(isVisible, errorMessage = null) {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: isVisible, errorModalMessage: errorMessage});
+}
+
+/**
+ * Set the current error message.
  *
  * @param {String} error
- * @param {Boolean} shouldGrowl
+ * @param {Boolean} showInErrorModal
  */
-function showBankAccountFormValidationError(error, shouldGrowl) {
+function showBankAccountFormValidationError(error, showInErrorModal) {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {error});
-    if (shouldGrowl) {
-        Growl.error(error);
+    if (showInErrorModal) {
+        setErrorModalVisible(true, error);
     }
 }
 
@@ -795,7 +806,7 @@ function setupWithdrawalAccount(data) {
         .catch((response) => {
             Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, achData: {...newACHData}});
             console.error(response.stack);
-            Growl.error(translateLocal('common.genericErrorMessage'), 5000);
+            setErrorModalVisible(true, translateLocal('common.genericErrorMessage'));
         });
 }
 
@@ -803,10 +814,6 @@ function hideBankAccountErrors() {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {error: '', existingOwnersList: ''});
 }
 
-function setErrorModalVisible(isVisible) {
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: isVisible});
-}
-
 export {
     activateWallet,
     addPersonalBankAccount,
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
index e86f22f44bf..a07ca6ee967 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
+++ b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
@@ -14,12 +14,12 @@ import FixedFooter from '../../components/FixedFooter';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import {
     goToWithdrawalAccountSetupStep,
+    setErrorModalVisible,
     setupWithdrawalAccount,
 } from '../../libs/actions/BankAccounts';
 import Navigation from '../../libs/Navigation/Navigation';
 import CONST from '../../CONST';
 import {isValidIdentity} from '../../libs/ValidationUtils';
-import Growl from '../../libs/Growl';
 import ONYXKEYS from '../../ONYXKEYS';
 import compose from '../../libs/compose';
 
@@ -67,12 +67,12 @@ class BeneficialOwnersStep extends React.Component {
         }
 
         if (!this.state.acceptTermsAndConditions) {
-            Growl.error(this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
+            setErrorModalVisible(true, this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
             return false;
         }
 
         if (!this.state.certifyTrueInformation) {
-            Growl.error(this.props.translate('beneficialOwnersStep.error.certify'));
+            setErrorModalVisible(true, this.props.translate('beneficialOwnersStep.error.certify'));
             return false;
         }
 
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 9b8d2e9deb4..c1751926b12 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -242,7 +242,7 @@ class ReimbursementAccountPage extends React.Component {
                     <ConfirmModal
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
                         onConfirm={() => setErrorModalVisible(false)}
-                        prompt={this.props.translate('companyStep.confirmModalPrompt')}
+                        prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
                         isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
                         shouldShowCancelButton={false}
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 122b5825acb..a1c725a8aff 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -13,13 +13,13 @@ import CheckboxWithLabel from '../../components/CheckboxWithLabel';
 import Text from '../../components/Text';
 import {
     goToWithdrawalAccountSetupStep,
+    setErrorModalVisible,
     setupWithdrawalAccount,
 } from '../../libs/actions/BankAccounts';
 import Button from '../../components/Button';
 import FixedFooter from '../../components/FixedFooter';
 import IdentityForm from './IdentityForm';
 import {isValidIdentity} from '../../libs/ValidationUtils';
-import Growl from '../../libs/Growl';
 import Onfido from '../../components/Onfido';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -71,7 +71,7 @@ class RequestorStep extends React.Component {
      */
     validate() {
         if (!this.state.isControllingOfficer) {
-            Growl.error(this.props.translate('requestorStep.isControllingOfficerError'));
+            setErrorModalVisible(true, this.props.translate('requestorStep.isControllingOfficerError'));
             return false;
         }
 

From 0b9c7de7ccd03118cbe0c8b02d7b3efabdb12d98 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 13:36:49 -0700
Subject: [PATCH 04/15] Replace growls. Refactor identity validation.

Split setErrorModalVisible into two methods.
---
 src/languages/en.js                           |  1 +
 src/languages/es.js                           |  1 +
 src/libs/ValidationUtils.js                   | 33 +++++++++++--------
 src/libs/actions/BankAccounts.js              | 30 +++++++++--------
 .../BeneficialOwnersStep.js                   |  7 ++--
 src/pages/ReimbursementAccount/CompanyStep.js |  6 ++--
 .../ReimbursementAccountPage.js               |  4 +--
 .../ReimbursementAccount/RequestorStep.js     | 15 ++++++---
 8 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 560e7d692f2..9b83e49848c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -564,6 +564,7 @@ export default {
         error: {
             termsAndConditions: 'Must accept terms and conditions',
             certify: 'Must certify information is true and accurate',
+            invalidBeneficialOwner: 'There is an invalid Beneficial Owner',
         },
     },
     vbaLoadingAnimation: {
diff --git a/src/languages/es.js b/src/languages/es.js
index e7c6bedbe49..d89969f4704 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -566,6 +566,7 @@ export default {
         error: {
             termsAndConditions: 'Debe aceptar términos y condiciones',
             certify: 'Debe certificar que la información es verdadera y precisa',
+            invalidBeneficialOwner: 'There is an invalid Beneficial Owner',
         },
     },
     vbaLoadingAnimation: {
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 061860f93b7..dc55bc45037 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -1,7 +1,6 @@
 import moment from 'moment';
 import CONST from '../CONST';
 import {translateLocal} from './translate';
-import {showBankAccountFormValidationError} from './actions/BankAccounts';
 
 /**
  * Validating that this is a valid address (PO boxes are not allowed)
@@ -69,39 +68,45 @@ function isValidSSNLastFour(ssnLast4) {
 }
 
 /**
+ * Get error translation keys associated with the first invalid field found
+ *
  * @param {Object} identity
- * @returns {Boolean}
+ * @returns {string|undefined}
  */
-function isValidIdentity(identity) {
+
+function getIdentityError(identity) {
     if (!isValidAddress(identity.street)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.address'), true);
-        return false;
+        return translateLocal('bankAccount.error.address');
     }
 
     if (identity.state === '') {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.addressState'), true);
-        return false;
+        return translateLocal('bankAccount.error.addressState');
     }
 
     if (!isValidZipCode(identity.zipCode)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.zipCode'), true);
-        return false;
+        return translateLocal('bankAccount.error.zipCode');
     }
 
     if (!isValidDate(identity.dob)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.dob'), true);
-        return false;
+        return translateLocal('bankAccount.error.dob');
     }
 
     if (!isValidSSNLastFour(identity.ssnLast4)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.ssnLast4'), true);
-        return false;
+        return translateLocal('bankAccount.error.ssnLast4');
     }
+    return undefined;
+}
 
-    return true;
+/**
+ * @param {Object} identity
+ * @returns {Boolean}
+ */
+function isValidIdentity(identity) {
+    return !getIdentityError(identity);
 }
 
 export {
+    getIdentityError,
     isValidAddress,
     isValidDate,
     isValidIndustryCode,
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index b9f72578b8c..de263ff5c65 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -603,27 +603,29 @@ function validateBankAccount(bankAccountID, validateCode) {
 }
 
 /**
- * Set visibility and error message of the error modal.
+ * Show error modal and optionally a specific error message
  *
- * @param {Boolean} isVisible
- * @param {String} errorMessage The error message to be displayed in the modal's body. We show translate(companyStep.confirmModalPrompt) if not provided.
+ * @param {String} errorMessage The error message to be displayed in the modal's body. We show translate('companyStep.confirmModalPrompt') if not provided.
  */
 
-function setErrorModalVisible(isVisible, errorMessage = null) {
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: isVisible, errorModalMessage: errorMessage});
+function showErrorModal(errorMessage = null) {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage: errorMessage});
+}
+
+/**
+ * Hide error modal
+ */
+function hideErrorModal() {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: false});
 }
 
 /**
  * Set the current error message.
  *
  * @param {String} error
- * @param {Boolean} showInErrorModal
  */
-function showBankAccountFormValidationError(error, showInErrorModal) {
+function showBankAccountFormValidationError(error) {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {error});
-    if (showInErrorModal) {
-        setErrorModalVisible(true, error);
-    }
 }
 
 /**
@@ -800,13 +802,14 @@ function setupWithdrawalAccount(data) {
             goToWithdrawalAccountSetupStep(nextStep, achData);
 
             if (error) {
-                showBankAccountFormValidationError(error, true);
+                showBankAccountFormValidationError(error);
+                showErrorModal(error);
             }
         })
         .catch((response) => {
             Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, achData: {...newACHData}});
             console.error(response.stack);
-            setErrorModalVisible(true, translateLocal('common.genericErrorMessage'));
+            showErrorModal(translateLocal('common.genericErrorMessage'));
         });
 }
 
@@ -827,6 +830,7 @@ export {
     setupWithdrawalAccount,
     validateBankAccount,
     hideBankAccountErrors,
-    setErrorModalVisible,
+    hideErrorModal,
+    showErrorModal,
     showBankAccountFormValidationError,
 };
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
index a07ca6ee967..ff96ff6a7f6 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
+++ b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
@@ -14,8 +14,8 @@ import FixedFooter from '../../components/FixedFooter';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import {
     goToWithdrawalAccountSetupStep,
-    setErrorModalVisible,
     setupWithdrawalAccount,
+    showErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Navigation from '../../libs/Navigation/Navigation';
 import CONST from '../../CONST';
@@ -62,17 +62,18 @@ class BeneficialOwnersStep extends React.Component {
             ));
 
             if (invalidBeneficifialOwner) {
+                showErrorModal(this.props.translate('beneficialOwnersStep.error.invalidBeneficialOwner'));
                 return false;
             }
         }
 
         if (!this.state.acceptTermsAndConditions) {
-            setErrorModalVisible(true, this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
+            showErrorModal(this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
             return false;
         }
 
         if (!this.state.certifyTrueInformation) {
-            setErrorModalVisible(true, this.props.translate('beneficialOwnersStep.error.certify'));
+            showErrorModal(this.props.translate('beneficialOwnersStep.error.certify'));
             return false;
         }
 
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index bf14fc8325f..87893bc7ae0 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -5,14 +5,14 @@ import {View, ScrollView} from 'react-native';
 import Str from 'expensify-common/lib/str';
 import moment from 'moment';
 import PropTypes from 'prop-types';
-import Onyx, {withOnyx} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import CONST from '../../CONST';
 import {
     goToWithdrawalAccountSetupStep, hideBankAccountErrors,
-    setErrorModalVisible,
     setupWithdrawalAccount,
     showBankAccountFormValidationError,
+    showErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Navigation from '../../libs/Navigation/Navigation';
 import Text from '../../components/Text';
@@ -135,7 +135,7 @@ class CompanyStep extends React.Component {
 
     submit() {
         if (!this.validate()) {
-            setErrorModalVisible(true);
+            showErrorModal();
             return;
         }
 
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index c1751926b12..5d08b322db3 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -6,7 +6,7 @@ import Str from 'expensify-common/lib/str';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ScreenWrapper from '../../components/ScreenWrapper';
-import {fetchFreePlanVerifiedBankAccount, setErrorModalVisible} from '../../libs/actions/BankAccounts';
+import {fetchFreePlanVerifiedBankAccount, hideErrorModal} from '../../libs/actions/BankAccounts';
 import ONYXKEYS from '../../ONYXKEYS';
 import VBALoadingIndicator from '../../components/VBALoadingIndicator';
 import Permissions from '../../libs/Permissions';
@@ -241,7 +241,7 @@ class ReimbursementAccountPage extends React.Component {
                     )}
                     <ConfirmModal
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
-                        onConfirm={() => setErrorModalVisible(false)}
+                        onConfirm={() => hideErrorModal()}
                         prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
                         isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index a1c725a8aff..85a18f32f31 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -13,13 +13,14 @@ import CheckboxWithLabel from '../../components/CheckboxWithLabel';
 import Text from '../../components/Text';
 import {
     goToWithdrawalAccountSetupStep,
-    setErrorModalVisible,
     setupWithdrawalAccount,
+    showBankAccountFormValidationError,
+    showErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Button from '../../components/Button';
 import FixedFooter from '../../components/FixedFooter';
 import IdentityForm from './IdentityForm';
-import {isValidIdentity} from '../../libs/ValidationUtils';
+import {getIdentityError} from '../../libs/ValidationUtils';
 import Onfido from '../../components/Onfido';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -71,17 +72,21 @@ class RequestorStep extends React.Component {
      */
     validate() {
         if (!this.state.isControllingOfficer) {
-            setErrorModalVisible(true, this.props.translate('requestorStep.isControllingOfficerError'));
+            showErrorModal(this.props.translate('requestorStep.isControllingOfficerError'));
             return false;
         }
 
-        if (!isValidIdentity({
+        const identity = {
             street: this.state.requestorAddressStreet,
             state: this.state.requestorAddressState,
             zipCode: this.state.requestorAddressZipCode,
             dob: this.state.dob,
             ssnLast4: this.state.ssnLast4,
-        })) {
+        };
+        const identityError = getIdentityError(identity);
+        if (identityError) {
+            showBankAccountFormValidationError(identityError);
+            showErrorModal();
             return false;
         }
 

From bda43b766639895e31e15b572475274255f2fa54 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 14:44:35 -0700
Subject: [PATCH 05/15] Revert ValidationUtils identity validation

---
 src/languages/en.js                           |  1 -
 src/languages/es.js                           |  1 -
 src/libs/ValidationUtils.js                   | 39 ++++++++++---------
 .../BeneficialOwnersStep.js                   |  1 -
 .../ReimbursementAccount/RequestorStep.js     |  8 +---
 5 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 9b83e49848c..560e7d692f2 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -564,7 +564,6 @@ export default {
         error: {
             termsAndConditions: 'Must accept terms and conditions',
             certify: 'Must certify information is true and accurate',
-            invalidBeneficialOwner: 'There is an invalid Beneficial Owner',
         },
     },
     vbaLoadingAnimation: {
diff --git a/src/languages/es.js b/src/languages/es.js
index d89969f4704..e7c6bedbe49 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -566,7 +566,6 @@ export default {
         error: {
             termsAndConditions: 'Debe aceptar términos y condiciones',
             certify: 'Debe certificar que la información es verdadera y precisa',
-            invalidBeneficialOwner: 'There is an invalid Beneficial Owner',
         },
     },
     vbaLoadingAnimation: {
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index dc55bc45037..9d0a03f7e32 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -1,5 +1,6 @@
 import moment from 'moment';
 import CONST from '../CONST';
+import {showBankAccountFormValidationError, showErrorModal} from './actions/BankAccounts';
 import {translateLocal} from './translate';
 
 /**
@@ -68,45 +69,45 @@ function isValidSSNLastFour(ssnLast4) {
 }
 
 /**
- * Get error translation keys associated with the first invalid field found
- *
  * @param {Object} identity
- * @returns {string|undefined}
+ * @returns {Boolean}
  */
-
-function getIdentityError(identity) {
+function isValidIdentity(identity) {
     if (!isValidAddress(identity.street)) {
-        return translateLocal('bankAccount.error.address');
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.address'), true);
+        showErrorModal();
+        return false;
     }
 
     if (identity.state === '') {
-        return translateLocal('bankAccount.error.addressState');
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.addressState'), true);
+        showErrorModal();
+        return false;
     }
 
     if (!isValidZipCode(identity.zipCode)) {
-        return translateLocal('bankAccount.error.zipCode');
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.zipCode'), true);
+        showErrorModal();
+        return false;
     }
 
     if (!isValidDate(identity.dob)) {
-        return translateLocal('bankAccount.error.dob');
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.dob'), true);
+        showErrorModal();
+        return false;
     }
 
     if (!isValidSSNLastFour(identity.ssnLast4)) {
-        return translateLocal('bankAccount.error.ssnLast4');
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.ssnLast4'), true);
+        showErrorModal();
+        return false;
     }
-    return undefined;
-}
 
-/**
- * @param {Object} identity
- * @returns {Boolean}
- */
-function isValidIdentity(identity) {
-    return !getIdentityError(identity);
+    return true;
 }
 
+
 export {
-    getIdentityError,
     isValidAddress,
     isValidDate,
     isValidIndustryCode,
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
index ff96ff6a7f6..2bd704c8be2 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
+++ b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
@@ -62,7 +62,6 @@ class BeneficialOwnersStep extends React.Component {
             ));
 
             if (invalidBeneficifialOwner) {
-                showErrorModal(this.props.translate('beneficialOwnersStep.error.invalidBeneficialOwner'));
                 return false;
             }
         }
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 85a18f32f31..7efadc673d7 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -14,13 +14,12 @@ import Text from '../../components/Text';
 import {
     goToWithdrawalAccountSetupStep,
     setupWithdrawalAccount,
-    showBankAccountFormValidationError,
     showErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Button from '../../components/Button';
 import FixedFooter from '../../components/FixedFooter';
 import IdentityForm from './IdentityForm';
-import {getIdentityError} from '../../libs/ValidationUtils';
+import {isValidIdentity} from '../../libs/ValidationUtils';
 import Onfido from '../../components/Onfido';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -83,10 +82,7 @@ class RequestorStep extends React.Component {
             dob: this.state.dob,
             ssnLast4: this.state.ssnLast4,
         };
-        const identityError = getIdentityError(identity);
-        if (identityError) {
-            showBankAccountFormValidationError(identityError);
-            showErrorModal();
+        if (!isValidIdentity(identity)) {
             return false;
         }
 

From 44f488ecb554590ab0b0cf087e53eaef1af28a1b Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 16:10:03 -0700
Subject: [PATCH 06/15] Remove unnecesary arrow function

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

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 5d08b322db3..8973ef06181 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -241,7 +241,7 @@ class ReimbursementAccountPage extends React.Component {
                     )}
                     <ConfirmModal
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
-                        onConfirm={() => hideErrorModal()}
+                        onConfirm={hideErrorModal}
                         prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
                         isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}

From 413a1ad8e032921131ce8cdf2b22d71a5bf55171 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 16:10:16 -0700
Subject: [PATCH 07/15] Revert unnecesary change

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

diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 7efadc673d7..8c38f790e8d 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -75,14 +75,13 @@ class RequestorStep extends React.Component {
             return false;
         }
 
-        const identity = {
+        if (!isValidIdentity({
             street: this.state.requestorAddressStreet,
             state: this.state.requestorAddressState,
             zipCode: this.state.requestorAddressZipCode,
             dob: this.state.dob,
             ssnLast4: this.state.ssnLast4,
-        };
-        if (!isValidIdentity(identity)) {
+        })) {
             return false;
         }
 

From e275bc69375ec7f2128f8a5362788fe89093c759 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 16:21:12 -0700
Subject: [PATCH 08/15] Removed unexisting param on function call

---
 src/libs/ValidationUtils.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 9d0a03f7e32..7ea36dbeaba 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -74,31 +74,31 @@ function isValidSSNLastFour(ssnLast4) {
  */
 function isValidIdentity(identity) {
     if (!isValidAddress(identity.street)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.address'), true);
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.address'));
         showErrorModal();
         return false;
     }
 
     if (identity.state === '') {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.addressState'), true);
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.addressState'));
         showErrorModal();
         return false;
     }
 
     if (!isValidZipCode(identity.zipCode)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.zipCode'), true);
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.zipCode'));
         showErrorModal();
         return false;
     }
 
     if (!isValidDate(identity.dob)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.dob'), true);
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.dob'));
         showErrorModal();
         return false;
     }
 
     if (!isValidSSNLastFour(identity.ssnLast4)) {
-        showBankAccountFormValidationError(translateLocal('bankAccount.error.ssnLast4'), true);
+        showBankAccountFormValidationError(translateLocal('bankAccount.error.ssnLast4'));
         showErrorModal();
         return false;
     }

From 22d8089e926a823fa116e393bf409d58ce156772 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 16:21:35 -0700
Subject: [PATCH 09/15] Parameter rename in showErrorModal

---
 src/libs/actions/BankAccounts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index de263ff5c65..1cf0a092fde 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -605,11 +605,11 @@ function validateBankAccount(bankAccountID, validateCode) {
 /**
  * Show error modal and optionally a specific error message
  *
- * @param {String} errorMessage The error message to be displayed in the modal's body. We show translate('companyStep.confirmModalPrompt') if not provided.
+ * @param {String} errorModalMessage The error message to be displayed in the modal's body. We show translate('companyStep.confirmModalPrompt') if not provided.
  */
 
-function showErrorModal(errorMessage = null) {
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage: errorMessage});
+function showErrorModal(errorModalMessage = null) {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage});
 }
 
 /**

From 4dae3cb046c4531021521b9a739d83468a5cc9a8 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Mon, 30 Aug 2021 16:23:17 -0700
Subject: [PATCH 10/15] Remove unnecessary comment

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

diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 1cf0a092fde..5bc377e0e04 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -605,7 +605,7 @@ function validateBankAccount(bankAccountID, validateCode) {
 /**
  * Show error modal and optionally a specific error message
  *
- * @param {String} errorModalMessage The error message to be displayed in the modal's body. We show translate('companyStep.confirmModalPrompt') if not provided.
+ * @param {String} errorModalMessage The error message to be displayed in the modal's body.
  */
 
 function showErrorModal(errorModalMessage = null) {

From c15dc0eadf36600124b2e72119d80ee5bbf9d5e1 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 31 Aug 2021 10:01:54 -0700
Subject: [PATCH 11/15] Rename methods to hide/show VBA error modal

---
 src/libs/ValidationUtils.js                          | 12 ++++++------
 src/libs/actions/BankAccounts.js                     | 12 ++++++------
 .../ReimbursementAccount/BeneficialOwnersStep.js     |  6 +++---
 src/pages/ReimbursementAccount/CompanyStep.js        |  4 ++--
 .../ReimbursementAccount/ReimbursementAccountPage.js |  4 ++--
 src/pages/ReimbursementAccount/RequestorStep.js      |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 7ea36dbeaba..30e91b0d960 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -1,6 +1,6 @@
 import moment from 'moment';
 import CONST from '../CONST';
-import {showBankAccountFormValidationError, showErrorModal} from './actions/BankAccounts';
+import {showBankAccountFormValidationError, showBankAccountErrorModal} from './actions/BankAccounts';
 import {translateLocal} from './translate';
 
 /**
@@ -75,31 +75,31 @@ function isValidSSNLastFour(ssnLast4) {
 function isValidIdentity(identity) {
     if (!isValidAddress(identity.street)) {
         showBankAccountFormValidationError(translateLocal('bankAccount.error.address'));
-        showErrorModal();
+        showBankAccountErrorModal();
         return false;
     }
 
     if (identity.state === '') {
         showBankAccountFormValidationError(translateLocal('bankAccount.error.addressState'));
-        showErrorModal();
+        showBankAccountErrorModal();
         return false;
     }
 
     if (!isValidZipCode(identity.zipCode)) {
         showBankAccountFormValidationError(translateLocal('bankAccount.error.zipCode'));
-        showErrorModal();
+        showBankAccountErrorModal();
         return false;
     }
 
     if (!isValidDate(identity.dob)) {
         showBankAccountFormValidationError(translateLocal('bankAccount.error.dob'));
-        showErrorModal();
+        showBankAccountErrorModal();
         return false;
     }
 
     if (!isValidSSNLastFour(identity.ssnLast4)) {
         showBankAccountFormValidationError(translateLocal('bankAccount.error.ssnLast4'));
-        showErrorModal();
+        showBankAccountErrorModal();
         return false;
     }
 
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 5bc377e0e04..f69265f996c 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -608,14 +608,14 @@ function validateBankAccount(bankAccountID, validateCode) {
  * @param {String} errorModalMessage The error message to be displayed in the modal's body.
  */
 
-function showErrorModal(errorModalMessage = null) {
+function showBankAccountErrorModal(errorModalMessage = null) {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage});
 }
 
 /**
  * Hide error modal
  */
-function hideErrorModal() {
+function hideBankAccountErrorModal() {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: false});
 }
 
@@ -803,13 +803,13 @@ function setupWithdrawalAccount(data) {
 
             if (error) {
                 showBankAccountFormValidationError(error);
-                showErrorModal(error);
+                showBankAccountErrorModal(error);
             }
         })
         .catch((response) => {
             Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, achData: {...newACHData}});
             console.error(response.stack);
-            showErrorModal(translateLocal('common.genericErrorMessage'));
+            showBankAccountErrorModal(translateLocal('common.genericErrorMessage'));
         });
 }
 
@@ -830,7 +830,7 @@ export {
     setupWithdrawalAccount,
     validateBankAccount,
     hideBankAccountErrors,
-    hideErrorModal,
-    showErrorModal,
+    hideBankAccountErrorModal,
+    showBankAccountErrorModal,
     showBankAccountFormValidationError,
 };
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
index 2bd704c8be2..e02c5e35ffc 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
+++ b/src/pages/ReimbursementAccount/BeneficialOwnersStep.js
@@ -15,7 +15,7 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
 import {
     goToWithdrawalAccountSetupStep,
     setupWithdrawalAccount,
-    showErrorModal,
+    showBankAccountErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Navigation from '../../libs/Navigation/Navigation';
 import CONST from '../../CONST';
@@ -67,12 +67,12 @@ class BeneficialOwnersStep extends React.Component {
         }
 
         if (!this.state.acceptTermsAndConditions) {
-            showErrorModal(this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
+            showBankAccountErrorModal(this.props.translate('beneficialOwnersStep.error.termsAndConditions'));
             return false;
         }
 
         if (!this.state.certifyTrueInformation) {
-            showErrorModal(this.props.translate('beneficialOwnersStep.error.certify'));
+            showBankAccountErrorModal(this.props.translate('beneficialOwnersStep.error.certify'));
             return false;
         }
 
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 87893bc7ae0..fa6b105d593 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -12,7 +12,7 @@ import {
     goToWithdrawalAccountSetupStep, hideBankAccountErrors,
     setupWithdrawalAccount,
     showBankAccountFormValidationError,
-    showErrorModal,
+    showBankAccountErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Navigation from '../../libs/Navigation/Navigation';
 import Text from '../../components/Text';
@@ -135,7 +135,7 @@ class CompanyStep extends React.Component {
 
     submit() {
         if (!this.validate()) {
-            showErrorModal();
+            showBankAccountErrorModal();
             return;
         }
 
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 8973ef06181..8ef724378c0 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -6,7 +6,7 @@ import Str from 'expensify-common/lib/str';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ScreenWrapper from '../../components/ScreenWrapper';
-import {fetchFreePlanVerifiedBankAccount, hideErrorModal} from '../../libs/actions/BankAccounts';
+import {fetchFreePlanVerifiedBankAccount, hideBankAccountErrorModal} from '../../libs/actions/BankAccounts';
 import ONYXKEYS from '../../ONYXKEYS';
 import VBALoadingIndicator from '../../components/VBALoadingIndicator';
 import Permissions from '../../libs/Permissions';
@@ -241,7 +241,7 @@ class ReimbursementAccountPage extends React.Component {
                     )}
                     <ConfirmModal
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
-                        onConfirm={hideErrorModal}
+                        onConfirm={hideBankAccountErrorModal}
                         prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
                         isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 8c38f790e8d..39244d14125 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -14,7 +14,7 @@ import Text from '../../components/Text';
 import {
     goToWithdrawalAccountSetupStep,
     setupWithdrawalAccount,
-    showErrorModal,
+    showBankAccountErrorModal,
 } from '../../libs/actions/BankAccounts';
 import Button from '../../components/Button';
 import FixedFooter from '../../components/FixedFooter';
@@ -71,7 +71,7 @@ class RequestorStep extends React.Component {
      */
     validate() {
         if (!this.state.isControllingOfficer) {
-            showErrorModal(this.props.translate('requestorStep.isControllingOfficerError'));
+            showBankAccountErrorModal(this.props.translate('requestorStep.isControllingOfficerError'));
             return false;
         }
 

From 2d2347e8ecc770eff852ee8f1ad22407c034379f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 31 Aug 2021 10:09:38 -0700
Subject: [PATCH 12/15] Handle error modal visibility default using lodash

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

diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 8ef724378c0..2753a8def27 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -243,7 +243,7 @@ class ReimbursementAccountPage extends React.Component {
                         title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
                         onConfirm={hideBankAccountErrorModal}
                         prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
-                        isVisible={Boolean(this.props.reimbursementAccount.isErrorModalVisible)}
+                        isVisible={lodashGet(this.props, 'reimbursementAccount.isErrorModalVisible', false)}
                         confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
                         shouldShowCancelButton={false}
                     />

From b88c31711731f8c92095edd0f6187e0233936b2f Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 1 Sep 2021 11:58:43 -0700
Subject: [PATCH 13/15] Correct mistake when merging conflicts

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

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index fa6b105d593..2a8adac983c 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -342,7 +342,7 @@ class CompanyStep extends React.Component {
                         />
                     </View>
                 </ScrollView>
-                <FixedFooter style={[styles.mt5]}>
+                <FixedFooter>
                     <Button
                         success
                         onPress={this.submit}

From 53e96198f53c62d58887f446307200657413fbd1 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 1 Sep 2021 12:12:20 -0700
Subject: [PATCH 14/15] Replace error modal header with Oops

---
 src/languages/en.js                                        | 6 +++---
 src/languages/es.js                                        | 6 +++---
 src/pages/ReimbursementAccount/ReimbursementAccountPage.js | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index f596589a43d..b1799d59035 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -374,6 +374,9 @@ export default {
         checkHelpLine: 'Your routing number and account number can be found on a check for the account.',
         hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
         hasBeenThrottledError: ({fromNow}) => `For security reasons, we're taking a break from bank account setup so you can double-check your company information. Please try again ${fromNow}. Sorry!`,
+        confirmModalTitle: 'Oops',
+        confirmModalPrompt: 'Please double check any highlighted fields and try again.',
+        confirmModalConfirmText: 'Got it',
         error: {
             noBankAccountAvailable: 'Sorry, no bank account is available',
             taxID: 'Please enter a valid Tax ID Number',
@@ -524,9 +527,6 @@ export default {
         listOfRestrictedBusinesses: 'list of restricted businesses',
         incorporationDatePlaceholder: 'Start date (yyyy-mm-dd)',
         companyPhonePlaceholder: '10 digits, no hyphens',
-        confirmModalTitle: 'Are you sure?',
-        confirmModalPrompt: 'Please double check any highlighted fields and try again.',
-        confirmModalConfirmText: 'Got it',
     },
     requestorStep: {
         headerTitle: 'Requestor information',
diff --git a/src/languages/es.js b/src/languages/es.js
index 3300ed6a335..37bf9080a2c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -374,6 +374,9 @@ export default {
         checkHelpLine: 'Su número de ruta y número de cuenta se pueden encontrar en un cheque para la cuenta.',
         hasPhoneLoginError: 'Para agregar una cuenta bancaria verificada, asegúrese de que su inicio de sesión principal sea un correo electrónico válido y vuelva a intentarlo. Puede agregar su número de teléfono como inicio de sesión secundario.',
         hasBeenThrottledError: ({fromNow}) => `Por razones de seguridad, nos tomamos un descanso de la configuración de la cuenta bancaria para que pueda verificar la información de su empresa. Inténtalo de nuevo ${fromNow}. ¡Lo siento!`,
+        confirmModalTitle: 'Ups',
+        confirmModalPrompt: 'Por favor, comprueba los campos resaltados e inténtalo de nuevo.',
+        confirmModalConfirmText: 'OK',
         error: {
             noBankAccountAvailable: 'Lo sentimos, no hay ninguna cuenta bancaria disponible',
             taxID: 'Ingrese un número de identificación fiscal válido',
@@ -526,9 +529,6 @@ export default {
         listOfRestrictedBusinesses: 'lista de negocios restringidos',
         incorporationDatePlaceholder: 'Fecha de inicio (aaaa-mm-dd)',
         companyPhonePlaceholder: '10 dígitos, sin guiones',
-        confirmModalTitle: '¿Estás seguro?',
-        confirmModalPrompt: 'Por favor, comprueba los campos resaltados e inténtalo de nuevo.',
-        confirmModalConfirmText: 'OK',
     },
     requestorStep: {
         headerTitle: 'Información del solicitante',
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 7bb633e44eb..5a4216d9f97 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -245,11 +245,11 @@ class ReimbursementAccountPage extends React.Component {
                         />
                     )}
                     <ConfirmModal
-                        title={this.props.translate('companyStep.confirmModalTitle')} // TODO: Update translation key
+                        title={this.props.translate('bankAccount.confirmModalTitle')}
                         onConfirm={hideBankAccountErrorModal}
-                        prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('companyStep.confirmModalPrompt')}
+                        prompt={this.props.reimbursementAccount.errorModalMessage || this.props.translate('bankAccount.confirmModalPrompt')}
                         isVisible={lodashGet(this.props, 'reimbursementAccount.isErrorModalVisible', false)}
-                        confirmText={this.props.translate('companyStep.confirmModalConfirmText')}
+                        confirmText={this.props.translate('bankAccount.confirmModalConfirmText')}
                         shouldShowCancelButton={false}
                     />
                 </KeyboardAvoidingView>

From 22ba4bc45524d5e02866e1dc0d1a555a8a8246b3 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Wed, 1 Sep 2021 12:41:47 -0700
Subject: [PATCH 15/15] Remove unnecessary empty lines

---
 src/libs/ValidationUtils.js      | 1 -
 src/libs/actions/BankAccounts.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.js
index 30e91b0d960..a0aebb4767a 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.js
@@ -106,7 +106,6 @@ function isValidIdentity(identity) {
     return true;
 }
 
-
 export {
     isValidAddress,
     isValidDate,
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index c000b233e5c..786f20aa160 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -616,7 +616,6 @@ function validateBankAccount(bankAccountID, validateCode) {
  *
  * @param {String} errorModalMessage The error message to be displayed in the modal's body.
  */
-
 function showBankAccountErrorModal(errorModalMessage = null) {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage});
 }