Fix travel reload/back Not Found by preserving policyID in base path by neerajbachani · Pull Request #95900 · Expensify/App

neerajbachani · 2026-07-11T18:38:16Z

Explanation of Change

When navigating to travel dynamic routes (public-domain-error, domain-selector), policyID was declared as a dynamic-suffix query param. On reload and in-app back, getPathWithoutDynamicSuffix stripped policyID because it collided with the My Trips entry-screen param, rebuilding bare /travel and causing AccessOrNotFoundWrapper to show Not Found.

This change removes policyID from those dynamic route suffix configs and updates callers to pass an explicit base path (e.g. travel?policyID=...) via createDynamicRoute, so policyID is preserved on the base path through reload and back navigation.

Fixed Issues

$ #94652
PROPOSAL: #94652 (comment)

Tests

Log in with a personal-email account on web
Open FAB → Book Travel → Book Travel and confirm My Trips loads with policyID in the URL
Tap Book Travel again to navigate to the public-domain-error dynamic route
Reload the page
Press the back button
Verify the Book Travel (My Trips) page is shown instead of "Hmm... it's not here"
Repeat steps 2–6 for the domain-selector flow (account with multiple private domains)
From Workspace → Travel, trigger the public-domain-error flow and verify reload + back still returns to workspace travel with the correct policyID

Verify that no errors appear in the JS console

Offline tests

Navigate to My Trips → public-domain-error dynamic route
Go offline
Reload the page
Press in-app back
Verify back navigation still lands on My Trips (or the expected offline state) and does not show Not Found

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Navigate to staging.new.expensify.com
Sign up with a new personal-email account (e.g. @gmail.com) and select any onboarding intent except "Manage my team's expenses".
Create a new workspace.
Go to Workspace Settings > More Features and enable the Travel feature toggle.
Click on FAB > Book Travel > Book Travel > Reload page
Click the back button.
Verify the Book Travel (My Trips) page is shown and "Hmm... it's not here" is not shown

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-30.at.2.07.45.AM.mov

melvin-bot · 2026-07-11T18:38:22Z

@truph01 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]

codecov · 2026-07-11T18:41:09Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/ROUTES.ts	`21.29% <ø> (ø)`
... and 8 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dd73ffb16b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

JmillsExpensify

LGTM

truph01 · 2026-07-13T04:41:16Z

@neerajbachani Could you resolve AI's comment?

neerajbachani · 2026-07-15T17:11:25Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fc9bce28ef

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Keep policyID on the entry base path for TRAVEL_PUBLIC_DOMAIN_ERROR and TRAVEL_DOMAIN_SELECTOR so reload and in-app back do not rebuild bare /travel.

neerajbachani · 2026-07-15T18:15:09Z

@codex review

chatgpt-codex-connector · 2026-07-15T18:20:32Z

Codex Review: Didn't find any major issues. Chef's kiss.

Reviewed commit: 9039a8368f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

neerajbachani · 2026-07-15T18:22:29Z

We are good to proceed from here

cc: @JmillsExpensify @truph01

truph01 · 2026-07-17T08:51:19Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (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 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)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-07-17.at.15.48.26.mov

Android: mWeb Chrome

Screen.Recording.2026-07-17.at.15.50.49.mov

iOS: HybridApp

Screen.Recording.2026-07-17.at.15.45.42.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-07-17.at.15.29.46.mov

JmillsExpensify

No product review required.

melvin-bot · 2026-07-17T14:26:47Z

Congrats, that's your 5th PR merged! 🎉 Do you know about the ContributorPlus role? It's an opportunity to earn more in the Expensify Open Source community. Keep up the great work - thanks!

github-actions · 2026-07-17T14:28:33Z

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

github-actions · 2026-07-17T14:34:17Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #95900.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-544b57843c0-a3f6363-0584d1db826f03c709b8af101fa2c40f367f4440/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-544b578-a3f6363-927c308dd55b0c2ef823c86fbb65129448e8fc8e/index.html

Web 🕸️
https://95900.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-17T14:36:01Z

✋ 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 · 2026-07-21T01:31:43Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.4.41-0 🚀

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

MelvinBot · 2026-07-21T01:33:43Z

🤖 Help site review: no changes required

I reviewed the changes in this PR and confirmed no updates are needed to the help site files under App/docs/articles.

Why: This is a purely internal routing bug fix. It removes policyID from the queryParams of the public-domain-error and domain-selector travel dynamic routes in src/ROUTES.ts so that policyID is preserved on the base path through reload and in-app back navigation (fixing the "Hmm... it's not here" Not Found state). It does not add, remove, or change any user-facing feature, UI label, tab, setting, or documented workflow.

The help site travel articles (e.g. App/docs/articles/travel/booking-travel/) describe how to book and manage travel — none of them document the internal URL structure or navigation behavior this PR corrects, so they remain accurate as-is.

No draft PR was created because there is nothing to change on the help site.

OSBotify · 2026-07-22T06:12:37Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.41-4 🚀

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

