Fix fragment.text literal and close search RHP after deleting last message by WojtekBoman · Pull Request #92543 · Expensify/App

WojtekBoman · 2026-06-03T15:10:36Z

Explanation of Change

Fixes the "fragment.text" literal showing in chat after deleting a thread conversation: the default case in ReportActionItemFragment now renders {fragment?.text ?? ''} instead of the literal string. Additionally, in deleteReportComment, when a report shown in the search RHP (/search/view/:reportID) has no visible actions left after deletion, we pop that RHP screen (keeping any wider RHP below open).

Screen.Recording.2026-06-03.at.17.09.44.mov

Fixed Issues

$ #91603
PROPOSAL:

Tests

Go to a workspace chat and create two expenses.
Go to Spend > Reports and open the report.
Open any expense, then send a message in the transaction thread.
Right click the message > Reply in thread, and send a reply in the thread.
Delete the parent message (right click > Delete comment), then delete the thread reply (right click > Delete comment).
Verify that "fragment.text" does NOT appear anywhere after deleting the thread conversation.
Verify that once the last visible message in the report opened via /search/view/:reportID is deleted, that RHP screen closes automatically (instead of showing an empty report).
With a wider RHP (e.g. expense details) stacked below the search report view, repeat step 7 and verify that only the top report screen is popped while the wider RHP underneath remains open.

Verify that no errors appear in the JS console

Offline tests

Go offline.
Open a report via Spend > Reports (/search/view/:reportID) and delete its last visible message.
Verify that the RHP screen is popped and "fragment.text" never appears.
Go back online and verify the deletion persists and the UI stays consistent.

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

melvin-bot · 2026-06-03T15:10:44Z

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

github-actions · 2026-06-03T19:38:17Z

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

mkhutornyi · 2026-06-07T14:53:02Z

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
- MacOS: Desktop
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

android.mov

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

web2.mov

mkhutornyi

We already have the auto navigation logic here:

App/src/pages/inbox/ReportNavigateAwayHandler.tsx

Lines 158 to 167 in 82237b8

    
           if ( 
        
               // non-optimistic case 
        
               (!prevUserLeavingStatus && !!userLeavingStatus) || 
        
               didReportClose || 
        
               isRemovalExpectedForReportType || 
        
               isClosedTopLevelPolicyRoom || 
        
               (prevDeletedParentAction && !deletedParentAction) 
        
           ) { 
        
               navigateAwayFromReport(prevOnyxReportID, prevReport?.parentReportID); 
        
           }

web2.mov

So this doesn't happen when the thread report is NOT RHP modal.
The root cause is that isInNarrowPaneModal is true so early return here insde navigateAwayFromReport function:

App/src/pages/inbox/ReportNavigateAwayHandler.tsx

Lines 107 to 109 in 82237b8

    
           if ((!isFocused && !isHoldScreenOpenInRHP && !isReportDetailOpenInRHP) || (!isHoldScreenOpenInRHP && isInNarrowPaneModal)) { 
        
               return; 
        
           }

mkhutornyi · 2026-06-07T15:58:23Z

+        !isDeletedParentAction &&
+        !ReportActionsUtils.doesReportHaveVisibleActions(reportID, canUserPerformWriteAction, optimisticReportActions as ReportActions, visibleReportActionsDataParam)
+    ) {
+        Navigation.goBack();


This causes regression:

Screen.Recording.2026-06-07.at.4.56.50.PM.mov

We should NOT auto close report when parent message is not deleted

Another bad regression:

Screen.Recording.2026-06-07.at.4.59.54.PM.mov

mkhutornyi · 2026-06-07T16:02:28Z

I am not sure I am following the current approach. Can we fix this root cause instead but without reintroducing the bug what it fixed?

…ssage

codecov · 2026-06-08T11:50:17Z

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 Δ
...rc/pages/inbox/report/ReportActionItemFragment.tsx	`55.76% <0.00%> (ø)`
src/pages/inbox/ReportNavigateAwayHandler.tsx	`68.83% <0.00%> (-1.84%)`	⬇️
... and 511 files with indirect coverage changes

WojtekBoman · 2026-06-08T12:10:21Z

Screen.Recording.2026-06-08.at.14.05.40.mov

It fixes the original issue and regressions don't occur :) @mkhutornyi Could you check if it's ok now?

mkhutornyi · 2026-06-10T08:26:12Z

yes it fixes the original issue.

I found another similar case where auto navigation doesn't happen.

Repro step:

Go to Spend > Expenses and open any expense.
Send a message.
Right click the message > Reply in thread (Do not send a reply in the thread so keep no visible report actions).
Delete the parent message (right click > Delete comment).
Observe that RHP screen doesn't close automatically.

bug.mov

Let's fix this separately to avoid regressions. (Maybe adjust condition in your original approach. We should check with reportAction.childReportID, NOT reportID)

We already have auto navigation logic in deleteReportComment but fails in this case.
The root cause is that Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportAction.childReportID)) condition isn't met in search pages

App/src/libs/actions/Report/index.ts

