From d0e6f66fefc6874db618ea2311fe863f99af292b Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 21 Jun 2023 16:58:38 -0400 Subject: [PATCH 1/2] Merge pull request #21267 from Expensify/version-BUILD-40C0E3F8-AA8A-44F7-9B86-9FC0C3180016 Update version to 1.3.30-3 on main (cherry picked from commit 392ea67fe0bae6a5ea243c2a96ef64e7523024a6) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1be79b0142cb..e97b3e074aa3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001033002 - versionName "1.3.30-2" + versionCode 1001033003 + versionName "1.3.30-3" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c7ef32b3f17b..08c5ff053515 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.30.2 + 1.3.30.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3e2e385a241c..55ea77223917 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.30.2 + 1.3.30.3 diff --git a/package-lock.json b/package-lock.json index 1c26356d33b1..cfd597689e2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.30-2", + "version": "1.3.30-3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.30-2", + "version": "1.3.30-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c16fc006d9a4..aba4b2525250 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.30-2", + "version": "1.3.30-3", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From f71f4af3952e784614b6b8c3ca23dead4eb2d873 Mon Sep 17 00:00:00 2001 From: Srikar Parsi <48188732+srikarparsi@users.noreply.github.com> Date: Wed, 21 Jun 2023 16:25:58 -0400 Subject: [PATCH 2/2] Merge pull request #21252 from Expensify/chirag-backAccount-fix Account number fix (cherry picked from commit 9e8a151b908447f3d79261ddb0f62d10c19b5c6e) --- 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 5e495f70b27e..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 === routingNumber) { - errorFields.accountNumber = this.props.translate('bankAccount.error.routingAndAccountNumberCannotBeSame'); - } if (!values.acceptTerms) { errorFields.acceptTerms = 'common.error.acceptTerms'; }