[Payment due @daledah] Allow admins to merge card + cash expenses across draft reports by youssef-lr · Pull Request #102438 · Expensify/App

youssef-lr · 2026-09-28T17:12:10Z

Explanation of Change

Admins have always been allowed to merge transactions from different reports in the Spend page. This PR brings this functionality to the expense view, as well as add a system message notifying the submitter of the deleted merged expense.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/678389
PROPOSAL:

Tests

Added unit tests for admin card and cash merges across reports.

Offline tests

As an admin, go offline, open a card expense on one draft report, tap Merge — verify cash expenses from other draft reports (same submitter, same or different workspace where you are admin) appear as candidates.
Repeat with no cached policy for one workspace — verify its expenses do not appear as candidates.
As a non-admin manager reviewing a processing report, go offline, tap Merge — verify only same-report expenses appear.

QA Steps

As a workspace admin, open a card expense on a draft report, tap Merge — verify cash expenses from other draft reports of the same submitter (same workspace) appear.
As a workspace admin, select a card expense and a cash expense from different draft reports of the same submitter in Search, verify Merge is available.
As a non-admin approver, open a card expense on a submitted (processing) report, tap Merge — verify only other expenses on that same report appear.
As an admin who is also the submitter, tap Merge — verify all own eligible expenses appear (cross-report).
As a workspace admin, merge a submitter's card expense on report A with a cash expense on report B, which also holds another expense — as the submitter, open report B and verify a system message from the admin reads "merged expenses and moved one to Deleted".
Repeat with a cash expense that is the only expense on its report — verify that report is deleted and the system message appears on the report that holds the kept expense.
Switch the language to Spanish — verify the system message is translated.

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

admins.merging.card.cash.mov

Remove the same-report shortcut for admins in getTransactionsForMerging. Admins now discover cross-report and cross-workspace candidates via the API (online) or the local filter (offline). Only non-admin managers reviewing a processing report keep the same-report restriction. The offline filter (getTransactionsForMergingLocally) now resolves admin access per-candidate against that candidate's own workspace policy. Candidates are excluded when their workspace policy is absent from the local cache rather than assumed accessible. MergeTransactionsListContent subscribes to allPolicies and allReports and forwards them for the offline per-candidate check. Tests: 5 new cases covering admin cross-report (same workspace), non-admin workspace rejection, missing-cache exclusion, manager same-report restriction, and admin-as-submitter cross-report.

…-manual-merge-expenses-drafts

github-actions · 2026-09-28T17:13:23Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

codecov · 2026-09-28T17:17:11Z

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/CONST/index.ts	`95.90% <ø> (ø)`
src/hooks/useSelectedTransactionsActions.ts	`78.62% <ø> (ø)`
src/libs/MergeTransactionUtils.ts	`91.48% <100.00%> (ø)`
...ages/TransactionMerge/DynamicDetailsReviewPage.tsx	`83.92% <ø> (ø)`
...ages/TransactionMerge/DynamicReceiptReviewPage.tsx	`0.00% <ø> (ø)`
src/hooks/useSearchBulkActions.ts	`80.14% <0.00%> (ø)`
...box/report/actionContents/SimpleMessageContent.tsx	`92.15% <50.00%> (-1.73%)`	⬇️
src/libs/actions/MergeTransaction.ts	`90.38% <86.66%> (+5.88%)`	⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx	`0.00% <0.00%> (ø)`
... and 11 files with indirect coverage changes

melvin-bot · 2026-09-28T19:42:10Z

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

daledah · 2026-09-29T03:03:24Z

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 proper code patterns were followed (see Reviewing the code)
- 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 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)
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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.
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

iOS: HybridApp

ios.mov

MacOS: Chrome / Safari

Screen.Recording.2026-09-29.at.16.45.20.mov

youssef-lr · 2026-09-29T18:52:15Z

This is pending an internal discussion.

…sef-lr-app-678389-admins-merge

melvin-bot · 2026-10-01T16:59:26Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

youssef-lr · 2026-10-12T17:03:47Z

Ready again @daledah

daledah

LGTM

melvin-bot · 2026-10-13T07:23:33Z

🎯 @daledah, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/678389.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

