feat: [CFI] Add group-by report layout feature v2 by TaduJR · Pull Request #76253 · Expensify/App

TaduJR · 2025-11-27T16:40:15Z

Explanation of Change

This PR implements a group-by report layout feature that allows users to organize expense report transactions by Category or Tag, matching the familiar OldDot functionality that NewDot customers have been requesting.

Fixed Issues

$ #72100
$ #76227
$ #76075
$ #76077
$ #76078
$ #76093
$ #76089
$ #76210
PROPOSAL: #72100 (comment)

Tests

Test 1: Back button navigation in Report Layout RHP (#76227)

Go to workspace chat
Create two expenses
Open expense report
Send a message in the chat
Go to Reports > Chats
Click on the message from Step 4
Click More > Report layout
Click RHP back button
Verify that expense report RHP remains open (not closed)

Test 2: Negative amount display (#76075)

Go to workspace chat
Create two manual expenses with different categories, one with a negative amount (e.g., -$50)
Open the expense report
Verify that the amount next to the negative expense category is displayed as negative (not positive)

Test 3: Offline expense amount display (#76077)

Go to workspace chat
Turn off internet connection (go offline)
Create two manual expenses with different categories
Open the report of the just created expenses
Verify that amount next to the expense categories displays the real amount (not $0.00)
Go online and verify amounts remain correct after sync

Test 4: Split expense offline - total not doubled (#76078)

Go to workspace chat
Create two expenses with the same category
Open the expense report
Note the total amount next to the category
Go offline
Open any expense
Click More > Split > Save
Verify that total next to category checkbox remains the same (not doubled)

Test 5: Edit split amount - total updates correctly (#76093)

Go to workspace chat
Create an expense
Open the expense report
Click More > Split > Save
Open any split
Click Amount
Edit the amount and save it
Verify that total amount next to category updates correctly

Test 6: Android 16 minimum font size - amount visible (#76089)
Android 16 only, device font size set to minimum

Launch Expensify app
Go to workspace chat
Create two expenses with the same amount and same category
Open the expense report
Verify that amount next to the category is visible (not hidden)

Test 7: Indeterminate checkbox behavior consistency (#76210)

Go to workspace chat
Create two expenses with the same category
Open the expense report
Select one expense via checkbox (category shows indeterminate state)
Click on the indeterminate checkbox next to the category
Verify that all expenses are deselected (not selected)
With no selections, click category checkbox
Verify that all expenses are selected
Uncheck one expense (indeterminate state again)
Click on the indeterminate "Select All" checkbox
Verify both checkboxes behave the same - deselect when in indeterminate state

Verify that no errors appear in the JS console

Offline 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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

… RHP

Expensify#76075 - Negative amounts displaying incorrectly - Fixed with getConvertedAmount() that flips the sign - Stored negative → displayed positive Expensify#76077 - Offline transactions showing $0 - Fixed with fallback logic in calculateGroupTotal() - If convertedAmount exists → use it - Else if same currency → use amount

…nsify#76078, Expensify#76093)

codecov · 2025-11-27T16:48:08Z

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 Δ
src/libs/ReportSecondaryActionUtils.ts	`90.73% <100.00%> (ø)`
src/libs/actions/IOU.ts	`64.50% <100.00%> (-0.17%)`	⬇️
src/pages/settings/Report/ReportLayoutPage.tsx	`0.00% <ø> (ø)`
...equestReportView/MoneyRequestReportGroupHeader.tsx	`16.00% <0.00%> (-3.05%)`	⬇️
...stReportView/MoneyRequestReportTransactionList.tsx	`1.81% <0.00%> (ø)`
src/libs/ReportLayoutUtils.ts	`0.00% <0.00%> (ø)`
... and 51 files with indirect coverage changes

…indeterminate toggle behavior (Expensify#76191, Expensify#76210)

melvin-bot · 2025-11-28T10:35:46Z

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

TaduJR · 2025-11-28T10:40:16Z

Also Tagging @Krishna2323

github-actions · 2025-11-28T11:14:44Z

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

…xpensify#76078)

github-actions · 2025-11-28T11:49:31Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/76253/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/76253/index.html

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

👀 View the workflow run that generated this build 👀

…mount for split expenses

Approved by mistake

shubham1206agra · 2025-12-01T07:16:30Z

#76227

Screen.Recording.2025-12-01.at.12.46.06.PM.mov

Fixed

shubham1206agra · 2025-12-01T07:17:46Z

#76075

Fixed

shubham1206agra · 2025-12-01T07:35:09Z

#76093

Screen.Recording.2025-12-01.at.1.04.31.PM.mov

Edit - It is fixed now using #76253 (comment)

shubham1206agra · 2025-12-01T07:37:50Z

#76210

Screen.Recording.2025-12-01.at.1.07.24.PM.mov

Fixed

)

shubham1206agra · 2025-12-01T12:54:18Z

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

Android: HybridApp

Screen.Recording.2025-12-01.at.6.19.51.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-12-01.at.6.12.02.PM.mov

iOS: HybridApp

Screen.Recording.2025-12-01.at.6.15.35.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-12-01.at.6.09.22.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-01.at.6.04.34.PM.mov

OSBotify · 2025-12-01T13:36:11Z

✋ 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 · 2025-12-01T23:45:23Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.2.67-0 🚀

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

OSBotify · 2025-12-03T13:58:02Z

🚀 Deployed 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:53:29Z

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

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

suneox · 2026-01-28T17:18:07Z

+        const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction;
+        optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false);


Coming from #78814 checklist: we’re missing logic to recalculate convertedAmount for optimistic data in split expenses. Instead of omitting convertedAmount, we should calculate it based on the split amount.

TaduJR added 3 commits November 27, 2025 16:09

fix: Expense - Back button on Report layout RHP closes expense report…

24fefcb

… RHP

fix: omit amount fields when merging split expense transactions (Expe…

244098a

…nsify#76078, Expensify#76093)

melvin-bot Bot assigned TaduJR Nov 27, 2025

shubham1206agra reviewed Nov 27, 2025

View reviewed changes

Comment thread src/libs/actions/IOU.ts

TaduJR added 3 commits November 27, 2025 21:32

refactor: only omit convertedAmount when merging split transactions

73e85ba

chore: move Report layout menu item below View details

f01f51f

fix: disable group checkbox when all expenses pending delete and fix …

f4cf08c

…indeterminate toggle behavior (Expensify#76191, Expensify#76210)

mountiny self-requested a review November 28, 2025 00:36

fix: rename unused variable to satisfy naming convention

a32f5ca

TaduJR marked this pull request as ready for review November 28, 2025 10:35

TaduJR requested review from a team as code owners November 28, 2025 10:35

melvin-bot Bot requested review from heyjennahay and shubham1206agra and removed request for a team November 28, 2025 10:35

melvin-bot Bot requested review from a team and JmillsExpensify and removed request for a team November 28, 2025 10:35

TaduJR mentioned this pull request Nov 28, 2025

[$250] Expense - Hold message is duplicated after splitting held expense #76005

Closed

8 tasks

fix: copy only card fields when splitting expenses (Expensify#76005, E…

31f1b14

…xpensify#76078)

shubham1206agra reviewed Nov 28, 2025

View reviewed changes

Comment thread src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx Outdated

fix: use CONST.DOT_SEPARATOR in group header and omit only convertedA…

6105a43

…mount for split expenses

TaduJR requested a review from shubham1206agra November 28, 2025 14:09

shubham1206agra reviewed Dec 1, 2025

View reviewed changes

Comment thread src/libs/ReportLayoutUtils.ts Outdated

fix: correct group total calculation for split expenses (Expensify#76093

cca9d68

)

shubham1206agra approved these changes Dec 1, 2025

View reviewed changes

nkuoch approved these changes Dec 1, 2025

View reviewed changes

mountiny marked this pull request as draft December 1, 2025 13:03

mountiny marked this pull request as ready for review December 1, 2025 13:03

mountiny approved these changes Dec 1, 2025

View reviewed changes

mountiny merged commit d08766b into Expensify:main Dec 1, 2025
33 checks passed

OSBotify mentioned this pull request Dec 1, 2025

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

Closed

This was referenced Dec 2, 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

suneox reviewed Jan 28, 2026

View reviewed changes

		const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction;
		optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false);

Conversation

TaduJR commented Nov 27, 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!

codecov Bot commented Nov 27, 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!

Uh oh!

melvin-bot Bot commented Nov 28, 2025

Uh oh!

TaduJR commented Nov 28, 2025

Uh oh!

github-actions Bot commented Nov 28, 2025

Uh oh!

github-actions Bot commented Nov 28, 2025

Uh oh!

Uh oh!

shubham1206agra commented Dec 1, 2025

Uh oh!

shubham1206agra commented Dec 1, 2025

Uh oh!

shubham1206agra commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shubham1206agra commented Dec 1, 2025

Uh oh!

Uh oh!

shubham1206agra commented Dec 1, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Dec 1, 2025

Uh oh!

OSBotify commented Dec 1, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

OSBotify commented Dec 3, 2025

Uh oh!

suneox Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

TaduJR commented Nov 27, 2025 •

edited

Loading

codecov Bot commented Nov 27, 2025 •

edited by github-actions Bot

Loading

shubham1206agra commented Dec 1, 2025 •

edited

Loading