Merge pull request #11616 from Expensify/cmartins-fixManualVBA

Fix masked account number and default values (cherry picked from commit 5d65be5)
Expensify · Oct 5, 2022 · 743a47c · 743a47c
1 parent 0cdcefb
commit 743a47c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/CONST.js b/src/CONST.js
@@ -88,6 +88,10 @@ const CONST = {
         },
         REGEX: {
             US_ACCOUNT_NUMBER: /^[0-9]{4,17}$/,
+
+            // If the account number length is from 4 to 13 digits, we show the last 4 digits and hide the rest with X
+            // If the length is longer than 13 digits, we show the first 6 and last 4 digits, hiding the rest with X
+            MASKED_US_ACCOUNT_NUMBER: /^[X]{0,9}[0-9]{4}$|^[0-9]{6}[X]{4,7}[0-9]{4}$/,
             SWIFT_BIC: /^[A-Za-z0-9]{8,11}$/,
         },
         VERIFICATION_MAX_ATTEMPTS: 7,

diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js
@@ -37,7 +37,10 @@ class BankAccountManualStep extends React.Component {
         const errorFields = {};
         const routingNumber = values.routingNumber && values.routingNumber.trim();
 
-        if (!values.accountNumber || !CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim())) {
+        if (
+            !values.accountNumber
+            || (!CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim()) && !CONST.BANK_ACCOUNT.REGEX.MASKED_US_ACCOUNT_NUMBER.test(values.accountNumber.trim()))
+        ) {
             errorFields.accountNumber = this.props.translate('bankAccount.error.accountNumber');
         }
         if (!routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber)) {
@@ -91,6 +94,7 @@ class BankAccountManualStep extends React.Component {
                     <TextInput
                         inputID="routingNumber"
                         label={this.props.translate('bankAccount.routingNumber')}
+                        defaultValue={ReimbursementAccountUtils.getDefaultStateForField(this.props, 'routingNumber', '')}
                         keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
                         disabled={shouldDisableInputs}
                         shouldSaveDraft
@@ -99,6 +103,7 @@ class BankAccountManualStep extends React.Component {
                         inputID="accountNumber"
                         containerStyles={[styles.mt4]}
                         label={this.props.translate('bankAccount.accountNumber')}
+                        defaultValue={ReimbursementAccountUtils.getDefaultStateForField(this.props, 'accountNumber', '')}
                         keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
                         disabled={shouldDisableInputs}
                         shouldSaveDraft
@@ -116,6 +121,7 @@ class BankAccountManualStep extends React.Component {
                                 </TextLink>
                             </View>
                         )}
+                        defaultValue={ReimbursementAccountUtils.getDefaultStateForField(this.props, 'acceptTerms', true)}
                         shouldSaveDraft
                     />
                 </Form>