2 - Select attendee options when merging two expenses by hoangzinh · Pull Request #71758 · Expensify/App

hoangzinh · 2025-10-02T10:41:05Z

Explanation of Change

Fixed Issues

$ #68447
PROPOSAL:

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

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

Precondition:

Enable Tracking Attendees in a Workspace

Sign in to ND
Go to a workspace chat
Submit 2 expenses with different attendees
Go to one expense
Tap Merge button
Select another expense
Verify it displays the Attendees option to select when merging
Tap on "Continue"
Verify that App displays preferred attendees in "Confirmation" page
Tap on "Merge expense"
Verify that App merges attendees successfully

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-09-17.at.06.55.59.android.mov

Android: mWeb Chrome

Screen.Recording.2025-09-17.at.06.43.20.android.chrome.mov

iOS: Native

Screen.Recording.2025-09-17.at.07.11.43.mov

iOS: mWeb Safari

Screen.Recording.2025-09-17.at.07.07.41.mov

MacOS: Chrome / Safari

Screen.Recording.2025-09-17.at.06.00.02.web.mov

MacOS: Desktop

Screen.Recording.2025-09-17.at.07.00.16.desktop.mov

This reverts commit bbebea5.

- Remove direct import of localeCompare from LocaleCompare module - Update getMergeableDataAndConflictFields to accept localeCompare as parameter - Update all React components to use localeCompare from useLocalize hook - Add localeCompare to useCallback dependency arrays where needed - Update tests to pass mock localeCompare function - Follows same pattern as PR Expensify#71430 for PolicyDistanceRatesPage This fixes the issue where localeCompare direct imports no longer work and ensures consistent usage of localization utilities across the app.

codecov · 2025-10-02T10:52:28Z

Codecov Report

❌ Patch coverage is 72.85714% with 19 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/actions/IOU.ts	56.25%	7 Missing ⚠️
...c/components/ReportActionItem/MoneyRequestView.tsx	0.00%	4 Missing ⚠️
src/pages/TransactionMerge/ConfirmationPage.tsx	0.00%	3 Missing ⚠️
src/pages/TransactionMerge/DetailsReviewPage.tsx	0.00%	3 Missing ⚠️
src/libs/TransactionUtils/index.ts	66.66%	1 Missing ⚠️
src/libs/actions/MergeTransaction.ts	95.45%	1 Missing ⚠️

