Merge pull request #36178 from ZhenjaHorbach/workspaces-listed-in-roo…

…m-are-not-listed-in-alphabetical-order
Expensify · Feb 12, 2024 · 6ce5574 · 6ce5574
2 parents 4ceb7ee + 78bbc35
commit 6ce5574
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
@@ -15,7 +15,9 @@ 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.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.name && !!policy.id,
+    );
 }
 
 /**

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -114,7 +114,7 @@ function WorkspaceNewRoomPage(props) {
                     key: policy.id,
                     value: policy.id,
                 }),
-            ),
+            ).sort((a, b) => a.label.toLowerCase().localeCompare(b.label.toLowerCase())),
         [props.policies],
     );
     const [policyID, setPolicyID] = useState(() => {