Fix incorrect chat opening after merging expense with self DM by marufsharifi · Pull Request #79766 · Expensify/App

marufsharifi · 2026-01-16T14:50:57Z

Explanation of Change

Ensure the destination report is opened instead of the workspace chat after merging an expense with a self DM expense.

Fixed Issues

Tests

Test 1:

Create an expense in self DM.
Create an expense in workspace chat.
Open the expense report in the workspace chat.
Click More > Merge.
Select self DM expense > Continue.
Select all the details from self DM expense (second option in each section) > Next.
Click Merge expenses.
You should be redirected to self-dm

Test 2:
1 Create an expense in Workspace Chat A.
2 Create an expense in Workspace Chat B.
3 Open Reports->Expenses
4 Select the expense in the workspace chat A created in step 1.
5 Click More > Merge.
6 Select expense created in Step 2 > Continue.
7 Select all the details from expense (second option in each section) > Next.
8 Click Merge expenses.
9 Verify that the transaction thread report of the expense report from Workspace chat B is displayed.

Test 3:
1 Create an expense in Workspace Chat A.
2 Create an expense in self DM.
3 Open Reports->Expenses
4 Select the expense in the workspace chat A created in step 1.
5 Click More > Merge.
6 Select self DM expense > Continue.
7 Select all the details from self DM expense (second option in each section) > Next.
8 Click Merge expenses.
9 Verify that the transaction thread report of the self-DM is displayed

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

Screen.Recording.1404-10-20.at.11.19.27.AM.mov

Android: mWeb Chrome

Screen.Recording.1404-10-20.at.11.21.19.AM.mov

iOS: Native

Screen.Recording.1404-10-20.at.11.24.45.AM.mov

iOS: mWeb Safari

Screen.Recording.1404-10-20.at.11.27.44.AM.mov

MacOS: Chrome / Safari

Screen.Recording.1404-10-20.at.11.08.30.AM.mov

melvin-bot · 2026-01-16T14:51:04Z

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

src/pages/TransactionMerge/ConfirmationPage.tsx

codecov · 2026-01-16T14:59:51Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/TransactionMerge/ConfirmationPage.tsx	`0.00% <0.00%> (ø)`
... and 12 files with indirect coverage changes

marufsharifi · 2026-01-16T21:33:06Z

@rojiphil, Pr is ready for your review. thanks

marufsharifi · 2026-01-20T04:37:40Z

@rojiphil, kindly bump. thanks.

rojiphil · 2026-01-21T03:48:12Z

Reviewing today

rojiphil · 2026-01-21T15:07:47Z

@marufsharifi Had a fresh look at this today but it looks like we have to fix this issue as the issue mentioned here seems to have got fixed somewhere and is not reproducible. But we will still face this issue. Can you please check this?

79766-issue_002.mp4

rojiphil · 2026-01-21T15:25:07Z

Also, navigation to the self dm report in RHP does not look right. What do you think?

79766-issue_001.mp4

marufsharifi · 2026-01-26T16:27:43Z

@marufsharifi Had a fresh look at this today but it looks like we have to fix this issue as the issue mentioned here seems to have got fixed somewhere and is not reproducible. But we will still face this issue. Can you please check this?

79766-issue_002.mp4

@rojiphil, this is not reproducible on the latest main.

marufsharifi · 2026-01-26T16:33:27Z

Also, navigation to the self dm report in RHP does not look right. What do you think?

79766-issue_001.mp4

@rojiphil, I think it redirects correctly. After the merge, it redirects to the self-dm report from search, which it should do, but the page doesn't properly show the expenses. I think that's not related to this issue and should be fixed as a follow-up. thanks.

Screen.Recording.1404-11-06.at.8.59.42.PM.mov

marufsharifi · 2026-01-30T12:36:27Z

@rojiphil, kindly bump. thanks

marufsharifi · 2026-02-02T06:47:01Z

@rojiphil, quick bump, thanks.

rojiphil · 2026-02-02T09:09:03Z

@marufsharifi Had a fresh look at this today but it looks like we have to fix this issue as the issue mentioned here seems to have got fixed somewhere and is not reproducible. But we will still face this issue. Can you please check this?
79766-issue_002.mp4

@rojiphil, this is not reproducible on the latest main.

Yeah.. That’s solved. Thanks for the clarification.

79766-ios-hybrid-001.mp4

rojiphil · 2026-02-02T09:16:12Z

I think it redirects correctly. After the merge, it redirects to the self-dm report from search, which it should do, but the page doesn't properly show the expenses. I think that's not related to this issue and should be fixed as a follow-up.

Digged in a little deeper here. And it looks like the RHP displays expense report after the merge operation whereas we are displaying the self DM report here which does not seem right.

