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

hoangzinh · 2025-09-12T15:18:00Z

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

…nses

melvin-bot · 2025-09-18T02:02:07Z

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

github-actions · 2025-09-18T14:26:24Z

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

github-actions · 2025-09-18T15:07:20Z

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

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

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/70478/NewExpensify.dmg	https://70478.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

garrettmknight · 2025-09-18T16:20:38Z

Just tested and it looks good to me. A few cool points:

The $X/user is a nice touch in the confirm step.

When I merged an expense onto a Collect workspace, the attendees were removed from view, but when I moved that same expense onto a Control workspace, they showed back up. I like that we're still maintaining the data.

dominictb · 2025-09-22T02:15:22Z

    const isTransactionScanning = isScanning(updatedTransaction ?? transaction);
    const hasRoute = hasRouteTransactionUtils(transactionBackup ?? transaction, isDistanceRequest);

+    const actualAttendees = isFromMergeTransaction && updatedTransaction ? updatedTransaction.comment?.attendees : transactionAttendees;


Ideally we shouldn't always apply ternary check here for merge-able fields, the MoneyRequestView is supposed to display the only transaction details that it receives. But as we have this cleanup ticket #69564 which will refactor the MoneyRequestView that way, we can temporarily work around like this for now. @hoangzinh Can you confirm?

Also can't we just simply do a fallback like this?

const actualAttendees = updatedTransaction?.comment?.attendees ?? transactionAttendees;

But as we have this cleanup ticket #69564 which will refactor the MoneyRequestView that way, we can temporarily work around like this for now.

You're right. Btw, I worry it will break "Duplicate transaction" flow if we're going that way. Do you think it's safe if we go with your approach?

dominictb · 2025-09-22T02:26:42Z

        }

