Merge pull request #50110 from situchan/fix-50069

[CP Staging] fix wrong last message in LHN after message deletion
Expensify · Oct 2, 2024 · 312fdec · 312fdec
2 parents c3b4a65 + b585a9d
commit 312fdec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -317,11 +317,11 @@ Onyx.connect({
 
             const firstReportAction = sortedReportActions.at(0);
             if (!firstReportAction) {
-                return;
+                delete lastReportActions[reportID];
+            } else {
+                lastReportActions[reportID] = firstReportAction;
             }
 
-            lastReportActions[reportID] = firstReportAction;
-
             // The report is only visible if it is the last action not deleted that
             // does not match a closed or created state.
             const reportActionsForDisplay = sortedReportActions.filter(
@@ -334,6 +334,7 @@ Onyx.connect({
             );
             const reportActionForDisplay = reportActionsForDisplay.at(0);
             if (!reportActionForDisplay) {
+                delete lastVisibleReportActions[reportID];
                 return;
             }
             lastVisibleReportActions[reportID] = reportActionForDisplay;

diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
@@ -51,6 +51,7 @@ Onyx.connect({
 
         const reportAction = reportActionsForDisplay.at(-1);
         if (!reportAction) {
+            delete visibleReportActionItems[reportID];
             return;
         }
         visibleReportActionItems[reportID] = reportAction;