If the report is being merged from RHP such that self DM report is the destination as demonstrated below, we may want to navigate to the central pane and show the self DM report instead.
@joekaufmanexpensify Does this make sense?

79766-query-001.mp4

joekaufmanexpensify · 2026-02-02T13:28:30Z

@rojiphil Just to make sure I'm following, you are asking if we want to consistently redirect the user to self-DM if they merge an expense to the self-DM from anywhere, including RHP report on the reports page?

rojiphil · 2026-02-02T17:08:51Z

@rojiphil Just to make sure I'm following, you are asking if we want to consistently redirect the user to self-DM if they merge an expense to the self-DM from anywhere, including RHP report on the reports page?

@joekaufmanexpensify Yes. And when we merge an expense from a RHP report to the self-DM, we redirect the user to self-DM currently but this lands on RHP itself. So, I am also asking if the self-DM should instead come up in the central pane?

joekaufmanexpensify

Changes make sense from a product perpsective

marufsharifi · 2026-02-11T03:45:42Z

@rojiphil, kindly bump. thanks.

rojiphil · 2026-02-12T13:12:21Z

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

79766-android-hybrid-001.mp4

Android: mWeb Chrome

79766-mweb-chrome-001.mp4

iOS: HybridApp

79766-ios-hybrid-002.mp4

iOS: mWeb Safari

79766-mweb-safari-001.mp4

MacOS: Chrome / Safari

79766-web-chrome-002.mp4

marufsharifi · 2026-02-15T10:19:36Z

@rojiphil, quick bump. thanks.

marufsharifi · 2026-02-18T16:48:56Z

@rojiphil, kindly bump. thanks.

marufsharifi · 2026-02-20T09:17:24Z

@rojiphil, quick bump. thanks.

rojiphil · 2026-02-20T15:02:42Z

@marufsharifi Can you please merge with the latest main? I want to test this again. Thanks.

marufsharifi · 2026-02-20T15:06:50Z

@rojiphil, merged the main. thanks

marufsharifi · 2026-02-22T05:41:10Z

@rojiphil, kindly bump. thanks.

rojiphil · 2026-02-22T17:09:28Z

@marufsharifi Thanks for your patience. Changes LGTM
However, please add the following tests too in the PR OP so that the related scenarios are also captured. Thanks.

Test 2:
1 Create an expense in Workspace Chat A.
2 Create an expense in Workspace Chat B.
3 Open Reports->Expenses
4 Select the expense in the workspace chat A created in step 1.
5 Click More > Merge.
6 Select expense created in Step 2 > Continue.
7 Select all the details from expense (second option in each section) > Next.
8 Click Merge expenses.
9 Verify that the transaction thread report of the expense report from Workspace chat B is displayed.

Test 3:
1 Create an expense in Workspace Chat A.
2 Create an expense in self DM.
3 Open Reports->Expenses
4 Select the expense in the workspace chat A created in step 1.
5 Click More > Merge.
6 Select self DM expense > Continue.
7 Select all the details from self DM expense (second option in each section) > Next.
8 Click Merge expenses.
9 Verify that the transaction thread report of the self-DM is displayed

79766-web-chrome-011.mp4

marufsharifi · 2026-02-23T04:47:24Z

@marufsharifi Thanks for your patience. Changes LGTM However, please add the following tests too in the PR OP so that the related scenarios are also captured. Thanks.

Test 2: 1 Create an expense in Workspace Chat A. 2 Create an expense in Workspace Chat B. 3 Open Reports->Expenses 4 Select the expense in the workspace chat A created in step 1. 5 Click More > Merge. 6 Select expense created in Step 2 > Continue. 7 Select all the details from expense (second option in each section) > Next. 8 Click Merge expenses. 9 Verify that the transaction thread report of the expense report from Workspace chat B is displayed.

Test 3: 1 Create an expense in Workspace Chat A. 2 Create an expense in self DM. 3 Open Reports->Expenses 4 Select the expense in the workspace chat A created in step 1. 5 Click More > Merge. 6 Select self DM expense > Continue. 7 Select all the details from self DM expense (second option in each section) > Next. 8 Click Merge expenses. 9 Verify that the transaction thread report of the self-DM is displayed

79766-web-chrome-011.mp4

@rojiphil, thanks for the review, added. Please take another look. thanks.

rojiphil

Thanks @marufsharifi for the update.

@MonilBhavsar @joekaufmanexpensify Changes LGTM.
Over to you for review. Thanks.

MonilBhavsar · 2026-02-23T09:02:33Z

thanks!

github-actions · 2026-02-23T09:03:43Z

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

github-actions · 2026-02-23T09:07:52Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-6164ca9-08338eb-dcfabce0c3332c6a8d570fd85d35a211b2ffac88/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-6164ca9-08338eb-67ab6d4dd02b5bf2e1035bea9eddce420de8fb0b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-23T09:10:54Z

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

