Merge pull request Expensify#43201 from Expensify/revert-42554-fix/is…

…sue-41519-get-all-ancestors
kmbcook · Jun 6, 2024 · 01c418d · 01c418d
2 parents 4c86fbf + f042edc
commit 01c418d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -6506,23 +6506,33 @@ function getAllAncestorReportActions(report: Report | null | undefined): Ancesto
     let parentReportID = report.parentReportID;
     let parentReportActionID = report.parentReportActionID;
 
+    // Store the child of parent report
+    let currentReport = report;
+
     while (parentReportID) {
         const parentReport = getReport(parentReportID);
         const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '0');
 
-        if (!parentReport || !parentReportAction || ReportActionsUtils.isTransactionThread(parentReportAction) || ReportActionsUtils.isReportPreviewAction(parentReportAction)) {
+        if (!parentReportAction || ReportActionsUtils.isTransactionThread(parentReportAction) || ReportActionsUtils.isReportPreviewAction(parentReportAction)) {
             break;
         }
 
         const isParentReportActionUnread = ReportActionsUtils.isCurrentActionUnread(parentReport ?? {}, parentReportAction);
         allAncestors.push({
-            report: parentReport,
+            report: currentReport,
             reportAction: parentReportAction,
             shouldDisplayNewMarker: isParentReportActionUnread,
         });
 
+        if (!parentReport) {
+            break;
+        }
+
         parentReportID = parentReport?.parentReportID;
         parentReportActionID = parentReport?.parentReportActionID;
+        if (!isEmptyObject(parentReport)) {
+            currentReport = parentReport;
+        }
     }
 
     return allAncestors.reverse();

diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
@@ -812,10 +812,10 @@ describe('ReportUtils', () => {
 
         it('should return correctly all ancestors of a thread report', () => {
             const resultAncestors = [
-                {report: reports[0], reportAction: reportActions[0], shouldDisplayNewMarker: false},
-                {report: reports[1], reportAction: reportActions[1], shouldDisplayNewMarker: false},
-                {report: reports[2], reportAction: reportActions[2], shouldDisplayNewMarker: false},
-                {report: reports[3], reportAction: reportActions[3], shouldDisplayNewMarker: false},
+                {report: reports[1], reportAction: reportActions[0], shouldDisplayNewMarker: false},
+                {report: reports[2], reportAction: reportActions[1], shouldDisplayNewMarker: false},
+                {report: reports[3], reportAction: reportActions[2], shouldDisplayNewMarker: false},
+                {report: reports[4], reportAction: reportActions[3], shouldDisplayNewMarker: false},
             ];
 
             expect(ReportUtils.getAllAncestorReportActions(reports[4])).toEqual(resultAncestors);