From cef4bde80d75e2b01a2aebc3e98ec118027bd021 Mon Sep 17 00:00:00 2001
From: "Tongci.Z" <116621270+ZTongci@users.noreply.github.com>
Date: Wed, 2 Oct 2024 17:48:02 +0900
Subject: [PATCH] refactor(web): refactor currentWorkspaceId (#1165)

Co-authored-by: tcsola <tcsola@tcsolaMacBook-Pro.local>
---
 web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx | 2 +-
 web/src/beta/features/Navbar/hooks.ts                      | 2 +-
 web/src/beta/features/Navbar/index.tsx                     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx b/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
index 556e4476a..806185746 100644
--- a/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
+++ b/web/src/beta/features/AccountAndWorkSpaceSetting/index.tsx
@@ -45,7 +45,7 @@ const AccountAndWorkSpaceSetting: FC<Props> = ({ tab }) => {
 
   return (
     <Wrapper>
-      <Navbar workspaceId={meData.myTeam?.id} page="settings" />
+      <Navbar page="settings" />
       <MainSection>
         <LeftSidePanel>
           <SidebarWrapper>
diff --git a/web/src/beta/features/Navbar/hooks.ts b/web/src/beta/features/Navbar/hooks.ts
index 01d955549..17f152b04 100644
--- a/web/src/beta/features/Navbar/hooks.ts
+++ b/web/src/beta/features/Navbar/hooks.ts
@@ -68,7 +68,7 @@ export default ({
   return {
     workspaces,
     currentProject,
-    workspace,
+    currentWorkspace,
     handleWorkspaceChange,
     handleLogout
   };
diff --git a/web/src/beta/features/Navbar/index.tsx b/web/src/beta/features/Navbar/index.tsx
index 7aaa7d21f..7c1a147a6 100644
--- a/web/src/beta/features/Navbar/index.tsx
+++ b/web/src/beta/features/Navbar/index.tsx
@@ -31,7 +31,7 @@ const Navbar: React.FC<Props> = ({
 }) => {
   const {
     currentProject,
-    workspace,
+    currentWorkspace,
     workspaces,
     handleLogout,
     handleWorkspaceChange
@@ -50,7 +50,7 @@ const Navbar: React.FC<Props> = ({
     <Wrapper>
       <LeftSection
         currentProject={currentProject}
-        currentWorkspace={workspace}
+        currentWorkspace={currentWorkspace}
         workspaces={workspaces}
         sceneId={sceneId}
         page={page}