From 5af1e38b4e9cb3bdd7ae64cb2079859459b9f295 Mon Sep 17 00:00:00 2001 From: Maruf Sharifi Date: Thu, 16 Jul 2026 15:09:40 +0430 Subject: [PATCH 1/2] Preserve Search context when opening trip previews --- src/components/ReportActionItem/TripRoomPreview.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ReportActionItem/TripRoomPreview.tsx b/src/components/ReportActionItem/TripRoomPreview.tsx index 092eca342b2a..b46396154ffa 100644 --- a/src/components/ReportActionItem/TripRoomPreview.tsx +++ b/src/components/ReportActionItem/TripRoomPreview.tsx @@ -17,6 +17,7 @@ import useTripTransactions from '@hooks/useTripTransactions'; import ControlSelection from '@libs/ControlSelection'; import DateUtils from '@libs/DateUtils'; import {canUseTouchScreen} from '@libs/DeviceCapabilities'; +import getReportRouteForCurrentContext from '@libs/Navigation/helpers/getReportRouteForCurrentContext'; import Navigation from '@libs/Navigation/Navigation'; import {getOriginalMessage} from '@libs/ReportActionsUtils'; import type {ReservationData} from '@libs/TripReservationUtils'; @@ -26,7 +27,6 @@ import variables from '@styles/variables'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; import type {Report, ReportAction} from '@src/types/onyx'; import type {Reservation} from '@src/types/onyx/Transaction'; @@ -154,7 +154,7 @@ function TripRoomPreview({action, containerStyles, isHovered = false}: TripRoomP ); }, [convertToDisplayString, currency, totalDisplaySpend, tripTransactions]); - const navigateToTrip = () => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chatReportID, undefined, undefined, Navigation.getActiveRoute())); + const navigateToTrip = () => Navigation.navigate(getReportRouteForCurrentContext({reportID: chatReportID})); const renderItem = ({item}: ListRenderItemInfo) => ( Date: Wed, 29 Jul 2026 16:06:05 +0430 Subject: [PATCH 2/2] Use linkedReportID as fallback for trip nav --- src/components/ReportActionItem/TripRoomPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/TripRoomPreview.tsx b/src/components/ReportActionItem/TripRoomPreview.tsx index 8d437ec1e6dd..1f5efef5b241 100644 --- a/src/components/ReportActionItem/TripRoomPreview.tsx +++ b/src/components/ReportActionItem/TripRoomPreview.tsx @@ -131,7 +131,7 @@ function TripRoomPreview({action, containerStyles, isHovered = false}: TripRoomP const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${linkedReportID}`); const [iouReportCurrency] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`, {selector: selectCurrency}); - const chatReportID = chatReport?.reportID; + const chatReportID = chatReport?.reportID ?? linkedReportID; const tripTransactions = useTripTransactions(chatReportID); const reservationsData: ReservationData[] = getReservationsFromTripReport(chatReport, tripTransactions);