From f1a2def37cf5a7ff6561f037976442a18851a3e9 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 28 Jul 2021 09:13:43 -0700
Subject: [PATCH 1/4] Disable the submit button if required form fields are not
 filled out

---
 src/pages/ReimbursementAccount/CompanyStep.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 5f8732b881e..87c2e167c49 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -45,6 +45,19 @@ class CompanyStep extends React.Component {
             hasNoConnectionToCannabis: lodashGet(props, ['achData', 'hasNoConnectionToCannabis'], false),
             password: '',
         };
+
+        // These fields need to be filled out in order to submit the form
+        this.requiredFields = [
+            'companyName',
+            'addressStreet',
+            'addressCity',
+            'addressState',
+            'addressZipCode',
+            'companyTaxID',
+            'incorporationDate',
+            'industryCode',
+            'password',
+        ];
     }
 
     /**
@@ -111,6 +124,8 @@ class CompanyStep extends React.Component {
     render() {
         const shouldDisableCompanyName = Boolean(this.props.achData.bankAccountID && this.props.achData.companyName);
         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
@@ -253,6 +268,7 @@ class CompanyStep extends React.Component {
                         onPress={this.submit}
                         style={[styles.w100]}
                         text={this.props.translate('common.saveAndContinue')}
+                        isDisabled={shouldDisableSubmitButton}
                     />
                 </FixedFooter>
             </>

From 3b545d01cd4b5591a537137dd4a166d34a8b4809 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 28 Jul 2021 09:19:40 -0700
Subject: [PATCH 2/4] Add website

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

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 87c2e167c49..c0fc39effba 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -53,6 +53,7 @@ class CompanyStep extends React.Component {
             'addressCity',
             'addressState',
             'addressZipCode',
+            'website',
             'companyTaxID',
             'incorporationDate',
             'industryCode',

From 8b291cc563bc3274e75247066c0879c72f8d7ef6 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 28 Jul 2021 09:46:39 -0700
Subject: [PATCH 3/4] Remove duplicate checks

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

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index c0fc39effba..47b6b46b4ba 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -65,21 +65,11 @@ class CompanyStep extends React.Component {
      * @returns {Boolean}
      */
     validate() {
-        if (!this.state.password.trim()) {
-            Growl.error(this.props.translate('common.passwordCannotBeBlank'));
-            return false;
-        }
-
         if (!isValidAddress(this.state.addressStreet)) {
             Growl.error(this.props.translate('bankAccount.error.addressStreet'));
             return false;
         }
 
-        if (this.state.addressState === '') {
-            Growl.error(this.props.translate('bankAccount.error.addressState'));
-            return false;
-        }
-
         if (!isValidZipCode(this.state.addressZipCode)) {
             Growl.error(this.props.translate('bankAccount.error.zipCode'));
             return false;

From 79f9648f180cd3c251986b24ac60c7d2f46a93eb Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Thu, 29 Jul 2021 19:00:12 -0700
Subject: [PATCH 4/4] Revert "Remove duplicate checks"

This reverts commit 8b291cc563bc3274e75247066c0879c72f8d7ef6.
---
 src/pages/ReimbursementAccount/CompanyStep.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 47b6b46b4ba..c0fc39effba 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -65,11 +65,21 @@ class CompanyStep extends React.Component {
      * @returns {Boolean}
      */
     validate() {
+        if (!this.state.password.trim()) {
+            Growl.error(this.props.translate('common.passwordCannotBeBlank'));
+            return false;
+        }
+
         if (!isValidAddress(this.state.addressStreet)) {
             Growl.error(this.props.translate('bankAccount.error.addressStreet'));
             return false;
         }
 
+        if (this.state.addressState === '') {
+            Growl.error(this.props.translate('bankAccount.error.addressState'));
+            return false;
+        }
+
         if (!isValidZipCode(this.state.addressZipCode)) {
             Growl.error(this.props.translate('bankAccount.error.zipCode'));
             return false;