Update Address search - show all inputs #6569
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 |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import PropTypes from 'prop-types'; | ||
| import ExpensiTextInput from '../../components/ExpensiTextInput'; | ||
| import AddressSearch from '../../components/AddressSearch'; | ||
| import styles from '../../styles/styles'; | ||
| import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; | ||
| import CONST from '../../CONST'; | ||
| import StatePicker from '../../components/StatePicker'; | ||
| import Text from '../../components/Text'; | ||
|
|
||
| const propTypes = { | ||
| /** Callback fired when a field changes. Passes args as {[fieldName]: val} */ | ||
| onFieldChange: PropTypes.func.isRequired, | ||
|
|
||
| /** Form values */ | ||
| values: PropTypes.shape({ | ||
| /** Address street field */ | ||
| street: PropTypes.string, | ||
|
|
||
| /** Address city field */ | ||
| city: PropTypes.string, | ||
|
|
||
| /** Address state field */ | ||
| state: PropTypes.string, | ||
|
|
||
| /** Address zip code field */ | ||
| zipCode: PropTypes.string, | ||
| }), | ||
|
|
||
| /** Any errors that can arise from form validation */ | ||
| errors: PropTypes.objectOf(PropTypes.bool), | ||
|
|
||
| ...withLocalizePropTypes, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| values: { | ||
| street: '', | ||
| city: '', | ||
| state: '', | ||
| zipCode: '', | ||
| }, | ||
| errors: {}, | ||
| }; | ||
|
|
||
| const AddressForm = props => ( | ||
|
Contributor
There was a problem hiding this comment. Thanks for refactoring this! |
||
| <> | ||
| <AddressSearch | ||
| label={props.translate('common.personalAddress')} | ||
| containerStyles={[styles.mt4]} | ||
| value={props.values.street} | ||
| onChange={props.onFieldChange} | ||
| errorText={props.errors.street ? props.translate('bankAccount.error.addressStreet') : ''} | ||
| /> | ||
| <Text style={[styles.mutedTextLabel, styles.mt1]}>{props.translate('common.noPO')}</Text> | ||
| <View style={[styles.flexRow, styles.mt4]}> | ||
| <View style={[styles.flex2, styles.mr2]}> | ||
| <ExpensiTextInput | ||
| label={props.translate('common.city')} | ||
| value={props.values.city} | ||
| onChangeText={value => props.onFieldChange({city: value})} | ||
| errorText={props.errors.city ? props.translate('bankAccount.error.addressCity') : ''} | ||
| /> | ||
| </View> | ||
| <View style={[styles.flex1]}> | ||
| <StatePicker | ||
| value={props.values.state} | ||
| onChange={value => props.onFieldChange({state: value})} | ||
| errorText={props.errors.state ? props.translate('bankAccount.error.addressState') : ''} | ||
| hasError={Boolean(props.errors.state)} | ||
| /> | ||
| </View> | ||
| </View> | ||
| <ExpensiTextInput | ||
| label={props.translate('common.zip')} | ||
| containerStyles={[styles.mt4]} | ||
| keyboardType={CONST.KEYBOARD_TYPE.NUMERIC} | ||
| value={props.values.zipCode} | ||
| onChangeText={value => props.onFieldChange({zipCode: value})} | ||
| errorText={props.errors.zipCode ? props.translate('bankAccount.error.zipCode') : ''} | ||
| maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE} | ||
| /> | ||
| </> | ||
| ); | ||
|
|
||
| AddressForm.propTypes = propTypes; | ||
| AddressForm.defaultProps = defaultProps; | ||
| AddressForm.displayName = 'AddressForm'; | ||
| export default withLocalize(AddressForm); | ||
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.
NAB, should we trim
props.value.lengthin case there is whitespace that makes it longer but less accurate?Also, I wonder if we need to worry about a case like this where someone enters some very long address into the street input. I feel like in trying to optimize for the Apartment # case we are maybe introducing the possibility of bad street info instead of trusting the correctness of what Google Places returns.
Here's an example of what I mean:
I think we can maybe wait and see if this is a problem...
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.
I honestly don't like it either, I think the ideal case is to have the Apt number in a separate field. As @luacmartins , this also causes the autocomplete to start showing results while the user may be only trying to input the apt number and it looks weird :P. Having said that, if we wanted to do a separate input for it, I think that should be done in a separate pr/issue.