remove isArchivedReport param

Expensify · Mar 14, 2024 · 5f1add8 · 5f1add8
1 parent 220ee46
commit 5f1add8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -5148,12 +5148,13 @@ function hasUpdatedTotal(report: OnyxEntry<Report>): boolean {
  * - 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: OnyxEntry<ReportAction>, reportID: string, isArchivedReport = false): boolean {
+function shouldDisableThread(reportAction: OnyxEntry<ReportAction>, reportID: string): boolean {
     const isSplitBillAction = ReportActionsUtils.isSplitBillAction(reportAction);
     const isDeletedAction = ReportActionsUtils.isDeletedAction(reportAction);
     const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
     const isIOUAction = ReportActionsUtils.isMoneyRequestAction(reportAction);
     const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
+    const isArchivedReport = isArchivedRoom(getReport(reportID));
 
     return (
         CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName) ||

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -194,7 +194,7 @@ const ContextMenuActions: ContextMenuAction[] = [
             if (type !== CONST.CONTEXT_MENU_TYPES.REPORT_ACTION) {
                 return false;
             }
-            return !ReportUtils.shouldDisableThread(reportAction, reportID, isArchivedRoom);
+            return !ReportUtils.shouldDisableThread(reportAction, reportID);
         },
         onPress: (closePopover, {reportAction, reportID}) => {
             if (closePopover) {

diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
@@ -679,13 +679,20 @@ describe('ReportUtils', () => {
         });
 
         it('should disable on archived reports and not-thread actions', () => {
-            const reportAction = {
-                childVisibleActionCount: 1,
-            };
-            expect(ReportUtils.shouldDisableThread(reportAction, reportID, true)).toBeFalsy();
+            Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
+                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+            })
+                .then(() => waitForBatchedUpdates())
+                .then(() => {
+                    const reportAction = {
+                        childVisibleActionCount: 1,
+                    };
+                    expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeFalsy();
 
-            reportAction.childVisibleActionCount = 0;
-            expect(ReportUtils.shouldDisableThread(reportAction, reportID, true)).toBeTruthy();
+                    reportAction.childVisibleActionCount = 0;
+                    expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
+                });
         });
 
         it("should disable on a whisper action and it's neither a report preview nor IOU action", () => {