🍒 Cherry pick PR #7649 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001013701
-        versionName "1.1.37-1"
+        versionCode 1001013702
+        versionName "1.1.37-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.37.1</string>
+	<string>1.1.37.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.37.1</string>
+	<string>1.1.37.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.37-1",
+  "version": "1.1.37-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/CONST.js

@@ -282,6 +282,7 @@ const CONST = {
         HOMEPAGE_REPORTS_LOADED: 'homepage_reports_loaded',
         SWITCH_REPORT: 'switch_report',
         SIDEBAR_LOADED: 'sidebar_loaded',
+        PERSONAL_DETAILS_FORMATTED: 'personal_details_formatted',
         COLD: 'cold',
         REPORT_ACTION_ITEM_LAYOUT_DEBOUNCE_TIME: 1500,
         TOOLTIP_SENSE: 1000,

src/libs/actions/PersonalDetails.js

@@ -12,6 +12,7 @@ import * as ReportUtils from '../reportUtils';
 import * as OptionsListUtils from '../OptionsListUtils';
 import Growl from '../Growl';
 import * as Localize from '../Localize';
+import Timing from './Timing';
 
 let currentUserEmail = '';
 Onyx.connect({
@@ -82,32 +83,37 @@ function getMaxCharacterError(isError) {
  * @return {Object}
  */
 function formatPersonalDetails(personalDetailsList) {
-    return _.reduce(personalDetailsList, (finalObject, personalDetailsResponse, login) => {
+    Timing.start(CONST.TIMING.PERSONAL_DETAILS_FORMATTED);
+    const formattedResult = {};
+
+    // This method needs to be SUPER PERFORMANT because it can be called with a massive list of logins depending on the policies that someone belongs to
+    // eslint-disable-next-line rulesdir/prefer-underscore-method
+    Object.keys(personalDetailsList).forEach((login) => {
+        const personalDetailsResponse = personalDetailsList[login];
+
         // Form the details into something that has all the data in an easy to use format.
         const avatar = getAvatar(personalDetailsResponse, login);
         const displayName = getDisplayName(login, personalDetailsResponse);
-        const pronouns = lodashGet(personalDetailsResponse, 'pronouns', '');
-        const timezone = lodashGet(personalDetailsResponse, 'timeZone', CONST.DEFAULT_TIME_ZONE);
-        const firstName = lodashGet(personalDetailsResponse, 'firstName', '');
-        const lastName = lodashGet(personalDetailsResponse, 'lastName', '');
-        const payPalMeAddress = lodashGet(personalDetailsResponse, 'expensify_payPalMeAddress', '');
-        const phoneNumber = lodashGet(personalDetailsResponse, 'phoneNumber', '');
-
-        return {
-            ...finalObject,
-            [login]: {
-                login,
-                avatar,
-                displayName,
-                firstName,
-                lastName,
-                pronouns,
-                timezone,
-                payPalMeAddress,
-                phoneNumber,
-            },
+        const pronouns = personalDetailsResponse.pronouns || '';
+        const timezone = personalDetailsResponse.timeZone || CONST.DEFAULT_TIME_ZONE;
+        const firstName = personalDetailsResponse.firstName || '';
+        const lastName = personalDetailsResponse.lastName || '';
+        const payPalMeAddress = personalDetailsResponse.expensify_payPalMeAddress || '';
+        const phoneNumber = personalDetailsResponse.phoneNumber || '';
+        formattedResult[login] = {
+            login,
+            avatar,
+            displayName,
+            firstName,
+            lastName,
+            pronouns,
+            timezone,
+            payPalMeAddress,
+            phoneNumber,
         };
-    }, {});
+    });
+    Timing.end(CONST.TIMING.PERSONAL_DETAILS_FORMATTED);
+    return formattedResult;
 }
 
 /**