[CP Staging] Fix the preExistingReportID by mountiny · Pull Request #79762 · Expensify/App

mountiny · 2026-01-16T14:02:48Z

Explanation of Change

This PR fixes an infinite loading issue when opening a secondary login chat page.

Root Cause:
PR #77657 ("Super wide RHP") changed how handlePreexistingReport determines if the user is viewing an optimistic report. It switched from using Navigation.getActiveRoute() to navigationRef.getCurrentRoute()?.path.

The problem is that getCurrentRoute()?.path can be undefined during first navigation (this is even documented in the codebase). When the path is undefined:

isOptimisticReportFocused evaluates to undefined (falsy)
The re-routing logic to navigate to preexistingReportID is completely skipped
The user remains stuck on the stale optimistic reportID
Subsequent API calls with that stale reportID fail, causing infinite loading

Fix:
Use Navigation.getActiveRoute() which reliably builds the path from navigation state using getPathFromState(), instead of relying on the potentially undefined .path property. We still use getCurrentRoute() for accessing params and screenName as getActiveRoute() only returns the path string.

Fixed Issues

$ #79731
PROPOSAL:

Tests

Have two accounts: Account A with a primary email and Account B
On Account B, start a new chat with Account A using Account A's secondary login (e.g., phone number or secondary email)
Verify the chat opens successfully without infinite loading
Verify the correct report is displayed (the preexisting DM chat, not a new optimistic one)
Verify you can send messages in the chat

Verify that no errors appear in the JS console

Offline tests

Start a new chat with a secondary login while online
Turn off network connection
Verify the chat still displays correctly (with offline indicator)
Turn network back on
Verify the chat syncs properly

QA Steps

Have two accounts: Account A with primary email + secondary login, and Account B
Ensure Account A and Account B already have an existing DM chat
On Account B, use "Start chat" and enter Account A's secondary login (phone or secondary email)
Verify the existing DM chat opens successfully without infinite loading
Verify you can send/receive messages in the chat

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

github-actions · 2026-01-16T14:04:03Z

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

github-actions · 2026-01-16T14:08:35Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

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

👀 View the workflow run that generated this build 👀

codecov · 2026-01-16T14:12:21Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Report.ts	`53.62% <0.00%> (ø)`
... and 11 files with indirect coverage changes

melvin-bot · 2026-01-16T14:48:39Z

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

ZhenjaHorbach · 2026-01-16T14:51:42Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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

2026-01-16.16.25.44.mov

Android: mWeb Chrome

2026-01-16.16.27.20.mov

iOS: HybridApp

2026-01-16.16.25.44.mov

iOS: mWeb Safari

2026-01-16.16.27.20.mov

MacOS: Chrome / Safari

2026-01-16.16.23.19.mov

WojtekBoman

LGTM!

mountiny · 2026-01-16T15:12:13Z

@codex review

chatgpt-codex-connector · 2026-01-16T15:17:11Z

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

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

ZhenjaHorbach · 2026-01-16T15:28:52Z

LGTM!

melvin-bot · 2026-01-16T15:29:37Z

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

[CP Staging] Fix the preExistingReportID (cherry picked from commit 3e042bf) (cherry-picked to staging by mountiny)

OSBotify · 2026-01-16T15:50:12Z

✋ 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-01-16T16:22:14Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.3-6 🚀

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

IuliiaHerets · 2026-01-16T17:28:31Z

@mountiny CP is pass on Web and iOS for QA team, build 9.3.3-6

1768583431478.ScreenRecording_01-16-2026_11-52-31_1.mp4

1768582230991.Recording__1279.mp4

OSBotify · 2026-01-16T23:18:23Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.3-8 🚀

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

OSBotify · 2026-01-16T23:38:29Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.4-0 🚀

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

OSBotify · 2026-01-20T17:11:46Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.4-6 🚀

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

Fix the preExistingReportID

4d1f0dc

mountiny self-assigned this Jan 16, 2026

mountiny marked this pull request as ready for review January 16, 2026 14:48

mountiny requested review from a team as code owners January 16, 2026 14:48

melvin-bot bot requested review from JmillsExpensify and ZhenjaHorbach and removed request for a team and ZhenjaHorbach January 16, 2026 14:48

melvin-bot bot removed the request for review from a team January 16, 2026 14:48

mountiny requested review from WojtekBoman and ZhenjaHorbach January 16, 2026 14:51

WojtekBoman approved these changes Jan 16, 2026

View reviewed changes

ZhenjaHorbach approved these changes Jan 16, 2026

View reviewed changes

melvin-bot bot requested a review from mjasikowski January 16, 2026 15:29

mjasikowski approved these changes Jan 16, 2026

View reviewed changes

lakchote approved these changes Jan 16, 2026

View reviewed changes

mountiny merged commit 3e042bf into main Jan 16, 2026
38 of 43 checks passed

mountiny deleted the vit-79731 branch January 16, 2026 15:41

OSBotify pushed a commit that referenced this pull request Jan 16, 2026

Merge pull request #79762 from Expensify/vit-79731

4284dca

[CP Staging] Fix the preExistingReportID (cherry picked from commit 3e042bf) (cherry-picked to staging by mountiny)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jan 16, 2026

OSBotify mentioned this pull request Jan 16, 2026

Deploy Checklist: New Expensify 2026-01-15 #79701

Closed

65 tasks

rayane-d mentioned this pull request Jan 19, 2026

Handle the preExistingReportID for transaction threads, message threads, and single expense reports #75101

Merged

54 tasks

melvin-bot bot mentioned this pull request Jan 20, 2026

[Due for payment 2026-01-27] Infinite loading when open secondary login chat page #79731

Closed

7 tasks

Conversation

mountiny commented Jan 16, 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!

github-actions bot commented Jan 16, 2026

Uh oh!

github-actions bot commented Jan 16, 2026

Uh oh!

codecov bot commented Jan 16, 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!

melvin-bot bot commented Jan 16, 2026

Uh oh!

ZhenjaHorbach commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

WojtekBoman left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 16, 2026

Uh oh!

ZhenjaHorbach commented Jan 16, 2026

Uh oh!

melvin-bot bot commented Jan 16, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

IuliiaHerets commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 16, 2026

Uh oh!

OSBotify commented Jan 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

mountiny commented Jan 16, 2026 •

edited

Loading

codecov bot commented Jan 16, 2026 •

edited by github-actions bot

Loading

ZhenjaHorbach commented Jan 16, 2026 •

edited

Loading