Merge pull request #22866 from GItGudRatio/fix/22515-new-room-page

fix: dismiss create new room page if user has no workspaces
Expensify · Jul 14, 2023 · d4cf9a8 · d4cf9a8
2 parents 78f8a70 + 02a8612
commit d4cf9a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -130,14 +130,14 @@ function WorkspaceNewRoomPage(props) {
     );
 
     useEffect(() => {
-        if (Permissions.canUsePolicyRooms(props.betas)) {
+        if (Permissions.canUsePolicyRooms(props.betas) && workspaceOptions.length) {
             return;
         }
         Log.info('Not showing create Policy Room page since user is not on policy rooms beta');
         Navigation.dismissModal();
-    }, [props.betas]);
+    }, [props.betas, workspaceOptions]);
 
-    if (!Permissions.canUsePolicyRooms(props.betas)) {
+    if (!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length) {
         return null;
     }