-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from Expensify/master
Merge
- Loading branch information
Showing
17 changed files
with
133 additions
and
253 deletions.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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 |
|---|---|---|
| @@ -1,7 +1,12 @@ | ||
| import React from 'react'; | ||
| import IOUModal from './IOUModal'; | ||
| import ScreenWrapper from '../../components/ScreenWrapper'; | ||
|
|
||
| export default props => ( | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| <IOUModal {...props} hasMultipleParticipants /> | ||
| <ScreenWrapper> | ||
| {() => ( | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| <IOUModal {...props} hasMultipleParticipants /> | ||
| )} | ||
| </ScreenWrapper> | ||
| ); |
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 |
|---|---|---|
| @@ -1,7 +1,12 @@ | ||
| import React from 'react'; | ||
| import IOUModal from './IOUModal'; | ||
| import ScreenWrapper from '../../components/ScreenWrapper'; | ||
|
|
||
| export default props => ( | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| <IOUModal {...props} /> | ||
| <ScreenWrapper> | ||
| {() => ( | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| <IOUModal {...props} /> | ||
| )} | ||
| </ScreenWrapper> | ||
| ); |
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 |
|---|---|---|
| @@ -1,24 +1,109 @@ | ||
| import React from 'react'; | ||
| import HeaderWithCloseButton from '../../components/HeaderWithCloseButton'; | ||
| import Navigation from '../../libs/Navigation/Navigation'; | ||
| import {Pressable, TextInput, View} from 'react-native'; | ||
| import PropTypes from 'prop-types'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import CONST from '../../CONST'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
| import ROUTES from '../../ROUTES'; | ||
| import HeaderWithCloseButton from '../../components/HeaderWithCloseButton'; | ||
| import Text from '../../components/Text'; | ||
| import ScreenWrapper from '../../components/ScreenWrapper'; | ||
| import NameValuePair from '../../libs/actions/NameValuePair'; | ||
| import {fetch} from '../../libs/actions/User'; | ||
| import Navigation from '../../libs/Navigation/Navigation'; | ||
| import styles from '../../styles/styles'; | ||
|
|
||
| const propTypes = { | ||
| payPalMeUsername: PropTypes.string, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| payPalMeUsername: '', | ||
| }; | ||
|
|
||
| class PaymentsPage extends React.Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.state = { | ||
| payPalMeUsername: props.payPalMeUsername, | ||
| }; | ||
| this.setPayPalMeUsername = this.setPayPalMeUsername.bind(this); | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| fetch(); | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps) { | ||
| if (prevProps.payPalMeUsername !== this.props.payPalMeUsername) { | ||
| // Suppressing because this is within a conditional, and hence we won't run into an infinite loop | ||
| // eslint-disable-next-line react/no-did-update-set-state | ||
| this.setState({payPalMeUsername: this.props.payPalMeUsername}); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Sets the payPalMeUsername for the current user | ||
| */ | ||
| setPayPalMeUsername() { | ||
| NameValuePair.set(CONST.NVP.PAYPAL_ME_ADDRESS, this.state.payPalMeUsername, ONYXKEYS.NVP_PAYPAL_ME_ADDRESS); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <ScreenWrapper> | ||
| {() => ( | ||
| <> | ||
| <HeaderWithCloseButton | ||
| title="Payments" | ||
| shouldShowBackButton | ||
| onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} | ||
| onCloseButtonPress={() => Navigation.dismissModal()} | ||
| /> | ||
| <View style={[styles.flex1, styles.p5]}> | ||
| <View style={[styles.flex1]}> | ||
| <Text style={[styles.textP, styles.mb4]}> | ||
| Enter your username to get paid back via PayPal. | ||
| </Text> | ||
| <Text style={[styles.formLabel]} numberOfLines={1}> | ||
| PayPal.me/ | ||
| </Text> | ||
| <TextInput | ||
| style={[styles.textInput]} | ||
| value={this.state.payPalMeUsername} | ||
| placeholder="Your PayPal username" | ||
| onChangeText={text => this.setState({payPalMeUsername: text})} | ||
| /> | ||
| </View> | ||
| <Pressable | ||
| onPress={this.setPayPalMeUsername} | ||
| style={({hovered}) => [ | ||
| styles.button, | ||
| styles.buttonSuccess, | ||
| styles.mt3, | ||
| hovered && styles.buttonSuccessHovered, | ||
| ]} | ||
| > | ||
| <Text style={[styles.buttonText, styles.buttonSuccessText]}> | ||
| Add PayPal Account | ||
| </Text> | ||
| </Pressable> | ||
| </View> | ||
| </> | ||
|
|
||
| const PaymentsPage = () => ( | ||
| <ScreenWrapper> | ||
| {() => ( | ||
| <> | ||
| <HeaderWithCloseButton | ||
| title="Payments" | ||
| shouldShowBackButton | ||
| onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} | ||
| onCloseButtonPress={() => Navigation.dismissModal()} | ||
| /> | ||
| </> | ||
| )} | ||
| </ScreenWrapper> | ||
| ); | ||
| )} | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| PaymentsPage.propTypes = propTypes; | ||
| PaymentsPage.defaultProps = defaultProps; | ||
| PaymentsPage.displayName = 'PaymentsPage'; | ||
|
|
||
| export default PaymentsPage; | ||
| export default withOnyx({ | ||
| payPalMeUsername: { | ||
| key: ONYXKEYS.NVP_PAYPAL_ME_ADDRESS, | ||
| }, | ||
| })(PaymentsPage); |
Oops, something went wrong.