Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change State field in Company Info to 'Incorporation state' #5748

Merged
merged 1 commit into from
Oct 11, 2021
Merged

Change State field in Company Info to 'Incorporation state' #5748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/StatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ const STATES = _.map(CONST.STATES, ({stateISO}) => ({
}));

const propTypes = {
/** The label for the field */
label: PropTypes.string,

/** A callback method that is called when the value changes and it received the selected value as an argument */
onChange: PropTypes.func.isRequired,

Expand All @@ -21,6 +24,7 @@ const propTypes = {
};

const defaultProps = {
label: '',
value: '',
};

Expand All @@ -30,7 +34,7 @@ const StatePicker = props => (
items={STATES}
onChange={props.onChange}
value={props.value}
label={props.translate('common.state')}
label={props.label || props.translate('common.state')}
hasError={props.hasError}
errorText={props.errorText}
/>
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ export default {
taxIDNumberPlaceholder: '9 digits, no hyphens',
companyType: 'Company type',
incorporationDate: 'Incorporation date',
incorporationState: 'Incorporation state',
industryClassificationCode: 'Industry classification code',
confirmCompanyIsNot: 'I confirm that this company is not on the',
listOfRestrictedBusinesses: 'list of restricted businesses',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@ export default {
taxIDNumberPlaceholder: '9 dígitos, sin guiones',
companyType: 'Tipo de empresa',
incorporationDate: 'Fecha de incorporación',
incorporationState: 'Estado de incorporación',
industryClassificationCode: 'Código de clasificación industrial',
confirmCompanyIsNot: 'Confirmo que esta empresa no está en el',
listOfRestrictedBusinesses: 'lista de negocios restringidos',
Expand Down
3 changes: 2 additions & 1 deletion src/pages/ReimbursementAccount/CompanyStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ class CompanyStep extends React.Component {
/>
</View>
<View style={[styles.flexRow, styles.mt4]}>
<View style={[styles.flex2, styles.mr2]}>
<View style={[styles.flex1, styles.mr2]}>
<DatePicker
label={this.props.translate('companyStep.incorporationDate')}
onChange={value => this.clearErrorAndSetValue('incorporationDate', value)}
Expand All @@ -238,6 +238,7 @@ class CompanyStep extends React.Component {
</View>
<View style={[styles.flex1]}>
<StatePicker
label={this.props.translate('companyStep.incorporationState')}
onChange={value => this.clearErrorAndSetValue('incorporationState', value)}
value={this.state.incorporationState}
hasError={this.getErrors().incorporationState}
Expand Down