From 0d4e597be590cdd083942b760faf58f7796263ce Mon Sep 17 00:00:00 2001
From: MingLiang Wang <mingliangwang0o0@gmail.com>
Date: Sat, 24 Dec 2022 11:44:17 +0800
Subject: [PATCH] feat: fix private workspace name

---
 .../SelectorPopperContent.tsx                  | 13 ++++++-------
 .../WorkspaceSelector/WorkspaceSelector.tsx    | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
index cfca67ec49..e5f89a3eab 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
@@ -109,18 +109,17 @@ export const SelectorPopperContent = ({
               key={workspace.id}
               id={workspace.id}
               icon={
-                (workspaces[workspace.id]?.meta.avatar &&
-                  `/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
-                (workspace.type === WorkspaceType.Private
+                workspace.type === WorkspaceType.Private
                   ? user.avatar_url
-                  : `loading...`)
+                  : (workspaces[workspace.id]?.meta.avatar &&
+                      `/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
+                    `loading...`
               }
               onClick={handleClickSettingWorkspace}
               name={
-                workspaces[workspace.id]?.meta.name ||
-                (workspace.type === WorkspaceType.Private
+                workspace.type === WorkspaceType.Private
                   ? user.name
-                  : `loading...`)
+                  : workspaces[workspace.id]?.meta.name || `loading...`
               }
               memberCount={workSpaceDetails[workspace.id]?.memberCount || 1}
             />
diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
index f7967febc6..dc2e5e01d7 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
@@ -24,11 +24,12 @@ export const WorkspaceSelector = () => {
         <Avatar
           alt="Affine"
           src={
-            (currentWorkspace?.meta.avatar &&
-              `/api/blob/${currentWorkspace?.meta.avatar}`) ||
-            (workspaceMeta?.type === WorkspaceType.Private && user
-              ? user.avatar_url
-              : '')
+            workspaceMeta?.type === WorkspaceType.Private
+              ? user
+                ? user.avatar_url
+                : ''
+              : currentWorkspace?.meta.avatar &&
+                `/api/blob/${currentWorkspace?.meta.avatar}`
           }
         >
           {workspaceMeta?.type === WorkspaceType.Private && user ? (
@@ -38,10 +39,11 @@ export const WorkspaceSelector = () => {
           )}
         </Avatar>
         <WorkspaceName>
-          {currentWorkspace?.meta.name ||
-            (workspaceMeta?.type === WorkspaceType.Private && user
+          {workspaceMeta?.type === WorkspaceType.Private
+            ? user
               ? user.name
-              : 'AFFiNE')}
+              : 'AFFiNE'
+            : currentWorkspace?.meta.name}
         </WorkspaceName>
       </SelectorWrapper>
     </Popper>