Skip to content

[Bug] Hide cancelled reservations from Upcoming - #101385

Merged
blimpich merged 1 commit into
mainfrom
rodrigo-fix-cancelled-upcoming-travel
Sep 17, 2026
Merged

blimpich merged 1 commit into
mainfrom
rodrigo-fix-cancelled-upcoming-travel

Conversation

@rlinoz

@rlinoz rlinoz commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Exclude cancelled travel reservations from the Home tab's Upcoming section.

Fixed Issues

$ #101054
PROPOSAL:

Tests

  1. Create a new trip using the cli
  2. Update the state to cancelled of some PNR
  3. Verify it disapperas from upcoming travel and still shows in the trip room as cancelled
Screenshot 2026-09-16 at 19 45 53 Screenshot 2026-09-16 at 19 45 56
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Book a flight in the staging environment.
  2. Open the Home tab and verify the flight appears in Upcoming.
  3. Cancel the booking from the Travel page.
  4. Return to the Home tab.
  5. Verify the cancelled booking no longer appears in Upcoming.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native

Not tested.

Android: mWeb Chrome

Not tested.

iOS: Native

Not tested.

iOS: mWeb Safari

Not tested.

MacOS: Chrome / Safari

Not tested.

@rlinoz
rlinoz requested a review from blimpich September 16, 2026 22:47
@rlinoz
rlinoz marked this pull request as ready for review September 16, 2026 22:47
@rlinoz
rlinoz requested review from a team as code owners September 16, 2026 22:47
@melvin-bot
melvin-bot Bot requested review from mananjadhav and trjExpensify and removed request for a team September 16, 2026 22:47
@melvin-bot

melvin-bot Bot commented Sep 16, 2026

Copy link
Copy Markdown

@mananjadhav Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team September 16, 2026 22:47
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 16, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ⚠️ Failed 2026-09-16T23:18:09.817155Z 6e79e93 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@rlinoz
rlinoz removed the request for review from mananjadhav September 16, 2026 22:47
@blimpich
blimpich merged commit 7400e7e into main Sep 17, 2026
50 of 51 checks passed
@blimpich
blimpich deleted the rodrigo-fix-cancelled-upcoming-travel branch September 17, 2026 00:37
@github-actions

Copy link
Copy Markdown
Contributor

🚧 blimpich has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.82-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 cancelled 🔪
🍎 iOS 🍎 cancelled 🔪

@MelvinBot

Copy link
Copy Markdown
Contributor

Yes — help site changes were required, and the docs were actually stating the opposite of the new behavior. Draft PR: Docs updates for E/A#101385 Cancelled reservations excluded from Upcoming travel

What was wrong

docs/articles/new-expensify/getting-started/Expensify-Home-Overview.md:100 already documented the Upcoming travel section and said:

Canceled reservations stay in the list and are labeled Canceled.

Your change at src/pages/home/UpcomingTravelSection/useUpcomingTravelReservations.ts:46-48 skips isCancelled reservations, so that sentence is now incorrect.

What changed in the docs PR

Expensify-Home-Overview.md

  • Corrected the Upcoming travel section — canceled reservations are excluded from Home, and the canceled reservation still shows inside the trip with the Canceled label.
  • Updated Why don't I see the Upcoming travel section? — canceled reservations no longer count toward the 7-day window, so a member whose only reservation in that window is canceled now sees no section at all. Worth calling out: UpcomingTravelSection returns null on an empty list, so this is a genuinely new way for the whole section to disappear.
  • Added Why did my canceled booking disappear from the Upcoming travel section? — "my trip vanished from Home" reads like a bug, so it needs an explicit answer.
  • Added canceled-reservation search terms to keywords.

Canceling-Travel-Arrangements.md

  • Added Where does a canceled booking go on Home? — members hit this right after canceling, so the answer belongs here too, not only in the Home article.
Authoring compliance and UI verification

Applied HELPSITE_NAMING_CONVENTIONS.md, HELP_AUTHORING_GUIDELINES.md, and TEMPLATE.md:

  • Only ## headings below the single # title; every new heading starts with a question word.
  • All UI labels bolded and matched exactly against src/languages/en.ts:1235-1247 and src/languages/en.ts:1476Upcoming travel, Canceled, Flight to …, Hotel in …, Car rental in …, Train to …, Today, In 1 day, In 1 week.
  • Relative cross-links only, two total, both prerequisite/deep-dive.
  • No new screenshots suggested — the change is behavioral, not a new control a member has to locate.
  • npm run spell-changed reports 0 issues.

Live UI check (web): confirmed the navigation tab is labeled exactly Home and the Home page section titles render as documented. I could not see Upcoming travel rendered live — the test account has no travel bookings, and the section returns null with zero reservations — so the label text and row formats are verified against src/languages/en.ts rather than a screenshot. Flagging that so you can sanity-check the row wording against a real booking.

One thing I could not verify: the 7-day window is CONST.UPCOMING_TRAVEL_WINDOW_DAYS: 7, and the docs already described it that way before this PR. I left that as-is.


@rlinoz, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants