From 615cc5c0d8f5fffdf1b729f8002c23822ff5e333 Mon Sep 17 00:00:00 2001
From: c3024 <chaitanya3024@gmail.com>
Date: Fri, 7 Jun 2024 15:56:47 +0530
Subject: [PATCH 1/2] correct last message text in selfDM

---
 src/libs/OptionsListUtils.ts    |  2 +-
 src/libs/ReportActionsUtils.ts  | 16 ++++------------
 src/pages/home/ReportScreen.tsx |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index fef64b712ad6..4f6d4e0d97eb 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -289,7 +289,7 @@ Onyx.connect({
 
             // If the report is a one-transaction report and has , we need to return the combined reportActions so that the LHN can display modifications
             // to the transaction thread or the report itself
-            const transactionThreadReportID = ReportActionUtils.getOneTransactionThreadReportID(reportID, actions[reportActions[0]], true);
+            const transactionThreadReportID = ReportActionUtils.getOneTransactionThreadReportID(reportID, actions[reportActions[0]]);
             if (transactionThreadReportID) {
                 const transactionThreadReportActionsArray = Object.values(actions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`] ?? {});
                 sortedReportActions = ReportActionUtils.getCombinedReportActions(reportActionsArray, transactionThreadReportActionsArray, reportID);
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 1830edd91b68..b912009a4abf 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -872,18 +872,10 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
  * Gets the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions.
  * Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
  */
-function getOneTransactionThreadReportID(
-    reportID: string,
-    reportActions: OnyxEntry<ReportActions> | ReportAction[],
-    skipReportTypeCheck: boolean | undefined = undefined,
-    isOffline: boolean | undefined = undefined,
-): string | null {
-    if (!skipReportTypeCheck) {
-        // If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
-        const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
-        if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
-            return null;
-        }
+function getOneTransactionThreadReportID(reportID: string, reportActions: OnyxEntry<ReportActions> | ReportAction[], isOffline: boolean | undefined = undefined): string | null {
+    const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
+        return null;
     }
 
     const reportActionsArray = Object.values(reportActions ?? {});
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 5d747a7cfa16..dcdb6a0e8882 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -332,7 +332,7 @@ function ReportScreen({
     );
 
     const transactionThreadReportID = useMemo(
-        () => ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], false, isOffline),
+        () => ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline),
         [report.reportID, reportActions, isOffline],
     );
 

From 07a3cd677bcb161d826418b34df169fb1fcf0f92 Mon Sep 17 00:00:00 2001
From: c3024 <chaitanya3024@gmail.com>
Date: Fri, 7 Jun 2024 17:31:25 +0530
Subject: [PATCH 2/2] add back the accidentally removed comment

---
 src/libs/ReportActionsUtils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index b912009a4abf..0a832d0cfd50 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -873,6 +873,7 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
  * Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
  */
 function getOneTransactionThreadReportID(reportID: string, reportActions: OnyxEntry<ReportActions> | ReportAction[], isOffline: boolean | undefined = undefined): string | null {
+    // If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
     const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
         return null;