[CP Staging] Fix: open flagged expense thread when its report holds multiple transactions by MelvinBot · Pull Request #95163 · Expensify/App

MelvinBot · 2026-07-02T10:28:42Z

Explanation of Change

The "Review X expenses" row on Home opened the whole expense report when a single flagged expense lived inside a report that still held other (unflagged) transactions, instead of opening the RHP for the flagged expense.

The handler in useReviewFlaggedExpenses decided between "open the report directly" and "open the single transaction thread" with:

if (flaggedExpenses.length === 1 && isMoneyRequestReport(firstFlaggedReport)) { ... }

isMoneyRequestReport only checks the report type (isIOUReport || isExpenseReport), which is always true for the OPEN expense reports this hook scans. So flaggedExpenses.length === 1 alone drove the branch, and the "open the report directly" shortcut — intended only for genuine one-transaction reports — fired even when the report contained multiple expenses.

The fix swaps the type check for the transaction-count check that expresses the real intent, isOneTransactionReport (report?.transactionCount === 1):

if (flaggedExpenses.length === 1 && isOneTransactionReport(firstFlaggedReport)) { ... }

Now a lone flagged expense inside a multi-transaction report falls through to navigateToTransactionThread, opening the RHP for that single flagged expense (matching the Expected Result). The "open the report directly" shortcut stays reserved for reports that genuinely hold only one expense.

Added unit coverage in tests/unit/hooks/useReviewFlaggedExpenses.test.ts (lone flagged expense in a 2-transaction report → opens the thread) and UI coverage in tests/ui/ForYouSectionTest.tsx for both the multi-transaction (→ thread) and single-transaction (→ report directly) paths.

Fixed Issues

$ #95089
PROPOSAL: #95089 (comment)

Tests

Go to a workspace chat.
Create two expenses without a category.
Go to Home.
Click Review 2 expenses.
Click Category and select any category.
Close the report view.
Click Review 1 expense.
Verify the expense RHP for the expense with the missing category opens (not the expense report showing both expenses).

Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

Go to a workspace chat.
Create two expenses without a category.
Go to Home.
Click Review 2 expenses.
Click Category and select any category.
Close the report view.
Click Review 1 expense.
Verify the expense RHP for the expense with the missing category opens (not the expense report showing both expenses).

Verify that no errors appear in the JS console

PR Author Checklist

…actions The Review row shortcut used isMoneyRequestReport (report type) to decide whether to open the report directly. That check is always true for expense reports, so a single flagged expense inside a multi-transaction report opened the whole report instead of the flagged expense. Gate on isOneTransactionReport (transactionCount === 1) so a lone flagged expense in a multi-transaction report opens its own thread. Co-authored-by: Cristi Paval <cristipaval@users.noreply.github.com>

codecov · 2026-07-02T10:33:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ges/home/ForYouSection/useReviewFlaggedExpenses.ts	`95.52% <100.00%> (+2.98%)`	⬆️
... and 16 files with indirect coverage changes

MelvinBot · 2026-07-02T10:33:51Z

🤖 I looked into the failing checks. There's no code fix to push — the only failing check is the PR Author Checklist, which is a human-completion gate, not a code problem.

What's failing: PR Author Checklist / checklist — the action reports "You completed 2 out of 41 checklist items with 39 unfinished items." It fails simply because the checklist boxes in the PR description aren't all ticked.

Why I can't fix it: those checkboxes (plus the Tests and QA Steps sections) are the human co-author's responsibility — MelvinBot isn't allowed to fill out those human-only sections on someone's behalf. So cristipaval needs to review the checklist, run the test steps, and tick the boxes to clear this check.

Everything else is green or on track: typecheck, ESLint, Prettier, Storybook, React Compiler, unused-styles, and all 8 Jest test jobs (which include the new useReviewFlaggedExpenses and ForYouSection tests added here) have passed. The only checks still running are the long builds and perf tests (build, baseline-perf-tests, branch-perf-tests) — none of which are affected by this one-line import swap plus test additions.

TL;DR: nothing to fix in code. Complete the PR Author Checklist to turn the checklist check green.

github-actions · 2026-07-02T10:38:38Z

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

MelvinBot · 2026-07-02T10:43:11Z

🤖 I re-checked the checks now that the builds finished. Two checks are red, and neither is a code problem — there's nothing to fix in the PR.

1. build (New Expensify Dev, DebugDevelopment, false) — flaky iOS build, unrelated to this PR.

The log shows no source-level compile error — no error:, no "The following build commands failed", no linker/symbol errors. The only error line is an infrastructure one:

Remote cache failure error: NoSuchKey: The specified key does not exist.

