-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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 #12142 from Expensify/beaman-newDisplayNamePage
Add new Display Name page
- Loading branch information
Showing
10 changed files
with
188 additions
and
2 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
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
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,128 @@ | ||
| import lodashGet from 'lodash/get'; | ||
| import React, {Component} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails'; | ||
| import ScreenWrapper from '../../../components/ScreenWrapper'; | ||
| import HeaderWithCloseButton from '../../../components/HeaderWithCloseButton'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; | ||
| import * as Localize from '../../../libs/Localize'; | ||
| import ROUTES from '../../../ROUTES'; | ||
| import Form from '../../../components/Form'; | ||
| import ONYXKEYS from '../../../ONYXKEYS'; | ||
| import CONST from '../../../CONST'; | ||
| import * as ValidationUtils from '../../../libs/ValidationUtils'; | ||
| import TextInput from '../../../components/TextInput'; | ||
| import Text from '../../../components/Text'; | ||
| import styles from '../../../styles/styles'; | ||
| import Navigation from '../../../libs/Navigation/Navigation'; | ||
| import * as PersonalDetails from '../../../libs/actions/PersonalDetails'; | ||
| import compose from '../../../libs/compose'; | ||
|
|
||
| const propTypes = { | ||
| ...withLocalizePropTypes, | ||
| ...withCurrentUserPersonalDetailsPropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| ...withCurrentUserPersonalDetailsDefaultProps, | ||
| }; | ||
|
|
||
| class DisplayNamePage extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
|
|
||
| this.validate = this.validate.bind(this); | ||
| this.updateDisplayName = this.updateDisplayName.bind(this); | ||
| } | ||
|
|
||
| /** | ||
| * Submit form to update user's first and last name (and display name) | ||
| * @param {Object} values | ||
| * @param {String} values.firstName | ||
| * @param {String} values.lastName | ||
| */ | ||
| updateDisplayName(values) { | ||
| PersonalDetails.updateDisplayName( | ||
| values.firstName.trim(), | ||
| values.lastName.trim(), | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param {Object} values | ||
| * @param {String} values.firstName | ||
| * @param {String} values.lastName | ||
| * @returns {Object} - An object containing the errors for each inputID | ||
| */ | ||
| validate(values) { | ||
| const errors = {}; | ||
|
|
||
| const [hasFirstNameError, hasLastNameError] = ValidationUtils.doesFailCharacterLimitAfterTrim( | ||
| CONST.FORM_CHARACTER_LIMIT, | ||
| [values.firstName, values.lastName], | ||
| ); | ||
|
|
||
| if (hasFirstNameError) { | ||
| errors.firstName = Localize.translateLocal('personalDetails.error.characterLimit', {limit: CONST.FORM_CHARACTER_LIMIT}); | ||
| } | ||
|
|
||
| if (hasLastNameError) { | ||
| errors.lastName = Localize.translateLocal('personalDetails.error.characterLimit', {limit: CONST.FORM_CHARACTER_LIMIT}); | ||
| } | ||
|
|
||
| return errors; | ||
| } | ||
|
|
||
| render() { | ||
| const currentUserDetails = this.props.currentUserPersonalDetails || {}; | ||
|
|
||
| return ( | ||
| <ScreenWrapper> | ||
| <HeaderWithCloseButton | ||
| title={this.props.translate('displayNamePage.headerTitle')} | ||
| shouldShowBackButton | ||
| onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS_PROFILE)} | ||
| onCloseButtonPress={() => Navigation.dismissModal(true)} | ||
| /> | ||
| <Form | ||
| style={[styles.flexGrow1, styles.ph5]} | ||
| formID={ONYXKEYS.FORMS.DISPLAY_NAME_FORM} | ||
| validate={this.validate} | ||
| onSubmit={this.updateDisplayName} | ||
| submitButtonText={this.props.translate('common.save')} | ||
| enabledWhenOffline | ||
| > | ||
| <Text style={[styles.mb6]}> | ||
| {this.props.translate('displayNamePage.isShownOnProfile')} | ||
| </Text> | ||
| <View style={styles.mb4}> | ||
| <TextInput | ||
| inputID="firstName" | ||
| name="fname" | ||
| label={this.props.translate('common.firstName')} | ||
| defaultValue={lodashGet(currentUserDetails, 'firstName', '')} | ||
| placeholder={this.props.translate('displayNamePage.john')} | ||
| /> | ||
| </View> | ||
| <View> | ||
| <TextInput | ||
| inputID="lastName" | ||
| name="lname" | ||
| label={this.props.translate('common.lastName')} | ||
| defaultValue={lodashGet(currentUserDetails, 'lastName', '')} | ||
| placeholder={this.props.translate('displayNamePage.doe')} | ||
| /> | ||
| </View> | ||
| </Form> | ||
| </ScreenWrapper> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| DisplayNamePage.propTypes = propTypes; | ||
| DisplayNamePage.defaultProps = defaultProps; | ||
|
|
||
| export default compose( | ||
| withLocalize, | ||
| withCurrentUserPersonalDetails, | ||
| )(DisplayNamePage); |
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