Fix bulk merge post-merge navigation to open target thread report by marufsharifi · Pull Request #83825 · Expensify/App

marufsharifi · 2026-03-02T07:56:05Z

Explanation of Change

Bulk expense merge now follows the same destination behavior as individual merge.

Before this update, bulk merge from Reports > Expenses could open the wrong place (for example, self-DM) after merge because the app sometimes lost the intended transaction-thread destination during the multi-step merge flow.

Now, the app determines the correct target transaction thread earlier in the merge process and carries that destination through to confirmation. That makes post-merge navigation consistent and predictable across flows, especially when merging workspace and self-DM expenses from search.

follow-up of #79766

Fixed Issues

$ #83257
PROPOSAL:

Tests

Create an expense in self DM.
Create an expense in workspace chat.
Go to Reports > Expenses.
Select the workspace expense via the checkbox.
Click the dropdown button > Merge.
Select self DM expense > Continue.
Select the second option in each section > Next > Merge expenses.
Verify the transaction thread is open after merging expenses via the bulk option

Verify that no errors appear in the JS console

Offline tests

Same as 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.native.mp4

Android: mWeb Chrome

android.web.mp4

iOS: Native

Screen.Recording.2026-03-06.at.5.49.31.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-03-06.at.5.52.45.PM.mov

MacOS: Chrome / Safari

web.mp4

marufsharifi · 2026-03-02T07:57:32Z

PR changes:

Persisted targetTransactionThreadReportID in merge flow state during setup in setupMergeTransactionDataAndNavigate() so destination is resolved early and remains stable across merge steps.
Updated confirmation navigation to prioritize the persisted thread report ID from merge state before runtime fallback resolution.
Threaded isOnSearch through MergeTransactionsListPage → MergeTransactionsListContent → setupMergeTransactionDataAndNavigate for consistent search-context behavior in bulk flow.
Extended MergeTransaction Onyx type with optional targetTransactionThreadReportID to support this explicit destination handoff.

codecov · 2026-03-02T08:03:24Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
.../components/MoneyRequestHeaderSecondaryActions.tsx	`1.04% <ø> (ø)`
...equestReportView/MoneyRequestReportActionsList.tsx	`59.45% <ø> (ø)`
src/hooks/useAllTransactions.ts	`100.00% <100.00%> (ø)`
...ges/TransactionMerge/MergeTransactionsListPage.tsx	`0.00% <ø> (ø)`
src/libs/MergeTransactionUtils.ts	`79.82% <90.90%> (+0.56%)`	⬆️
.../libs/Navigation/helpers/isSearchOriginForMerge.ts	`93.33% <93.33%> (ø)`
src/libs/actions/MergeTransaction.ts	`75.52% <88.88%> (+12.27%)`	⬆️
src/pages/TransactionMerge/ConfirmationPage.tsx	`0.00% <0.00%> (ø)`
src/hooks/useSelectedTransactionsActions.ts	`78.60% <93.33%> (+1.85%)`	⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx	`0.00% <0.00%> (ø)`
... and 1 more
... and 21 files with indirect coverage changes

melvin-bot · 2026-03-07T09:21:31Z

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

marufsharifi · 2026-03-07T09:24:27Z

@rojiphil, thanks for your patience the pr is ready for your review. The failure unit test doesn't seem related to my changes, btw. thanks.

marufsharifi · 2026-03-09T07:29:56Z

@rojiphil, kindly bump. thanks.

joekaufmanexpensify

👍

rojiphil · 2026-03-10T07:22:32Z

@marufsharifi There are two issues which needs fix:

While the issue for Reports->Expenses->Expense via Checkbox is fixed, we would still face with the same problem for Reports->Reports->Expense via Checkbox.
While testing for merge in Inbox->Report->Expense, the thread report is shown (main view navigates to Reports) which needs a fix. The staging navigates to self DM as expected.

Attaching staging and pr version test videos for reference.

83825-pr-issues.mp4

83825-staging-issues.mp4

marufsharifi · 2026-03-16T05:22:13Z

Sorry for the delay, I will try to update this tomorrow.

marufsharifi · 2026-03-23T11:24:14Z

Sorry for the delay i was OOO, i will update here today. Thanks.

marufsharifi · 2026-03-25T12:57:30Z

I've fixed the case where we select more than one expense from bulk actions, then merge. But for one expense selected from bulk action, it sometimes doesn't work. I will update here tomorrow. Thanks for your patience.

- resolve the target transaction thread before starting one-selected report checkbox merge - fall back to creating the transaction thread when thread metadata is not yet hydrated - keep the two-selected report merge path unchanged - add focused hook coverage for report-action and thread-creation overrides

marufsharifi · 2026-03-26T12:38:08Z

This PR fixes the merge destination issues for search-origin expense merges.

Root cause

The merge flow was resolving the destination thread too late, from rehydrated transaction data. For fresh expenses, that data was often still missing, so merge confirmation fell back to the parent report instead of the target transaction thread.
Search-origin context was not preserved consistently through the merge flow.
Individual merge from search/view/... used an overly broad origin check, so some inbox/home flows were incorrectly treated as search-origin.

Approach

Resolve the target transaction thread at merge entry from the freshest available data, and persist it in merge state so later screens do not recompute it from stale data. This is handled in MergeTransactionUtils.ts, useSearchBulkActions.ts, useSelectedTransactionsActions.ts, and MergeTransaction.ts.
Preserve both the stored thread ID and isOnSearch through the merge list and confirmation steps so search-origin merges always reopen the correct transaction thread. See MergeTransactionsListContent.tsx and ConfirmationPage.tsx.
Narrow individual merge origin detection so search/view/... is only treated as search-origin when its backTo actually points to search. See MoneyRequestHeaderSecondaryActions.tsx and isSearchOriginForMerge.ts.