followed by a generic RockError: Failed to build the project from xcodebuild. This is a remote-build-cache miss on the Rock CI infra, not a build break.

Evidence it's not caused by the changes here:

This PR only swaps one TypeScript import (isMoneyRequestReport → isOneTransactionReport) in useReviewFlaggedExpenses.ts plus two test files — nothing native/iOS.
The Android build of the same JS/TS (build (Expensify Dev, Debug, true)) and both other build variants passed. A broken bundle would have failed those too.

I can't re-trigger the job from here (permission-gated in this run). cristipaval — please hit "Re-run failed jobs" on that run, or push any commit to re-trigger; it should go green.

2. PR Author Checklist / checklist — human-completion gate.

Fails with "You completed 2 out of 41 checklist items." These checkboxes (and the Tests/QA Steps sections) are the human co-author's responsibility — I'm not allowed to fill them out. Complete the checklist to clear it.

Everything else is green: typecheck, ESLint, Prettier, Storybook, React Compiler, unused-styles, and all 8 Jest test jobs (including the new useReviewFlaggedExpenses and ForYouSection tests).

melvin-bot · 2026-07-02T10:45:17Z

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

MelvinBot · 2026-07-02T10:45:59Z

🤖 Update: a second check has now failed, but neither failing check is caused by this PR, and there's nothing for me to fix in code.

1. build (New Expensify Dev, DebugDevelopment, false) — unrelated iOS infra failure.
The iOS build fails compiling native Swift, not JS:

ios/CertificatePinning.swift:83:82: error: cannot find type 'TSKPinningValidationResult' in scope

TSKPinningValidationResult comes from the TrustKit CocoaPod, and ios/CertificatePinning.swift:83 is not in this PR's diff — the only files changed here are useReviewFlaggedExpenses.ts and two test files. A JS import swap can't produce a Swift "type not in scope" error. I confirmed the same Remote Build iOS failure is currently hitting main and other unrelated branches (e.g. claude-perDiemSubtitleFlexRow, a revert-* branch) at the same time — so this is a broad Pods/TrustKit resolution issue in CI, not something in this PR. It should clear once the underlying pod/env issue is resolved on main; a re-run alone likely won't help since it's a deterministic compile error, not a flake.

2. PR Author Checklist / checklist — human-completion gate.
"You completed 2 out of 41 checklist items." This just needs cristipaval to fill out the checklist boxes / Tests / QA sections — MelvinBot isn't allowed to complete those human-only sections.

Everything code-related is green: typecheck, ESLint, Prettier, Storybook, React Compiler, unused-styles, and all 8 Jest test jobs (including the new useReviewFlaggedExpenses and ForYouSection tests) passed.

TL;DR: no code fix to push. The iOS build break is a pre-existing infra issue affecting main too; the checklist just needs to be completed by the author.

truph01 · 2026-07-02T11:32:49Z

@codex review

chatgpt-codex-connector · 2026-07-02T11:37:57Z

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 1fd663a922

ℹ️ 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-07-02T12:56:28Z

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

2026-07-02.15.10.34.mov

Android: mWeb Chrome

2026-07-02.15.12.42.mov

iOS: HybridApp

2026-07-02.15.10.34.mov

iOS: mWeb Safari

2026-07-02.15.12.42.mov

MacOS: Chrome / Safari

2026-07-02.15.05.59.mov

ZhenjaHorbach · 2026-07-02T13:04:55Z

@MelvinBot
Add test steps from the issue in the PR description

MelvinBot · 2026-07-02T13:07:37Z

🤖 Added the concrete reproduction steps from #95089 to the Tests and QA Steps sections of the PR description:

Go to a workspace chat.
Create two expenses without a category.
Go to Home.
Click Review 2 expenses.
Click Category and select any category.
Close the report view.
Click Review 1 expense.
Verify the expense RHP for the expense with the missing category opens (not the expense report showing both expenses).

github-actions · 2026-07-02T13:45:40Z

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

github-actions · 2026-07-02T13:51:16Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9fb8f6382a9-78d7f86-90a8c9c08ba171682f417fae67db5761f0827732/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9fb8f63-78d7f86-4993c0a032ed91df330562d1246b27d3fa52208b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-02T13:51:17Z

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

…ingleThread Fix: open flagged expense thread when its report holds multiple transactions (cherry picked from commit 9fb8f63) (cherry-picked to staging by cristipaval)

OSBotify · 2026-07-02T14:30:28Z

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.4.26-5 🚀

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

MelvinBot · 2026-07-02T14:32:19Z

🤖 Help site review: no docs changes required.

