Merge pull request #34311 from Expensify/revert-34046-ionatan_killare…

…ChatRoomsEnabled Revert "[NO QA] Remove areChatRoomsEnabled checks"
Expensify · Jan 11, 2024 · 778eee5 · 778eee5
2 parents 7517d74 + 79a4b11
commit 778eee5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -14,7 +14,10 @@ type UnitRate = {rate: number};
  * These are policies that we can use to create reports with in NewDot.
  */
 function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] | undefined {
-    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return Object.values(policies ?? {}).filter<Policy>(
+        (policy): policy is Policy =>
+            policy !== null && policy && (policy.isPolicyExpenseChatEnabled || policy.areChatRoomsEnabled) && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+    );
 }
 
 /**

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
@@ -62,6 +62,9 @@ type Policy = {
     /** The custom units data for this policy */
     customUnits?: Record<string, CustomUnit>;
 
+    /** Whether chat rooms can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
+    areChatRoomsEnabled: boolean;
+
     /** Whether policy expense chats can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
     isPolicyExpenseChatEnabled: boolean;
 

diff --git a/tests/utils/LHNTestUtils.js b/tests/utils/LHNTestUtils.js
@@ -252,6 +252,7 @@ function getFakePolicy(id = 1, name = 'Workspace-Test-001') {
         avatar: '',
         employeeList: [],
         isPolicyExpenseChatEnabled: true,
+        areChatRoomsEnabled: true,
         lastModified: 1697323926777105,
         autoReporting: true,
         autoReportingFrequency: 'immediate',

diff --git a/tests/utils/collections/policies.ts b/tests/utils/collections/policies.ts
@@ -7,6 +7,7 @@ export default function createRandomPolicy(index: number): Policy {
         id: index.toString(),
         name: randWord(),
         type: rand(Object.values(CONST.POLICY.TYPE)),
+        areChatRoomsEnabled: randBoolean(),
         autoReporting: randBoolean(),
         isPolicyExpenseChatEnabled: randBoolean(),
         autoReportingFrequency: rand(Object.values(CONST.POLICY.AUTO_REPORTING_FREQUENCIES)),