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

Refactor ReimbursementAccountPage's fetchFreePlanVerifiedBankAccount #11751

Merged
merged 18 commits into from
Nov 10, 2022
Merged

Refactor ReimbursementAccountPage's fetchFreePlanVerifiedBankAccount #11751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6397999
add new command
Oct 4, 2022
4e3f948
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 5, 2022
36d1277
get local items
Oct 5, 2022
06d3a45
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 11, 2022
20da5bf
pass in params
Oct 12, 2022
24ec6ea
remove old usage
Oct 12, 2022
79958f7
update param to isBankAccountINReview
Oct 12, 2022
0f99df9
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 12, 2022
68f70e7
optimistic data
Oct 18, 2022
34f6a52
cleanup
Oct 19, 2022
7f48071
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 19, 2022
3a5d99b
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 19, 2022
9110407
merge main fix
Oct 21, 2022
7daf5ad
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Oct 21, 2022
6e40443
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Nov 1, 2022
0c96aef
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Nov 1, 2022
9da4d3e
Merge branch 'main' into ckt_fetchFreePlan_reimbursementPage_2
Nov 2, 2022
206f310
undo unnecessary change
Nov 3, 2022
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
46 changes: 44 additions & 2 deletions src/libs/actions/BankAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,47 @@ function validateBankAccount(bankAccountID, validateCode) {
});
}

function openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep) {
const onyxData = {
optimisticData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {
errors: null,
isLoading: true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it this @ctkochan22 ?

Are we stuck in the isLoading state?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but upon any sort of completion it should be set to false

},
},
],
successData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {
isLoading: false,
},
},
],
failureData: [
{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
value: {
isLoading: false,
},
},
],
};

const param = {
stepToOpen,
subStep,
localCurrentStep,
};

return API.read('OpenReimbursementAccountPage', param, onyxData);
}

/**
* Updates the bank account in the database with the company step data
*
Expand Down Expand Up @@ -323,12 +364,13 @@ function verifyIdentityForBankAccount(bankAccountID, onfidoData) {

export {
addPersonalBankAccount,
connectBankAccountManually,
clearOnfidoToken,
clearPersonalBankAccount,
clearPlaid,
clearOnfidoToken,
connectBankAccountManually,
connectBankAccountWithPlaid,
deletePaymentBankAccount,
openReimbursementAccountPage,
updateBeneficialOwnersForBankAccount,
updateCompanyInformationForBankAccount,
updatePersonalInformationForBankAccount,
Expand Down
8 changes: 5 additions & 3 deletions src/pages/ReimbursementAccount/ReimbursementAccountPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import getPlaidOAuthReceivedRedirectURI from '../../libs/getPlaidOAuthReceivedRe
import Text from '../../components/Text';
import {withNetwork} from '../../components/OnyxProvider';
import networkPropTypes from '../../components/networkPropTypes';
import * as store from '../../libs/actions/ReimbursementAccount/store';

// Steps
import BankAccountStep from './BankAccountStep';
Expand Down Expand Up @@ -150,9 +151,10 @@ class ReimbursementAccountPage extends React.Component {
// We can specify a step to navigate to by using route params when the component mounts.
// We want to use the same stepToOpen variable when the network state changes because we can be redirected to a different step when the account refreshes.
const stepToOpen = this.getStepToOpenFromRouteParams();

// If we are trying to navigate to `/bank-account/new` and we already have a bank account then don't allow returning to `/new`
BankAccounts.fetchFreePlanVerifiedBankAccount(stepToOpen !== CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT ? stepToOpen : '');
const reimbursementAccount = store.getReimbursementAccountInSetup();
const subStep = reimbursementAccount.subStep || '';
const localCurrentStep = reimbursementAccount.currentStep || '';
BankAccounts.openReimbursementAccountPage(stepToOpen, subStep, localCurrentStep);
}

render() {
Expand Down