From 9af4d78c4498dd81b201ae74a42661a1f0d4b497 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:13:03 -0800
Subject: [PATCH 1/2] Merge pull request #6934 from
 Expensify/version-BUILD-26c0c2ea0e4ac0ba4f4f34a2099e12833b615ba7

(cherry picked from commit 9585da9a2aec9652a21342a789ffada51ed83649)
---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3c1ffdeddb53..3198bc1b1c6d 100644
--- 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 1001012400
-        versionName "1.1.24-0"
+        versionCode 1001012401
+        versionName "1.1.24-1"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 7d101f41f630..f77a5e88a30b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/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>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f387b22d5efb..81ae62bc484f 100644
--- 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.24.0</string>
+	<string>1.1.24.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 8dd64666ef05..e5655d31372c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.24-0",
+  "version": "1.1.24-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6890aa4b777e..74241145f967 100644
--- a/package.json
+++ b/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.",

From 009be7627e18952997e50bbae27b384a45467f80 Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:10:35 -0300
Subject: [PATCH 2/2] Merge pull request #6930 from
 mananjadhav/fix/street-placeholder

[No QA] fix: Added translate key for street name based on the form

(cherry picked from commit 26c0c2ea0e4ac0ba4f4f34a2099e12833b615ba7)
---
 src/pages/ReimbursementAccount/AddressForm.js  | 6 +++++-
 src/pages/ReimbursementAccount/CompanyStep.js  | 1 +
 src/pages/ReimbursementAccount/IdentityForm.js | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/AddressForm.js b/src/pages/ReimbursementAccount/AddressForm.js
index acfcc5d8650f..af9f28d41a2c 100644
--- a/src/pages/ReimbursementAccount/AddressForm.js
+++ b/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}
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 358462dca5ea..f28a65701802 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/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,
diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index c755b454e99f..25bca5fef707 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/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}