Skip to content

Disable threading for Manager McTest messages #77484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikkiWines merged 8 commits into from
Dec 17, 2025
Merged

Disable threading for Manager McTest messages #77484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc2b8a1
disable threading for manager mctest messages
c3024 Dec 2, 2025
6b4d2fd
Merge branch 'main' into disable-threading-for-manager-mctest-messages
c3024 Dec 12, 2025
9ec45e9
use only accountID check
c3024 Dec 12, 2025
8dd37c7
remove join thread from context menu actions
c3024 Dec 12, 2025
8d6b88f
remove unused reportID parameter
c3024 Dec 12, 2025
7df695b
add test for disabling threading for mctest
c3024 Dec 12, 2025
d95adfc
Merge branch 'main' into disable-threading-for-manager-mctest-messages
c3024 Dec 15, 2025
b43d691
Merge branch 'main' into disable-threading-for-manager-mctest-messages
c3024 Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10797,16 +10797,18 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, shouldExcludeNonR
* - The action is a whisper action and it's neither a report preview nor IOU action
* - The action is the thread's first chat
*/
function shouldDisableThread(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string, isThreadReportParentAction: boolean, isReportArchived = false): boolean {
function shouldDisableThread(reportAction: OnyxInputOrEntry<ReportAction>, isThreadReportParentAction: boolean, isReportArchived = false): boolean {
const isSplitBillAction = isSplitBillReportAction(reportAction);
const isDeletedActionLocal = isDeletedAction(reportAction);
const isReportPreviewActionLocal = isReportPreviewAction(reportAction);
const isIOUAction = isMoneyRequestAction(reportAction);
const isWhisperActionLocal = isWhisperAction(reportAction) || isActionableTrackExpense(reportAction);
const isActionDisabled = CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName);
const isManagerMcTestOwner = reportAction?.actorAccountID === CONST.ACCOUNT_ID.MANAGER_MCTEST;

return (
isActionDisabled ||
isManagerMcTestOwner ||
isSplitBillAction ||
(isDeletedActionLocal && !reportAction?.childVisibleActionCount) ||
(isReportArchived && !reportAction?.childVisibleActionCount) ||
Expand Down
4 changes: 3 additions & 1 deletion src/pages/home/report/ContextMenu/ContextMenuActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ const ContextMenuActions: ContextMenuAction[] = [
if (type !== CONST.CONTEXT_MENU_TYPES.REPORT_ACTION || !reportID) {
return false;
}
return !shouldDisableThread(reportAction, reportID, isThreadReportParentAction, isArchivedRoom);
return !shouldDisableThread(reportAction, isThreadReportParentAction, isArchivedRoom);
},
onPress: (closePopover, {reportAction, reportID}) => {
const originalReportID = getOriginalReportID(reportID, reportAction);
Expand Down Expand Up @@ -486,13 +486,15 @@ const ContextMenuActions: ContextMenuAction[] = [
const isExpenseReportAction = isMoneyRequestAction(reportAction) || isReportPreviewActionReportActionsUtils(reportAction);
const isTaskAction = isCreatedTaskReportAction(reportAction);
const isHarvestCreatedExpenseReportAction = isHarvestReport && isCreatedAction(reportAction);
const shouldDisableJoinThread = shouldDisableThread(reportAction, isThreadReportParentAction, isArchivedRoom);
return (
!subscribed &&
!isWhisperAction &&
!isTaskAction &&
!isExpenseReportAction &&
!isThreadReportParentAction &&
!isHarvestCreatedExpenseReportAction &&
!shouldDisableJoinThread &&
(shouldDisplayThreadReplies || (!isDeletedAction && !isArchivedRoom))
);
},
Expand Down
47 changes: 35 additions & 12 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,7 +3341,7 @@ describe('ReportUtils', () => {

it('should disable on thread-disabled actions', () => {
const reportAction = buildOptimisticCreatedReportAction('email1@test.com');
expect(shouldDisableThread(reportAction, reportID, false)).toBeTruthy();
expect(shouldDisableThread(reportAction, false)).toBeTruthy();
});

it('should disable thread on split expense actions', () => {
Expand All @@ -3353,7 +3353,7 @@ describe('ReportUtils', () => {
participants: [{login: 'email1@test.com'}, {login: 'email2@test.com'}],
transactionID: NumberUtils.rand64(),
}) as ReportAction;
expect(shouldDisableThread(reportAction, reportID, false)).toBeTruthy();
expect(shouldDisableThread(reportAction, false)).toBeTruthy();
});

it("should disable on a whisper action and it's neither a report preview nor IOU action", () => {
Expand All @@ -3363,14 +3363,37 @@ describe('ReportUtils', () => {
whisperedTo: [123456],
},
} as ReportAction;
expect(shouldDisableThread(reportAction, reportID, false)).toBeTruthy();
expect(shouldDisableThread(reportAction, false)).toBeTruthy();
});

it('should disable on thread first chat', () => {
const reportAction = {
childReportID: reportID,
} as ReportAction;
expect(shouldDisableThread(reportAction, reportID, true)).toBeTruthy();
expect(shouldDisableThread(reportAction, true)).toBeTruthy();
});

it('should disable thread for messages sent by MANAGER_MCTEST', () => {
// Given a report action from MANAGER_MCTEST
const reportAction = {
actorAccountID: CONST.ACCOUNT_ID.MANAGER_MCTEST,
message: [
{
translationKey: '',
type: 'COMMENT',
html: 'Test message from Manager McTest',
text: 'Test message from Manager McTest',
},
],
actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
} as ReportAction;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, false);

// Then the thread should be disabled
// This ensures "Reply in thread" and "Join thread" context menu options won't be shown
expect(isThreadDisabled).toBeTruthy();
});

describe('deleted threads', () => {
Expand All @@ -3389,7 +3412,7 @@ describe('ReportUtils', () => {
} as ReportAction;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false);
const isThreadDisabled = shouldDisableThread(reportAction, false);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3410,7 +3433,7 @@ describe('ReportUtils', () => {
} as ReportAction;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false);
const isThreadDisabled = shouldDisableThread(reportAction, false);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3430,7 +3453,7 @@ describe('ReportUtils', () => {
} as ReportAction;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false);
const isThreadDisabled = shouldDisableThread(reportAction, false);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3451,7 +3474,7 @@ describe('ReportUtils', () => {
} as ReportAction;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false);
const isThreadDisabled = shouldDisableThread(reportAction, false);

// Then the thread should be disabled
expect(isThreadDisabled).toBeTruthy();
Expand All @@ -3477,7 +3500,7 @@ describe('ReportUtils', () => {
const isReportArchived = false;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false, isReportArchived);
const isThreadDisabled = shouldDisableThread(reportAction, false, isReportArchived);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3500,7 +3523,7 @@ describe('ReportUtils', () => {
const isReportArchived = false;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false, isReportArchived);
const isThreadDisabled = shouldDisableThread(reportAction, false, isReportArchived);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3523,7 +3546,7 @@ describe('ReportUtils', () => {
const isReportArchived = true;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false, isReportArchived);
const isThreadDisabled = shouldDisableThread(reportAction, false, isReportArchived);

// Then the thread should be enabled
expect(isThreadDisabled).toBeFalsy();
Expand All @@ -3546,7 +3569,7 @@ describe('ReportUtils', () => {
const isReportArchived = true;

// When it's checked to see if the thread should be disabled
const isThreadDisabled = shouldDisableThread(reportAction, reportID, false, isReportArchived);
const isThreadDisabled = shouldDisableThread(reportAction, false, isReportArchived);

// Then the thread should be disabled
expect(isThreadDisabled).toBeTruthy();
Expand Down
Loading