diff --git a/android/app/build.gradle b/android/app/build.gradle
index cb6171e5bff..4448bc9e888 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 1001010709
- versionName "1.1.7-9"
+ versionCode 1001010710
+ versionName "1.1.7-10"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 4eb14b9a303..177d521f3ee 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.7.9
+ 1.1.7.10
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7c68ee9ddf7..e2b14353ebd 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.7.9
+ 1.1.7.10
diff --git a/package-lock.json b/package-lock.json
index 01f14cb52fd..04db2035451 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-9",
+ "version": "1.1.7-10",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index fb6d7ac9dbd..72e77b86e34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-9",
+ "version": "1.1.7-10",
"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 f2697261a6f..e8dac3382bf 100644
--- a/src/libs/actions/BankAccounts.js
+++ b/src/libs/actions/BankAccounts.js
@@ -9,7 +9,6 @@ import * as API from '../API';
import BankAccount from '../models/BankAccount';
import Growl from '../Growl';
import {translateLocal} from '../translate';
-import Navigation from '../Navigation/Navigation';
/**
* List of bank accounts. This data should not be stored in Onyx since it contains unmasked PANs.
@@ -574,7 +573,6 @@ function validateBankAccount(bankAccountID, validateCode) {
API.BankAccount_Validate({bankAccountID, validateCode})
.then((response) => {
if (response.jsonCode === 200) {
- Growl.show('Bank Account successfully validated!', CONST.GROWL.SUCCESS, 5000);
Onyx.set(ONYXKEYS.REIMBURSEMENT_ACCOUNT_DRAFT, null);
API.User_IsUsingExpensifyCard()
.then(({isUsingExpensifyCard}) => {
@@ -584,12 +582,7 @@ function validateBankAccount(bankAccountID, validateCode) {
achData: {state: BankAccount.STATE.OPEN},
};
- if (isUsingExpensifyCard) {
- Navigation.dismissModal();
- } else {
- reimbursementAccount.achData.currentStep = CONST.BANK_ACCOUNT.STEP.ENABLE;
- }
-
+ reimbursementAccount.achData.currentStep = CONST.BANK_ACCOUNT.STEP.ENABLE;
Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard});
Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, reimbursementAccount);
});
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountForm.js b/src/pages/ReimbursementAccount/ReimbursementAccountForm.js
index 3b1d5babd43..78a6be66527 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountForm.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountForm.js
@@ -11,6 +11,7 @@ import reimbursementAccountPropTypes from './reimbursementAccountPropTypes';
import compose from '../../libs/compose';
import ONYXKEYS from '../../ONYXKEYS';
import FormAlertWithSubmitButton from '../../components/FormAlertWithSubmitButton';
+import CONST from '../../CONST';
const propTypes = {
/** ACH data for the withdrawal account actively being set up */
@@ -34,6 +35,12 @@ class ReimbursementAccountForm extends React.Component {
// @TODO once all validation errors show in multiples we can remove this check
|| lodashGet(this.props, 'reimbursementAccount.error', '').length > 0;
+ const currentStep = lodashGet(
+ this.props,
+ 'reimbursementAccount.achData.currentStep',
+ CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT,
+ );
+
return (
{
this.form.scrollTo({y: 0, animated: true});