Implement query parameters handling in dynamic routes by collectioneur · Pull Request #84158 · Expensify/App

collectioneur · 2026-03-04T15:55:20Z

Explanation of Change

Add query parameter support to dynamic routes. Previously, dynamic suffixes couldn't include query params (e.g., country?country=US). This extends DynamicRouteConfig with an optional getRoute function, refactors createDynamicRoute to merge base and suffix query strings, and updates getPathWithoutDynamicSuffix to strip suffix-specific params. Migrates SETTINGS_ADDRESS_COUNTRY from a static route to the new ADDRESS_COUNTRY dynamic route as a proof of concept.

Fixed Issues

$ #84119

Tests

Verify that no errors appear in the JS console

1 test

Navigate to Settings > Profile > Address
Tap on the Country field to open the country selection page
Select a different country (e.g., "United States")
Verify that you are navigated back to the Address page with the selected country populated correctly
Tap on the Country field again and verify the previously selected country is shown as the current selection

2 test

Navigate to Settings > Profile > Address
Tap on the Country field to open the country selection page
Press the back button (header back arrow) without selecting a new country
Verify that you return to the Address page and the original country value is preserved

3 test

Open the app and navigate directly to a deep link like settings/profile/address/country?country=US
Verify the country selection page opens with "US" pre-selected
Select a different country and verify navigation back to the address page works correctly

Test 4

Navigate to Settings -> Wallet -> Add Bank Account and log into the US bank account (log into the fake Plaid using the staging server).
While on the address step, open the country page.
Verify that the country suffix, along with the country parameter, is added to the URL.
Refresh the page and verify that the screen underneath the RHP is still the settings/wallet.

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-03-06.at.17.22.34.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-06.at.16.51.33.mov

add-us-bank-account test country page:
https://github.com/user-attachments/assets/39923dfb-4636-4c20-a96d-878508f6f617

…ponents, and updating navigation dynamic routes logic.

…tioneur/dynamic-routes-parameters-handling

…ling

codecov · 2026-03-06T12:32:48Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/SCREENS.ts	`100.00% <ø> (ø)`
src/components/WorkspaceConfirmationForm.tsx	`0.00% <ø> (ø)`
src/hooks/useDynamicBackPath.ts	`100.00% <ø> (ø)`
...rs/dynamicRoutesUtils/findMatchingDynamicSuffix.ts	`100.00% <ø> (ø)`
.../dynamicRoutesUtils/getPathWithoutDynamicSuffix.ts	`100.00% <100.00%> (ø)`
...helpers/dynamicRoutesUtils/isDynamicRouteSuffix.ts	`100.00% <ø> (ø)`
...on/helpers/dynamicRoutesUtils/splitPathAndQuery.ts	`100.00% <ø> (ø)`
...libs/Navigation/helpers/getAdaptedStateFromPath.ts	`54.67% <ø> (ø)`
src/libs/Navigation/helpers/getPathFromState.ts	`100.00% <ø> (ø)`
src/libs/Navigation/helpers/getStateFromPath.ts	`86.95% <ø> (ø)`
... and 12 more
... and 430 files with indirect coverage changes

WojtekBoman · 2026-03-09T12:34:21Z

src/libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute.ts

+/**
+ * Merges two query strings into one. If both contain the same key,
+ * the suffix value wins and a warning is logged.
+ */


Could you add an example in the docs? What will be the result of merging two example values etc.

WojtekBoman · 2026-03-09T12:35:18Z

src/libs/Navigation/helpers/dynamicRoutesUtils/getPathWithoutDynamicSuffix.ts

 import splitPathAndQuery from './splitPathAndQuery';