github-actions · 2026-10-13T11:41:51Z

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

flaviadefaria · 2026-10-13T13:06:26Z

Running some tests now and I'm not quite sure when this happens but I sometimes run into an attendee field when merging two expenses. Not sure what the logic is for displaying the attendee option, but I didn't expect to see it if there are no attendees (the field is disabled in the expense) or only one attendee in both or either expenses.

2026-10-13_14-42-03.mp4

2026-10-13_15-03-25.mp4

flaviadefaria · 2026-10-13T13:27:26Z

Other than that which is a small thing, and if needed could be fixed in a separare PR, all looks good!

youssef-lr · 2026-10-13T13:29:07Z

Thanks for testing @flaviadefaria! Looking into your comments now.

youssef-lr · 2026-10-13T13:55:10Z

Yeah I can reproduce the issues. I think let’s get this fixed in this PR. I’ll update it shortly.

Compare attendees as stored instead of applying the report-owner display fallback, which is only resolvable for locally loaded reports and made one side [owner] and the other [] when merging across reports. When either expense has no attendees, keep the other side's attendees instead of flagging a conflict. Remove the now-unused owner-fallback parameters.

youssef-lr · 2026-10-13T14:13:22Z

Fix pushed. Tested 7 different scenarios locally.

Screen.Recording.2026-10-13.at.14.11.00.mov

youssef-lr · 2026-10-13T14:25:07Z

@daledah can you review again please

daledah

the code changes LGTM and tested well

…-admins-merge # Conflicts: # src/libs/ReportActionsUtils.ts

stitesExpensify

Pretty huge PR, but I didn't see anything that looked obviously incorrect or that could cause problems. Excited to get this across the finish line

OSBotify · 2026-10-15T22:16:09Z

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

github-actions · 2026-10-15T22:17:10Z

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

github-actions · 2026-10-15T22:22:26Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-548d07f-ceee300-f4b7c1fd6c8ef39f63838080dfd70639e0fbe938/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-548d07f-ceee300-0d40647f05ea3eaf8a5fe20df9b43c6dd3df2d85/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-16T12:13:08Z

🚀 Deployed to staging by https://github.com/stitesExpensify in version: 9.5.13-0 🚀

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

MelvinBot · 2026-10-16T12:19:21Z

Yes, this PR needs a help site update. I opened Docs updates for E/A#102438 Let admins merge expenses across a member's reports.

This PR lets workspace admins merge a member's expenses across different reports. That makes this sentence in How to Merge Duplicate Expenses incorrect:

Approvers and Workspace Admins can merge expenses on the same Draft or Outstanding report.

The docs PR splits that sentence into two bullets:

Approvers can merge expenses on the same Draft or Outstanding report.
Workspace admins can merge a member's expenses across that member's Draft and Outstanding reports.

I didn't document the new "merged expenses and moved one to Deleted" system message, because it already explains itself in the app.

@youssef-lr, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

view run

youssef-lr added 4 commits September 12, 2026 22:45

Merge remote-tracking branch 'origin/main' into youssef-lr-app-678389…

5ade77e

…-manual-merge-expenses-drafts

Merge remote-tracking branch 'origin/main' into youssef-lr-app-678389…

75c5af1

…-manual-merge-expenses-drafts

Merge main into youssef-lr-app-678389-admins-merge

e9cbf48

melvin-bot Bot assigned youssef-lr Sep 28, 2026

youssef-lr force-pushed the youssef-lr-app-678389-admins-merge branch from 3fd0cf5 to e9cbf48 Compare September 28, 2026 17:17

youssef-lr changed the title ~~[HOLD] Allow admins to merge card + cash expenses across draft reports~~ Allow admins to merge card + cash expenses across draft reports Sep 28, 2026

youssef-lr added 2 commits September 28, 2026 19:35

Update comments

8d3c144

Add test for submitted case

76ea846

youssef-lr marked this pull request as ready for review September 28, 2026 19:42

youssef-lr requested review from a team as code owners September 28, 2026 19:42

melvin-bot Bot requested review from daledah and flaviadefaria and removed request for a team and flaviadefaria September 28, 2026 19:42

melvin-bot Bot removed the request for review from a team September 28, 2026 19:42

