[CP Staging] feat: [CFI] Add group-by report layout feature v2.2 by TaduJR · Pull Request #76533 · Expensify/App

TaduJR · 2025-12-02T14:28:23Z

Explanation of Change

Use getCurrency() instead of transaction.currency to correctly handle modifiedCurrency when user edits transaction currency
Exclude transactions with pendingAction: 'delete' from group subtotal calculation so deleted expenses don't count toward category/tag totals

Fixed Issues

$ #72100
$ #76471
$ #76473
PROPOSAL: #72100 (comment)

Tests

Test 1: Expense - Amount next to category does not update after changing expense currency #76471

Go to staging.new.expensify.com
Go to workspace chat.
Create two expenses with different category in workspace default currency.
Open expense report.
Open any expense.
Click Amount field.
Change the currency and save it.
Close the RHP.
Verify The amount next to category will update after changing expense currency.

Test 2: Expense - Amount next to category does not update when expense is deleted offline #76473

Go to staging.new.expensify.com
Go to workspace chat.
Create two expenses with the same category.
Open the expense report.
Go offline.
Delete one of the expenses
Verify Amount next to category will update when expense is deleted offline.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests
// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Macbook-Chrome-1.mp4

- Use getCurrency() instead of transaction.currency to handle modifiedCurrency (Expensify#76471) - Exclude pending delete transactions from subtotal calculation (Expensify#76473)

melvin-bot · 2025-12-02T14:28:32Z

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

melvin-bot · 2025-12-02T14:28:41Z

@shubham1206agra @mountiny One of you needs to 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]

codecov · 2025-12-02T14:36:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/ReportLayoutUtils.ts	`98.03% <100.00%> (+0.12%)`	⬆️
... and 14 files with indirect coverage changes

shubham1206agra · 2025-12-02T16:08:11Z

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
- MacOS: Desktop
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
xIf 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

Screen.Recording.2025-12-02.at.9.36.57.PM.mov

mountiny

Thanks!

…yout-feature [CP Staging] feat: [CFI] Add group-by report layout feature v2.2 (cherry picked from commit d7ae889) (cherry-picked to staging by mountiny)

OSBotify · 2025-12-02T17:02:14Z

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

…866318435-1 🍒 Cherry pick PR #76533 to staging 🍒

OSBotify · 2025-12-02T17:51:13Z

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

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

OSBotify · 2025-12-02T21:38:31Z

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

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

OSBotify · 2025-12-03T13:59:27Z

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

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

OSBotify · 2025-12-03T14:54:35Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.70-0 🚀

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

OSBotify · 2025-12-03T15:21:30Z

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

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

OSBotify · 2025-12-04T15:46:31Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.71-5 🚀

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

abzokhattab · 2026-08-21T22:29:21Z

BugZero Comment

This PR introduced groupTransactionsByCategory and groupTransactionsByTag in ReportLayoutUtils.ts using the raw category/tag string as the Map key for grouping:

const categoryKey = isCategoryMissing(category) ? '' : category;

The problem is that different code paths (MCC auto-categorization vs. distance default category) can produce the same category name with different HTML encodings — e.g., Uber & car washes vs Uber & car washes. Since the raw string is used as the grouping key, these resolve to two separate groups even though they represent the same category. The key should have been HTML-decoded before grouping (matching how OldDot handles this with _.unescape()).

Issue: https://github.com/Expensify/Expensify/issues/612034
Fix: #85603

fix: correct group subtotal calculation in ReportLayoutUtils

f7d874c

- Use getCurrency() instead of transaction.currency to handle modifiedCurrency (Expensify#76471) - Exclude pending delete transactions from subtotal calculation (Expensify#76473)

TaduJR requested review from a team as code owners December 2, 2025 14:28

melvin-bot Bot assigned TaduJR Dec 2, 2025

melvin-bot Bot requested review from JmillsExpensify and shubham1206agra and removed request for a team and shubham1206agra December 2, 2025 14:28

melvin-bot Bot requested review from a team, mountiny and shubham1206agra and removed request for a team December 2, 2025 14:28

shubham1206agra approved these changes Dec 2, 2025

View reviewed changes

mountiny changed the title ~~feat: [CFI] Add group-by report layout feature v2.2~~ [CP Staging] feat: [CFI] Add group-by report layout feature v2.2 Dec 2, 2025

mountiny approved these changes Dec 2, 2025

View reviewed changes

mountiny merged commit d7ae889 into Expensify:main Dec 2, 2025
34 checks passed

os-botify Bot mentioned this pull request Dec 2, 2025

🍒 Cherry pick PR #76533 to staging 🍒 #76545

Merged

51 tasks

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

AndrewGable added a commit that referenced this pull request Dec 2, 2025

Merge pull request #76545 from Expensify/cherry-pick-staging-76533-19…

850ba85

…866318435-1 🍒 Cherry pick PR #76533 to staging 🍒

OSBotify mentioned this pull request Dec 2, 2025

Deploy Checklist: New Expensify 2025-12-01 #76460

Closed

melvin-bot Bot mentioned this pull request Dec 3, 2025

[$500] [CFI] Add group-by report layout feature #72100

Closed

This was referenced Dec 4, 2025

[Due for payment 2025-12-11] Expense - Amount next to category does not update after changing expense currency #76471

Closed

[Due for payment 2025-12-11] Expense - Amount next to category does not update when expense is deleted offline #76473

Closed

abzokhattab mentioned this pull request Aug 21, 2026

[Due for payment 2026-08-18] Payment issue for PR #85603 #98916

Closed

Navigation Menu

[CP Staging] feat: [CFI] Add group-by report layout feature v2.2 - #76533

[CP Staging] feat: [CFI] Add group-by report layout feature v2.2#76533
mountiny merged 1 commit into
Expensify:mainfrom
TaduJR:feat-CFI-Add-group-by-report-layout-feature

TaduJR commented Dec 2, 2025 •

edited

Loading

Uh oh!

melvin-bot Bot commented Dec 2, 2025

Uh oh!

melvin-bot Bot commented Dec 2, 2025

Uh oh!

codecov Bot commented Dec 2, 2025 •

edited by github-actions Bot

Loading

Uh oh!

shubham1206agra commented Dec 2, 2025

Uh oh!

mountiny left a comment

Uh oh!

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 4, 2025

Uh oh!

abzokhattab commented Aug 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

TaduJR commented Dec 2, 2025 • 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!

melvin-bot Bot commented Dec 2, 2025

Uh oh!

melvin-bot Bot commented Dec 2, 2025

Uh oh!

codecov Bot commented Dec 2, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shubham1206agra commented Dec 2, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 2, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 4, 2025

Uh oh!

abzokhattab commented Aug 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TaduJR commented Dec 2, 2025 •

edited

Loading

codecov Bot commented Dec 2, 2025 •

edited by github-actions Bot

Loading