Refactor Terms step of Wallet_Activate into AcceptWalletTerms
#10443
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 |
|---|---|---|
|
|
@@ -9,6 +9,12 @@ import styles from '../../styles/styles'; | |
| import userWalletPropTypes from './userWalletPropTypes'; | ||
| import CONST from '../../CONST'; | ||
| import Text from '../../components/Text'; | ||
| import Icon from '../../components/Icon'; | ||
| import * as Illustrations from '../../components/Icon/Illustrations'; | ||
| import defaultTheme from '../../styles/themes/default'; | ||
| import FixedFooter from '../../components/FixedFooter'; | ||
| import Button from '../../components/Button'; | ||
| import * as PaymentMethods from '../../libs/actions/PaymentMethods'; | ||
|
|
||
| const propTypes = { | ||
| ...withLocalizePropTypes, | ||
|
|
@@ -21,24 +27,64 @@ const defaultProps = { | |
| userWallet: {}, | ||
| }; | ||
|
|
||
| class ActivateStep extends React.Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.renderGoldWalletActivationStep = this.renderGoldWalletActivationStep.bind(this); | ||
| } | ||
|
|
||
| renderGoldWalletActivationStep() { | ||
| return ( | ||
| <> | ||
| <View style={[styles.pageWrapper, styles.flex1, styles.flexColumn, styles.alignItemsCenter, styles.justifyContentCenter]}> | ||
| <Icon | ||
| src={Illustrations.TadaBlue} | ||
| height={100} | ||
| width={100} | ||
| fill={defaultTheme.iconSuccessFill} | ||
| /> | ||
| <View style={[styles.ph5]}> | ||
| <Text style={[styles.mt5, styles.h1, styles.textAlignCenter]}> | ||
| {this.props.translate('activateStep.activatedTitle')} | ||
| </Text> | ||
| <Text style={[styles.mt3, styles.textAlignCenter]}> | ||
| {this.props.translate('activateStep.activatedMessage')} | ||
| </Text> | ||
| </View> | ||
| </View> | ||
| <FixedFooter> | ||
| <Button | ||
| text={this.props.translate('common.continue')} | ||
|
There was a problem hiding this comment. Not a big deal but we can probably adjust this now or in a follow up PR. There was a problem hiding this comment. Yeah at the moment I don't see how we would do that so I don't mind if we do this in a follow-up PR. |
||
| onPress={PaymentMethods.continueSetup} | ||
|
There was a problem hiding this comment. Haven't tested but just wanted to confirm if clicking this will lead the user back to the action they were previously taking i.e. paying via the wallet or transferring their wallet balance? There was a problem hiding this comment. This is a huge pain to test on dev for some reason, but yes. It calls this function, which at the bottom ends up calling the Screen.Recording.2022-08-22.at.3.38.56.PM.mov |
||
| style={[styles.mt4]} | ||
| iconStyles={[styles.mr5]} | ||
| success | ||
| /> | ||
| </FixedFooter> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <ScreenWrapper> | ||
| <HeaderWithCloseButton | ||
| title={this.props.translate('activateStep.headerTitle')} | ||
| onCloseButtonPress={() => Navigation.dismissModal()} | ||
| shouldShowBackButton | ||
| onBackButtonPress={() => Navigation.goBack()} | ||
| /> | ||
| <View style={[styles.mh5, styles.flex1]}> | ||
francoisl marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {this.props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD && this.renderGoldWalletActivationStep()} | ||
| {this.props.userWallet.tierName === CONST.WALLET.TIER_NAME.SILVER && ( | ||
| <Text>{this.props.translate('activateStep.checkBackLater')}</Text> | ||
| )} | ||
|
Comment on lines
+80
to
+82
There was a problem hiding this comment. Created an issue for a mockup for the Doesn't have to be part of this PR, can be a follow up improvement. |
||
| </View> | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| ActivateStep.propTypes = propTypes; | ||
| ActivateStep.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,13 +2,14 @@ import React from 'react'; | |
| import {ScrollView} from 'react-native'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import PropTypes from 'prop-types'; | ||
| import lodashGet from 'lodash/get'; | ||
| import _ from 'underscore'; | ||
| import HeaderWithCloseButton from '../../components/HeaderWithCloseButton'; | ||
| import Navigation from '../../libs/Navigation/Navigation'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; | ||
| import styles from '../../styles/styles'; | ||
| import Button from '../../components/Button'; | ||
| import * as BankAccounts from '../../libs/actions/BankAccounts'; | ||
| import TextLink from '../../components/TextLink'; | ||
| import compose from '../../libs/compose'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
|
|
@@ -20,15 +21,15 @@ import LongTermsForm from './TermsPage/LongTermsForm'; | |
| const propTypes = { | ||
| /** Comes from Onyx. Information about the terms for the wallet */ | ||
| walletTerms: PropTypes.shape({ | ||
| /** Any additional error message to show */ | ||
| errors: PropTypes.objectOf(PropTypes.string), | ||
| }), | ||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| walletTerms: { | ||
| errors: null, | ||
| }, | ||
| }; | ||
|
|
||
|
|
@@ -64,6 +65,7 @@ class TermsStep extends React.Component { | |
| } | ||
|
|
||
| render() { | ||
| const errors = lodashGet(this.props, 'walletTerms.errors', {}); | ||
| return ( | ||
| <> | ||
| <HeaderWithCloseButton | ||
|
|
@@ -112,11 +114,15 @@ class TermsStep extends React.Component { | |
| {this.props.translate('common.error.acceptedTerms')} | ||
| </Text> | ||
| )} | ||
| {!_.isEmpty(errors) && ( | ||
| <Text style={[styles.formError, styles.mb2]}> | ||
| {_.last(_.values(errors))} | ||
| </Text> | ||
| )} | ||
| <Button | ||
|
There was a problem hiding this comment. Let's replace the Button component with the FormAlertWithSubmitButton. It's more consistent with all other forms and we can get rid of these lines const bool isButtonDisabled = !this.state.hasAcceptedDisclosure || !this.state.hasAcceptedPrivacyPolicyAndWalletAgreement;
...
<FormAlertWithSubmitButton
buttonText={this.props.translate('termsStep.enablePayments')}
onSubmit={() => {
if (!this.state.hasAcceptedDisclosure
|| !this.state.hasAcceptedPrivacyPolicyAndWalletAgreement) {
this.setState({error: true});
return;
}
this.setState({error: false});
BankAccounts.acceptWalletTerms({
hasAcceptedTerms: this.state.hasAcceptedDisclosure
&& this.state.hasAcceptedPrivacyPolicyAndWalletAgreement,
});
}}
isDisabled={isButtonDisabled || this.props.network.isOffline}
message={this.state.error ? this.props.translate('common.error.acceptedTerms') : !_.isEmpty(errors) ? _.last(_.values(errors)) : ''}
isAlertVisible={this.state.error || !_.isEmpty(errors)}
/>
|
||
| success | ||
| style={[styles.mv4]} | ||
| text={this.props.translate('termsStep.enablePayments')} | ||
| onPress={() => { | ||
| if (!this.state.hasAcceptedDisclosure | ||
| || !this.state.hasAcceptedPrivacyPolicyAndWalletAgreement) { | ||
|
|
@@ -125,7 +131,7 @@ class TermsStep extends React.Component { | |
| } | ||
|
|
||
| this.setState({error: false}); | ||
| BankAccounts.acceptWalletTerms({ | ||
| hasAcceptedTerms: this.state.hasAcceptedDisclosure | ||
| && this.state.hasAcceptedPrivacyPolicyAndWalletAgreement, | ||
| }); | ||
|
|
@@ -144,7 +150,6 @@ export default compose( | |
| withOnyx({ | ||
| walletTerms: { | ||
| key: ONYXKEYS.WALLET_TERMS, | ||
| }, | ||
| }), | ||
| )(TermsStep); | ||
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.