Error modal when signin from expired magic link #15505
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 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 |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import React, {PureComponent} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import colors from '../../styles/colors'; | ||
| import styles from '../../styles/styles'; | ||
| import Icon from '../Icon'; | ||
| import withLocalize, {withLocalizePropTypes} from '../withLocalize'; | ||
| import Text from '../Text'; | ||
| import * as Expensicons from '../Icon/Expensicons'; | ||
| import * as Illustrations from '../Icon/Illustrations'; | ||
| import variables from '../../styles/variables'; | ||
|
|
||
| const propTypes = { | ||
|
|
||
cristipaval marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| class AbracadabraModal extends PureComponent { | ||
|
There was a problem hiding this comment. NAB but this should be a functional component w/ memo, which is typically what we do for components that don't have state or use lifecycle methods. |
||
| render() { | ||
| return ( | ||
| <View style={styles.deeplinkWrapperContainer}> | ||
| <View style={styles.deeplinkWrapperMessage}> | ||
| <View style={styles.mb2}> | ||
| <Icon | ||
| width={variables.modalTopIconWidth} | ||
| height={variables.modalTopBigIconHeight} | ||
| src={Illustrations.Abracadabra} | ||
| /> | ||
| </View> | ||
| <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}> | ||
| {this.props.translate('validateCodeModal.successfulSignInTitle')} | ||
| </Text> | ||
| <View style={[styles.mt2, styles.mb2]}> | ||
| <Text style={[styles.fontSizeNormal, styles.textAlignCenter]}> | ||
| {this.props.translate('validateCodeModal.successfulSignInDescription')} | ||
| </Text> | ||
| </View> | ||
| </View> | ||
| <View style={styles.deeplinkWrapperFooter}> | ||
| <Icon | ||
| width={variables.modalWordmarkWidth} | ||
| height={variables.modalWordmarkHeight} | ||
| fill={colors.green} | ||
| src={Expensicons.ExpensifyWordmark} | ||
| /> | ||
| </View> | ||
| </View> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| AbracadabraModal.propTypes = propTypes; | ||
| export default withLocalize(AbracadabraModal); | ||
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 |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| import React, {PureComponent} from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {withOnyx} from 'react-native-onyx'; | ||
| import _, {compose} from 'underscore'; | ||
| import lodashGet from 'lodash/get'; | ||
| import {View} from 'react-native'; | ||
| import colors from '../../styles/colors'; | ||
| import styles from '../../styles/styles'; | ||
| import Icon from '../Icon'; | ||
| import withLocalize, {withLocalizePropTypes} from '../withLocalize'; | ||
| import Text from '../Text'; | ||
| import * as Expensicons from '../Icon/Expensicons'; | ||
| import * as Illustrations from '../Icon/Illustrations'; | ||
| import variables from '../../styles/variables'; | ||
| import TextLink from '../TextLink'; | ||
| import ONYXKEYS from '../../ONYXKEYS'; | ||
| import * as ErrorUtils from '../../libs/ErrorUtils'; | ||
|
|
||
| const propTypes = { | ||
|
|
||
cristipaval marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /** Whether the user can a new validate code from the current page */ | ||
| shouldShowRequestCodeLink: PropTypes.bool, | ||
|
|
||
| /** Callback to be called when user clicks the request code link */ | ||
| onRequestCodeClick: PropTypes.func, | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| shouldShowRequestCodeLink: false, | ||
| onRequestCodeClick: () => {}, | ||
| }; | ||
|
|
||
| class ExpiredValidateCodeModal extends PureComponent { | ||
| render() { | ||
| const codeRequestedMessage = lodashGet(this.props, 'account.message', null); | ||
| const accountErrors = lodashGet(this.props, 'account.errors', {}); | ||
|
There was a problem hiding this comment. NAB but I think we can simplify this part as |
||
| let codeRequestedErrors; | ||
| if (_.keys(accountErrors).length > 1) { | ||
| codeRequestedErrors = ErrorUtils.getLatestErrorMessage(this.props.account); | ||
| } | ||
| return ( | ||
| <View style={styles.deeplinkWrapperContainer}> | ||
| <View style={styles.deeplinkWrapperMessage}> | ||
| <View style={styles.mb2}> | ||
| <Icon | ||
| width={variables.modalTopIconWidth} | ||
| height={variables.modalTopIconHeight} | ||
| src={Illustrations.ToddBehindCloud} | ||
| /> | ||
| </View> | ||
| <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}> | ||
| {this.props.translate('validateCodeModal.expiredCodeTitle')} | ||
| </Text> | ||
| <View style={[styles.mt2, styles.mb2]}> | ||
| <Text style={[styles.fontSizeNormal, styles.textAlignCenter]}> | ||
| {this.props.translate('validateCodeModal.expiredCodeDescription')} | ||
| {this.props.shouldShowRequestCodeLink && !codeRequestedMessage | ||
| && ( | ||
| <> | ||
| <br /> | ||
| {this.props.translate('validateCodeModal.requestNewCode')} | ||
| {' '} | ||
| <TextLink onPress={this.props.onRequestCodeClick}> | ||
| {this.props.translate('validateCodeModal.requestNewCodeLink')} | ||
| </TextLink> | ||
| ! | ||
| </> | ||
| )} | ||
| </Text> | ||
| {this.props.shouldShowRequestCodeLink && codeRequestedErrors | ||
| && ( | ||
| <Text style={[styles.textDanger, styles.validateCodeMessage]}> | ||
| <br /> | ||
| <br /> | ||
|
|
||
| {codeRequestedErrors} | ||
|
|
||
cristipaval marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </Text> | ||
| )} | ||
| {this.props.shouldShowRequestCodeLink && codeRequestedMessage | ||
| && ( | ||
| <Text style={styles.validateCodeMessage}> | ||
| <br /> | ||
| <br /> | ||
| {codeRequestedMessage} | ||
| </Text> | ||
| )} | ||
| </View> | ||
| </View> | ||
| <View style={styles.deeplinkWrapperFooter}> | ||
| <Icon | ||
| width={variables.modalWordmarkWidth} | ||
| height={variables.modalWordmarkHeight} | ||
| fill={colors.green} | ||
| src={Expensicons.ExpensifyWordmark} | ||
| /> | ||
| </View> | ||
| </View> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| ExpiredValidateCodeModal.propTypes = propTypes; | ||
| ExpiredValidateCodeModal.defaultProps = defaultProps; | ||
| export default compose( | ||
| withLocalize, | ||
| withOnyx({ | ||
| account: {key: ONYXKEYS.ACCOUNT}, | ||
| }), | ||
| )(ExpiredValidateCodeModal); | ||
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
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.
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.
This file is almost exactly the same as
TfaRequiredModal, and has only minimal differences with the other two components in this directory. I think it would be valuable to DRY these up by creating aValidateCodeModalLayoutcomponent, and use it in the other components you've created here.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.
hey @roryabraham ! Thanks for the review! I do agree that we can dry up the code here. I spent a lot of time on this PR due to that challenge that I was facing (
componentDidMountbeing called twice). I created components for each state just to simplify the code inVaidateLoginPage. But now it looks like I ended up having duplicate code. Now that I solved the aforementioned challenge, I totally do agree I can reuse the same component for multiple states. I created this follow-up issue for your suggested refactor.