This PR is a pure navigation bug fix. It changes only the internal logic in useReviewFlaggedExpenses.ts (swapping a report-type check for isOneTransactionReport) plus test files, so that clicking Review 1 expense on Home opens the RHP for the single flagged expense instead of the whole expense report.

There is no new feature, no new/renamed UI element, no changed setting, and no change to any documented workflow — it simply restores the expected behavior. Nothing under App/docs/articles describes this "Review X expenses" navigation detail, so no help site article needs to be added or updated.

Because no changes are required, I did not create a draft help site PR. If you disagree and think an article should be updated, let me know which flow to document and I'll draft one.

cristipaval, please confirm whether you agree that no help site changes are needed here.

OSBotify · 2026-07-03T16:45:10Z

🚀 Cherry-picked to staging by https://github.com/cristipaval in version: 9.4.27-1 🚀

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

MelvinBot · 2026-07-03T16:47:15Z

🤖 Help site review — no changes required.

This PR is a bug fix that makes the actual behavior match what the help site already documents, so no updates to App/docs/articles are needed and no draft docs PR was created.

Why no docs change is needed

The only help article that documents where the Review item on Home navigates is Understanding-the-For-you-Section.md. It already states the intended behavior:

Line 40: "Review – expenses on your draft reports that are flagged against your workspace's rules and need to be reviewed before the report can be submitted"
Line 72: "Review takes you to the first flagged expense so you can resolve the rule violation"

This PR fixes an edge case where a lone flagged expense living inside a multi-transaction report incorrectly opened the whole report instead of the flagged expense's RHP. After the fix, a lone flagged expense opens the expense thread — which is exactly what the article already describes. The docs were already correct; only the app behavior needed to be brought in line.

I checked the other candidate articles (Expensify-Home-Overview.md, How-to-Find-and-Resolve-Flagged-Duplicate-Expenses.md) — none document the Review navigation target, so nothing there needs to change either.

@cristipaval, since no help site changes are required, there's no linked docs PR to review. If you believe the For you section article should be more explicit about this navigation behavior, let me know and I'll draft the change.

OSBotify · 2026-07-06T15:33:42Z

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot assigned cristipaval Jul 2, 2026

MelvinBot requested a review from a team July 2, 2026 10:28

MelvinBot mentioned this pull request Jul 2, 2026

[Due for payment 2026-07-13] [$250] Home - Review 1 expense opens expense report instead of expense with violation #95089

Closed

7 tasks

cristipaval requested a review from truph01 July 2, 2026 10:44

This comment has been minimized.

Sign in to view

cristipaval marked this pull request as ready for review July 2, 2026 10:45

cristipaval requested a review from a team as a code owner July 2, 2026 10:45

melvin-bot Bot requested review from JmillsExpensify and cristipaval and removed request for a team July 2, 2026 10:45

melvin-bot Bot removed the request for review from a team July 2, 2026 10:45

cristipaval approved these changes Jul 2, 2026

View reviewed changes

cristipaval requested a review from ZhenjaHorbach July 2, 2026 12:53

ZhenjaHorbach approved these changes Jul 2, 2026

View reviewed changes

melvin-bot Bot requested a review from cristipaval July 2, 2026 13:14

cristipaval approved these changes Jul 2, 2026

View reviewed changes

cristipaval merged commit 9fb8f63 into main Jul 2, 2026
45 of 48 checks passed

cristipaval deleted the claude-reviewFlaggedExpenseSingleThread branch July 2, 2026 13:44

cristipaval changed the title ~~Fix: open flagged expense thread when its report holds multiple transactions~~ [CP Staging] Fix: open flagged expense thread when its report holds multiple transactions Jul 2, 2026

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

OSBotify mentioned this pull request Jul 2, 2026

Deploy Checklist: New Expensify 2026-07-01 #95081

Closed

97 tasks

Uh oh!

Conversation

MelvinBot commented Jul 2, 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

Uh oh!

codecov Bot commented Jul 2, 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!

MelvinBot commented Jul 2, 2026

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

This comment has been minimized.

melvin-bot Bot commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

truph01 commented Jul 2, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 2, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

github-actions Bot commented Jul 2, 2026

Uh oh!

OSBotify commented Jul 2, 2026

Uh oh!

OSBotify commented Jul 2, 2026

Uh oh!

MelvinBot commented Jul 2, 2026

Uh oh!

OSBotify commented Jul 3, 2026

Uh oh!

MelvinBot commented Jul 3, 2026

Uh oh!

OSBotify commented Jul 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

MelvinBot commented Jul 2, 2026 •

edited

Loading

codecov Bot commented Jul 2, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Jul 2, 2026 •

edited

Loading

ZhenjaHorbach commented Jul 2, 2026 •

edited

Loading