Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍒 Cherry pick PR #5803 to staging 🍒 #5820

Merged
merged 2 commits into from
Oct 13, 2021
Merged

🍒 Cherry pick PR #5803 to staging 🍒 #5820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44929d6
Merge pull request #5819 from Expensify/version-BUILD-41ed04f379730e6…
OSBotify Oct 13, 2021
4a89a32
Merge pull request #5803 from Expensify/yuwen-betterSteps
luacmartins Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.7.9</string>
<string>1.1.7.10</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.7.9</string>
<string>1.1.7.10</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
9 changes: 1 addition & 8 deletions src/libs/actions/BankAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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}) => {
Expand All @@ -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);
});
Expand Down
9 changes: 8 additions & 1 deletion src/pages/ReimbursementAccount/ReimbursementAccountForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 (
<ScrollView
style={[styles.w100, styles.flex1]}
Expand All @@ -47,7 +54,7 @@ class ReimbursementAccountForm extends React.Component {
</View>
<FormAlertWithSubmitButton
isAlertVisible={isErrorVisible}
buttonText={this.props.translate('common.saveAndContinue')}
buttonText={currentStep === CONST.BANK_ACCOUNT.STEP.VALIDATION ? this.props.translate('validationStep.buttonText') : this.props.translate('common.saveAndContinue')}
onSubmit={this.props.onSubmit}
onFixTheErrorsLinkPressed={() => {
this.form.scrollTo({y: 0, animated: true});
Expand Down