Form refactor bankaccountstep #10900
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,24 +22,16 @@ import Text from '../../components/Text'; | |
| import * as BankAccounts from '../../libs/actions/BankAccounts'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
| import compose from '../../libs/compose'; | ||
| import Section from '../../components/Section'; | ||
| import * as ValidationUtils from '../../libs/ValidationUtils'; | ||
| import * as Illustrations from '../../components/Icon/Illustrations'; | ||
| import getPlaidDesktopMessage from '../../libs/getPlaidDesktopMessage'; | ||
| import CONFIG from '../../CONFIG'; | ||
| import ROUTES from '../../ROUTES'; | ||
| import Button from '../../components/Button'; | ||
| import Form from '../../components/Form'; | ||
|
|
||
| const propTypes = { | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** The OAuth URI + stateID needed to re-initialize the PlaidLink after the user logs into their bank */ | ||
| receivedRedirectURI: PropTypes.string, | ||
|
|
||
|
|
@@ -65,79 +57,50 @@ class BankAccountStep extends React.Component { | |
| constructor(props) { | ||
| super(props); | ||
|
|
||
| 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, | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * @param {Object} values - form input values passed by the Form component | ||
| * @returns {Object} | ||
| */ | ||
| validate(values) { | ||
| const errors = {}; | ||
|
|
||
| if (!values.accountNumber || !CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim())) { | ||
| errors.accountNumber = this.props.translate('bankAccount.error.accountNumber'); | ||
| } | ||
| if (!values.routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(values.routingNumber.trim()) || !ValidationUtils.isValidRoutingNumber(values.routingNumber.trim())) { | ||
| errors.routingNumber = this.props.translate('bankAccount.error.routingNumber'); | ||
| } | ||
| if (!values.acceptedTerms) { | ||
| errors.acceptedTerms = this.props.translate('common.error.acceptedTerms'); | ||
| } | ||
|
|
||
| return errors; | ||
| } | ||
|
|
||
| validatePlaidAccount() { | ||
|
There was a problem hiding this comment. I think we can skip validating Plaid account, as we don't allow the user to continue unless they choose an account. I don't see a way of triggering the validation error if it exists. @luacmartins what do you think? There was a problem hiding this comment. Yes I think we can skip this, removed validatePlaidAccount for now There was a problem hiding this comment. Makes sense since we can't display that error and the user can't continue without selecting an account. |
||
| 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, | ||
| accountNumber: values.accountNumber, | ||
| routingNumber: values.routingNumber, | ||
| setupType: CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL, | ||
|
|
||
| // Note: These are hardcoded as we're not supporting AU bank accounts for the free plan | ||
|
|
@@ -149,6 +112,7 @@ class BankAccountStep extends React.Component { | |
|
|
||
| /** | ||
| * Add the Bank account retrieved via Plaid in db | ||
| * @param {Object} values - form input values passed by the Form component | ||
| */ | ||
| addPlaidAccount() { | ||
| const selectedPlaidBankAccount = this.state.selectedPlaidBankAccount; | ||
|
|
@@ -185,8 +149,6 @@ class BankAccountStep extends React.Component { | |
| const subStep = shouldReinitializePlaidLink ? CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID : this.props.achData.subStep; | ||
| const plaidDesktopMessage = getPlaidDesktopMessage(); | ||
| const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.BANK_ACCOUNT}`; | ||
| const validated = lodashGet(this.props, 'user.validated', false); | ||
| return ( | ||
| <View style={[styles.flex1, styles.justifyContentBetween]}> | ||
|
|
@@ -274,36 +236,34 @@ class BankAccountStep extends React.Component { | |
| </ScrollView> | ||
| )} | ||
| {subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID && ( | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Form | ||
| formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT} | ||
| validate={this.validatePlaidAccount} | ||
| onSubmit={this.addPlaidAccount} | ||
| submitButtonText={this.props.translate('common.saveAndContinue')} | ||
| style={[styles.mh5, styles.flexGrow1]} | ||
| isSubmitButtonVisible={!_.isUndefined(this.state.selectedPlaidBankAccount)} | ||
| > | ||
| <AddPlaidBankAccount | ||
| onSelect={(params) => { | ||
| this.setState({ | ||
| selectedPlaidBankAccount: params.selectedPlaidBankAccount, | ||
| }); | ||
| }} | ||
| onExitPlaid={() => BankAccounts.setBankAccountSubStep(null)} | ||
| receivedRedirectURI={this.props.receivedRedirectURI} | ||
| plaidLinkOAuthToken={this.props.plaidLinkOAuthToken} | ||
| allowDebit | ||
| /> | ||
| </Form> | ||
| )} | ||
| {subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL && ( | ||
| <Form | ||
| formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT} | ||
luacmartins marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| validate={this.validate} | ||
| onSubmit={this.addManualAccount} | ||
| submitButtonText={this.props.translate('common.saveAndContinue')} | ||
| style={[styles.mh5, styles.flexGrow1]} | ||
| > | ||
| <Text style={[styles.mb5]}> | ||
| {this.props.translate('bankAccount.checkHelpLine')} | ||
|
|
@@ -314,26 +274,23 @@ class BankAccountStep extends React.Component { | |
| source={exampleCheckImage(this.props.preferredLocale)} | ||
| /> | ||
| <TextInput | ||
| inputID="routingNumber" | ||
| label={this.props.translate('bankAccount.routingNumber')} | ||
| keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD} | ||
| disabled={shouldDisableInputs} | ||
| shouldSaveDraft | ||
| /> | ||
| <TextInput | ||
| inputID="accountNumber" | ||
| containerStyles={[styles.mt4]} | ||
| label={this.props.translate('bankAccount.accountNumber')} | ||
| keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD} | ||
| disabled={shouldDisableInputs} | ||
| shouldSaveDraft | ||
| /> | ||
| <CheckboxWithLabel | ||
| style={styles.mt4} | ||
| inputID="acceptedTerms" | ||
| LabelComponent={() => ( | ||
| <View style={[styles.flexRow, styles.alignItemsCenter]}> | ||
| <Text> | ||
|
|
@@ -344,9 +301,9 @@ class BankAccountStep extends React.Component { | |
| </TextLink> | ||
| </View> | ||
| )} | ||
| shouldSaveDraft | ||
| /> | ||
| </Form> | ||
| )} | ||
| </View> | ||
| ); | ||
|
|
@@ -359,12 +316,6 @@ BankAccountStep.defaultProps = defaultProps; | |
| export default compose( | ||
| withLocalize, | ||
| withOnyx({ | ||
| user: { | ||
| key: ONYXKEYS.USER, | ||
| }, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this needs to be moved below
submitButtonText, as now it sits under the/* Onyx Props */comment but it's not an Onyx prop.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change has been done