From 7981df150a97d254a5a645df9584cc4157a01892 Mon Sep 17 00:00:00 2001
From: DiamondThree <diamond.shx@gmail.com>
Date: Fri, 23 Dec 2022 09:42:34 +0800
Subject: [PATCH] feat: totas error

---
 .../src/components/invite-members/index.tsx    |  2 +-
 .../WorkspaceSelector/WorkspaceSelector.tsx    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/app/src/components/invite-members/index.tsx b/packages/app/src/components/invite-members/index.tsx
index 846631a684..ba791da63d 100644
--- a/packages/app/src/components/invite-members/index.tsx
+++ b/packages/app/src/components/invite-members/index.tsx
@@ -134,7 +134,7 @@ export const InviteMembers = ({
                     onInviteSuccess && onInviteSuccess();
                   })
                   .catch(err => {
-                    toast('Invite failed');
+                    // toast('Invite failed');
                     console.log(err);
                   });
               }}
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 c7be2949ae..e0a6a4776c 100644
--- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
+++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx
@@ -2,10 +2,17 @@ import { Popper } from '@/ui/popper';
 import { Avatar, WorkspaceName, SelectorWrapper } from './styles';
 import { SelectorPopperContent } from './SelectorPopperContent';
 import { useState } from 'react';
+import { useAppState } from '@/providers/app-state-provider';
+import { WorkspaceType } from '@pathfinder/data-services';
 
 export const WorkspaceSelector = () => {
   const [isShow, setIsShow] = useState(false);
-
+  const { currentWorkspace, workspacesMeta, currentWorkspaceId, user } =
+    useAppState();
+  const workspaceMeta = workspacesMeta.find(
+    meta => String(meta.id) === String(currentWorkspaceId)
+  );
+  console.log('currentWorkspace', currentWorkspace, workspaceMeta);
   return (
     <Popper
       content={<SelectorPopperContent isShow={isShow} />}
@@ -15,8 +22,13 @@ export const WorkspaceSelector = () => {
       onVisibleChange={setIsShow}
     >
       <SelectorWrapper>
-        <Avatar alt="Affine" />
-        <WorkspaceName>AFFiNE</WorkspaceName>
+        <Avatar alt="Affine" src={currentWorkspace?.meta.avatar || ''} />
+        <WorkspaceName>
+          {currentWorkspace?.meta.name ||
+            (workspaceMeta?.type === WorkspaceType.Private && user
+              ? user.name
+              : `workspace-${workspaceMeta?.id}`)}
+        </WorkspaceName>
       </SelectorWrapper>
     </Popper>
   );