Files with missing lines	Coverage Δ
src/libs/MergeTransactionUtils.ts	`83.21% <100.00%> (+8.41%)`	⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx	`0.00% <ø> (ø)`
src/pages/TransactionMerge/ReceiptReviewPage.tsx	`0.00% <ø> (ø)`
src/libs/TransactionUtils/index.ts	`68.09% <66.66%> (-0.05%)`	⬇️
src/libs/actions/MergeTransaction.ts	`56.70% <95.45%> (+2.85%)`	⬆️
src/pages/TransactionMerge/ConfirmationPage.tsx	`0.00% <0.00%> (ø)`
src/pages/TransactionMerge/DetailsReviewPage.tsx	`0.00% <0.00%> (ø)`
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.30% <0.00%> (-0.01%)`	⬇️
src/libs/actions/IOU.ts	`63.10% <56.25%> (+0.05%)`	⬆️

... and 23 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

melvin-bot · 2025-10-02T15:13:37Z

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

hoangzinh · 2025-10-02T15:15:53Z

Our original PR was reverted here https://expensify.slack.com/archives/C01GTK53T8Q/p1759386483854869?thread_ts=1759370400.913469&cid=C01GTK53T8Q

This PR is the 2nd attempt to support merge attendees. It also fixes LocalCompare issue and the optimistic report action issue

garrettmknight · 2025-10-06T19:15:31Z

@hoangzinh is this ready for review from @dominictb ?

hoangzinh · 2025-10-07T07:42:26Z

Yes, @garrettmknight.

dominictb · 2025-10-07T16:51:34Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2025-09-28.at.22.55.21-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2025-09-28.at.22.42.49-compressed.mov

MacOS: Desktop

dominictb · 2025-10-07T16:55:00Z

Note for me:

Original PR: Select attendee options when merging two expenses #70478
Regressions: Expense - System message that shows up after merging expenses grays out when opened in thread #71729 and Merge expenses - One of the options in Attendee section is blank after reset app #71757

dominictb · 2025-10-07T17:06:21Z

#71757 is still reproducible

dominictb · 2025-10-07T17:11:30Z

+    const updatedReportAction = shouldBuildModifiedReportAction
+        ? buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport, policy, updatedTransaction)
+        : undefined;
+    if (!hasPendingWaypoints && !(hasModifiedDistanceRate && isFetchingWaypointsFromServer(transaction)) && updatedReportAction) {


Is this to fix #71729? If so can you briefly explain the root cause and your solution? Also add a code comment like the "waypoints" cases above.

I also don't like the way we're using shouldBuildModifiedReportAction, can we check to stop building modified report action in-place like we're checking the waypoints here?

The buildOptimisticModifiedExpenseReportAction will optimistically generate a system report action MODIFIED_EXPENSE like this

However, it seems in our merge flow, even when we select merchant/description from sourceTransaction, BE won't generate system report action MODIFIED_EXPENSE, thus it will cause the report not found, like this DB #71729. I think we should keep this OD behavior by not optimistically generating system report actions when merging expenses.

Please update the param name to shouldBuildOptimisticModifiedExpenseReportAction; add param JSDoc comments above getUpdateTrackExpenseParams and getUpdateMoneyRequestParams functions; and update these comments saying that we don't do this for merged expense:

App/src/libs/actions/IOU.ts

Lines 4148 to 4153 in aaed3a8

// Step 3: Build the modified expense report actions

// We don't create a modified report action if:

// - we're updating the waypoints

// - we're updating the distance rate while the waypoints are still pending

// In these cases, there isn't a valid optimistic mileage data we can use,

// and the report action is created on the server with the distance-related response from the MapBox API

App/src/libs/actions/IOU.ts

Lines 4585 to 4590 in aaed3a8

// Step 3: Build the modified expense report actions

// We don't create a modified report action if:

// - we're updating the waypoints

// - we're updating the distance rate while the waypoints are still pending

// In these cases, there isn't a valid optimistic mileage data we can use,

// and the report action is created on the server with the distance-related response from the MapBox API

I updated in this commit 455d76b

There is a max-params linter after we add this new argument. I have refactored this function in this commit as well 650a200

…tendees merge logic - Update isEmptyMergeValue to return true for empty arrays - Update comment to reflect empty array handling - Improve attendees merge logic to use isEmptyMergeValue for better empty value detection - Add comprehensive test coverage for array handling in isEmptyMergeValue

hoangzinh · 2025-10-08T09:57:24Z

feat: enhance isEmptyMergeValue to handle empty arrays and improve at…

I fixed in this commit 64f09fd by checking if attendee is empty

…; return null instead of undefined for updatedReportAction; add comments noting no optimistic MODIFIED_EXPENSE for merged expenses; update MergeTransaction to pass false accordingly (per review suggestion)

dominictb

LGTM

…h inline destructuring - Create GetUpdateMoneyRequestParams type with all parameters - Update function signature to use single object parameter with inline destructuring - Update all 15+ function calls in IOU.ts to use object syntax - Update MergeTransaction.ts call to use object syntax - Simplify JSDoc to document single params object - Resolves ESLint max-params error (was 11 params, now 1 param) - More maintainable and self-documenting code

youssef-lr · 2025-10-13T01:50:40Z

@hoangzinh we have conflicts

hoangzinh · 2025-10-13T10:52:31Z

@youssef-lr Conflicts are resolved

OSBotify · 2025-10-13T13:20:47Z

✋ 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-10-13T21:20:36Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.2.30-0 🚀

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

OSBotify · 2025-10-14T17:35:02Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.30-6 🚀

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

Revert "Revert "Select attendee options when merging two expenses""

900c682

This reverts commit bbebea5.

melvin-bot Bot assigned hoangzinh Oct 2, 2025

Do not build modified report action for merge expense

ac11376

hoangzinh marked this pull request as ready for review October 2, 2025 15:13

hoangzinh requested a review from a team as a code owner October 2, 2025 15:13

melvin-bot Bot requested review from dominictb and removed request for a team October 2, 2025 15:13

hoangzinh changed the title ~~Select attendee options when merging two expenses~~ 2 - Select attendee options when merging two expenses Oct 2, 2025

dominictb mentioned this pull request Oct 2, 2025

Expense - System message that shows up after merging expenses grays out when opened in thread #71729

Closed

8 tasks

dominictb suggested changes Oct 7, 2025

View reviewed changes

hoangzinh added 5 commits October 8, 2025 16:11

Merge branch 'main' into 68447-merge-attendees

2290085

Update param after merge main

5f880dd

Fix merge conflict

e24f2e9

Fix typeerror

c180dd9

dominictb suggested changes Oct 8, 2025

View reviewed changes

Comment thread src/libs/actions/IOU.ts Outdated

Comment thread src/libs/actions/IOU.ts Outdated

IOU: rename param to shouldBuildOptimisticModifiedExpenseReportAction…

455d76b

…; return null instead of undefined for updatedReportAction; add comments noting no optimistic MODIFIED_EXPENSE for merged expenses; update MergeTransaction to pass false accordingly (per review suggestion)

dominictb approved these changes Oct 8, 2025

View reviewed changes

melvin-bot Bot requested a review from youssef-lr October 8, 2025 15:14

Merge branch 'main' into 68447-merge-attendees

d2c8d14

hoangzinh added 3 commits October 8, 2025 23:13

Run prettier

566c7e6

Refactor code after merge main

76d20d4

dominictb approved these changes Oct 9, 2025

View reviewed changes

hoangzinh added 2 commits October 13, 2025 17:35

Merge branch 'main' into 68447-merge-attendees

d4b835a

Revert changes due to resolve merge conflict

a500918

youssef-lr approved these changes Oct 13, 2025

View reviewed changes

youssef-lr merged commit c83f25a into Expensify:main Oct 13, 2025
21 checks passed

OSBotify mentioned this pull request Oct 13, 2025

Deploy Checklist: New Expensify 2025-10-13 #72503

Closed

92 tasks

melvin-bot Bot mentioned this pull request Oct 14, 2025

[Due for payment 2025-10-21] [Merge] Attendees on expenses aren't an option when merging two expenses #68447

Closed

8 tasks

	// Step 3: Build the modified expense report actions
	// We don't create a modified report action if:
	// - we're updating the waypoints
	// - we're updating the distance rate while the waypoints are still pending
	// In these cases, there isn't a valid optimistic mileage data we can use,
	// and the report action is created on the server with the distance-related response from the MapBox API

Uh oh!

Conversation

hoangzinh commented Oct 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!

codecov Bot commented Oct 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Oct 2, 2025

Uh oh!

hoangzinh commented Oct 2, 2025

Uh oh!

garrettmknight commented Oct 6, 2025

Uh oh!

hoangzinh commented Oct 7, 2025

Uh oh!

dominictb commented Oct 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb commented Oct 7, 2025

Uh oh!

dominictb commented Oct 7, 2025

Uh oh!

dominictb Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Oct 8, 2025

Uh oh!

Uh oh!

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

youssef-lr commented Oct 13, 2025

Uh oh!

hoangzinh commented Oct 13, 2025

Uh oh!

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 13, 2025

Uh oh!

OSBotify commented Oct 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hoangzinh commented Oct 2, 2025 •

edited

Loading

codecov Bot commented Oct 2, 2025 •

edited

Loading

dominictb commented Oct 7, 2025 •

edited

Loading