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

Autofill previously entered accounting and routing numbers #4477

Merged
merged 5 commits into from
Aug 10, 2021
Merged

Autofill previously entered accounting and routing numbers #4477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9adaa96
Autofill previously entered accounting and routing numbers
Jag96 Aug 6, 2021
4b9ff3f
fix incorrect center-align
Jag96 Aug 9, 2021
c92b309
ensure merge finishes before continuing
Jag96 Aug 9, 2021
f5bb534
lint and comments
Jag96 Aug 9, 2021
a905816
merge main
Jag96 Aug 9, 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
31 changes: 28 additions & 3 deletions src/libs/actions/BankAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ function fetchUserWallet() {
* @param {String} [stepToOpen]
*/
function fetchFreePlanVerifiedBankAccount(stepToOpen) {
const oldACHData = {
accountNumber: reimbursementAccountInSetup.accountNumber || '',
routingNumber: reimbursementAccountInSetup.routingNumber || '',
};

// 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});
Expand Down Expand Up @@ -478,7 +483,18 @@ function fetchFreePlanVerifiedBankAccount(stepToOpen) {
goToWithdrawalAccountSetupStep(currentStep, achData);
})
.finally(() => {
Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false});
const dataToMerge = {
loading: false,
};

// If we didn't get a routingNumber and accountNumber from the response and we have previously saved
// values, autofill them
if (!reimbursementAccountInSetup.routingNumber && !reimbursementAccountInSetup.accountNumber
&& oldACHData.routingNumber && oldACHData.accountNumber) {
dataToMerge.achData = oldACHData;
}

Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, dataToMerge);
});
});
}
Expand Down Expand Up @@ -602,9 +618,18 @@ function setupWithdrawalAccount(data) {
}

API.BankAccount_SetupWithdrawal(newACHData)
/* eslint-disable arrow-body-style */
.then((response) => {
// Without this block, we can call merge again with the achData before this merge finishes, resulting in
// the original achData overwriting the data we're trying to set here. With this block, we ensure that the
// newACHData is set in Onyx before we call merge on the reimbursementAccount key again.
return Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {
loading: false,
achData: {...newACHData},
})
.then(() => Promise.resolve(response));
})
.then((response) => {
Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {loading: false, achData: {...newACHData}});

const currentStep = newACHData.currentStep;
let achData = lodashGet(response, 'achData', {});
let error = lodashGet(achData, CONST.BANK_ACCOUNT.VERIFICATIONS.ERROR_MESSAGE);
Expand Down
4 changes: 1 addition & 3 deletions src/pages/ReimbursementAccount/CompanyStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ class CompanyStep extends React.Component {
/>
<ScrollView style={[styles.flex1, styles.w100]}>
<View style={[styles.p4]}>
<View style={[styles.alignItemsCenter]}>
<Text>{this.props.translate('companyStep.subtitle')}</Text>
</View>
<Text>{this.props.translate('companyStep.subtitle')}</Text>
<ExpensiTextInput
label={this.props.translate('companyStep.legalBusinessName')}
containerStyles={[styles.mt4]}
Expand Down