From 6e91c0c5751ae1167d4caa233717f1cc27d19c9f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 12 May 2022 10:40:38 -0700
Subject: [PATCH 1/2] Merge pull request #8971 from
 Expensify/version-BUILD-d5dbe5e518c5d8ab59c93fa7ccae64044d23ae35

Update version to 1.1.57-16 on main

(cherry picked from commit 6c31393671ad653214c484537d0e07829a4c0fb1)
---
 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 ba9332d3bea3..cebcb61eb63e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015715
-        versionName "1.1.57-15"
+        versionCode 1001015716
+        versionName "1.1.57-16"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index fe969a8c488f..e0217722884a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.15</string>
+	<string>1.1.57.16</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3b57f471d2d3..860e356753f6 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.57.15</string>
+	<string>1.1.57.16</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 7cc914d2574d..6898d16f2876 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-15",
+  "version": "1.1.57-16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 98e48ec26483..157c6f7e414a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.57-15",
+  "version": "1.1.57-16",
   "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 911e22bb8804dec19f86c99d276ae9d3e00dcbab Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian <chirag@expensify.com>
Date: Thu, 12 May 2022 10:28:00 -0700
Subject: [PATCH 2/2] Merge pull request #8969 from
 Expensify/cmartins-fixPlaidConnection

Fix connect with Plaid on mobile

(cherry picked from commit ef383f0010301923a72743a41a2d7e2d4986a1cb)
---
 src/libs/actions/App.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 06aea48844d4..4343e10523b3 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -91,9 +91,10 @@ AppState.addEventListener('change', (nextAppState) => {
  * Fetches data needed for app initialization
  *
  * @param {Boolean} shouldSyncPolicyList Should be false if the initial policy needs to be created. Otherwise, should be true.
+ * @param {Boolean} shouldSyncVBA Set to false if we are calling on reconnect.
  * @returns {Promise}
  */
-function getAppData(shouldSyncPolicyList = true) {
+function getAppData(shouldSyncPolicyList = true, shouldSyncVBA = true) {
     NameValuePair.get(CONST.NVP.PRIORITY_MODE, ONYXKEYS.NVP_PRIORITY_MODE, 'default');
     NameValuePair.get(CONST.NVP.IS_FIRST_TIME_NEW_EXPENSIFY_USER, ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER, true);
     getLocale();
@@ -102,9 +103,12 @@ function getAppData(shouldSyncPolicyList = true) {
     User.getDomainInfo();
     PersonalDetails.fetchLocalCurrency();
     GeoLocation.fetchCountryCodeByRequestIP();
-    BankAccounts.fetchFreePlanVerifiedBankAccount();
     BankAccounts.fetchUserWallet();
 
+    if (shouldSyncVBA) {
+        BankAccounts.fetchFreePlanVerifiedBankAccount();
+    }
+
     if (shouldSyncPolicyList) {
         Policy.getPolicyList();
     }
@@ -117,7 +121,7 @@ function getAppData(shouldSyncPolicyList = true) {
 }
 
 // When the app reconnects from being offline, fetch all initialization data
-NetworkConnection.onReconnect(getAppData);
+NetworkConnection.onReconnect(() => getAppData(true, false));
 
 export {
     setCurrentURL,