Merge branch 'main' of https://github.com/hurali97/Expensify-App into…

… perf/optimise-composer-send

src/libs/ReportUtils.ts

@@ -1116,24 +1116,14 @@ function getReportRecipientAccountIDs(report: OnyxEntry<Report>, currentLoginAcc
 
 /**
  * Whether the time row should be shown for a report.
- * @param {Object} report
- * @return {Boolean}
  */
-function canShowReportRecipientLocalTime(report) {
-    const reportRecipientAccountIDs = getReportRecipientAccountIDs(report, currentUserAccountID);
+function canShowReportRecipientLocalTime(report: OnyxEntry<Report>, accountID: number): boolean {
+    const reportRecipientAccountIDs = getReportRecipientAccountIDs(report, accountID);
     const hasMultipleParticipants = reportRecipientAccountIDs.length > 1;
-    const reportRecipient = allPersonalDetails[reportRecipientAccountIDs[0]];
-    const reportRecipientTimezone = lodashGet(reportRecipient, 'timezone', CONST.DEFAULT_TIME_ZONE);
-    const isReportParticipantValidated = lodashGet(reportRecipient, 'validated', false);
-    return Boolean(
-        !hasMultipleParticipants &&
-            !isChatRoom(report) &&
-            !isPolicyExpenseChat(report) &&
-            reportRecipient &&
-            reportRecipientTimezone &&
-            reportRecipientTimezone.selected &&
-            isReportParticipantValidated,
-    );
+    const reportRecipient = allPersonalDetails?.[reportRecipientAccountIDs[0]];
+    const reportRecipientTimezone = reportRecipient?.timezone ?? CONST.DEFAULT_TIME_ZONE;
+    const isReportParticipantValidated = reportRecipient?.validated ?? false;
+    return Boolean(!hasMultipleParticipants && !isChatRoom(report) && !isPolicyExpenseChat(report) && reportRecipient && reportRecipientTimezone?.selected && isReportParticipantValidated);
 }
 
 /**
@@ -1174,20 +1164,16 @@ function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
 /**
  * Returns the appropriate icons for the given chat report using the stored personalDetails.
  * The Avatar sources can be URLs or Icon components according to the chat type.
- *
- * @param {Array} participants
- * @param {Object} passedPersonalDetails
- * @returns {Array<*>}
  */
-function getIconsForParticipants(participants, passedPersonalDetails) {
-    const participantDetails = [];
+function getIconsForParticipants(participants: number[], passedPersonalDetails: OnyxCollection<PersonalDetails>): Icon[] {
+    const participantDetails: ParticipantDetails[] = [];
     const participantsList = participants || [];
-    const personalDetails = passedPersonalDetails || allPersonalDetails;
-    for (let i = 0; i < participantsList.length; i++) {
-        const accountID = participantsList[i];
-        const avatarSource = UserUtils.getAvatar(lodashGet(personalDetails, [accountID, 'avatar'], ''), accountID);
-        const displayNameLogin = lodashGet(personalDetails, [accountID, 'displayName']) || lodashGet(personalDetails, [accountID, 'login'], '');
-        participantDetails.push([accountID, displayNameLogin, avatarSource, lodashGet(personalDetails, [accountID, 'fallBackIcon'])]);
+    const personalDetails = passedPersonalDetails ?? allPersonalDetails;
+
+    for (const accountID of participantsList) {
+        const avatarSource = UserUtils.getAvatar(personalDetails?.[accountID]?.avatar ?? '', accountID);
+        const displayNameLogin = personalDetails?.[accountID]?.displayName ? personalDetails?.[accountID]?.displayName : personalDetails?.[accountID]?.login;
+        participantDetails.push([accountID, displayNameLogin ?? '', avatarSource, personalDetails?.[accountID]?.fallbackIcon ?? '']);
     }
 
     const sortedParticipantDetails = participantDetails.sort((first, second) => {
@@ -1241,26 +1227,25 @@ function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> =
 /**
  * Returns the appropriate icons for the given chat report using the stored personalDetails.
  * The Avatar sources can be URLs or Icon components according to the chat type.
- *
- * @param {Object} report
- * @param {*} [defaultIcon]
- * @param {String} [defaultName]
- * @param {Number} [defaultAccountID]
- * @param {Object} [policy]
- * @param {Object} passedPersonalDetails
- * @returns {Array<*>}
- */
-function getIcons(report, defaultIcon = null, defaultName = '', defaultAccountID = -1, policy = undefined, passedPersonalDetails = allPersonalDetails) {
-    const personalDetails = passedPersonalDetails;
-    if (_.isEmpty(report)) {
-        const fallbackIcon = {
-            source: defaultIcon || Expensicons.FallbackAvatar,
+ */
+function getIcons(
+    report: OnyxEntry<Report>,
+    defaultIcon: UserUtils.AvatarSource | null = null,
+    defaultName = '',
+    defaultAccountID = -1,
+    policy: OnyxEntry<Policy> = null,
+    passedPersonalDetails: OnyxCollection<PersonalDetails> = allPersonalDetails,
+): Icon[] {
+    if (isEmptyObject(report)) {
+        const fallbackIcon: Icon = {
+            source: defaultIcon ?? Expensicons.FallbackAvatar,
             type: CONST.ICON_TYPE_AVATAR,
             name: defaultName,
             id: defaultAccountID,
         };
         return [fallbackIcon];
     }
+    const personalDetails = passedPersonalDetails;
     if (isExpenseRequest(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
         const workspaceIcon = getWorkspaceIcon(report, policy);

src/libs/SidebarUtils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable rulesdir/prefer-underscore-method */
 import Str from 'expensify-common/lib/str';
-import Onyx, {OnyxEntry} from 'react-native-onyx';
+import Onyx, {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';

src/pages/home/report/ReportActionCompose/SuggestionMention.js

@@ -56,7 +56,7 @@ function SuggestionMention({
      * hence we don't have to use it with `withOnyx`.
      */
     const personalDetails = PersonalDetailsUtils.getPersonalDetails();
-    const {translate} = useLocalize();
+    const {translate, formatPhoneNumber} = useLocalize();
     const previousValue = usePrevious(value);
     const [suggestionValues, setSuggestionValues] = useState(defaultSuggestionsValues);