🍒 Cherry pick PR #5771 to staging 🍒

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010706
-        versionName "1.1.7-6"
+        versionCode 1001010707
+        versionName "1.1.7-7"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.6</string>
+	<string>1.1.7.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.7.6</string>
+	<string>1.1.7.7</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.7-6",
+  "version": "1.1.7-7",
   "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.",

src/libs/actions/BankAccounts.js

@@ -335,14 +335,21 @@ function fetchUserWallet() {
  * Fetch the bank account currently being set up by the user for the free plan if it exists.
  *
  * @param {String} [stepToOpen]
+ * @param {String} [localBankAccountState]
  */
-function fetchFreePlanVerifiedBankAccount(stepToOpen) {
+function fetchFreePlanVerifiedBankAccount(stepToOpen, localBankAccountState) {
     // Remember which account BankAccountStep subStep the user had before so we can set it later
     const subStep = lodashGet(reimbursementAccountInSetup, 'subStep', '');
+    const initialData = {loading: true, error: ''};
+
+    // Some UI needs to know the bank account state during the loading process, so we are keeping it in Onyx if passed
+    if (localBankAccountState) {
+        initialData.achData = {state: localBankAccountState};
+    }
 
     // We are using set here since we will rely on data from the server (not local data) to populate the VBA flow
     // and determine which step to navigate to.
-    Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: true, error: ''});
+    Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT, initialData);
     let bankAccountID;
 
     API.Get({

src/pages/workspace/WorkspacePageWithSections.js

@@ -46,7 +46,8 @@ const defaultProps = {
 
 class WorkspacePageWithSections extends React.Component {
     componentDidMount() {
-        fetchFreePlanVerifiedBankAccount();
+        const achState = lodashGet(this.props.reimbursementAccount, 'achData.state', '');
+        fetchFreePlanVerifiedBankAccount('', achState);
     }
 
     render() {