Result

Flow reports > expenses > bulk selectand reports > reports > expenses now open the correct target transaction thread, including for freshly created expenses.
The two-selected merge path remains unchanged.
Inbox/home-origin individual merge no longer incorrectly reopens Search.

Tests
Coverage was added for the persisted thread behavior, search snapshot fallback, flow 4 thread creation fallback, and search-origin detection in:
MergeTransactionTest.ts,
MergeTransactionUtilsTest.ts,
useSelectedTransactionsActions.test.ts,
useAllTransactions.test.ts,
and isSearchOriginForMerge.test.ts.

- preserve the prefixed transaction key type in search bulk merge lookup - clean up a spellcheck-only encoded route string in merge tests - use typed report action fixtures in merge utility tests - scope legacy originalMessage and SearchResults casts in hook tests

marufsharifi · 2026-03-26T13:11:41Z

@rojiphil, I've fixed all the issue, could you please take another look when you get a chance? thanks.

marufsharifi · 2026-03-29T11:42:58Z

@rojiphil, gentle bump. thanks.

rojiphil · 2026-03-31T01:16:08Z

Reviewing today

marufsharifi · 2026-04-01T06:11:48Z

@rojiphil, gentle bump. thanks.

rojiphil

@marufsharifi Thanks for the PR. Just one query though.
Also, there typecheck and unit test failures. And need conflict resolution too.
Please have a look.

rojiphil · 2026-04-02T04:15:18Z

src/hooks/useAllTransactions.ts

+
+            mergedTransactions[key] = {
+                ...onyxTransaction,
+                transactionThreadReportID: snapshotTransaction.transactionThreadReportID,


Why is there a need to set transactionThreadReportID here again?

rojiphil · 2026-04-02T04:23:49Z

The different scenarios work well too.

83825-web-chrome-001.mp4

rojiphil · 2026-04-02T04:38:35Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a1728068d9

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/libs/actions/MergeTransaction.ts

- make merge thread overrides transaction-aware instead of passing a bare thread ID - only persist the override when it still matches the final kept target after merge target/source selection - prevent same-report split merges from redirecting to a deleted source thread - add targeted coverage for split-over-cash target swap and updated hook override behavior

- align report checkbox merge tests with the actual lowercase bulk action value - use the shared merge action constant instead of a hardcoded "MERGE" string - apply the expected Prettier formatting in MergeTransaction

Fix bulk merge post-merge navigation to open target thread report

1905fde

melvin-bot bot assigned marufsharifi Mar 2, 2026

marufsharifi added 3 commits March 6, 2026 08:18

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

c98d937

Preserve target thread report during bulk merge flow

9c38f4f

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

94d58d4

marufsharifi marked this pull request as ready for review March 7, 2026 09:21

marufsharifi requested review from a team as code owners March 7, 2026 09:21

melvin-bot bot requested review from joekaufmanexpensify and rojiphil and removed request for a team March 7, 2026 09:21

melvin-bot bot removed the request for review from a team March 7, 2026 09:21

joekaufmanexpensify previously approved these changes Mar 9, 2026

View reviewed changes

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

f0bc1e3

marufsharifi dismissed joekaufmanexpensify’s stale review via f0bc1e3 March 14, 2026 05:02

rojiphil mentioned this pull request Mar 16, 2026

[$250] Expense - Different destination opens when bulk merging vs merging individually #83257

Open

7 tasks

marufsharifi added 2 commits March 24, 2026 11:43

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

62aea6a

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

aa60f19

marufsharifi added 3 commits March 26, 2026 09:20

Preserve search merge thread metadata for report checkbox flows

bcce3bd

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

1a23bc4

Fix merge navigation for fresh search expenses

6f38f04

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

3cebf84

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

a172806

rojiphil reviewed Apr 2, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Apr 2, 2026

View reviewed changes

src/libs/actions/MergeTransaction.ts Outdated Show resolved Hide resolved

marufsharifi added 9 commits April 2, 2026 15:32

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

1f1679b

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

48a2b7b

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

245c27c

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

95bcacd

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

1542f06

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

4000f3a

Merge branch 'main' into fix/expense-bulk-merge-destination-mismatch

c9b40b5

Fix merge PR test and formatting failures

d84cc36

- align report checkbox merge tests with the actual lowercase bulk action value - use the shared merge action constant instead of a hardcoded "MERGE" string - apply the expected Prettier formatting in MergeTransaction

Conversation

marufsharifi commented Mar 2, 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!

marufsharifi commented Mar 2, 2026

Uh oh!

codecov bot commented Mar 2, 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 Mar 7, 2026

Uh oh!

marufsharifi commented Mar 7, 2026

Uh oh!

marufsharifi commented Mar 9, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Mar 10, 2026

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

marufsharifi commented Mar 23, 2026

Uh oh!

marufsharifi commented Mar 25, 2026

Uh oh!

marufsharifi commented Mar 26, 2026

Uh oh!

marufsharifi commented Mar 26, 2026

Uh oh!

marufsharifi commented Mar 29, 2026

Uh oh!

rojiphil commented Mar 31, 2026

Uh oh!

marufsharifi commented Apr 1, 2026

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

rojiphil Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Apr 2, 2026

Uh oh!

rojiphil commented Apr 2, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

marufsharifi commented Mar 2, 2026 •

edited

Loading

codecov bot commented Mar 2, 2026 •

edited by github-actions bot

Loading