diff --git a/android/app/build.gradle b/android/app/build.gradle index c81f1de07027..b7fa2b0a37f1 100644 --- a/android/app/build.gradle +++ b/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 { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index f0e34407b06b..281e7a20fa32 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.7.6 + 1.1.7.7 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 886c00b8936e..e515ed9038ca 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.7.6 + 1.1.7.7 diff --git a/package-lock.json b/package-lock.json index f3a38b4bcfd6..381c70af6661 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.7-6", + "version": "1.1.7-7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a71e0d1547b0..ca26ab82bab2 100644 --- a/package.json +++ b/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.", diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index c9191083f0ce..f2697261a6ff 100644 --- a/src/libs/actions/BankAccounts.js +++ b/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({ diff --git a/src/pages/workspace/WorkspacePageWithSections.js b/src/pages/workspace/WorkspacePageWithSections.js index 6179eb8b6c65..07ff09ff8b05 100644 --- a/src/pages/workspace/WorkspacePageWithSections.js +++ b/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() {