mitarachim · 2026-02-23T22:43:02Z

@marufsharifi Test 3 in this PR is failing because of a regression issue #83257

The issue is reproducible in: Web

Bug7086423_1771884485618.5.mp4

OSBotify · 2026-02-24T01:16:34Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.25-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	cancelled 🔪

OSBotify · 2026-02-25T15:50:24Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.25-13 🚀

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

Fix incorrect chat opening after merging expense with self DM

de28fc3

marufsharifi requested review from a team as code owners January 16, 2026 14:50

melvin-bot bot assigned marufsharifi Jan 16, 2026

melvin-bot bot requested review from heyjennahay and rojiphil and removed request for a team January 16, 2026 14:51

melvin-bot bot removed the request for review from a team January 16, 2026 14:51

github-actions bot reviewed Jan 16, 2026

View reviewed changes

src/pages/TransactionMerge/ConfirmationPage.tsx Outdated Show resolved Hide resolved

marufsharifi added 2 commits January 17, 2026 02:00

Merge branch 'main' into fix/expense-merge-opens-incorrect-chat

09a1430

applied ai feedback.

d1e6e9f

Merge branch 'main' into fix/expense-merge-opens-incorrect-chat

dc88d02

VickyStash mentioned this pull request Jan 28, 2026

fix: offline merge visibility for track distance expenses #77862

Closed

52 tasks

joekaufmanexpensify requested review from joekaufmanexpensify and removed request for heyjennahay February 2, 2026 13:28

joekaufmanexpensify approved these changes Feb 10, 2026

View reviewed changes

Merge branch 'main' into fix/expense-merge-opens-incorrect-chat

d42b40b

rojiphil approved these changes Feb 23, 2026

View reviewed changes

melvin-bot bot requested a review from MonilBhavsar February 23, 2026 04:51

MonilBhavsar approved these changes Feb 23, 2026

View reviewed changes

MonilBhavsar merged commit 6164ca9 into Expensify:main Feb 23, 2026
31 checks passed

OSBotify mentioned this pull request Feb 23, 2026

Deploy Checklist: New Expensify 2026-02-23 #83247

Closed

mitarachim mentioned this pull request Feb 23, 2026

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

Open

7 tasks

mitarachim mentioned this pull request Feb 23, 2026

[$250] Expense - Self DM opens instead of transaction thread after merging with unreported expenses #83258

Closed

7 tasks

mitarachim mentioned this pull request Feb 25, 2026

[$250] “Hm... it’s not here” displayed and unable to return to LHN after merging expenses #83414

Open

7 tasks

melvin-bot bot mentioned this pull request Feb 25, 2026

[Due for payment 2026-03-04] [$250] Expense- Workspace chat opens instead of destination report after merging with self DM expense #78842

Closed

7 tasks

marufsharifi mentioned this pull request Mar 2, 2026

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

Open

52 tasks

MelvinBot mentioned this pull request Mar 25, 2026

Fix infinite loading after cross-report expense merge #84540

Draft

52 tasks

Conversation

marufsharifi commented Jan 16, 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!

melvin-bot bot commented Jan 16, 2026

Uh oh!

Uh oh!

codecov bot commented Jan 16, 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!

marufsharifi commented Jan 16, 2026

Uh oh!

marufsharifi commented Jan 20, 2026

Uh oh!

rojiphil commented Jan 21, 2026

Uh oh!

rojiphil commented Jan 21, 2026

Uh oh!

rojiphil commented Jan 21, 2026

Uh oh!

marufsharifi commented Jan 26, 2026

Uh oh!

marufsharifi commented Jan 26, 2026

Uh oh!

marufsharifi commented Jan 30, 2026

Uh oh!

marufsharifi commented Feb 2, 2026

Uh oh!

rojiphil commented Feb 2, 2026

Uh oh!

rojiphil commented Feb 2, 2026

Uh oh!

joekaufmanexpensify commented Feb 2, 2026

Uh oh!

rojiphil commented Feb 2, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Feb 11, 2026

Uh oh!

rojiphil commented Feb 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

marufsharifi commented Feb 15, 2026

Uh oh!

marufsharifi commented Feb 18, 2026

Uh oh!

marufsharifi commented Feb 20, 2026

Uh oh!

rojiphil commented Feb 20, 2026

Uh oh!

marufsharifi commented Feb 20, 2026

Uh oh!

marufsharifi commented Feb 22, 2026

Uh oh!

rojiphil commented Feb 22, 2026

Uh oh!

marufsharifi commented Feb 23, 2026

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented Feb 23, 2026

Uh oh!

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

OSBotify commented Feb 23, 2026

marufsharifi commented Jan 16, 2026 •

edited

Loading

codecov bot commented Jan 16, 2026 •

edited by github-actions bot

Loading