Skip to content

Preserve Search context when opening trip previews #96283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luacmartins merged 8 commits into from
Aug 7, 2026
Merged

Preserve Search context when opening trip previews #96283

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5af1e38
Preserve Search context when opening trip previews
marufsharifi Jul 16, 2026
9dcb4ac
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Jul 21, 2026
3f8e165
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Jul 27, 2026
fa66558
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Jul 27, 2026
f83774d
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Jul 29, 2026
8257da5
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Jul 29, 2026
bf3c965
Use linkedReportID as fallback for trip nav
marufsharifi Jul 29, 2026
c947be7
Merge branch 'main' into fix/preserve-search-context-for-trip-previews
marufsharifi Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/ReportActionItem/TripRoomPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';

Expand Down Expand Up @@ -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);
Expand All @@ -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<ReservationData>) => (
<ReservationView
reservation={item.reservation}
Expand Down
Loading