Add ChooseTransferAccountPage and allow selecting accounts for wallet transfer #7200
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
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
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
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
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,27 +1,100 @@ | ||
| import React from 'react'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import {View} from 'react-native'; | ||
| import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton'; | ||
| import ScreenWrapper from '../../../components/ScreenWrapper'; | ||
| import Navigation from '../../../libs/Navigation/Navigation'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; | ||
| import KeyboardAvoidingView from '../../../components/KeyboardAvoidingView'; | ||
| import CONST from '../../../CONST'; | ||
| import PaymentMethodList from './PaymentMethodList'; | ||
| import * as PaymentMethods from '../../../libs/actions/PaymentMethods'; | ||
| import ROUTES from '../../../ROUTES'; | ||
| import MenuItem from '../../../components/MenuItem'; | ||
| import * as Expensicons from '../../../components/Icon/Expensicons'; | ||
| import compose from '../../../libs/compose'; | ||
| import ONYXKEYS from '../../../ONYXKEYS'; | ||
| import walletTransferPropTypes from './walletTransferPropTypes'; | ||
| import styles from '../../../styles/styles'; | ||
|
|
||
| const propTypes = { | ||
| /** Wallet transfer propTypes */ | ||
| walletTransfer: walletTransferPropTypes, | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| walletTransfer: {}, | ||
| }; | ||
|
|
||
| const ChooseTransferAccountPage = (props) => { | ||
| /** | ||
| * Go back to transfer balance screen with the selected bank account set | ||
| * @param {Object} event Click event object | ||
| * @param {String} accountType of the selected account type | ||
| * @param {Object} account of the selected account data | ||
| */ | ||
| const selectAccountAndNavigateBack = (event, accountType, account) => { | ||
| PaymentMethods.saveWalletTransferAccountTypeAndID( | ||
| accountType, | ||
| accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT | ||
| ? account.bankAccountID | ||
| : account.fundID, | ||
| ); | ||
| Navigation.navigate(ROUTES.SETTINGS_PAYMENTS_TRANSFER_BALANCE); | ||
|
Contributor
There was a problem hiding this comment. If we are going back can we just do
Contributor
There was a problem hiding this comment. Whatever we do maybe it should be consistent because we are using |
||
| }; | ||
|
Contributor
There was a problem hiding this comment. NAB, this method isn't using
Member
Author
There was a problem hiding this comment. Yeah, I agree but I didn't see any example of such a functional component. Where should I move this. Outside the component in the same file?
Contributor
There was a problem hiding this comment. Yeah outside the component in the same file would work. Also maybe a good sign that it should be an action instead of a component method. |
||
|
|
||
| /** | ||
| * @param {String} paymentType | ||
| */ | ||
| const navigateToAddPaymentMethodPage = () => { | ||
| if (props.walletTransfer.filterPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) { | ||
| Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD); | ||
| return; | ||
| } | ||
| Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT); | ||
| }; | ||
|
|
||
| return ( | ||
| <ScreenWrapper> | ||
| <KeyboardAvoidingView> | ||
| <HeaderWithCloseButton | ||
| title={props.translate('chooseTransferAccountPage.chooseAccount')} | ||
| shouldShowBackButton | ||
| onBackButtonPress={() => Navigation.goBack()} | ||
| onCloseButtonPress={() => Navigation.dismissModal()} | ||
| /> | ||
| <View style={[styles.mt6, styles.flexShrink1, styles.flexBasisAuto]}> | ||
| <PaymentMethodList | ||
| onPress={selectAccountAndNavigateBack} | ||
| shouldShowSelectedState | ||
| filterType={props.walletTransfer.filterPaymentMethodType} | ||
| selectedMethodID={props.walletTransfer.selectedAccountID} | ||
| shouldShowAddPaymentMethodButton={false} | ||
|
Contributor
There was a problem hiding this comment. NAB, but it would be better to eventually find the case where we DO want to show an add payment method button and show one next to the list instead of inside of it. Now we have this list that must specify "no thanks, I don't need this". And in this case we just shows a very similar button below which could be confusing. Maybe a good follow up issue to create and have someone fix up.
Member
Author
There was a problem hiding this comment. Yeah, I was thinking th same but then it would unnecessary refactor for this PR so I left it as it is. |
||
| /> | ||
| </View> | ||
| <MenuItem | ||
| onPress={navigateToAddPaymentMethodPage} | ||
| title={props.walletTransfer.filterPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT | ||
| ? props.translate('paymentMethodList.addNewBankAccount') | ||
| : props.translate('paymentMethodList.addNewDebitCard')} | ||
| icon={Expensicons.Plus} | ||
| /> | ||
| </KeyboardAvoidingView> | ||
| </ScreenWrapper> | ||
| ); | ||
| }; | ||
|
|
||
| ChooseTransferAccountPage.propTypes = propTypes; | ||
| ChooseTransferAccountPage.defaultProps = defaultProps; | ||
| ChooseTransferAccountPage.displayName = 'ChooseTransferAccountPage'; | ||
|
|
||
| export default compose( | ||
| withLocalize, | ||
| withOnyx({ | ||
| walletTransfer: { | ||
| key: ONYXKEYS.WALLET_TRANSFER, | ||
| }, | ||
| }), | ||
| )(ChooseTransferAccountPage); | ||
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.