fix super wide RHP closing after merging an expense on Search by apeyada · Pull Request #96910 · Expensify/App

apeyada · 2026-07-23T21:25:07Z

Explanation of Change

Scenario	Post-merge count	Path taken	Result
One-transaction report already open, source elsewhere	1	production (`dismissModal` + navigate)	single report open
2 expenses in report → 1	1	production (`dismissModal` + navigate)	single report open
3 expenses → 2 (source in report)	2	`dismissToPreviousRHP`	RHP kept open (unchanged)
Multi-transaction, source elsewhere	≥2	`dismissToPreviousRHP`	RHP kept open (unchanged)
Different target/merge report	—	production path (outer)	unchanged

Fixed Issues

$ #89799
PROPOSAL: #89799 (comment)

Tests

Create Expense A on Report 1 (multi-expense report)
Create Expense B on Report 2
Go to the Spend tab → Reports and open Report 1
Open Expense A from the Report 1 view
Tap More → Merge
Merge with Expense B, selecting Report 1 as the destination
Verify that user is redirected to the merged expense detail view with expense report view (super wide RHP) in the background

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

web.mov

apeyada · 2026-07-23T21:26:26Z

@codex review

codecov · 2026-07-23T21:30:38Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/MergeTransactionUtils.ts	`80.85% <92.00%> (+1.20%)`	⬆️
...pages/TransactionMerge/DynamicConfirmationPage.tsx	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c2513e748b

ℹ️ 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".

apeyada · 2026-07-27T07:36:31Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ae448074a0

ℹ️ 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".

apeyada · 2026-07-27T08:05:47Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 40bd44c072

ℹ️ 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".

…89799

…e global transaction collection

apeyada · 2026-07-27T08:52:11Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2e06e3a3f9

ℹ️ 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".

apeyada · 2026-07-27T09:09:56Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0e7ea96b1f

ℹ️ 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".

…import case)

apeyada · 2026-07-27T09:22:32Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dd00cd48e8

ℹ️ 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".

melvin-bot · 2026-07-27T12:48:45Z

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

melvin-bot · 2026-07-27T12:48:51Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 637248b64e

ℹ️ 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".

mkhutornyi · 2026-07-27T13:23:15Z

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

iOS: mWeb Safari

MacOS: Chrome / Safari

case1.mov

case2.mov

case3.mov

case4.mov

case5.mov

offline.mov

mkhutornyi · 2026-07-27T13:26:48Z

I think these can be out of scope as the root cause exists in production / already production behavior.

Checkbox selection is not cleared in super wide RHP after merge expense

case3-bug.mov

When destination report has multiple expenses, super wide RHP of destination report is not opened in the background after merge expense

case5-bug.mov

joekaufmanexpensify

Good for product

grgia

NAB

grgia · 2026-07-28T15:02:39Z

@mkhutornyi for final review

github-actions · 2026-07-28T15:03:55Z

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

github-actions · 2026-07-28T15:10:19Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-00aa4f0f1f2-2be666f-45506cd0aaf539e57f3fd83cbc8f55162fd93c60/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-00aa4f0-2be666f-14578d2c20195a4885fd986a70120b4dbf3582bd/index.html

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

👀 View the workflow run that generated this build 👀

mkhutornyi · 2026-07-29T11:27:25Z

@apeyada please pull main and minify comments as Georgia stated

apeyada · 2026-07-29T15:21:41Z

@apeyada please pull main and minify comments as Georgia stated

Done. Thanks

fix super wide RHP closing after merging an expense on Search

c2513e7

melvin-bot Bot assigned apeyada Jul 23, 2026

chatgpt-codex-connector Bot reviewed Jul 23, 2026

View reviewed changes

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

apeyada and others added 2 commits July 27, 2026 07:40

Merge branch 'Expensify:main' into fix-89799

9dec042

fix one-transaction thread report case

ae44807

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

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

apeyada added 2 commits July 27, 2026 08:44

fix one-transaction thread report case after merge

f0b91d3

fallback to production path if post-merge count is 1

40bd44c

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

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

apeyada added 5 commits July 27, 2026 09:19

fix unreported case

45856a4

fix performance impact: new full-collection subscription

0fe5f31

consider deleted/pending/optimistic transactions when count

23fcb5b

Merge branch 'main' of https://github.com/apeyada/Expensify into fix-…

2b352bc

…89799

address codex comment - report has not been loaded completely into th…

2e06e3a

…e global transaction collection

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

Comment thread src/libs/MergeTransactionUtils.ts Outdated

apeyada added 2 commits July 27, 2026 10:05

add unit test

2a42aa8

handle offline delete pending case

0e7ea96

fix snapshot union can bypass the pending-delete filter

ef8ce1f

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

Comment thread src/pages/TransactionMerge/DynamicConfirmationPage.tsx

Comment thread src/libs/MergeTransactionUtils.ts Outdated

preserve the RHP only when it belongs to the target (fix split, card …

dd00cd4

…import case)

guard against the undefined === undefined false-positive

3640540

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

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

fix - dismiss a swapped source thread before preserving its report

41f3d99

melvin-bot Bot requested review from joekaufmanexpensify and mkhutornyi July 27, 2026 12:48

melvin-bot Bot requested review from a team and grgia and removed request for a team July 27, 2026 12:48

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

Comment thread src/libs/MergeTransactionUtils.ts Outdated

github-actions Bot reviewed Jul 27, 2026

View reviewed changes

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

apeyada added 2 commits July 27, 2026 14:01

optimize performance

96d5cb0

address codex comment

00aa4f0

joekaufmanexpensify previously approved these changes Jul 27, 2026

View reviewed changes

grgia reviewed Jul 28, 2026

View reviewed changes

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

grgia reviewed Jul 28, 2026

View reviewed changes

Comment thread src/libs/MergeTransactionUtils.ts Outdated

grgia previously approved these changes Jul 28, 2026

View reviewed changes

only keep necessary comments

c3e18e5

apeyada dismissed stale reviews from grgia and joekaufmanexpensify via c3e18e5 July 29, 2026 15:19

Merge branch 'Expensify:main' into fix-89799

de360f8

mkhutornyi approved these changes Jul 29, 2026

View reviewed changes

melvin-bot Bot requested a review from grgia July 29, 2026 17:29

Uh oh!

Conversation

apeyada commented Jul 23, 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!

apeyada commented Jul 23, 2026

Uh oh!

codecov Bot commented Jul 23, 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!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

apeyada commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

apeyada commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

apeyada commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

apeyada commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

apeyada commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 27, 2026

Uh oh!

melvin-bot Bot commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

mkhutornyi commented Jul 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mkhutornyi commented Jul 27, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

apeyada commented Jul 23, 2026 •

edited

Loading

codecov Bot commented Jul 23, 2026 •

edited by github-actions Bot

Loading

mkhutornyi commented Jul 27, 2026 •

edited

Loading