Bundle Size Analysis (Sentry):

Android

truph01 · 2026-07-23T17:15:57Z

@MelvinBot Help me identify which PR introduced the bug that this PR fixes.

MelvinBot · 2026-07-23T17:22:01Z

The bug was introduced by #89727 — "migrate travel part 1" (huult, merged 2026-05-14).

That PR migrated the travel routes to the dynamic-route system and declared queryParams: ['policyID'] on both TRAVEL_PUBLIC_DOMAIN_ERROR and TRAVEL_DOMAIN_SELECTOR in src/ROUTES.ts — the exact two lines this PR removes. Marking policyID as a dynamic-suffix query param is what made getPathWithoutDynamicSuffix strip it (colliding with the My Trips entry-screen param) and rebuild bare /travel, so reload/back showed "Hmm... it's not here".

Evidence

The diff of #89727 added exactly what #95900 reverts:

+    TRAVEL_PUBLIC_DOMAIN_ERROR: {
+        path: 'public-domain-error',
+        getRoute: (policyID?: string) => getUrlWithParams('public-domain-error', {policyID}),
+        queryParams: ['policyID'],
...
+    TRAVEL_DOMAIN_SELECTOR: {
+        path: 'domain-selector',
+        getRoute: (policyID?: string) => getUrlWithParams('domain-selector', {policyID}),
+        queryParams: ['policyID'],

Timeline lines up: #89727 merged 2026-05-14, the regression was reported 2026-06-26. The route bodies at the PR base were unchanged from #89727 until this fix removed the queryParams lines.

Note the underlying dynamic-suffix / queryParams mechanism itself came from earlier navigation-refactor PRs (#83701, #84158, #85120), but those didn't touch the travel routes — #89727 is where these specific routes got the problematic queryParams: ['policyID'] config.

neerajbachani requested review from a team as code owners July 11, 2026 18:38

melvin-bot Bot assigned neerajbachani Jul 11, 2026

melvin-bot Bot requested review from JmillsExpensify and truph01 and removed request for a team July 11, 2026 18:38

chatgpt-codex-connector Bot reviewed Jul 11, 2026

View reviewed changes

Comment thread src/components/BookTravelButton.tsx Resolved

JmillsExpensify previously approved these changes Jul 12, 2026

View reviewed changes

neerajbachani dismissed JmillsExpensify’s stale review via fc9bce2 July 15, 2026 16:48

chatgpt-codex-connector Bot reviewed Jul 15, 2026

View reviewed changes

Comment thread src/components/BookTravelButton.tsx Resolved

neerajbachani force-pushed the fix/94652-travel-reload-back-not-found branch from fc9bce2 to 90b556d Compare July 15, 2026 17:46

Remove policyID from travel dynamic suffix queryParams

9039a83

Keep policyID on the entry base path for TRAVEL_PUBLIC_DOMAIN_ERROR and TRAVEL_DOMAIN_SELECTOR so reload and in-app back do not rebuild bare /travel.

neerajbachani force-pushed the fix/94652-travel-reload-back-not-found branch from 90b556d to 9039a83 Compare July 15, 2026 17:54

neerajbachani requested a review from JmillsExpensify July 15, 2026 18:23

truph01 approved these changes Jul 17, 2026

View reviewed changes

melvin-bot Bot requested a review from arosiclair July 17, 2026 08:53

JmillsExpensify reviewed Jul 17, 2026

View reviewed changes

arosiclair approved these changes Jul 17, 2026

View reviewed changes

arosiclair merged commit 544b578 into Expensify:main Jul 17, 2026
36 checks passed

OSBotify mentioned this pull request Jul 21, 2026

Deploy Checklist: New Expensify 2026-07-21 #96534

Closed

melvin-bot Bot mentioned this pull request Jul 22, 2026

[Due for payment 2026-07-29] [$250] Travel - Hmm... it's not here page is shown when navigating back to book travel #94652

Closed

1 of 7 tasks

Conversation

neerajbachani commented Jul 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 11, 2026

Uh oh!

codecov Bot commented Jul 11, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

truph01 commented Jul 13, 2026

Uh oh!

neerajbachani commented Jul 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

neerajbachani commented Jul 15, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 15, 2026

Uh oh!

neerajbachani commented Jul 15, 2026

Uh oh!

truph01 commented Jul 17, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 17, 2026

Uh oh!

github-actions Bot commented Jul 17, 2026

Uh oh!

github-actions Bot commented Jul 17, 2026

Uh oh!

OSBotify commented Jul 17, 2026

Uh oh!

OSBotify commented Jul 21, 2026

Uh oh!

MelvinBot commented Jul 21, 2026

Uh oh!

OSBotify commented Jul 22, 2026

Uh oh!

truph01 commented Jul 23, 2026

Uh oh!

MelvinBot commented Jul 23, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

neerajbachani commented Jul 11, 2026 •

edited

Loading

codecov Bot commented Jul 11, 2026 •

edited by github-actions Bot

Loading