Merge pull request #6935 from Expensify/OSBotify-cherry-pick-staging-…

…6930

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012400
-        versionName "1.1.24-0"
+        versionCode 1001012401
+        versionName "1.1.24-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.24.0</string>
+	<string>1.1.24.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.24.0</string>
+	<string>1.1.24.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.24-0",
+  "version": "1.1.24-1",
   "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.",

src/pages/ReimbursementAccount/AddressForm.js

@@ -10,6 +10,10 @@ import StatePicker from '../../components/StatePicker';
 import Text from '../../components/Text';
 
 const propTypes = {
+
+    /** Translate key for Street name */
+    streetTranslationKey: PropTypes.string.isRequired,
+
     /** Callback fired when a field changes. Passes args as {[fieldName]: val} */
     onFieldChange: PropTypes.func.isRequired,
 
@@ -47,7 +51,7 @@ const defaultProps = {
 const AddressForm = props => (
     <>
         <AddressSearch
-            label={props.translate('common.personalAddress')}
+            label={props.translate(props.streetTranslationKey)}
             containerStyles={[styles.mt4]}
             value={props.values.street}
             onChange={props.onFieldChange}

src/pages/ReimbursementAccount/CompanyStep.js

@@ -205,6 +205,7 @@ class CompanyStep extends React.Component {
                         errorText={this.getErrorText('companyName')}
                     />
                     <AddressForm
+                        streetTranslationKey="common.companyAddress"
                         values={{
                             street: this.state.addressStreet,
                             city: this.state.addressCity,

src/pages/ReimbursementAccount/IdentityForm.js

@@ -108,6 +108,7 @@ const IdentityForm = (props) => {
                 maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
             />
             <AddressForm
+                streetTranslationKey="common.personalAddress"
                 values={props.values}
                 errors={props.errors}
                 onFieldChange={props.onFieldChange}