Fix/leave thread option #76739

mukhrr · 2025-12-04T17:03:39Z

Explanation of Change

Fixed Issues

$ #76489

PROPOSAL: #76489 (comment)

Tests

The same as QA

Verify that no errors appear in the JS console

Offline tests

QA Steps

Test 1 for your own message:

Send a message in any channel or DM
Right click on the message

Verify you see 'Join thread'

Click "Join Thread" option

Verify you see "Leave Thread" option now

Test 2 for other's message:

Have a separate account send a message in any channel or a DM to you

Right click on the message
Click Join thread
Right click on the message again

Verify you see 'Leave thread'
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_mWeb.mp4

MacOS: Chrome / Safari

web.mp4

codecov · 2025-12-04T17:16:03Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/ContextMenuUtils.ts	`100.00% <100.00%> (ø)`
src/libs/ReportUtils.ts	`73.15% <0.00%> (+0.06%)`	⬆️
...ges/home/report/ContextMenu/ContextMenuActions.tsx	`0.85% <0.00%> (+0.05%)`	⬆️
... and 7 files with indirect coverage changes

…existence checks

…dd tests

melvin-bot · 2025-12-06T06:23:50Z

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

mukhrr · 2025-12-06T06:24:27Z

well the PR changes includes things in this #74468 (comment)

eh2077 · 2025-12-08T16:23:50Z

@mukhrr I'm not clear about which issue this PR is fixing. The QA steps of this PR are already working on main. Can you explain about the issue and root cause? Thx

mukhrr · 2025-12-08T16:27:20Z

@eh2077 sorry for confusement. I've updated QA steps.

Click "Leave Thread" option

Verify you see "Join Thread" option now

eh2077 · 2025-12-08T16:34:23Z

@mukhrr Can you explain why Leave thread shows twice?

mukhrr · 2025-12-08T17:07:22Z

@eh2077 yeah, it was checked for message creator (isActionCreator). I mean if you message creator and already subscribed childReportNotificationPreference comes empty -> you see "Leave Thread". And you click that option which makes childReportNotificationPreference as always. And you click "Leave thread" once more which makes childReportNotificationPreference hidden this time and show "Join Thread"

App/src/libs/ReportUtils.ts

Lines 2678 to 2686 in c00cf1d

    
           function getChildReportNotificationPreference(reportAction: OnyxInputOrEntry<ReportAction> | Partial<ReportAction>): NotificationPreference { 
        
               const childReportNotificationPreference = reportAction?.childReportNotificationPreference ?? ''; 
        
               if (childReportNotificationPreference) { 
        
                   return childReportNotificationPreference; 
        
               } 
        
               return isActionCreator(reportAction) ? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS : CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN; 
        
           }

src/libs/ReportUtils.ts

JmillsExpensify

All good product polish.

JmillsExpensify · 2025-12-10T11:36:44Z

@heyjennahay unassigned you since I got here first.

mukhrr · 2025-12-15T17:16:18Z

@eh2077 kindly bumo here #76739 (comment)

eh2077 · 2025-12-16T14:30:18Z

Sorry for the delay, I'll look into it tmr

eh2077 · 2025-12-22T10:28:36Z

QA Steps

Test 1 for your own message:

Send a message in any channel or DM

Right click on the message

Verify you see 'Leave thread'

Click "Leave Thread" option

Verify you see "Join Thread" option now

Is it a bug or wrong test steps? The 2nd step show Join thread option

Screen.Recording.2025-12-22.at.6.21.18.PM.mov

mukhrr · 2025-12-22T10:30:45Z

Is it a bug or wrong test steps? The 2nd step show Join thread option

Screen.Recording.2025-12-22.at.6.21.18.PM.mov

oh it's wrong QA step. let me fix that

eh2077 · 2025-12-22T13:39:04Z

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

Screen.Recording.2025-12-22.at.9.49.46.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-12-22.at.9.50.39.PM.mov

iOS: HybridApp

Screen.Recording.2025-12-22.at.9.44.47.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-12-22.at.9.47.55.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-22.at.9.39.24.PM.mov

eh2077

looks good!

mukhrr · 2025-12-24T06:46:29Z

@AndrewGable kindly bump here

