From f570b3b2ee7320e2904718376867bead373a12c5 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Mon, 1 Jul 2024 18:23:38 +0800
Subject: [PATCH] misc: combined into one list

---
 frontend/src/layouts/AppLayout/AppLayout.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx
index 816665a46..70f3656d2 100644
--- a/frontend/src/layouts/AppLayout/AppLayout.tsx
+++ b/frontend/src/layouts/AppLayout/AppLayout.tsx
@@ -129,13 +129,11 @@ export const AppLayout = ({ children }: LayoutProps) => {
   const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg?.id!);
   const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites();
 
-  const nonFavoriteWorkspaces = useMemo(
-    () => workspaces.filter((w) => !projectFavorites?.includes(w.id)),
-    [workspaces, projectFavorites]
-  );
-
-  const favoriteWorkspaces = useMemo(
-    () => workspaces.filter((w) => projectFavorites?.includes(w.id)),
+  const workspaceList = useMemo(
+    () => [
+      ...workspaces.filter((w) => projectFavorites?.includes(w.id)),
+      ...workspaces.filter((w) => !projectFavorites?.includes(w.id))
+    ],
     [workspaces, projectFavorites]
   );
 
@@ -500,7 +498,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                         dropdownContainerClassName="text-bunker-200 bg-mineshaft-800 border border-mineshaft-600 z-50 max-h-96 border-gray-700"
                       >
                         <div className="no-scrollbar::-webkit-scrollbar h-full no-scrollbar">
-                          {[...favoriteWorkspaces, ...nonFavoriteWorkspaces]
+                          {workspaceList
                             .filter((ws) => ws.orgId === currentOrg?.id)
                             .map(({ id, name }) => (
                               <div