Merge pull request #5923 from Expensify/maria-fix-incorporation-state…

…-and-date-fields Place incorporation date and state fields in the Company information form on separate rows to avoid overflowing labels (cherry picked from commit c7812ac)
Expensify · Oct 19, 2021 · b700600 · b700600
1 parent 52cd782
commit b700600
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -250,25 +250,23 @@ class CompanyStep extends React.Component {
                             hasError={this.getErrors().incorporationType}
                         />
                     </View>
-                    <View style={[styles.flexRow, styles.mt4]}>
-                        <View style={[styles.flex1, styles.mr2]}>
-                            <DatePicker
-                                label={this.props.translate('companyStep.incorporationDate')}
-                                onChange={value => this.clearErrorAndSetValue('incorporationDate', value)}
-                                value={this.state.incorporationDate}
-                                placeholder={this.props.translate('companyStep.incorporationDatePlaceholder')}
-                                errorText={this.getErrorText('incorporationDate')}
-                                translateX={-14}
-                            />
-                        </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}
-                            />
-                        </View>
+                    <View style={styles.mt4}>
+                        <DatePicker
+                            label={this.props.translate('companyStep.incorporationDate')}
+                            onChange={value => this.clearErrorAndSetValue('incorporationDate', value)}
+                            value={this.state.incorporationDate}
+                            placeholder={this.props.translate('companyStep.incorporationDatePlaceholder')}
+                            errorText={this.getErrorText('incorporationDate')}
+                            translateX={-14}
+                        />
+                    </View>
+                    <View style={styles.mt4}>
+                        <StatePicker
+                            label={this.props.translate('companyStep.incorporationState')}
+                            onChange={value => this.clearErrorAndSetValue('incorporationState', value)}
+                            value={this.state.incorporationState}
+                            hasError={this.getErrors().incorporationState}
+                        />
                     </View>
                     <CheckboxWithLabel
                         isChecked={this.state.hasNoConnectionToCannabis}