Skip to content

[Bug] Hide cancelled reservations from Upcoming #101385

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
blimpich merged 1 commit into from
Sep 17, 2026
+22 −0
Merged

[Bug] Hide cancelled reservations from Upcoming #101385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/pages/home/UpcomingTravelSection/useUpcomingTravelReservations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ function useUpcomingTravelReservations(): UpcomingReservation[] {
}
const reservations = getReservationsFromTripReport(report, tripReportNameValuePairs);
for (const resData of reservations) {
if (resData.isCancelled) {
continue;
}
const startDate = new Date(resData.reservation.start.date);
if (Number.isNaN(startDate.getTime())) {
continue;
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/hooks/useUpcomingTravelReservations.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,25 @@ describe('useUpcomingTravelReservations', () => {
expect(result.current.at(0)?.reportID).toBe('102');
});

it('should exclude cancelled reservations', async () => {
const cancelledFlight = makeAirPnr('PNR_CANCELLED', daysFromNow(3), daysFromNow(3, 15));
const firstLeg = cancelledFlight.data.airPnr?.legs.at(0);
if (firstLeg) {
firstLeg.legStatus = CONST.LEG_STATUS.CANCELLED;
}
const tripRoom = makeTripRoomReport('103');

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}103`, tripRoom);
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}103`, makeTripRoomReportNameValuePairs('103', [cancelledFlight]));
await waitForBatchedUpdates();

const {result} = renderHook(() => useUpcomingTravelReservations());

await waitFor(() => {
expect(result.current).toEqual([]);
});
});

it('should exclude reservation that departed yesterday', async () => {
const pastFlight = makeAirPnr('PNR_JUST_PASSED', daysFromNow(-1, 22), daysFromNow(-1, 23));
const upcomingFlight = makeAirPnr('PNR_LATER_TODAY', daysFromNow(1), daysFromNow(1, 15));
Expand Down
Loading