From 8fbd2d11123b956d87e030aefbdc7bdbedd97de1 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 5 Apr 2024 14:30:47 +0100
Subject: [PATCH] Merge pull request #39572 from nkdengineer/fix/39436

[CP Staging] Fix three-dot menu item display incorrectly when opening receipt in combine report

(cherry picked from commit 54db9ccd9a38a7c0de0c60dafb03383c4abccada)
---
 src/components/ReportActionItem/ReportActionItemImage.tsx | 6 ++++--
 src/components/ShowContextMenuContext.ts                  | 2 ++
 src/pages/home/report/ReportActionItem.tsx                | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
index 740f784d2669..400d61b782b6 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -95,10 +95,12 @@ function ReportActionItemImage({
     if (enablePreviewModal) {
         return (
             <ShowContextMenuContext.Consumer>
-                {({report}) => (
+                {({report, transactionThreadReport}) => (
                     <PressableWithoutFocus
                         style={[styles.w100, styles.h100, styles.noOutline as ViewStyle]}
-                        onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(report?.reportID ?? '', transaction?.transactionID ?? ''))}
+                        onPress={() =>
+                            Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(transactionThreadReport?.reportID ?? report?.reportID ?? '', transaction?.transactionID ?? ''))
+                        }
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                         accessibilityRole={CONST.ROLE.BUTTON}
                     >
diff --git a/src/components/ShowContextMenuContext.ts b/src/components/ShowContextMenuContext.ts
index 374ca8a2f1e5..3a996a8d2c64 100644
--- a/src/components/ShowContextMenuContext.ts
+++ b/src/components/ShowContextMenuContext.ts
@@ -13,6 +13,7 @@ type ShowContextMenuContextProps = {
     anchor: ContextMenuAnchor;
     report: OnyxEntry<Report>;
     action: OnyxEntry<ReportAction>;
+    transactionThreadReport: OnyxEntry<Report>;
     checkIfContextMenuActive: () => void;
 };
 
@@ -20,6 +21,7 @@ const ShowContextMenuContext = createContext<ShowContextMenuContextProps>({
     anchor: null,
     report: null,
     action: null,
+    transactionThreadReport: null,
     checkIfContextMenuActive: () => {},
 });
 
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 485d75c9099b..980fc7217b1d 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -366,9 +366,10 @@ function ReportActionItem({
             anchor: popoverAnchorRef.current,
             report,
             action,
+            transactionThreadReport,
             checkIfContextMenuActive: toggleContextMenuFromActiveReportAction,
         }),
-        [report, action, toggleContextMenuFromActiveReportAction],
+        [report, action, toggleContextMenuFromActiveReportAction, transactionThreadReport],
     );
 
     const actionableItemButtons: ActionableItem[] = useMemo(() => {