From 94fd6f8f712aa34c281982fe9283caf9c81675b1 Mon Sep 17 00:00:00 2001
From: chiragsalian <chirag@expensify.com>
Date: Fri, 6 Aug 2021 17:03:20 -0700
Subject: [PATCH 1/4] Me playing around while i wait for confirmation from the
 issue

---
 src/pages/ReimbursementAccount/CompanyStep.js | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index c0fc39effba9..7cb7bf1f89db 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -22,6 +22,7 @@ import Growl from '../../libs/Growl';
 import {
     isValidAddress, isValidDate, isValidIndustryCode, isValidZipCode,
 } from '../../libs/ValidationUtils';
+import ConfirmModal from '../../components/ConfirmModal';
 
 class CompanyStep extends React.Component {
     constructor(props) {
@@ -44,6 +45,8 @@ class CompanyStep extends React.Component {
             industryCode: lodashGet(props, ['achData', 'industryCode'], ''),
             hasNoConnectionToCannabis: lodashGet(props, ['achData', 'hasNoConnectionToCannabis'], false),
             password: '',
+            isConfirmModalOpen: false,
+            confirmModalPrompt: '',
         };
 
         // These fields need to be filled out in order to submit the form
@@ -65,48 +68,45 @@ class CompanyStep extends React.Component {
      * @returns {Boolean}
      */
     validate() {
-        if (!this.state.password.trim()) {
-            Growl.error(this.props.translate('common.passwordCannotBeBlank'));
-            return false;
-        }
+        let prompt = '';
 
-        if (!isValidAddress(this.state.addressStreet)) {
-            Growl.error(this.props.translate('bankAccount.error.addressStreet'));
-            return false;
+        if (!this.state.password.trim()) {
+            prompt += `- ${this.props.translate('common.passwordCannotBeBlank')}\n`;
         }
 
-        if (this.state.addressState === '') {
-            Growl.error(this.props.translate('bankAccount.error.addressState'));
-            return false;
+        if (!isValidAddress(this.state.addressStreet) || this.state.addressState === '') {
+            prompt += `- ${this.props.translate('bankAccount.error.addressStreet')}\n`;
         }
 
         if (!isValidZipCode(this.state.addressZipCode)) {
-            Growl.error(this.props.translate('bankAccount.error.zipCode'));
-            return false;
+            prompt += `- ${this.props.translate('bankAccount.error.zipCode')}\n`;
         }
 
         if (!Str.isValidURL(this.state.website)) {
-            Growl.error(this.props.translate('bankAccount.error.website'));
-            return false;
+            prompt += `- ${this.props.translate('bankAccount.error.website')}\n`;
         }
 
         if (!/[0-9]{9}/.test(this.state.companyTaxID)) {
-            Growl.error(this.props.translate('bankAccount.error.taxID'));
-            return false;
+            prompt += `- ${this.props.translate('bankAccount.error.taxID')}\n`;
         }
 
         if (!isValidDate(this.state.incorporationDate)) {
-            Growl.error(this.props.translate('bankAccount.error.incorporationDate'));
-            return false;
+            prompt += `- ${this.props.translate('bankAccount.error.incorporationDate')}\n`;
         }
 
         if (!isValidIndustryCode(this.state.industryCode)) {
-            Growl.error(this.props.translate('bankAccount.error.industryCode'));
-            return false;
+            prompt += `- ${this.props.translate('bankAccount.error.industryCode')}\n`;
         }
 
         if (!this.state.hasNoConnectionToCannabis) {
-            Growl.error(this.props.translate('bankAccount.error.restrictedBusiness'));
+            prompt += `- ${this.props.translate('bankAccount.error.restrictedBusiness')}`;
+        }
+
+        if (prompt) {
+            this.setState({
+                isConfirmModalOpen: true,
+                confirmModalPrompt: `Please double check any highlighted fields and try again.\n${prompt}`,
+            });
             return false;
         }
 
@@ -127,6 +127,7 @@ class CompanyStep extends React.Component {
         const shouldDisableCompanyTaxID = Boolean(this.props.achData.bankAccountID && this.props.achData.companyTaxID);
         const shouldDisableSubmitButton = this.requiredFields
             .reduce((acc, curr) => acc || !this.state[curr].trim(), false);
+
         return (
             <>
                 <HeaderWithCloseButton
@@ -263,6 +264,15 @@ class CompanyStep extends React.Component {
                         />
                     </View>
                 </ScrollView>
+                <ConfirmModal
+                    title="Oops something went wrong!"
+                    onConfirm={() => this.setState({isConfirmModalOpen: false})}
+                    prompt={this.state.confirmModalPrompt}
+                    isVisible={this.state.isConfirmModalOpen}
+                    confirmText="Got it"
+                    shouldShowCancelButton={false}
+                />
+
                 <FixedFooter style={[styles.mt5]}>
                     <Button
                         success

From 04507438a6945db88b5fe8ae147c07f38b45f348 Mon Sep 17 00:00:00 2001
From: chiragsalian <chirag@expensify.com>
Date: Fri, 6 Aug 2021 17:27:33 -0700
Subject: [PATCH 2/4] Simple prompt modal

---
 src/pages/ReimbursementAccount/CompanyStep.js | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 7cb7bf1f89db..9f0e55877b7d 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -68,45 +68,35 @@ class CompanyStep extends React.Component {
      * @returns {Boolean}
      */
     validate() {
-        let prompt = '';
-
         if (!this.state.password.trim()) {
-            prompt += `- ${this.props.translate('common.passwordCannotBeBlank')}\n`;
+            return false;
         }
 
         if (!isValidAddress(this.state.addressStreet) || this.state.addressState === '') {
-            prompt += `- ${this.props.translate('bankAccount.error.addressStreet')}\n`;
+            return false;
         }
 
         if (!isValidZipCode(this.state.addressZipCode)) {
-            prompt += `- ${this.props.translate('bankAccount.error.zipCode')}\n`;
+            return false;
         }
 
         if (!Str.isValidURL(this.state.website)) {
-            prompt += `- ${this.props.translate('bankAccount.error.website')}\n`;
+            return false;
         }
 
         if (!/[0-9]{9}/.test(this.state.companyTaxID)) {
-            prompt += `- ${this.props.translate('bankAccount.error.taxID')}\n`;
+            return false;
         }
 
         if (!isValidDate(this.state.incorporationDate)) {
-            prompt += `- ${this.props.translate('bankAccount.error.incorporationDate')}\n`;
+            return false;
         }
 
         if (!isValidIndustryCode(this.state.industryCode)) {
-            prompt += `- ${this.props.translate('bankAccount.error.industryCode')}\n`;
+            return false;
         }
 
         if (!this.state.hasNoConnectionToCannabis) {
-            prompt += `- ${this.props.translate('bankAccount.error.restrictedBusiness')}`;
-        }
-
-        if (prompt) {
-            this.setState({
-                isConfirmModalOpen: true,
-                confirmModalPrompt: `Please double check any highlighted fields and try again.\n${prompt}`,
-            });
             return false;
         }
 
@@ -115,6 +105,7 @@ class CompanyStep extends React.Component {
 
     submit() {
         if (!this.validate()) {
+            this.setState({isConfirmModalOpen: true});
             return;
         }
 
@@ -267,7 +258,7 @@ class CompanyStep extends React.Component {
                 <ConfirmModal
                     title="Oops something went wrong!"
                     onConfirm={() => this.setState({isConfirmModalOpen: false})}
-                    prompt={this.state.confirmModalPrompt}
+                    prompt="Please double check any highlighted fields and try again."
                     isVisible={this.state.isConfirmModalOpen}
                     confirmText="Got it"
                     shouldShowCancelButton={false}

From 8cc1b27647e12bf6fb80377aae4c5f148374e215 Mon Sep 17 00:00:00 2001
From: chiragsalian <chirag@expensify.com>
Date: Fri, 6 Aug 2021 17:28:47 -0700
Subject: [PATCH 3/4] removing unnecessary import

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

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 9f0e55877b7d..2da3ad213ca3 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -18,7 +18,6 @@ import TextLink from '../../components/TextLink';
 import Picker from '../../components/Picker';
 import StatePicker from '../../components/StatePicker';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import Growl from '../../libs/Growl';
 import {
     isValidAddress, isValidDate, isValidIndustryCode, isValidZipCode,
 } from '../../libs/ValidationUtils';

From 2c75b4bdaff14c0c93e7e20c019c8df1d716eccb Mon Sep 17 00:00:00 2001
From: chiragsalian <chirag@expensify.com>
Date: Fri, 6 Aug 2021 17:51:10 -0700
Subject: [PATCH 4/4] removing test file and reverting an unnecessary
 conditional change

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

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 2da3ad213ca3..bfe900fdcaf6 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -45,7 +45,6 @@ class CompanyStep extends React.Component {
             hasNoConnectionToCannabis: lodashGet(props, ['achData', 'hasNoConnectionToCannabis'], false),
             password: '',
             isConfirmModalOpen: false,
-            confirmModalPrompt: '',
         };
 
         // These fields need to be filled out in order to submit the form
@@ -71,7 +70,11 @@ class CompanyStep extends React.Component {
             return false;
         }
 
-        if (!isValidAddress(this.state.addressStreet) || this.state.addressState === '') {
+        if (!isValidAddress(this.state.addressStreet)) {
+            return false;
+        }
+
+        if (this.state.addressState === '') {
             return false;
         }