OSBotify · 2026-01-05T22:31:38Z

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

OSBotify · 2026-01-06T14:09:04Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.2.94-0 🚀

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

Fix/leave thread option

OSBotify · 2026-01-07T13:39:56Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.94-4 🚀

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

mukhrr added 2 commits December 4, 2025 21:49

fix: hide join option for thread creators

af91f5b

fix: hide join/leave thread options when thread doesn't exist

56105b3

melvin-bot bot assigned mukhrr Dec 4, 2025

fix: add eslint disable comments for deprecated getReportName usage

e5cc095

mukhrr added 4 commits December 4, 2025 22:16

prettier fix

f3e3dfc

fix: simplify thread join/leave logic by removing thread creator and …

c9457d4

…existence checks

prettier fix

f77086c

refactor: extract thread join/leave logic into ContextMenuUtils and a…

2539a88

…dd tests

mukhrr marked this pull request as ready for review December 6, 2025 06:23

mukhrr requested review from a team as code owners December 6, 2025 06:23

melvin-bot bot requested review from eh2077 and heyjennahay and removed request for a team December 6, 2025 06:23

melvin-bot bot requested review from a team and JmillsExpensify and removed request for a team December 6, 2025 06:23

This was referenced Dec 6, 2025

[Due for payment 2026-01-14] [$250] Chat - User has to leave thread twice, to make the "Join Thread" option appear. #76489

Open

[Due for Payment 12/10] [$250] Conversation - There's no "Leave Thread" option when right-clicking on a message #74468

Closed

eh2077 reviewed Dec 10, 2025

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

JmillsExpensify reviewed Dec 10, 2025

View reviewed changes

JmillsExpensify removed the request for review from heyjennahay December 10, 2025 11:36

mukhrr added 2 commits December 17, 2025 11:24

Merge remote-tracking branch 'origin' into fix/leave-thread-option

f50e590

Hide join/leave thread options for Harvest report created actions

6690051

eh2077 approved these changes Dec 22, 2025

View reviewed changes

melvin-bot bot requested a review from AndrewGable December 22, 2025 13:53

AndrewGable approved these changes Jan 5, 2026

View reviewed changes

AndrewGable merged commit 653feca into Expensify:main Jan 5, 2026
32 of 41 checks passed

OSBotify mentioned this pull request Jan 6, 2026

Deploy Checklist: New Expensify 2026-01-06 #78900

Closed

53 tasks

This was referenced Jan 6, 2026

[Due for payment 2026-01-15] Thread - Join button appears briefly when starting a thread #78922

Closed

[CP Staging] Revert "Fix/leave thread option" #78926

Merged

abzokhattab pushed a commit to abzokhattab/App that referenced this pull request Jan 6, 2026

Merge pull request Expensify#76739 from mukhrr/fix/leave-thread-option

93c3514

Fix/leave thread option

Fix/leave thread option #76739

Fix/leave thread option #76739

Conversation

mukhrr commented Dec 4, 2025 • 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!

codecov bot commented Dec 4, 2025 • 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 Dec 6, 2025

Uh oh!

mukhrr commented Dec 6, 2025

Uh oh!

eh2077 commented Dec 8, 2025

Uh oh!

mukhrr commented Dec 8, 2025

Uh oh!

eh2077 commented Dec 8, 2025

Uh oh!

mukhrr commented Dec 8, 2025

Uh oh!

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

JmillsExpensify commented Dec 10, 2025

Uh oh!

mukhrr commented Dec 15, 2025

Uh oh!

eh2077 commented Dec 16, 2025

Uh oh!

eh2077 commented Dec 22, 2025

QA Steps

Uh oh!

mukhrr commented Dec 22, 2025

Uh oh!

eh2077 commented Dec 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

mukhrr commented Dec 24, 2025

Uh oh!

Uh oh!

OSBotify commented Jan 5, 2026

Uh oh!

OSBotify commented Jan 6, 2026

Uh oh!

OSBotify commented Jan 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mukhrr commented Dec 4, 2025 •

edited

Loading

codecov bot commented Dec 4, 2025 •

edited by github-actions bot

Loading

eh2077 commented Dec 22, 2025 •

edited

Loading