Fix - Header link takes 2 steps back to expense report when reply is created in transaction thread

Author: dmkt9

src/libs/ReportUtils.ts

@@ -154,6 +154,7 @@ import {
     getReportActionHtml,
     getReportActionMessage as getReportActionMessageReportUtils,
     getReportActionMessageText,
+    getReportActions,
     getReportActionText,
     getRetractedMessage,
     getTravelUpdateMessage,
@@ -8631,9 +8632,9 @@ function navigateToLinkedReportAction(ancestor: Ancestor, isInNarrowPaneModal: b
     const parentReportAction = getReportAction(ancestor.report.parentReportID, ancestor.report.parentReportActionID);
 
     let newAncestor = ancestor;
-    // If `parentReport` is an IOU or Expense report, navigate directly to `parentReport`,
+    // If `parentReport` is an money report with one transaction, navigate directly to `parentReport`,
     // preventing redundant navigation when threading back to the parent chat thread
-    if (parentReport && parentReportAction && (isIOUReport(parentReport) || isExpenseReport(parentReport))) {
+    if (parentReport && parentReportAction && !!getOneTransactionThreadReportID(parentReport, getReportOrDraftReport(parentReport.chatReportID), getReportActions(parentReport))) {
         newAncestor = {
             ...ancestor,
             report: parentReport,
@@ -11252,6 +11253,7 @@ export {
     hasReportBeenReopened,
     getMoneyReportPreviewName,
     getNextApproverAccountID,
+    isOneTransactionReport,
 };
 
 export type {

src/pages/home/HeaderView.tsx

@@ -34,6 +34,7 @@ import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
+import {getOneTransactionThreadReportID, getReportActions} from '@libs/ReportActionsUtils';
 import {
     canJoinChat,
     canUserPerformWriteAction,
@@ -46,6 +47,7 @@ import {
     getPolicyName,
     getReportDescription,
     getReportName,
+    getReportOrDraftReport,
     hasReportNameError,
     isAdminRoom,
     isArchivedReport,
@@ -54,10 +56,8 @@ import {
     isChatUsedForOnboarding as isChatUsedForOnboardingReportUtils,
     isCurrentUserSubmitter,
     isDeprecatedGroupDM,
-    isExpenseReport,
     isExpenseRequest,
     isGroupChat as isGroupChatReportUtils,
-    isIOUReport,
     isOpenTaskReport,
     isPolicyExpenseChat as isPolicyExpenseChatReportUtils,
     isSelfDM as isSelfDMReportUtils,
@@ -140,7 +140,10 @@ function HeaderView({report, parentReportAction, onNavigationMenuButtonClicked,
     const isTaskReport = isTaskReportReportUtils(report);
     const [parentOfParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.parentReportID}`, {canBeMissing: true});
     const reportHeaderData =
-        ((!isTaskReport && !isChatThread) || (parentOfParentReport && (isIOUReport(parentOfParentReport) || isExpenseReport(parentOfParentReport)))) && report?.parentReportID
+        ((!isTaskReport && !isChatThread) ||
+            (parentOfParentReport &&
+                !!getOneTransactionThreadReportID(parentOfParentReport, getReportOrDraftReport(parentOfParentReport?.chatReportID), getReportActions(parentOfParentReport)))) &&
+        report?.parentReportID
             ? parentReport
             : report;
     // Use sorted display names for the title for group chats on native small screen widths