From aa58bbcd1bb7b8ddc45c459955ebd05828218cb1 Mon Sep 17 00:00:00 2001
From: MingLiang Wang <mingliangwang0o0@gmail.com>
Date: Fri, 23 Dec 2022 18:58:15 +0800
Subject: [PATCH] feat: add email avatar

---
 .../workspace-setting/general/general.tsx          |  2 +-
 .../WorkspaceSelector/SelectorPopperContent.tsx    |  8 +++++---
 .../WorkspaceSelector/WorkspaceSelector.tsx        | 14 ++++++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/components/workspace-setting/general/general.tsx b/packages/app/src/components/workspace-setting/general/general.tsx
index d5615a1656..98c1dcb997 100644
--- a/packages/app/src/components/workspace-setting/general/general.tsx
+++ b/packages/app/src/components/workspace-setting/general/general.tsx
@@ -57,7 +57,7 @@ export const GeneralPage = ({
     meta => meta.id === workspace.id
   );
   const nextWorkSpaceId =
-    currentWorkspaceIndex > workspacesMeta.length - 1
+    currentWorkspaceIndex === workspacesMeta.length - 1
       ? workspacesMeta[currentWorkspaceIndex - 1]?.id
       : workspacesMeta[currentWorkspaceIndex + 1]?.id;
   const handleClickDelete = () => {
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 87c44070a6..6f6916c44e 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
@@ -109,9 +109,11 @@ export const SelectorPopperContent = ({
               key={workspace.id}
               id={workspace.id}
               icon={
-                workspaces[workspace.id]?.meta.avatar
-                  ? 'api/blob/' + workspaces[workspace.id]?.meta.avatar
-                  : ''
+                (workspaces[workspace.id]?.meta.avatar &&
+                  `/api/blob/${workspaces[workspace.id]?.meta.avatar}`) ||
+                (workspace.type === WorkspaceType.Private
+                  ? user.avatar_url
+                  : `loading...`)
               }
               onClick={handleClickSettingWorkspace}
               name={
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 d97eb8ceeb..f7967febc6 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
@@ -24,12 +24,18 @@ export const WorkspaceSelector = () => {
         <Avatar
           alt="Affine"
           src={
-            currentWorkspace?.meta.avatar
-              ? `api/blob/${currentWorkspace?.meta.avatar}`
-              : ''
+            (currentWorkspace?.meta.avatar &&
+              `/api/blob/${currentWorkspace?.meta.avatar}`) ||
+            (workspaceMeta?.type === WorkspaceType.Private && user
+              ? user.avatar_url
+              : '')
           }
         >
-          <AffineIcon />
+          {workspaceMeta?.type === WorkspaceType.Private && user ? (
+            user?.name[0]
+          ) : (
+            <AffineIcon />
+          )}
         </Avatar>
         <WorkspaceName>
           {currentWorkspace?.meta.name ||