[CP Staging] Revert "Merge pull request #89360 from marufsharifi/fix/bulk-merge-ex…

[NicolasBonet]

Reverts #89360

Fixed issues
$ #92846

Test:

Screen.Recording.2026-06-08.at.9.44.20.AM.mov

[melvin-bot]

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

[NikkiWines]

👍

[NikkiWines]

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

MacOS: Chrome / Safari

[codecov]

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 Δ
.../MoneyRequestReportView/SelectionToolbar/index.tsx	76.59% <ø> (-0.49%)	⬇️
src/hooks/useSelectedTransactionsActions.ts	76.44% <100.00%> (-1.55%)	⬇️
src/libs/MergeTransactionUtils.ts	75.96% <ø> (-3.64%)	⬇️
.../components/MoneyRequestHeaderSecondaryActions.tsx	0.53% <0.00%> (ø)
src/hooks/useSearchBulkActions.ts	46.68% <0.00%> (+1.38%)	⬆️
src/pages/TransactionMerge/ConfirmationPage.tsx	0.00% <0.00%> (ø)
.../TransactionMerge/MergeTransactionsListContent.tsx	0.00% <0.00%> (ø)
...ges/TransactionMerge/MergeTransactionsListPage.tsx	0.00% <0.00%> (ø)
src/libs/actions/MergeTransaction.ts	67.89% <0.00%> (-11.81%)	⬇️
... and 12 files with indirect coverage changes

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c95817baf4

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[chatgpt-codex-connector]

Preserve the selected transaction thread for search merges

When a single merge target is selected from Search, the transaction snapshot returned by getTransactionsAndReportsFromSearch() does not always include transactionThreadReportID; the thread ID can exist only on the selected row's reportAction.childReportID or in the thread report that was just created for the flow. This commit stops storing that ID on mergeTransaction, so this recomputation can return undefined; after confirming from Search, handleMergeExpenses then falls back to the parent report instead of reopening/updating the expense thread. Please keep using the stored target thread report ID when it was captured for the merge flow.

Useful? React with 👍 / 👎.

[github-actions]

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

[OSBotify]

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

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b6595c6dd80-9a6f6b8-3602e308c4b4ac4f56a006977d97af9a194febd2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b6595c6-9a6f6b8-7b120f771be3e6088abf98d744c258919f0195b3/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.0-4 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

🤖 Help site review: no changes required.

This PR reverts #89360, which only changed the post-merge navigation destination for bulk merges (landing on the transaction thread instead of self-DM). That is internal navigation behavior — it does not change the documented merge steps, eligibility rules, or merge outcomes.

I reviewed the relevant help article, How-to-Merge-Expenses.md, which documents:

• How to merge from the Expenses page, a report, or an individual expense
• Who can merge and which expense types are eligible
• What happens after a merge

None of these describe where the app navigates after a merge, so nothing in the help site is affected by this revert. No draft PR was created.

---

@NicolasBonet, no linked help site PR was needed since this revert doesn't change any documented behavior. Let me know if you'd like me to reconsider.

[OSBotify]

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.0-7 🚀

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

[OSBotify]

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.1-0 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

Help site review — no changes required

I reviewed the changes in this PR against the help site files under App/docs/articles.

Conclusion: No help site updates are needed.

Why

This PR is a revert of #89360, a bug fix that changed the internal navigation logic for which transaction thread opens after a bulk merge (it had caused an infinite-loading RHP — #92846).

The changes are entirely in hooks, utils, actions, and tests (useSearchBulkActions.ts, useSelectedTransactionsActions.ts, MergeTransactionUtils.ts, MergeTransaction.ts, etc.). Specifically:

• No user-facing feature is added or removed. The Merge expenses feature, its entry points (Expenses page, report, individual expense), eligibility rules, and supported expense types are all unchanged.
• No copy/label changes. No src/languages/* files are touched, so all UI strings, tab names, and button labels referenced in the docs remain accurate.
• The reverted behavior isn't documented. The relevant article, How to Merge Duplicate Expenses, documents the merge steps and what happens to the expense data afterward — but it does not describe the post-merge navigation destination (which thread opens), which is the only behavior this revert affects.

So the documented flows remain correct after this revert, and there is nothing to update.

---

@NicolasBonet, no linked help site PR was created because no documentation changes are required. If you believe a doc update is warranted, let me know what behavior should be documented and I'll draft it.

[OSBotify]

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

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