Fix Chat - App returns to main chat after refreshing Flag as offensive RHP in thread by collectioneur · Pull Request #87622 · Expensify/App

collectioneur · 2026-04-10T12:59:49Z

Explanation of Change

Fix the screen-underneath resolution logic for dynamic routes in getMatchingFullScreenRoute. Dynamic routes never carry their own backTo - they inherit it from the screen underneath. Previously, the backTo param on a dynamic route was incorrectly used to resolve the full-screen route, leading to wrong screens being shown underneath overlays. Now the function checks whether the route is a dynamic screen via isDynamicRouteScreen (which verifies against the navigation config's dynamicRoutePaths) and skips backTo handling for dynamic screens. The isDynamicRouteScreen utility was also extracted into a shared file to be reused by both getPathFromState and getAdaptedStateFromPath.

Fixed Issues

$ #87602

Tests

Precondition:
User has received a message from another user.

Go to staging.new.expensify.com
Open 1:1 DM with received message.
Right click on the message > Reply in thread.
Right click on the parent message in thread > Flag as offensive.
Refresh the page.
Verify that app stays in thread after refreshing Flag as offensive RHP in thread.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-04-10.at.15.00.30.mov

codecov · 2026-04-10T13:14:41Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...helpers/dynamicRoutesUtils/isDynamicRouteScreen.ts	`100.00% <100.00%> (ø)`
...libs/Navigation/helpers/getAdaptedStateFromPath.ts	`51.87% <100.00%> (+0.36%)`	⬆️
src/libs/Navigation/helpers/getPathFromState.ts	`95.08% <ø> (-0.38%)`	⬇️
... and 34 files with indirect coverage changes

jmusial · 2026-04-10T14:34:06Z

+ * @param screenName - The name of the screen to check.
+ * @returns True if the screen name is a dynamic route screen, false otherwise.
+ */
+function isDynamicRouteScreen(screenName: Screen): boolean {


NAB: adding a test wouldn't hurt 😄

jmusial · 2026-04-10T14:35:38Z

+    // Dynamic screens are skipped here because they never carry their own backTo - they only
+    // inherit it from the screen underneath. Letting backTo dictate the full-screen route for
+    // a dynamic screen would resolve the wrong page.
+    if (isRouteWithBackToParam(route) && !isDynamicScreen) {


and a test for this branch

melvin-bot · 2026-04-10T14:49:28Z

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

huult · 2026-04-10T15:04:43Z

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

Screen.Recording.2026-04-10.at.22.42.41.mp4

Android: mWeb Chrome

Screen.Recording.2026-04-10.at.22.44.34.mp4

iOS: HybridApp

Screen.Recording.2026-04-10.at.22.49.07.mp4

iOS: mWeb Safari

Screen.Recording.2026-04-10.at.22.50.00.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-04-10.at.22.37.48.mov

huult · 2026-04-10T15:13:05Z

BUG:

Screen.Recording.2026-04-10.at.22.12.09.mov

huult · 2026-04-10T15:16:35Z

@collectioneur It is still happening on staging. Could you check if it is related to your changes?

collectioneur · 2026-04-10T15:18:35Z

@huult I checked, and it works exactly the same way in production. Even if it is a bug, it's unrelated to my changes

huult · 2026-04-10T15:19:30Z

Screen.Recording.2026-04-10.at.22.18.43.mov

collectioneur · 2026-04-10T15:23:38Z

@huult, yeah, it looks like that on staging. Try to reproduce it on that PR, it should be resolved

huult · 2026-04-10T15:25:09Z

Screen.Recording.2026-04-10.at.22.23.55.mov

It is not happening in production. Could you check whether it is related to your changes or not?

collectioneur · 2026-04-10T15:30:02Z

#87622 (comment)
regarding the point that my changes aren't related to the bug, I was actually referring to this video

#87622 (comment)
As for this bug, it was indeed introduced by my changes, but changes in this PR fixed it too

collectioneur · 2026-04-10T15:30:58Z

Screen.Recording.2026-04-10.at.17.30.20.mov

huult · 2026-04-10T15:36:27Z

@collectioneur Thank you! It’s working now.

huult

LGTM!

github-actions · 2026-04-13T08:21:23Z

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

github-actions · 2026-04-13T08:26:16Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-897ef5c-08ff3fc-04451a178139ff3470d2e24b3c6115cdb2a6aebe/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-897ef5c-08ff3fc-7d1a95eb7751d7cae4988e2d4baeac7a1bbd45f3/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-13T08:28:50Z

✋ 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-04-13T20:35:11Z

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

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-04-13T20:36:21Z

No help site changes required.

This PR fixes internal navigation routing logic (getMatchingFullScreenRoute and isDynamicRouteScreen utility) to correctly handle dynamic routes in the "Flag as offensive" RHP within threads. All changes are in src/libs/Navigation/helpers/ and corresponding test files — no user-facing features, settings names, or workflows are affected.

OSBotify · 2026-04-16T03:31:53Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀

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

fix screen underneath handling logic

2f63977

melvin-bot Bot assigned collectioneur Apr 10, 2026

fix prettier

a85b7d8

collectioneur added 4 commits April 10, 2026 15:44

make dynamic route checking more stable

1aa0aa5

fix comment

9318619

revert some unnecessary changes

8516d9c

Revert Mobile-Expensify submodule to main version

083ce8e

collectioneur changed the title ~~fix screen underneath handling logic~~ Fix screen underneath handling logic Apr 10, 2026

collectioneur changed the title ~~Fix screen underneath handling logic~~ Fix Chat - App returns to main chat after refreshing Flag as offensive RHP in thread Apr 10, 2026

jmusial reviewed Apr 10, 2026

View reviewed changes

add tests

a44f476

collectioneur marked this pull request as ready for review April 10, 2026 14:49

collectioneur requested review from a team as code owners April 10, 2026 14:49

melvin-bot Bot requested review from heyjennahay and huult and removed request for a team April 10, 2026 14:49

melvin-bot Bot removed the request for review from a team April 10, 2026 14:49

huult approved these changes Apr 10, 2026

View reviewed changes

melvin-bot Bot requested a review from mjasikowski April 10, 2026 15:53

mjasikowski approved these changes Apr 13, 2026

View reviewed changes

mjasikowski merged commit 897ef5c into Expensify:main Apr 13, 2026
36 checks passed

OSBotify mentioned this pull request Apr 13, 2026

Deploy Checklist: New Expensify 2026-04-13 #87792

Closed

89 tasks

melvin-bot Bot mentioned this pull request Apr 16, 2026

[Due for payment 2026-04-23] Chat - App returns to main chat after refreshing Flag as offensive RHP in thread #87602

Closed

7 tasks

Uh oh!

Conversation

collectioneur commented Apr 10, 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 Apr 10, 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!

jmusial Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Apr 10, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

huult commented Apr 10, 2026

Uh oh!

huult commented Apr 10, 2026

Uh oh!

collectioneur commented Apr 10, 2026

Uh oh!

huult commented Apr 10, 2026

Uh oh!

collectioneur commented Apr 10, 2026

Uh oh!

huult commented Apr 10, 2026

Uh oh!

collectioneur commented Apr 10, 2026

Uh oh!

collectioneur commented Apr 10, 2026

Uh oh!

huult commented Apr 10, 2026

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

collectioneur commented Apr 10, 2026 •

edited

Loading

codecov Bot commented Apr 10, 2026 •

edited by github-actions Bot

Loading

huult commented Apr 10, 2026 •

edited

Loading