+function getQueryParamsToStrip(dynamicSuffix: string): readonly string[] | undefined {


Add a description to this function

WojtekBoman · 2026-03-09T12:37:23Z

I see we have a lot of functions related to dynamic routes which are kept directly in Navigation/helpers, maybe it would be a good idea to create something like DynamicRoutesUtils to store them together, thanks to that it will be easy to recognize if the function is connected to the logic of dynamic routes

…ter organization and maintainability

…s utils

…dynamic routes and dynamic routes with query parameters

melvin-bot · 2026-03-10T17:51:09Z

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

joekaufmanexpensify · 2026-03-10T21:16:23Z

No product review needed

chatgpt-codex-connector · 2026-03-11T07:52:55Z

Codex Review: Didn't find any major issues. Bravo.

ℹ️ 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".

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

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

huult · 2026-03-11T08:11:11Z

Screen.Recording.2026-03-11.at.15.03.59.mov

BUG:

Go to Settings -> Profile -> Address -> Country
Reload the page
Select any country
Observe the URL: the suffix is removed before the query parameter is removed. As a result, the query parameter still exists briefly before it is removed.

This issue does not occur if the page is not reloaded.

huult · 2026-03-11T08:17:44Z

Screen.Recording.2026-03-11.at.15.15.41.mov

BUG:

Go to Settings -> Profile -> Address -> Country
Manually remove the country code so the URL becomes /settings/profile/address?country=
Reload the page
Navigate back and open the Country screen again

huult · 2026-03-11T08:43:10Z

@collectioneur Could you add the test steps and record the case when adding a bank account at the address step? This is because the CountrySelector is used there.

Screen.Recording.2026-03-11.at.15.36.56.mov

huult · 2026-03-11T08:46:08Z

Screen.Recording.2026-03-11.at.15.42.42.mov

BUG:

Go to Settings -> Wallet -> Add Bank Account
Log in with the account: user_good
Enter the required information and proceed to the Address step
Navigate to Country Selection and reload the page
The page is redirected to the Workspace Chat. It should remain on the current page (Wallet).

…election to fix bugs

collectioneur · 2026-03-11T15:38:55Z

Go to Settings -> Profile -> Address -> Country
Reload the page
Select any country
Observe the URL: the suffix is removed before the query parameter is removed. As a result, the query parameter still exists briefly before it is removed.

@huult This behavior is specific to the page I just migrated. Here's what's happening: to pass the data about a selected or existing parameter back, it has to attach this parameter to the previous page and then navigate back. This allows the previous page to properly extract the parameter and clean it up from the URL.
Normally, without a refresh, you don't even notice this because it happens instantly. However, if you refresh and then navigate back, the page re-renders and gets pushed to the navigation state. That's why you can see the parameter attached to the previous page for those few milliseconds.
So, this isn't a dynamic routes bug, it's just the specific behavior of this particular page. As for the other bugs, they have all been resolved 😄:

Screen.Recording.2026-03-11.at.16.36.37.mov

Screen.Recording.2026-03-11.at.16.37.20.mov

collectioneur · 2026-03-11T15:48:58Z

@collectioneur Could you add the test steps and record the case when adding a bank account at the address step? This is because the CountrySelector is used there.

Added test and recorded the case. Could you please give it one more review when you have a chance 🙂 ? Thank you!

huult · 2026-03-12T05:25:44Z

Reviewer Checklist

huult · 2026-03-12T05:26:38Z

@codex review

chatgpt-codex-connector · 2026-03-12T05:26:50Z

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

huult

LGTM!

mjasikowski · 2026-03-12T08:11:21Z

@codex review

chatgpt-codex-connector · 2026-03-12T08:45:42Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

We were unable to download your code in a timely manner.

ℹ️ 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".

mjasikowski · 2026-03-12T11:32:22Z

One more try
@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 70807267fa

ℹ️ 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".

chatgpt-codex-connector · 2026-03-12T12:04:54Z

src/libs/Navigation/helpers/linkTo/index.ts

        !isNavigatingToAttachmentScreen(focusedRouteFromPath?.name) &&
-        !isNavigatingToReportWithSameReportID(currentFocusedRoute, focusedRouteFromPath)
+        !isNavigatingToReportWithSameReportID(currentFocusedRoute, focusedRouteFromPath) &&
+        !findMatchingDynamicSuffix(normalizedPath)


Limit dynamic-route detection before skipping PUSH conversion

This new guard uses findMatchingDynamicSuffix(normalizedPath) to decide whether to keep NAVIGATE, but that suffix check is purely textual and also matches non-dynamic routes that end in the same segment (for example static .../verify-account routes such as SETTINGS_2FA_VERIFY_ACCOUNT and SETTINGS_WALLET_TRAVEL_CVV_VERIFY_ACCOUNT in src/ROUTES.ts). In those cases this branch now stops converting NAVIGATE to PUSH, which can reuse an existing stack entry and skip adding a history entry, regressing back/navigation behavior for normal static screens.

Useful? React with 👍 / 👎.

Given the context of the screens (RHPs) we are currently migrating, there is no scenario where they would have been in the navigation stack previously. Because of this, it is perfectly safe to leave the logic as it is. If any unforeseen regressions arise in the future, we can easily revisit and update this behavior

mjasikowski

Looking good!

OSBotify · 2026-03-12T13:09:55Z

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

github-actions · 2026-03-12T13:49:39Z

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

github-actions · 2026-03-12T13:54:23Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-03d6c3f-aadf1f5-e5c11ea997ec813c45dfade350270b3388ff9c53/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-03d6c3f-aadf1f5-fd5dce37027c384c05747e5a22e98934130bd8aa/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-12T23:18:05Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.37-0 🚀

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

nkuoch · 2026-03-13T09:20:13Z

@collectioneur @mjasikowski this likely caused #85191 (comment). Should we revert? Not sure, as I feel the bug (landing on the settings page after adding the PBA instead of staying on the expense details page) is not a huge deal, and could maybe just be a follow up

OSBotify · 2026-03-16T10:06:31Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.37-10 🚀

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

ADDRESS_COUNTRY with query parameter support, refactoring related com…

0948b32

…ponents, and updating navigation dynamic routes logic.

melvin-bot bot assigned collectioneur Mar 4, 2026

collectioneur added 4 commits March 6, 2026 13:03

cleanup

71fc193

Merge branch 'collectioneur/dynamic-routes-multisuffixes' into collec…

0ce08e8

…tioneur/dynamic-routes-parameters-handling

Merge branch 'main' into collectioneur/dynamic-routes-parameters-hand…

c77de1b

…ling

fix tests

a55b125

collectioneur changed the title ~~Collectioneur/dynamic routes parameters handling~~ Implement parameters handling in dynamic routes Mar 6, 2026

collectioneur force-pushed the collectioneur/dynamic-routes-parameters-handling branch from 39a53ba to a55b125 Compare March 6, 2026 14:02

collectioneur added 2 commits March 6, 2026 16:46

add other entryScreens to address country dynamic page

37871d1

change to additional arg in config

ad315d2

WojtekBoman reviewed Mar 9, 2026

View reviewed changes

collectioneur added 2 commits March 9, 2026 16:17

Refactor dynamic route imports to a dedicated utils directory for bet…

0938c45

…ter organization and maintainability

fix errors

8171ab1

collectioneur mentioned this pull request Mar 10, 2026

[BT-152] Migrate Settings - Security/Wallet/Subscription #83363

Open

Add private annotations to internal helper functions in dynamic route…

5229db4

…s utils

collectioneur changed the title ~~Implement parameters handling in dynamic routes~~ Implement query parameters handling in dynamic routes Mar 10, 2026

Enhance navigation documentation by adding sections on multi-segment …

2f9cd2f

…dynamic routes and dynamic routes with query parameters

WojtekBoman approved these changes Mar 10, 2026

View reviewed changes

collectioneur marked this pull request as ready for review March 10, 2026 17:51

collectioneur requested review from a team as code owners March 10, 2026 17:51

melvin-bot bot requested review from huult and removed request for a team March 10, 2026 17:51

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 10, 2026 17:51

collectioneur added 2 commits March 11, 2026 15:39

fix error when country param is left in url without value

afd42b6

Update dynamic route handling and navigation parameters for country s…

7080726

…election to fix bugs

huult approved these changes Mar 12, 2026

View reviewed changes

melvin-bot bot requested a review from mjasikowski March 12, 2026 05:28

chatgpt-codex-connector bot reviewed Mar 12, 2026

View reviewed changes

mjasikowski approved these changes Mar 12, 2026

View reviewed changes

mjasikowski merged commit 03d6c3f into Expensify:main Mar 12, 2026
38 checks passed

This was referenced Mar 12, 2026

Investigate workflow job failing on main: test / test (job 6) #85072

Closed

Investigate workflow job failing on main: test / test (job 7) #85073

Closed

OSBotify mentioned this pull request Mar 12, 2026

Deploy Checklist: New Expensify 2026-03-12 #85146

Closed

87 tasks

OSBotify mentioned this pull request Mar 13, 2026

[Due for payment 2026-03-24] Bank account - Employee lands on wallet page after adding PBA from expense details page #85191

Closed

7 tasks

		import splitPathAndQuery from './splitPathAndQuery';

		function getQueryParamsToStrip(dynamicSuffix: string): readonly string[] \| undefined {

Conversation

collectioneur commented Mar 4, 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!

codecov bot commented Mar 6, 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!

WojtekBoman Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot bot commented Mar 10, 2026

Uh oh!

joekaufmanexpensify commented Mar 10, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 11, 2026

Uh oh!

huult commented Mar 11, 2026

Uh oh!

huult commented Mar 11, 2026

Uh oh!

huult commented Mar 11, 2026

Uh oh!

huult commented Mar 11, 2026

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

huult commented Mar 12, 2026

Uh oh!

huult commented Mar 12, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 12, 2026

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

mjasikowski commented Mar 12, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 12, 2026

Uh oh!

mjasikowski commented Mar 12, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

collectioneur Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

mjasikowski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

collectioneur commented Mar 4, 2026 •

edited

Loading

codecov bot commented Mar 6, 2026 •

edited by github-actions bot

Loading

WojtekBoman commented Mar 9, 2026 •

edited

Loading

collectioneur commented Mar 11, 2026 •

edited

Loading

collectioneur commented Mar 11, 2026 •

edited

Loading

nkuoch commented Mar 13, 2026 •

edited

Loading