Lines 3149 to 3151 in 613f8f5

    
           } else if (Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(reportAction.childReportID)) && !isDeletedParentAction) { 
        
               Navigation.goBack(undefined); 
        
           }

github-actions · 2026-06-10T14:05:56Z

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

github-actions · 2026-06-10T14:12:14Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-739b7f43d7e-5dd32c1-def0d445f13b7769001e0b2c8f2c7eb67a4f8d1a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-739b7f4-5dd32c1-1891acd2c546c832bee7cea6312f8209360d2e5a/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-10T23:51:41Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.5-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-10T23:54:40Z

🤖 Help site review: no changes required

I reviewed the changes in this PR against the help site articles under docs/articles. This is a bug fix that does not alter any documented feature, setting, workflow, or UI label, so no help site updates are needed and I did not create a draft docs PR.

Why no docs changes are required

The PR makes two internal fixes that restore expected behavior rather than introducing or changing any user-facing functionality:

ReportActionItemFragment.tsx — the default case rendered the literal string fragment.text instead of the fragment's actual content. The fix renders {fragment?.text ?? ''}. This corrects a rendering bug; it does not change any feature behavior that would be described in help docs.
ReportNavigateAwayHandler.tsx — when a thread opened at the top of the search RHP becomes empty (parent message and its last reply both deleted), that RHP screen is now popped instead of leaving an empty report on screen. This is internal navigation behavior tied to deleting comments; it is not a documented workflow.

Deleting comments/threads and viewing reports via Spend > Reports are existing behaviors already covered (where relevant) by current articles, and their documented steps are unaffected by these fixes.

@WojtekBoman, since no help site changes are required, there is no linked help site PR to review. If you believe a documented behavior was affected, let me know and I'll create a draft docs PR.

OSBotify · 2026-06-11T23:42:55Z

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

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

WojtekBoman requested review from a team as code owners June 3, 2026 15:10

melvin-bot Bot assigned WojtekBoman Jun 3, 2026

melvin-bot Bot requested review from flaviadefaria and hungvu193 and removed request for a team and flaviadefaria June 3, 2026 15:10

melvin-bot Bot removed the request for review from a team June 3, 2026 15:10

This comment has been minimized.

Sign in to view

mkhutornyi reviewed Jun 7, 2026

View reviewed changes

mkhutornyi mentioned this pull request Jun 7, 2026

[CP Staging] Fix back navigation after delete expense request in search transcation pane RHP #44372

Merged

50 tasks

mkhutornyi reviewed Jun 7, 2026

View reviewed changes

Fix fragment.text literal and close search RHP after deleting last me…

8d66dfe

…ssage

WojtekBoman force-pushed the fix/closing-rhp-after-deleting-thread branch from 5964491 to 8d66dfe Compare June 8, 2026 11:46

mkhutornyi approved these changes Jun 10, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny June 10, 2026 08:27

mountiny approved these changes Jun 10, 2026

View reviewed changes

mountiny merged commit 739b7f4 into Expensify:main Jun 10, 2026
33 checks passed

OSBotify mentioned this pull request Jun 10, 2026

Deploy Checklist: New Expensify 2026-06-10 #93219

Closed

72 tasks

melvin-bot Bot mentioned this pull request Jun 11, 2026

[Due for payment 2026-06-18] Spend - "fragment.text" appears after deleting the thread conversation #91603

Closed

7 tasks

WojtekBoman mentioned this pull request Jun 23, 2026

[Payment due @mkhutornyi] Fix thread RHP not closing when parent message deleted from search pages #94293

Merged

43 tasks

suneox mentioned this pull request Sep 9, 2026

fix: Infinite loading when delete message in reply #77845

Closed

53 tasks

	if (
	// non-optimistic case
	(!prevUserLeavingStatus && !!userLeavingStatus) \|\|
	didReportClose \|\|
	isRemovalExpectedForReportType \|\|
	isClosedTopLevelPolicyRoom \|\|
	(prevDeletedParentAction && !deletedParentAction)
	) {
	navigateAwayFromReport(prevOnyxReportID, prevReport?.parentReportID);
	}

	if ((!isFocused && !isHoldScreenOpenInRHP && !isReportDetailOpenInRHP) \|\| (!isHoldScreenOpenInRHP && isInNarrowPaneModal)) {
	return;
	}

Conversation

WojtekBoman commented Jun 3, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 3, 2026

Uh oh!

github-actions Bot commented Jun 3, 2026

Uh oh!

This comment has been minimized.

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jun 7, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jun 7, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

codecov Bot commented Jun 8, 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!

WojtekBoman commented Jun 8, 2026

Uh oh!

mkhutornyi commented Jun 10, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 10, 2026

Uh oh!

github-actions Bot commented Jun 10, 2026

Uh oh!

OSBotify commented Jun 10, 2026

Uh oh!

MelvinBot commented Jun 10, 2026

Uh oh!

OSBotify commented Jun 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mkhutornyi commented Jun 7, 2026 •

edited

Loading

mkhutornyi commented Jun 7, 2026 •

edited

Loading

codecov Bot commented Jun 8, 2026 •

edited by github-actions Bot

Loading