Fix false-positive dynamic route matching when multiple suffixes match the same path by collectioneur · Pull Request #91621 · Expensify/App

collectioneur · 2026-05-25T14:56:41Z

Explanation of Change

Refactored findMatchingDynamicSuffix into findAllMatchingDynamicSuffixes, which returns all syntactically matching suffixes in priority order instead of just the first one. Callers (getStateFromPath, getAdaptedStateFromPath, getDynamicRouteAdaptedState, hooks) now iterate candidates and validate each against entryScreens, preventing false-positive greedy matches where a user-defined name (e.g. a tag named "gl-code") coincides with a registered static suffix.

Fixed Issues

$ #91703
$ #91480

Tests

Test 1: Workspace invite role

Click Workspaces in the left navigation
Select an existing workspace (or create one)
On the workspace Overview page, click Members in the sidebar
Click the Invite member button
Enter an email address in the search field, select the contact, and click Next
You should now be on the Invite message screen (URL: /workspaces/<policyID>/overview/invite/invite-message)
Click the Role option on this screen
Refresh the page
Verify that the Role screen loads correctly after refresh
Press the back button
Verify that you navigate back to the Invite message screen (not to the workspace overview or a blank page)
Press the back button again
Verify that you navigate back to the Invite screen

Test 2: Settings profile address country

Open settings
Click Profile in the settings menu
Scroll down and click the Address field
You should now be on the Address edit screen (URL: /settings/profile/address)
Click the Country field
You should now be on the Country picker screen (URL: /settings/profile/address/country?country=<country>)
Refresh the page
Verify that the Country picker screen loads correctly after refresh
Press the back button
Verify that you navigate back to the Address edit screen (not to the settings profile or a blank page)

Test 3: gl-code

Create a tag named "gl-code" in a workspace
Navigate to settings/<policyID>/tags (where policyID is the ID of the workspace)
Click on the "gl-code" tag
Verify that the modal loads correctly and everything works as expected
Reload the page and verify that the state builds correctly (same fullscreen underneath the modal, same modal with the opened "gl-code" tag)
Go back and verify that navigation to the previous modal works correctly

Verify that no errors appear in the JS console

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

iOS: mWeb Safari

MacOS: Chrome / Safari

Test 1:

test_2.mov

Test 2:

test_1.mov

Test 3:

Screen.Recording.2026-05-25.at.17.42.33.mov

… more routes

codecov · 2026-05-25T15:05:08Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useDynamicBackPath.ts	`90.90% <100.00%> (ø)`
src/hooks/useDynamicForwardPath.ts	`90.90% <100.00%> (ø)`
...boardShortcutsHandler/ShortcutsOverviewHandler.tsx	`57.14% <ø> (ø)`
...namicRoutesUtils/findAllMatchingDynamicSuffixes.ts	`97.67% <100.00%> (ø)`
.../dynamicRoutesUtils/getDynamicRouteAdaptedState.ts	`91.11% <93.75%> (+1.36%)`	⬆️
...libs/Navigation/helpers/getAdaptedStateFromPath.ts	`50.00% <60.00%> (ø)`
src/libs/Navigation/helpers/getStateFromPath.ts	`87.50% <83.33%> (ø)`
... and 104 files with indirect coverage changes

sumo-slonik · 2026-05-26T09:23:26Z

    const pathWithoutLeadingSlash = path.replaceAll(/^\/+/g, '');
-    const match = findMatchingDynamicSuffix(pathWithoutLeadingSlash);
-    if (match && match.pattern === dynamicRouteSuffix) {
+    const match = findAllMatchingDynamicSuffixes(pathWithoutLeadingSlash).find((m) => m.pattern === dynamicRouteSuffix);


Are we sure it should be find here and not findLast?

In useDynamicForwardPath and useDynamicBackPath, we already pass the dynamic suffix we want to find. Therefore, there are only two possibilities: either it is in the array, or it isn't. Ambiguous matches are impossible here (we can't have duplicate patterns), so it doesn't matter whether we use find or findLast 🙂

sumo-slonik · 2026-05-26T09:26:30Z

LGTM!

melvin-bot · 2026-05-26T09:31:44Z

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

huult · 2026-05-27T03:31:15Z

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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- 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 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)
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
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.
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.
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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-27.at.10.23.47.mp4

huult

LGTM.

melvin-bot · 2026-05-27T09:10:02Z

@mjasikowski looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

github-actions · 2026-05-27T09:17:22Z

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

github-actions · 2026-05-27T09:23:04Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-77270e40276-0146af9-6d53119bee57fd4a6c5793a50f11db83b87cfa5c/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-77270e4-0146af9-d48553a829698ebd96b06c94933e95879cc34b40/index.html

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

👀 View the workflow run that generated this build 👀

mjasikowski · 2026-05-27T09:24:37Z

