From 3779e7746571f746cc3919060aec30760d669f3f Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 28 Feb 2024 10:47:30 -0700
Subject: [PATCH 1/4] Remove deprecated method and pass down parentReportAction

---
 src/pages/home/ReportScreen.js                         |  1 +
 src/pages/home/report/ReportActionsList.js             |  5 +++++
 src/pages/home/report/ReportActionsListItemRenderer.js | 10 +++++++---
 src/pages/home/report/ReportActionsView.js             |  4 ++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 7fba188dcedd..da5a8e4aae27 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -561,6 +561,7 @@ function ReportScreen({
                                     <ReportActionsView
                                         reportActions={reportActions}
                                         report={report}
+                                        parentReportAction={parentReportAction}
                                         isLoadingInitialReportActions={reportMetadata.isLoadingInitialReportActions}
                                         isLoadingNewerReportActions={reportMetadata.isLoadingNewerReportActions}
                                         isLoadingOlderReportActions={reportMetadata.isLoadingOlderReportActions}
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 1da806b9c269..19bad7e61634 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -31,6 +31,9 @@ const propTypes = {
     /** The report currently being looked at */
     report: reportPropTypes.isRequired,
 
+    /** The report's parentReportAction */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
     /** Sorted actions prepared for display */
     sortedReportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)).isRequired,
 
@@ -123,6 +126,7 @@ function isMessageUnread(message, lastReadTime) {
 
 function ReportActionsList({
     report,
+    parentReportAction,
     isLoadingInitialReportActions,
     isLoadingOlderReportActions,
     isLoadingNewerReportActions,
@@ -412,6 +416,7 @@ function ReportActionsList({
         ({item: reportAction, index}) => (
             <ReportActionsListItemRenderer
                 reportAction={reportAction}
+                parentReportAction={parentReportAction}
                 index={index}
                 report={report}
                 linkedReportActionID={linkedReportActionID}
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.js b/src/pages/home/report/ReportActionsListItemRenderer.js
index 3fd6ddcef750..aa8ed9e71e2e 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.js
+++ b/src/pages/home/report/ReportActionsListItemRenderer.js
@@ -13,6 +13,9 @@ const propTypes = {
     /** All the data of the action item */
     reportAction: PropTypes.shape(reportActionPropTypes).isRequired,
 
+    /** The report's parentReportAction */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
     /** Position index of the report action in the overall report FlatList view */
     index: PropTypes.number.isRequired,
 
@@ -42,6 +45,7 @@ const defaultProps = {
 
 function ReportActionsListItemRenderer({
     reportAction,
+    parentReportAction,
     index,
     report,
     displayAsGroup,
@@ -51,9 +55,7 @@ function ReportActionsListItemRenderer({
     linkedReportActionID,
 }) {
     const shouldDisplayParentAction =
-        reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED &&
-        ReportUtils.isChatThread(report) &&
-        !ReportActionsUtils.isTransactionThread(ReportActionsUtils.getParentReportAction(report));
+        reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED && ReportUtils.isChatThread(report) && !ReportActionsUtils.isTransactionThread(parentReportAction);
 
     /**
      * Create a lightweight ReportAction so as to keep the re-rendering as light as possible by
@@ -120,6 +122,8 @@ function ReportActionsListItemRenderer({
         ],
     );
 
+    console.debug('timddd', shouldDisplayParentAction);
+
     return shouldDisplayParentAction ? (
         <ReportActionItemParentAction
             shouldHideThreadDividerLine={shouldDisplayParentAction && shouldHideThreadDividerLine}
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 064187855b57..810b752e63ff 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -34,6 +34,9 @@ const propTypes = {
     /** Array of report actions for this report */
     reportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)),
 
+    /** The report's parentReportAction */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
     /** The report metadata loading states */
     isLoadingInitialReportActions: PropTypes.bool,
 
@@ -254,6 +257,7 @@ function ReportActionsView(props) {
         <>
             <ReportActionsList
                 report={props.report}
+                parentReportAction={props.parentReportAction}
                 onLayout={recordTimeToMeasureItemLayout}
                 sortedReportActions={props.reportActions}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID}

From 82da6b59a8bf2e9cf6bd2e8fb07a6408d66e56b1 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 28 Feb 2024 10:59:11 -0700
Subject: [PATCH 2/4] Fix lint

---
 src/pages/home/report/ReportActionsList.js             | 3 ++-
 src/pages/home/report/ReportActionsListItemRenderer.js | 1 +
 src/pages/home/report/ReportActionsView.js             | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 19bad7e61634..3ace2ebeb436 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -82,6 +82,7 @@ const defaultProps = {
     isLoadingNewerReportActions: false,
     ...withCurrentUserPersonalDetailsDefaultProps,
     policy: {},
+    parentReportAction: {},
 };
 
 const VERTICAL_OFFSET_THRESHOLD = 200;
@@ -426,7 +427,7 @@ function ReportActionsList({
                 shouldDisplayNewMarker={shouldDisplayNewMarker(reportAction, index)}
             />
         ),
-        [report, linkedReportActionID, sortedReportActions, mostRecentIOUReportActionID, shouldHideThreadDividerLine, shouldDisplayNewMarker],
+        [report, linkedReportActionID, sortedReportActions, mostRecentIOUReportActionID, shouldHideThreadDividerLine, shouldDisplayNewMarker, parentReportAction],
     );
 
     // Native mobile does not render updates flatlist the changes even though component did update called.
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.js b/src/pages/home/report/ReportActionsListItemRenderer.js
index aa8ed9e71e2e..530480f326ed 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.js
+++ b/src/pages/home/report/ReportActionsListItemRenderer.js
@@ -41,6 +41,7 @@ const propTypes = {
 const defaultProps = {
     mostRecentIOUReportActionID: '',
     linkedReportActionID: '',
+    parentReportAction: {},
 };
 
 function ReportActionsListItemRenderer({
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 810b752e63ff..91a8810e91ff 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -81,6 +81,7 @@ const defaultProps = {
     session: {
         authTokenType: '',
     },
+    parentReportAction: {},
 };
 
 function ReportActionsView(props) {

From c1737590faa50ca05e03a2f15548aa3462b5c754 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@gmail.com>
Date: Wed, 28 Feb 2024 11:18:19 -0700
Subject: [PATCH 3/4] Update
 src/pages/home/report/ReportActionsListItemRenderer.js

Co-authored-by: Rajat <parasharrajat@users.noreply.github.com>
---
 src/pages/home/report/ReportActionsListItemRenderer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsListItemRenderer.js b/src/pages/home/report/ReportActionsListItemRenderer.js
index 530480f326ed..142be03517df 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.js
+++ b/src/pages/home/report/ReportActionsListItemRenderer.js
@@ -123,7 +123,6 @@ function ReportActionsListItemRenderer({
         ],
     );
 
-    console.debug('timddd', shouldDisplayParentAction);
 
     return shouldDisplayParentAction ? (
         <ReportActionItemParentAction

From 815dae1a86a9880cc3f17aafb4bdf816c15ebeeb Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 28 Feb 2024 11:49:54 -0700
Subject: [PATCH 4/4] Remove extra whitespace

---
 src/pages/home/report/ReportActionsListItemRenderer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsListItemRenderer.js b/src/pages/home/report/ReportActionsListItemRenderer.js
index 142be03517df..bc8e6a94359f 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.js
+++ b/src/pages/home/report/ReportActionsListItemRenderer.js
@@ -123,7 +123,6 @@ function ReportActionsListItemRenderer({
         ],
     );
 
-
     return shouldDisplayParentAction ? (
         <ReportActionItemParentAction
             shouldHideThreadDividerLine={shouldDisplayParentAction && shouldHideThreadDividerLine}