Merge pull request #48285 from mkzie2/mkzie2-issue-47655

Expensify · Sep 9, 2024 · fe44ab2 · fe44ab2
2 parents 7ddbd56 + a2e09ec
commit fe44ab2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -22,6 +22,7 @@ import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetails} from '@src/types/onyx';
 import OptionRowLHNData from './OptionRowLHNData';
 import type {LHNOptionsListProps, RenderItemProps} from './types';
 
@@ -148,6 +149,20 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             }
             const lastReportActionTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${lastReportActionTransactionID}`];
 
+            // SidebarUtils.getOptionData in OptionRowLHNData does not get re-evaluated when the linked task report changes, so we have the lastMessageTextFromReport evaluation logic here
+            let lastActorDetails: Partial<PersonalDetails> | null =
+                itemFullReport?.lastActorAccountID && personalDetails?.[itemFullReport.lastActorAccountID] ? personalDetails[itemFullReport.lastActorAccountID] : null;
+            if (!lastActorDetails && lastReportAction) {
+                const lastActorDisplayName = lastReportAction?.person?.[0]?.text;
+                lastActorDetails = lastActorDisplayName
+                    ? {
+                          displayName: lastActorDisplayName,
+                          accountID: itemFullReport?.lastActorAccountID,
+                      }
+                    : null;
+            }
+            const lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(itemFullReport, lastActorDetails, itemPolicy);
+
             return (
                 <OptionRowLHNData
                     reportID={reportID}
@@ -163,6 +178,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                     receiptTransactions={transactions}
                     viewMode={optionMode}
                     isFocused={!shouldDisableFocusOptions}
+                    lastMessageTextFromReport={lastMessageTextFromReport}
                     onSelectRow={onSelectRow}
                     preferredLocale={preferredLocale}
                     hasDraftComment={hasDraftComment}

diff --git a/src/components/LHNOptionsList/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHNData.tsx
@@ -28,6 +28,7 @@ function OptionRowLHNData({
     transaction,
     lastReportActionTransaction,
     transactionViolations,
+    lastMessageTextFromReport,
     ...propsToForward
 }: OptionRowLHNDataProps) {
     const reportID = propsToForward.reportID;
@@ -49,6 +50,7 @@ function OptionRowLHNData({
             policy,
             parentReportAction,
             hasViolations: !!shouldDisplayViolations || shouldDisplayReportViolations,
+            lastMessageTextFromReport,
             transactionViolations,
             invoiceReceiverPolicy,
         });
@@ -76,6 +78,7 @@ function OptionRowLHNData({
         receiptTransactions,
         invoiceReceiverPolicy,
         shouldDisplayReportViolations,
+        lastMessageTextFromReport,
     ]);
 
     return (

diff --git a/src/components/LHNOptionsList/types.ts b/src/components/LHNOptionsList/types.ts
@@ -88,6 +88,9 @@ type OptionRowLHNDataProps = {
     /** Toggle between compact and default view */
     viewMode?: OptionMode;
 
+    /** The last message text from the report */
+    lastMessageTextFromReport: string;
+
     /** A function that is called when an option is selected. Selected option is passed as a param */
     onSelectRow?: (optionItem: OptionData, popoverAnchor: RefObject<View>) => void;
 

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
@@ -240,6 +240,7 @@ function getOptionData({
     policy,
     parentReportAction,
     hasViolations,
+    lastMessageTextFromReport: lastMessageTextFromReportProp,
     transactionViolations,
     invoiceReceiverPolicy,
 }: {
@@ -250,6 +251,7 @@ function getOptionData({
     policy: OnyxEntry<Policy> | undefined;
     parentReportAction: OnyxEntry<ReportAction> | undefined;
     hasViolations: boolean;
+    lastMessageTextFromReport?: string;
     invoiceReceiverPolicy?: OnyxEntry<Policy>;
     transactionViolations?: OnyxCollection<TransactionViolation[]>;
 }): ReportUtils.OptionData | undefined {
@@ -384,7 +386,11 @@ function getOptionData({
     }
 
     const lastActorDisplayName = OptionsListUtils.getLastActorDisplayName(lastActorDetails, hasMultipleParticipants);
-    const lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(report, lastActorDetails, policy);
+
+    let lastMessageTextFromReport = lastMessageTextFromReportProp;
+    if (!lastMessageTextFromReport) {
+        lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(report, lastActorDetails, policy);
+    }
 
     // We need to remove sms domain in case the last message text has a phone number mention with sms domain.
     let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);