Refactor: Migrate BankAccountManualStep.js to function component #22245
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import React, {useCallback} from 'react'; | ||
| import _ from 'underscore'; | ||
| import {Image} from 'react-native'; | ||
| import lodashGet from 'lodash/get'; | ||
| import HeaderWithBackButton from '../../components/HeaderWithBackButton'; | ||
|
|
@@ -9,7 +10,8 @@ import TextInput from '../../components/TextInput'; | |
| import styles from '../../styles/styles'; | ||
| import CheckboxWithLabel from '../../components/CheckboxWithLabel'; | ||
| import TextLink from '../../components/TextLink'; | ||
| import useLocalize from '../../hooks/useLocalize'; | ||
| import {withLocalizePropTypes} from '../../components/withLocalize'; | ||
| import * as ValidationUtils from '../../libs/ValidationUtils'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
| import exampleCheckImage from './exampleCheckImage'; | ||
|
|
@@ -19,115 +21,116 @@ import ScreenWrapper from '../../components/ScreenWrapper'; | |
| import StepPropTypes from './StepPropTypes'; | ||
|
|
||
| const propTypes = { | ||
| ..._.omit(StepPropTypes, _.keys(withLocalizePropTypes)), | ||
| }; | ||
|
|
||
| function BankAccountManualStep(props) { | ||
| const {translate, preferredLocale} = useLocalize(); | ||
| const {reimbursementAccount, reimbursementAccountDraft} = props; | ||
| /** | ||
| * @param {Object} values - form input values passed by the Form component | ||
| * @returns {Object} | ||
| */ | ||
| const validate = useCallback( | ||
| (values) => { | ||
| const errorFields = {}; | ||
| const routingNumber = values.routingNumber && values.routingNumber.trim(); | ||
|
|
||
| if ( | ||
| !values.accountNumber || | ||
| (!CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim()) && !CONST.BANK_ACCOUNT.REGEX.MASKED_US_ACCOUNT_NUMBER.test(values.accountNumber.trim())) | ||
| ) { | ||
| errorFields.accountNumber = 'bankAccount.error.accountNumber'; | ||
| } else if (values.accountNumber === routingNumber) { | ||
| errorFields.accountNumber = translate('bankAccount.error.routingAndAccountNumberCannotBeSame'); | ||
| } | ||
| if (!routingNumber || !CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber)) { | ||
| errorFields.routingNumber = 'bankAccount.error.routingNumber'; | ||
| } | ||
| if (!values.acceptTerms) { | ||
| errorFields.acceptTerms = 'common.error.acceptTerms'; | ||
| } | ||
|
|
||
| return errorFields; | ||
| }, | ||
| [translate], | ||
| ); | ||
|
|
||
| const submit = useCallback( | ||
| (values) => { | ||
| BankAccounts.connectBankAccountManually( | ||
| lodashGet(reimbursementAccount, ['achData.bankAccountID']) || 0, | ||
|
Contributor
There was a problem hiding this comment. Looks like this line caused this regression. Why did you convert lodashGet to an array path? Regardless, this should be
Member
There was a problem hiding this comment. Oops, I completely missed this during refactor. There is one more. |
||
| values.accountNumber, | ||
| values.routingNumber, | ||
| lodashGet(reimbursementAccountDraft, ['plaidMask']), | ||
| ); | ||
| }, | ||
| [reimbursementAccount, reimbursementAccountDraft], | ||
|
Vishrut19 marked this conversation as resolved.
|
||
| ); | ||
|
|
||
| const shouldDisableInputs = Boolean(lodashGet(reimbursementAccount, ['achData.bankAccountID'])); | ||
|
|
||
| return ( | ||
| <ScreenWrapper includeSafeAreaPaddingBottom={false}> | ||
| <HeaderWithBackButton | ||
| title={translate('workspace.common.connectBankAccount')} | ||
| stepCounter={{step: 1, total: 5}} | ||
| shouldShowGetAssistanceButton | ||
| guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT} | ||
| onBackButtonPress={props.onBackButtonPress} | ||
| /> | ||
| <Form | ||
| formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM} | ||
| onSubmit={submit} | ||
| validate={validate} | ||
| submitButtonText={translate('common.continue')} | ||
| style={[styles.mh5, styles.flexGrow1]} | ||
| > | ||
| <Text style={[styles.mb5]}>{translate('bankAccount.checkHelpLine')}</Text> | ||
| <Image | ||
| resizeMode="contain" | ||
| style={[styles.exampleCheckImage, styles.mb5]} | ||
| source={exampleCheckImage(preferredLocale)} | ||
| /> | ||
| <TextInput | ||
| autoFocus | ||
| shouldDelayFocus={shouldDelayFocus} | ||
| inputID="routingNumber" | ||
| label={translate('bankAccount.routingNumber')} | ||
| defaultValue={props.getDefaultStateForField('routingNumber', '')} | ||
| keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD} | ||
| disabled={shouldDisableInputs} | ||
| shouldSaveDraft | ||
| shouldUseDefaultValue={shouldDisableInputs} | ||
| /> | ||
| <TextInput | ||
| inputID="accountNumber" | ||
| containerStyles={[styles.mt4]} | ||
| label={translate('bankAccount.accountNumber')} | ||
| defaultValue={props.getDefaultStateForField('accountNumber', '')} | ||
| keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD} | ||
| disabled={shouldDisableInputs} | ||
| shouldSaveDraft | ||
| shouldUseDefaultValue={shouldDisableInputs} | ||
| /> | ||
| <CheckboxWithLabel | ||
| accessibilityLabel={`${translate('common.iAcceptThe')} ${translate('common.expensifyTermsOfService')}`} | ||
| style={styles.mt4} | ||
| inputID="acceptTerms" | ||
| LabelComponent={() => ( | ||
| <Text> | ||
| {translate('common.iAcceptThe')} | ||
| <TextLink href={CONST.TERMS_URL}>{translate('common.expensifyTermsOfService')}</TextLink> | ||
| </Text> | ||
| )} | ||
| defaultValue={props.getDefaultStateForField('acceptTerms', false)} | ||
| shouldSaveDraft | ||
| /> | ||
| </Form> | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
|
|
||
| BankAccountManualStep.propTypes = propTypes; | ||
| BankAccountManualStep.displayName = 'BankAccountManualStep'; | ||
| export default BankAccountManualStep; | ||
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.
Why are we removing the withLocalizePropTypes in prop types?
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.
We moved to useLocalize from HOC so no such props will be passed.
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.
Then could we not include it in StepPropTypes? Or is that too big of a refactor
Uh oh!
There was an error while loading. Please reload this page.
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.
We can't remove it yet from StepPropTyped as that is still used in many other components so when last of that component is refactored to function, we can safely refactor all.
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.
Cool cool, thanks for the context