Merge pull request #6862 from Expensify/update-staging-from-main

Expensify · Dec 21, 2021 · 74a7675 · 74a7675
2 parents e3f9718 + d9b13b3
commit 74a7675
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 23 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012203
-        versionName "1.1.22-3"
+        versionCode 1001012204
+        versionName "1.1.22-4"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.22.3</string>
+	<string>1.1.22.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.22.3</string>
+	<string>1.1.22.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.22-3",
+  "version": "1.1.22-4",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -92,6 +92,8 @@ export default {
         bankAccount: 'Bank account',
         join: 'Join',
         decline: 'Decline',
+        cantFindAddress: 'Can\'t find your address? ',
+        enterManually: 'Enter it manually',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera permission required',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -92,6 +92,8 @@ export default {
         bankAccount: 'Cuenta bancaria',
         join: 'Unirse',
         decline: 'Rechazar',
+        cantFindAddress: '¿No encuentras tu dirección? ',
+        enterManually: 'Ingresar manualmente',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Se necesita permiso para usar la cámara',

diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -235,12 +235,17 @@ class CompanyStep extends React.Component {
                                 onChangeText={(fieldName, value) => this.clearErrorAndSetValue(fieldName, value)}
                                 errorText={this.getErrorText('addressStreet')}
                             />
-                            <TextLink
-                                style={[styles.textMicro]}
-                                onPress={() => this.setState({manualAddress: true})}
+                            <ExpensifyText
+                                style={[styles.textMicroSupporting, styles.pt2]}
                             >
-                                Can&apos;t find your address? Enter it manually
-                            </TextLink>
+                                {this.props.translate('common.cantFindAddress')}
+                                <TextLink
+                                    style={[styles.textMicro]}
+                                    onPress={() => this.setState({manualAddress: true})}
+                                >
+                                    {this.props.translate('common.enterManually')}
+                                </TextLink>
+                            </ExpensifyText>
                         </>
                     )}
                     {this.state.manualAddress && (

diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -178,12 +178,17 @@ const IdentityForm = (props) => {
                         onChangeText={(fieldName, value) => props.onFieldChange(fieldName, value)}
                         errorText={props.errors.street ? props.translate('bankAccount.error.addressStreet') : ''}
                     />
-                    <TextLink
-                        style={[styles.textMicro]}
-                        onPress={() => props.onFieldChange('manualAddress', true)}
+                    <ExpensifyText
+                        style={[styles.textMicroSupporting, styles.pt2]}
                     >
-                        Can&apos;t find your address? Enter it manually
-                    </TextLink>
+                        {props.translate('common.cantFindAddress')}
+                        <TextLink
+                            style={[styles.textMicro]}
+                            onPress={() => props.onFieldChange('manualAddress', true)}
+                        >
+                            {props.translate('common.enterManually')}
+                        </TextLink>
+                    </ExpensifyText>
                 </>
             )}
         </View>

diff --git a/src/pages/settings/Payments/AddDebitCardPage.js b/src/pages/settings/Payments/AddDebitCardPage.js
@@ -24,6 +24,7 @@ import FormAlertWithSubmitButton from '../../../components/FormAlertWithSubmitBu
 import ONYXKEYS from '../../../ONYXKEYS';
 import compose from '../../../libs/compose';
 import AddressSearch from '../../../components/AddressSearch';
+import StatePicker from '../../../components/StatePicker';
 
 const propTypes = {
     addDebitCardForm: PropTypes.shape({
@@ -223,13 +224,64 @@ class DebitCardPage extends Component {
                                     />
                                 </View>
                             </View>
-                            <AddressSearch
-                                label={this.props.translate('addDebitCardPage.billingAddress')}
-                                containerStyles={[styles.mt4]}
-                                value={this.state.addressStreet}
-                                onChangeText={(fieldName, value) => this.clearErrorAndSetValue(fieldName, value)}
-                                errorText={this.getErrorText('addressStreet')}
-                            />
+                            {!this.state.manualAddress && (
+                                <>
+                                    <AddressSearch
+                                        label={this.props.translate('addDebitCardPage.billingAddress')}
+                                        containerStyles={[styles.mt4]}
+                                        value={this.state.addressStreet}
+                                        onChangeText={(fieldName, value) => this.clearErrorAndSetValue(fieldName, value)}
+                                        errorText={this.getErrorText('addressStreet')}
+                                    />
+                                    <ExpensifyText
+                                        style={[styles.textMicroSupporting, styles.pt2]}
+                                    >
+                                        {this.props.translate('common.cantFindAddress')}
+                                        <TextLink
+                                            style={[styles.textMicro]}
+                                            onPress={() => this.setState({manualAddress: true})}
+                                        >
+                                            {this.props.translate('common.enterManually')}
+                                        </TextLink>
+                                    </ExpensifyText>
+                                </>
+                            )}
+                            {this.state.manualAddress && (
+                                <>
+                                    <ExpensiTextInput
+                                        label={this.props.translate('addDebitCardPage.billingAddress')}
+                                        containerStyles={[styles.mt4]}
+                                        onChangeText={value => this.clearErrorAndSetValue('addressStreet', value)}
+                                        value={this.state.addressStreet}
+                                        errorText={this.getErrorText('addressStreet')}
+                                    />
+                                    <View style={[styles.flexRow, styles.mt4]}>
+                                        <View style={[styles.flex2, styles.mr2]}>
+                                            <ExpensiTextInput
+                                                label={this.props.translate('common.city')}
+                                                onChangeText={value => this.clearErrorAndSetValue('addressCity', value)}
+                                                value={this.state.addressCity}
+                                                errorText={this.getErrorText('addressCity')}
+                                            />
+                                        </View>
+                                        <View style={[styles.flex1]}>
+                                            <StatePicker
+                                                onChange={value => this.clearErrorAndSetValue('addressState', value)}
+                                                value={this.state.addressState}
+                                                hasError={Boolean(this.getErrorText('addressState'))}
+                                            />
+                                        </View>
+                                    </View>
+                                    <ExpensiTextInput
+                                        label={this.props.translate('common.zip')}
+                                        containerStyles={[styles.mt4]}
+                                        keyboardType={CONST.KEYBOARD_TYPE.PHONE_PAD}
+                                        onChangeText={value => this.clearErrorAndSetValue('addressZipCode', value)}
+                                        value={this.state.addressZipCode}
+                                        errorText={this.getErrorText('addressZipCode')}
+                                    />
+                                </>
+                            )}
                             <CheckboxWithLabel
                                 isChecked={this.state.acceptedTerms}
                                 onPress={() => {