From 228273ec059719636609f8f1a668cd42e5469ebc Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 8 Nov 2021 08:18:50 -0800
Subject: [PATCH 1/2] Merge pull request #6264 from
Expensify/version-BUILD-180c7e721bec7c4b150d2bb06abc3d44fc50a28a
(cherry picked from commit 8dc45ecc13376325363d80f3660e1f65b5ae99d9)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a8776f4536da..cb459d2fe52a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001011403
- versionName "1.1.14-3"
+ versionCode 1001011404
+ versionName "1.1.14-4"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 9fb614746f94..07979b2aeed7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.14.3
+ 1.1.14.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7c4f6f1bc4bf..4bdc19a4831a 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.14.3
+ 1.1.14.4
diff --git a/package-lock.json b/package-lock.json
index a7ecfea82640..a69f4d9ea142 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.14-3",
+ "version": "1.1.14-4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 013434c78577..7ea0b0e92fbf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.14-3",
+ "version": "1.1.14-4",
"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 40c04b5828b67fbadda22f847abc790da7b84544 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Fri, 5 Nov 2021 14:06:49 -1000
Subject: [PATCH 2/2] Merge pull request #6257 from
Expensify/nikki-fix-removevba
Reset instead of deleting achData
(cherry picked from commit b12eb5f9f18ba6578790b55ad248b682724f77ae)
---
src/libs/actions/BankAccounts.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js
index 91988e7cdd1f..69b452cbab42 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -867,8 +867,15 @@ function resetFreePlanBankAccount() {
return;
}
- // Clear reimbursement account, draft user input, and the bank account list
- Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {});
+ // Reset reimbursement account, and clear draft user input, and the bank account list
+ const achData = {
+ useOnfido: true,
+ policyID: '',
+ isInSetup: true,
+ domainLimit: 0,
+ currentStep: CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT,
+ };
+ Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {achData});
Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT, null);
Onyx.set(ONYXKEYS.BANK_ACCOUNT_LIST, []);