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

Form refactor bankaccountstep #10900

Merged
merged 26 commits into from
Sep 30, 2022
Merged

Form refactor bankaccountstep #10900

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c09bf34
bank account step form refactored
jayeshmangwani Sep 5, 2022
3f8c116
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 6, 2022
8808c9c
fixed console warnings & changed inputID defaultValue from undefined …
jayeshmangwani Sep 6, 2022
9bf7312
added shouldSaveDraft to inputs and checkbox
jayeshmangwani Sep 8, 2022
7ecc6c2
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 8, 2022
590d0df
resolved conflicts & replaced form key with REIMBURSEMENT_ACCOUNT key
jayeshmangwani Sep 15, 2022
f4134db
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 20, 2022
191739a
added isSubmitButtonVisible form prop
jayeshmangwani Sep 21, 2022
90057a2
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 21, 2022
2d99e38
skipped validation for plaid
jayeshmangwani Sep 23, 2022
cdb883a
removed inputID from AddPlaidBankAccount
jayeshmangwani Sep 23, 2022
2ef74ca
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 23, 2022
0e2b26f
added validate function to PLAID Form
jayeshmangwani Sep 24, 2022
4bdc2d7
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 24, 2022
5f08c30
updated onyx key name for bankaccount form
jayeshmangwani Sep 26, 2022
df9b2c0
merged & resolved conflicts, accepted incoming changes
jayeshmangwani Sep 26, 2022
84011f1
added form component to BankAccountManualStep & BankAccountPlaidStep
jayeshmangwani Sep 26, 2022
e19f42f
updated formID for plaid
jayeshmangwani Sep 26, 2022
e8c0496
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 26, 2022
58198e2
merged and resolved conflicts
jayeshmangwani Sep 27, 2022
27dddb3
updated ONYX key name from BANK_FORM to REIMBURSEMENT_ACCOUNT_FORM
jayeshmangwani Sep 28, 2022
ebcc540
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 28, 2022
44cc59d
resolved conflicts
jayeshmangwani Sep 29, 2022
fbd3ca4
Merge branch 'main' into form_refactor_bankaccountstep
jayeshmangwani Sep 30, 2022
bd2e691
merged code from Form and FormActions
jayeshmangwani Sep 30, 2022
08753f3
fixed newline lint issue
jayeshmangwani Sep 30, 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
6 changes: 3 additions & 3 deletions src/components/Form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ const propTypes = {
/** Text to be displayed in the submit button */
submitButtonText: PropTypes.string.isRequired,

/** Should we show the submit button */
isSubmitButtonVisible: PropTypes.bool,

/** Callback to validate the form */
validate: PropTypes.func.isRequired,

Expand All @@ -40,9 +43,6 @@ const propTypes = {
// eslint-disable-next-line react/forbid-prop-types
draftValues: PropTypes.object,

/** Should we show the form button */
isSubmitButtonVisible: PropTypes.bool,

...withLocalizePropTypes,
};

Expand Down
12 changes: 0 additions & 12 deletions src/pages/ReimbursementAccount/BankAccountStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class BankAccountStep extends React.Component {
this.addManualAccount = this.addManualAccount.bind(this);
this.addPlaidAccount = this.addPlaidAccount.bind(this);
this.validate = this.validate.bind(this);
this.validatePlaidAccount = this.validatePlaidAccount.bind(this);
this.state = {
selectedPlaidBankAccount: undefined,
};
Expand All @@ -86,16 +85,6 @@ class BankAccountStep extends React.Component {
return errors;
}

validatePlaidAccount() {
const selectedPlaidBankAccount = this.state.selectedPlaidBankAccount;
const errors = {};
if (_.isUndefined(selectedPlaidBankAccount)) {
errors.selectedPlaidBankAccount = this.props.translate('bankAccount.error.noBankAccountSelected');
}

return errors;
}

addManualAccount(values) {
BankAccounts.setupWithdrawalAccount({
acceptTerms: values.acceptedTerms,
Expand Down Expand Up @@ -238,7 +227,6 @@ class BankAccountStep extends React.Component {
{subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID && (
<Form
formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
validate={this.validatePlaidAccount}
Copy link
Contributor

Choose a reason for hiding this comment

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

Removing this completely will cause an error, maybe we can have it return an empty object validate={() => ({})} to satisfy Form. I still think we don't need that validation method because it will only run when selectedPlaidBankAccount is already defined.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added empty object to validate in PLAID Form

onSubmit={this.addPlaidAccount}
submitButtonText={this.props.translate('common.saveAndContinue')}
style={[styles.mh5, styles.flexGrow1]}
Expand Down