Feature: Transfer balance #4177
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,4 +1,4 @@ | ||
| import React, {Component} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import Popover from './Popover'; | ||
|
|
@@ -9,54 +9,166 @@ import styles from '../styles/styles'; | |
| import compose from '../libs/compose'; | ||
| import ONYXKEYS from '../ONYXKEYS'; | ||
| import CONST from '../CONST'; | ||
| import * as StyleUtils from '../styles/StyleUtils'; | ||
| import getClickedElementLocation from '../libs/getClickedElementLocation'; | ||
| import ROUTES from '../ROUTES'; | ||
| import Navigation from '../libs/Navigation/Navigation'; | ||
|
|
||
|
|
||
| const propTypes = { | ||
| /** Username for PayPal.Me */ | ||
| payPalMeUsername: PropTypes.string, | ||
|
|
||
| /** Type to filter the payment Method list */ | ||
| filterType: PropTypes.oneOf([CONST.PAYMENT_METHODS.DEBIT_CARD, CONST.PAYMENT_METHODS.BANK_ACCOUNT, '']), | ||
|
|
||
| /** Are we loading payments from the server? */ | ||
| isLoadingPayments: PropTypes.bool, | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| payPalMeUsername: '', | ||
| filterType: '', | ||
| isLoadingPayments: false, | ||
| }; | ||
|
|
||
| class AddPaymentMethodMenu extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| isAddPaymentMenuActive: false, | ||
| anchorPosition: { | ||
| top: 0, | ||
| left: 0, | ||
| }, | ||
|
Contributor
There was a problem hiding this comment. We need to use this component in this PR and having it internally track the |
||
| }; | ||
| this.addPaymentMethodPressed = this.addPaymentMethodPressed.bind(this); | ||
| this.addPaymentMethodTypePressed = this.addPaymentMethodTypePressed.bind(this); | ||
| this.hideAddPaymentMenu = this.hideAddPaymentMenu.bind(this); | ||
| } | ||
|
|
||
| /** | ||
| * Get the AddPaymentMethod Button title | ||
| * @returns {String} | ||
| */ | ||
| getAddPaymentMethodButtonTitle() { | ||
| switch (this.props.filterType) { | ||
| case CONST.PAYMENT_METHODS.BANK_ACCOUNT: | ||
| return this.props.translate('paymentMethodList.addBankAccount'); | ||
| case CONST.PAYMENT_METHODS.DEBIT_CARD: | ||
| return this.props.translate('paymentMethodList.addDebitCard'); | ||
| default: break; | ||
| } | ||
| return this.props.translate('paymentMethodList.addPaymentMethod'); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. We need to make a new component that:
Contributor
There was a problem hiding this comment. I'd suggest calling it
Member
Author
There was a problem hiding this comment.
I didn't get it and I don't have access to that issue. But I got the idea.
Contributor
There was a problem hiding this comment. Ah I'm sorry, I forgot that you cannot see those issues. |
||
|
|
||
| /** | ||
| * Display the add payment method menu | ||
| * @param {Object} nativeEvent | ||
| */ | ||
| addPaymentMethodPressed(nativeEvent) { | ||
| const position = getClickedElementLocation(nativeEvent); | ||
| this.setState({ | ||
| isAddPaymentMenuActive: true, | ||
| anchorPosition: { | ||
| top: position.bottom, | ||
|
|
||
| // We want the position to be 20px to the right of the left border | ||
| left: position.left + 20, | ||
| }, | ||
| }); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. This would need to go into that other component. |
||
|
|
||
| /** | ||
| * Navigate to the appropriate payment type addition screen | ||
| * @param {String} paymentType | ||
| */ | ||
| addPaymentMethodTypePressed(paymentType) { | ||
| if (!this.props.filterType) { | ||
| this.hideAddPaymentMenu(); | ||
| } | ||
|
|
||
| if (paymentType === CONST.PAYMENT_METHODS.PAYPAL) { | ||
| Navigation.navigate(ROUTES.SETTINGS_ADD_PAYPAL_ME); | ||
| return; | ||
| } | ||
|
|
||
| if (paymentType === CONST.PAYMENT_METHODS.DEBIT_CARD) { | ||
| Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD); | ||
| return; | ||
| } | ||
|
|
||
| if (paymentType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) { | ||
| Navigation.navigate(ROUTES.SETTINGS_ADD_BANK_ACCOUNT); | ||
| return; | ||
| } | ||
|
Contributor
There was a problem hiding this comment. None of these routes should be in this component because we will eventually need to navigate to different routes depending on the context in which this component will be used. I would suggest passing in the route as a prop to keep this component reusable. |
||
|
|
||
| throw new Error('Invalid payment method type selected'); | ||
| } | ||
|
|
||
| /** | ||
| * Hide the add payment modal | ||
| */ | ||
| hideAddPaymentMenu() { | ||
| this.setState({isAddPaymentMenuActive: false}); | ||
| } | ||
|
|
||
| render() { | ||
| const addPaymentMethodButtonTitle = this.getAddPaymentMethodButtonTitle(); | ||
|
|
||
| return ( | ||
| <> | ||
| <MenuItem | ||
| onPress={e => (this.props.filterType | ||
| ? this.addPaymentMethodTypePressed(this.props.filterType) | ||
| : this.addPaymentMethodPressed(e) | ||
| )} | ||
| title={addPaymentMethodButtonTitle} | ||
| icon={Expensicons.Plus} | ||
| disabled={this.props.isLoadingPayments} | ||
| iconFill={this.state.isAddPaymentMenuActive | ||
| ? StyleUtils.getIconFillColor(CONST.BUTTON_STATES.PRESSED) | ||
| : undefined} | ||
| wrapperStyle={this.state.isAddPaymentMenuActive | ||
| ? [StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.PRESSED)] | ||
| : []} | ||
|
|
||
| /> | ||
| {!this.props.filterType && ( | ||
| <Popover | ||
| isVisible={this.state.isAddPaymentMenuActive} | ||
| onClose={this.hideAddPaymentMenu} | ||
| anchorPosition={this.state.anchorPosition} | ||
| > | ||
| <MenuItem | ||
| title={this.props.translate('common.bankAccount')} | ||
| icon={Expensicons.Bank} | ||
| onPress={() => this.addPaymentMethodTypePressed(CONST.PAYMENT_METHODS.BANK_ACCOUNT)} | ||
| wrapperStyle={styles.pr15} | ||
| /> | ||
| <MenuItem | ||
| title={this.props.translate('common.debitCard')} | ||
| icon={Expensicons.CreditCard} | ||
| onPress={() => this.addPaymentMethodTypePressed(CONST.PAYMENT_METHODS.DEBIT_CARD)} | ||
| wrapperStyle={styles.pr15} | ||
| /> | ||
| {!this.props.payPalMeUsername && ( | ||
| <MenuItem | ||
| title={this.props.translate('common.payPalMe')} | ||
| icon={Expensicons.PayPal} | ||
| onPress={() => this.addPaymentMethodTypePressed(CONST.PAYMENT_METHODS.PAYPAL)} | ||
| wrapperStyle={styles.pr15} | ||
| /> | ||
| )} | ||
| </Popover> | ||
| )} | ||
| </> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| AddPaymentMethodMenu.propTypes = propTypes; | ||
| AddPaymentMethodMenu.defaultProps = defaultProps; | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import PropTypes from 'prop-types'; | ||
| import styles from '../styles/styles'; | ||
| import Icon from './Icon'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import themeColors from '../styles/themes/default'; | ||
|
|
||
| const propTypes = { | ||
| /** Whether SelectCircle is checked */ | ||
| isChecked: PropTypes.bool, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| isChecked: false, | ||
| }; | ||
|
|
||
| const SelectCircle = props => ( | ||
| <View style={[styles.selectCircle, styles.alignSelfCenter]}> | ||
| {props.isChecked && ( | ||
| <Icon src={Expensicons.Checkmark} fill={themeColors.iconSuccessFill} /> | ||
| )} | ||
| </View> | ||
| ); | ||
|
|
||
| SelectCircle.propTypes = propTypes; | ||
| SelectCircle.defaultProps = defaultProps; | ||
| SelectCircle.displayName = 'SelectCircle'; | ||
|
|
||
| export default SelectCircle; |
Oops, something went wrong.
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.