From 4ee052dfcac66df8e45e4c57a4ba495ba6151b97 Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Wed, 21 Jun 2023 12:18:09 -0700 Subject: [PATCH 1/2] account number fix --- src/pages/ReimbursementAccount/BankAccountManualStep.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js index 5e495f70b27e..1e63fdaed896 100644 --- a/src/pages/ReimbursementAccount/BankAccountManualStep.js +++ b/src/pages/ReimbursementAccount/BankAccountManualStep.js @@ -46,7 +46,7 @@ class BankAccountManualStep extends React.Component { if (!routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber)) { errorFields.routingNumber = 'bankAccount.error.routingNumber'; } - if (values.accountNumber === routingNumber) { + if (values.accountNumber && values.accountNumber === routingNumber) { errorFields.accountNumber = this.props.translate('bankAccount.error.routingAndAccountNumberCannotBeSame'); } if (!values.acceptTerms) { From aae710b225d9bb0a2c8c0701f20855b4f48535dc Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Wed, 21 Jun 2023 12:58:44 -0700 Subject: [PATCH 2/2] DRY-ing the code --- src/pages/ReimbursementAccount/BankAccountManualStep.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js index 1e63fdaed896..40b256ff12f2 100644 --- a/src/pages/ReimbursementAccount/BankAccountManualStep.js +++ b/src/pages/ReimbursementAccount/BankAccountManualStep.js @@ -42,13 +42,12 @@ class BankAccountManualStep extends React.Component { (!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 = 'bankAccount.error.accountNumber'; + } else if (values.accountNumber === routingNumber) { + errorFields.accountNumber = this.props.translate('bankAccount.error.routingAndAccountNumberCannotBeSame'); } if (!routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber)) { errorFields.routingNumber = 'bankAccount.error.routingNumber'; } - if (values.accountNumber && values.accountNumber === routingNumber) { - errorFields.accountNumber = this.props.translate('bankAccount.error.routingAndAccountNumberCannotBeSame'); - } if (!values.acceptTerms) { errorFields.acceptTerms = 'common.error.acceptTerms'; }