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

…natan_killareChatRoomsEnabled Revert "[CP Staging] Revert "[NO QA] Remove areChatRoomsEnabled checks""
Expensify · Feb 5, 2024 · 1747e86 · 1747e86
2 parents 8034a1b + 18796cc
commit 1747e86
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 18 deletions.
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -15,10 +15,7 @@ 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.isPolicyExpenseChatEnabled || policy.areChatRoomsEnabled) && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    );
+    return Object.values(policies ?? {}).filter<Policy>((policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
 /**

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -1161,7 +1161,6 @@ function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', pol
                 isPolicyExpenseChatEnabled: true,
                 outputCurrency,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                areChatRoomsEnabled: true,
                 customUnits,
                 makeMeAdmin,
             },
@@ -1223,7 +1222,6 @@ function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName
                 isPolicyExpenseChatEnabled: true,
                 outputCurrency,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                areChatRoomsEnabled: true,
                 customUnits,
             },
         },
@@ -1603,7 +1601,6 @@ function createWorkspaceFromIOUPayment(iouReport: Report): string | undefined {
         // Setting the currency to USD as we can only add the VBBA for this policy currency right now
         outputCurrency: CONST.CURRENCY.USD,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        areChatRoomsEnabled: true,
         customUnits,
     };
 

diff --git a/src/libs/actions/TeachersUnite.ts b/src/libs/actions/TeachersUnite.ts
@@ -91,7 +91,6 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
             value: {
                 id: policyID,
                 isPolicyExpenseChatEnabled: true,
-                areChatRoomsEnabled: true,
                 type: CONST.POLICY.TYPE.CORPORATE,
                 name: policyName,
                 role: CONST.POLICY.ROLE.USER,

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -106,11 +106,14 @@ function WorkspaceNewRoomPage(props) {
 
     const workspaceOptions = useMemo(
         () =>
-            _.map(PolicyUtils.getActivePolicies(props.policies), (policy) => ({
-                label: policy.name,
-                key: policy.id,
-                value: policy.id,
-            })),
+            _.map(
+                _.filter(PolicyUtils.getActivePolicies(props.policies), (policy) => policy.type !== CONST.POLICY.TYPE.PERSONAL),
+                (policy) => ({
+                    label: policy.name,
+                    key: policy.id,
+                    value: policy.id,
+                }),
+            ),
         [props.policies],
     );
     const [policyID, setPolicyID] = useState(() => {

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
@@ -76,9 +76,6 @@ 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,7 +252,6 @@ 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,7 +7,6 @@ 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)),