feat:merge dev

2026-07-18 02:26:21 +08:00 · 2023-01-13 14:07:17 +08:00
parent 5df735db48 f892af6dcd
commit 5988777baf
38 changed files with 825 additions and 938 deletions
@@ -10,7 +10,7 @@ import {
  AddIcon,
 } from '@blocksuite/icons';
 import { toast } from '@/ui/toast';
-import { WorkspaceAvatar } from '@/components/workspace-avatar';
+import { WorkspaceUnitAvatar } from '@/components/workspace-avatar';
 import { useAppState } from '@/providers/app-state-provider';
 import { useRouter } from 'next/router';
 import { useConfirm } from '@/providers/ConfirmProvider';
@@ -67,11 +67,7 @@ export const WorkspaceModal = ({ open, onClose }: WorkspaceModalProps) => {
                          marginRight: '10px',
                        }}
                      >
-                        <WorkspaceAvatar
-                          size={50}
-                          name={item.name}
-                          avatar={item.avatar ?? ''}
-                        />
+                        <WorkspaceUnitAvatar size={50} workspaceUnit={item} />
                      </div>

                      <span