Repository navigation
feat: [CFI] Add group-by report layout feature v2 #76253
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
mountiny
merged 11 commits into
Expensify:main
from
TaduJR:feat-CFI-Add-group-by-report-layout-feature
Dec 1, 2025
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
24fefcb
fix: Expense - Back button on Report layout RHP closes expense report…
TaduJR 7e0a85d
fix: group subtotals with multi-currency and offline support
TaduJR 244098a
fix: omit amount fields when merging split expense transactions (#760…
TaduJR 73e85ba
refactor: only omit convertedAmount when merging split transactions
TaduJR f01f51f
chore: move Report layout menu item below View details
TaduJR f4cf08c
fix: disable group checkbox when all expenses pending delete and fix …
TaduJR a32f5ca
fix: rename unused variable to satisfy naming convention
TaduJR 31f1b14
fix: copy only card fields when splitting expenses (#76005, #76078)
TaduJR 6105a43
fix: use CONST.DOT_SEPARATOR in group header and omit only convertedA…
TaduJR 62a0cf6
Merge branch 'Expensify:main' into feat-CFI-Add-group-by-report-layou…
TaduJR cca9d68
fix: correct group total calculation for split expenses (#76093)
TaduJR File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3621,10 +3621,15 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma | |
| // data. This is a big can of worms to change it to `Onyx.merge()` as explored in https://expensify.slack.com/archives/C05DWUDHVK7/p1692139468252109. | ||
| // I want to clean this up at some point, but it's possible this will live in the code for a while so I've created https://github.com/Expensify/App/issues/25417 | ||
| // to remind me to do this. | ||
| if ((!!isSplitExpense || isDistanceRequest) && existingTransaction) { | ||
| if (isDistanceRequest && existingTransaction) { | ||
| optimisticTransaction = fastMerge(existingTransaction, optimisticTransaction, false); | ||
| } | ||
|
|
||
| if (isSplitExpense && existingTransaction) { | ||
| const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction; | ||
| optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false); | ||
|
Comment on lines
+3629
to
+3630
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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 marked this conversation as resolved.
Resolved
|
||
|
|
||
| // STEP 4: Build optimistic reportActions. We need: | ||
| // 1. CREATED action for the chatReport | ||
| // 2. CREATED action for the iouReport | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@TaduJR Can you make the similar changes when editing amount of a transaction?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, when we merge transactions too.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shubham1206agra Could you clarify what specific issue you're seeing with editing amount or merging transactions? The current fix targets the split expense flow where fastMerge copies convertedAmount to each split, causing doubled totals. The edit amount and merge duplicates flows don't use the same fastMerge(existingTransaction, optimisticTransaction) pattern, so I'm not sure what change would be needed there.