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

…6419

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011601
-        versionName "1.1.16-1"
+        versionCode 1001011602
+        versionName "1.1.16-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.16.1</string>
+	<string>1.1.16.2</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.16.1</string>
+	<string>1.1.16.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.16-1",
+  "version": "1.1.16-2",
   "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/components/ReportWelcomeText.js

@@ -10,6 +10,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import {getPersonalDetailsForLogins} from '../libs/OptionsListUtils';
 import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
 
 
 const personalDetailsPropTypes = PropTypes.shape({
@@ -53,10 +54,15 @@ const ReportWelcomeText = (props) => {
             const longName = displayName || Str.removeSMSDomain(login);
             const longNameLocalized = Str.isSMSLogin(longName) ? props.toLocalPhone(longName) : longName;
             const shortName = firstName || longNameLocalized;
+            let finalPronouns = pronouns;
+            if (pronouns && pronouns.startsWith(CONST.PRONOUNS.PREFIX)) {
+                const localeKey = pronouns.replace(CONST.PRONOUNS.PREFIX, '');
+                finalPronouns = props.translate(`pronouns.${localeKey}`);
+            }
             return {
                 displayName: isMultipleParticipant ? shortName : longNameLocalized,
                 tooltip: Str.removeSMSDomain(login),
-                pronouns,
+                pronouns: finalPronouns,
             };
         },
     );