daledah reviewed Sep 29, 2026

View reviewed changes

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

daledah reviewed Sep 29, 2026

View reviewed changes

Comment thread src/pages/TransactionMerge/MergeTransactionsListContent.tsx Outdated

youssef-lr changed the title ~~Allow admins to merge card + cash expenses across draft reports~~ [HOLD] Allow admins to merge card + cash expenses across draft reports Sep 29, 2026

youssef-lr added 2 commits October 1, 2026 16:50

Add MERGEDEXPENSEDELETED report action

e9b7295

Merge branch 'youssef-lr-app-678389-merged-expense-deleted' into yous…

4912b8f

…sef-lr-app-678389-admins-merge

youssef-lr mentioned this pull request Oct 1, 2026

[HOLD Auth#25045] Add support for MERGEDEXPENSEDELETED report action #102786

Closed

45 tasks

youssef-lr mentioned this pull request Oct 5, 2026

[HOLD] Allow admins to merge card + cash expenses across draft reports #101028

Closed

40 tasks

youssef-lr requested a review from daledah October 12, 2026 13:01

daledah approved these changes Oct 13, 2026

View reviewed changes

melvin-bot Bot requested a review from stitesExpensify October 13, 2026 07:23

melvin-bot Bot changed the title ~~Allow admins to merge card + cash expenses across draft reports~~ [Payment due @daledah] Allow admins to merge card + cash expenses across draft reports Oct 13, 2026

This comment has been minimized.

Sign in to view

youssef-lr requested a review from daledah October 13, 2026 14:25

daledah approved these changes Oct 13, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into youssef-lr-app-678389…

feed033

…-admins-merge # Conflicts: # src/libs/ReportActionsUtils.ts

stitesExpensify approved these changes Oct 15, 2026

View reviewed changes

stitesExpensify merged commit 548d07f into Expensify:main Oct 15, 2026
35 of 36 checks passed

OSBotify mentioned this pull request Oct 16, 2026

Deploy Checklist: New Expensify 2026-10-16 #104211

Open

40 of 65 tasks

MelvinBot mentioned this pull request Oct 16, 2026

[No QA] Docs updates for E/A#102438 Let admins merge expenses across a member's reports #104219

Draft

38 tasks

This was referenced Oct 16, 2026

[Deploy Blocker] Android - Two Workspaces tabs after creating new workspace, app crashes when creating more #104233

Closed

Merge-no system message shown after admin merging submitter's card & cash expense #104261

Closed

MelvinBot mentioned this pull request Oct 16, 2026

Android & iOS - Spend - No skeleton loader when loading #104277

Open

2 of 7 tasks

Conversation

youssef-lr commented Sep 28, 2026 • 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!

github-actions Bot commented Sep 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Sep 28, 2026

Uh oh!

daledah commented Sep 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

youssef-lr commented Sep 29, 2026

Uh oh!

melvin-bot Bot commented Oct 1, 2026

Uh oh!

youssef-lr commented Oct 12, 2026

Uh oh!

daledah left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 13, 2026

Uh oh!

github-actions Bot commented Oct 13, 2026

Uh oh!

This comment has been minimized.

flaviadefaria commented Oct 13, 2026

Uh oh!

flaviadefaria commented Oct 13, 2026

Uh oh!

youssef-lr commented Oct 13, 2026

Uh oh!

youssef-lr commented Oct 13, 2026

Uh oh!

youssef-lr commented Oct 13, 2026

Uh oh!

youssef-lr commented Oct 13, 2026

Uh oh!

daledah left a comment

Choose a reason for hiding this comment

Uh oh!

stitesExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 15, 2026

Uh oh!

github-actions Bot commented Oct 15, 2026

Uh oh!

github-actions Bot commented Oct 15, 2026

Uh oh!

OSBotify commented Oct 16, 2026

Uh oh!

MelvinBot commented Oct 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

youssef-lr commented Sep 28, 2026 •

edited

Loading

github-actions Bot commented Sep 28, 2026 •

edited

Loading

codecov Bot commented Sep 28, 2026 •

edited by github-actions Bot

Loading

daledah commented Sep 29, 2026 •

edited

Loading