+        if (field === 'attendees') {
+            const targetAttendeeLogins = ((targetValue as Attendee[] | undefined)?.map((attendee) => attendee.login ?? attendee.email) ?? []).sort(localeCompare);


Should this be like this as I see login is an optional filed?

Suggested change

const targetAttendeeLogins = ((targetValue as Attendee[] | undefined)?.map((attendee) => attendee.login ?? attendee.email) ?? []).sort(localeCompare);

const targetAttendeeLogins = ((targetValue as Attendee[] | undefined)?.map((attendee) => attendee.email ?? attendee.login) ?? []).sort(localeCompare);

I prefer login to support phone number login cases, and I found that we also use login in displaying attendees

App/src/libs/TransactionUtils/index.ts

Line 843 in 6c0ce0a

return [oldAttendees.map((item) => item.displayName ?? item.login).join(', '), newAttendees.map((item) => item.displayName ?? item.login).join(', ')];

Co-authored-by: Dominic <165644294+dominictb@users.noreply.github.com>

…nses

dominictb · 2025-09-23T17:37:27Z

BUG

I think it should say Please select an Attendee or Please select Attendees.

dominictb · 2025-09-23T17:56:24Z

BUG Per-person category limit violation is not cleared optimistically after merging~

Go to Categories > Set a per-person category limit (e.g., $5/person)
Create an expense with 1 attendee that violates the above per-person category limit (e.g., total amount $6)
Create an expense with 2 attendees
Merge these above expenses
Select attendees so that it should remove the category limit violation (e.g., select amount $6 with 2 attendees => $3/attendee)
Observe that the category limit violation is not cleared optimistically (only cleared after BE responds)

On main, we don't remove the violation even when the amount is updated (this is also a bug) but good to take a look to see if this one is different.

hoangzinh · 2025-09-24T10:32:23Z

BUG

I think it should say Please select an Attendee or Please select Attendees.

Hi @garrettmknight @youssef-lr, which option do you guys prefer in this case?

garrettmknight · 2025-09-25T11:35:55Z

Let's go with Please select Attendees.

hoangzinh · 2025-09-26T15:15:11Z

@dominictb PR is ready to review again

dominictb · 2025-09-28T15:44:02Z

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

youssef-lr

LGTM

youssef-lr · 2025-09-29T18:30:26Z

@hoangzinh we have conflicts 🙏

…nses

hoangzinh · 2025-09-29T23:14:41Z

@youssef-lr I resolved conflicts

hoangzinh · 2025-10-01T10:44:59Z

cc @youssef-lr your turn

youssef-lr

LGTM

OSBotify · 2025-10-02T05:15:45Z

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

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

OSBotify · 2025-10-03T17:35:46Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.22-6 🚀

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

Select attendees when merge two expenses

1284296

melvin-bot Bot assigned hoangzinh Sep 12, 2025

hoangzinh changed the title ~~Select attendees options when merge two expenses~~ Select attendee options when merging two expenses Sep 12, 2025

hoangzinh added 10 commits September 14, 2025 05:13

Handle compare attendees

769a653

Handle update attendees optimictic

5f5e9f6

Handle diff attendees by order

3583e17

Display selected attendees in confirmation page

2b003e8

Clear pendingFields of target transaction when success

7a544ee

Merge branch 'main' into 68447-attendees-option-when-merging-two-expe…

65f1a0e

…nses

Correct attendees value in API request

32f6c0e

Merge branch 'main' into 68447-attendees-option-when-merging-two-expe…

56de1e8

…nses

Fix failed specs

a41e712

Fix prettier

b99ef3b

hoangzinh marked this pull request as ready for review September 18, 2025 02:02

hoangzinh requested a review from a team as a code owner September 18, 2025 02:02

melvin-bot Bot requested review from dominictb and removed request for a team September 18, 2025 02:02

garrettmknight added the Ready To Build label Sep 18, 2025

dominictb reviewed Sep 22, 2025

View reviewed changes

hoangzinh and others added 2 commits September 22, 2025 18:37

Apply feedback

42538c6

Co-authored-by: Dominic <165644294+dominictb@users.noreply.github.com>

Merge branch 'main' into 68447-attendees-option-when-merging-two-expe…

4b5f082

…nses

Reuse existing format method

56ec1c0

hoangzinh added 2 commits September 26, 2025 22:12

Add spec for getMergeFieldErrorText and getDisplayValue

72e5c96

Fix eslint

605922f

dominictb approved these changes Sep 28, 2025

View reviewed changes

melvin-bot Bot requested a review from youssef-lr September 28, 2025 15:58

youssef-lr previously approved these changes Sep 29, 2025

View reviewed changes

Merge branch 'main' into 68447-attendees-option-when-merging-two-expe…

9a758f9

…nses

hoangzinh dismissed youssef-lr’s stale review via 9a758f9 September 29, 2025 23:03

youssef-lr approved these changes Oct 2, 2025

View reviewed changes

youssef-lr merged commit f3984ef into Expensify:main Oct 2, 2025
21 of 24 checks passed

hoangzinh mentioned this pull request Oct 2, 2025

[NO QA] Fix localeCompare import in MergeTransactionUtils #71721

Closed

54 tasks

OSBotify mentioned this pull request Oct 2, 2025

Deploy Checklist: New Expensify 2025-10-02 #71726

Closed

52 tasks

mitarachim 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

This was referenced Oct 2, 2025

[CP Staging] Revert "Select attendee options when merging two expenses" #71731

Merged

Refactored usage of localeCompare in ReportUtils (part 4) #71570

Merged

jponikarchuk mentioned this pull request Oct 2, 2025

Merge expenses - One of the options in Attendee section is blank after reset app #71757

Closed

8 tasks

hoangzinh mentioned this pull request Oct 2, 2025

2 - Select attendee options when merging two expenses #71758

Merged

54 tasks

hoangzinh mentioned this pull request Oct 7, 2025

[Due for payment 2025-11-26] [Merge] Expense - Different distance can be selected when merging expense but it is not kept #68183

Closed

8 tasks

	const targetAttendeeLogins = ((targetValue as Attendee[] \| undefined)?.map((attendee) => attendee.login ?? attendee.email) ?? []).sort(localeCompare);
	const targetAttendeeLogins = ((targetValue as Attendee[] \| undefined)?.map((attendee) => attendee.email ?? attendee.login) ?? []).sort(localeCompare);

Uh oh!

Conversation

hoangzinh commented Sep 12, 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 Sep 18, 2025

Uh oh!

github-actions Bot commented Sep 18, 2025

Uh oh!

github-actions Bot commented Sep 18, 2025

Uh oh!

garrettmknight commented Sep 18, 2025

Uh oh!

dominictb Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dominictb Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Sep 22, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb commented Sep 23, 2025

Uh oh!

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

Uh oh!

Uh oh!

hoangzinh commented Sep 24, 2025

Uh oh!

garrettmknight commented Sep 25, 2025

Uh oh!

hoangzinh commented Sep 26, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

youssef-lr left a comment

Choose a reason for hiding this comment

Uh oh!

youssef-lr commented Sep 29, 2025

Uh oh!

hoangzinh commented Sep 29, 2025

Uh oh!

hoangzinh commented Oct 1, 2025

Uh oh!

youssef-lr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 2, 2025

Uh oh!

OSBotify commented Oct 3, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

hoangzinh commented Sep 12, 2025 •

edited

Loading

dominictb commented Sep 23, 2025 •

edited

Loading

dominictb commented Sep 28, 2025 •

edited

Loading