Not an emergency, the checklists were not missing. Not sure what's going on here.

OSBotify · 2026-05-27T17:57:40Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-27T18:00:59Z

I reviewed the changes in this PR. This is a purely internal navigation/routing refactor that changes how the app resolves dynamic URL suffixes (findMatchingDynamicSuffix → findAllMatchingDynamicSuffixes). The modified files are internal navigation libraries, hooks, contributing guides, and tests — none of which affect user-facing features, UI labels, settings, or workflows documented on the help site.

No help site changes are required for this PR.

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

OSBotify · 2026-05-28T10:50:45Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-28T10:53:09Z

I reviewed the changes in this PR. This is an internal navigation/routing bug fix that refactors findMatchingDynamicSuffix into findAllMatchingDynamicSuffixes to prevent false-positive dynamic route matching when user-defined names (e.g., a tag named "gl-code") coincide with registered static suffixes.

No help site documentation changes are required — the PR does not alter any user-facing features, UI labels, settings, or workflows. All changes are to internal navigation utilities, developer-facing docs (NAVIGATION.md), and test files.

@collectioneur, no help site PR was created since no documentation changes are needed for this internal routing fix.

OSBotify · 2026-05-28T13:47:57Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-28T13:49:50Z

I've reviewed the changes in this PR. This is a purely internal navigation/routing code fix that refactors findMatchingDynamicSuffix into findAllMatchingDynamicSuffixes to prevent false-positive dynamic route matching. The changes are limited to:

Internal navigation utilities and hooks (src/libs/Navigation/...)
Developer-facing contributing guide (contributingGuides/NAVIGATION.md)
Tests

There are no user-facing feature changes, no new settings, no changed workflows, and no UI modifications. The help site docs under App/docs/articles do not reference any of the internal navigation concepts being modified here.

No help site changes are required for this PR.

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

OSBotify · 2026-05-28T20:40:24Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.88-2 🚀

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

add logic for edge case when findMatchingDynamicSuffix matches two or…

8b6db96

… more routes

melvin-bot Bot assigned collectioneur May 25, 2026

collectioneur changed the title ~~add logic for edge case when findMatchingDynamicSuffix matches two or…~~ Fix false-positive dynamic route matching when multiple suffixes match the same path May 25, 2026

collectioneur added 2 commits May 25, 2026 17:36

add one more edge case fix

d7e5a0d

cleanup

a8ed5d3

sumo-slonik reviewed May 26, 2026

View reviewed changes

collectioneur marked this pull request as ready for review May 26, 2026 09:31

collectioneur requested review from a team as code owners May 26, 2026 09:31

melvin-bot Bot requested review from carlosmiceli and trjExpensify and removed request for a team May 26, 2026 09:31

mjasikowski mentioned this pull request May 26, 2026

[Due for payment 2026-06-04] [BT-017] Fix False-Positive Dynamic Route Matching for Multiple Suffixes #91703

Open

mjasikowski requested review from huult and mjasikowski and removed request for carlosmiceli and trjExpensify May 26, 2026 09:46

huult approved these changes May 27, 2026

View reviewed changes

mjasikowski approved these changes May 27, 2026

View reviewed changes

mjasikowski merged commit 77270e4 into Expensify:main May 27, 2026
51 of 53 checks passed

melvin-bot Bot added the Emergency label May 27, 2026

mjasikowski removed the Emergency label May 27, 2026

OSBotify mentioned this pull request May 27, 2026

Deploy Checklist: New Expensify 2026-05-27 #91866

Closed

75 tasks

melvin-bot Bot mentioned this pull request May 28, 2026

[Due for payment 2026-06-04] Tags - Not here page opens when tag name is tag-edit, tag-gl-code or workspace-tag-approver #91480

Closed

7 tasks

Conversation

collectioneur commented May 25, 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 May 25, 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!

sumo-slonik May 26, 2026

Choose a reason for hiding this comment

Uh oh!

collectioneur May 26, 2026

Choose a reason for hiding this comment

Uh oh!

sumo-slonik commented May 26, 2026

Uh oh!

melvin-bot Bot commented May 26, 2026

Uh oh!

huult commented May 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented May 27, 2026

Uh oh!

github-actions Bot commented May 27, 2026

Uh oh!

github-actions Bot commented May 27, 2026

Uh oh!

mjasikowski commented May 27, 2026

Uh oh!

OSBotify commented May 27, 2026

Uh oh!

MelvinBot commented May 27, 2026

Uh oh!

OSBotify commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

Uh oh!

OSBotify commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

Uh oh!

OSBotify commented May 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

collectioneur commented May 25, 2026 •

edited

Loading

codecov Bot commented May 25, 2026 •

edited by github-actions Bot

Loading

huult commented May 27, 2026 •

edited

Loading