fix(flat-components): fix avatar show error (#1989)

netless-io · Aug 7, 2023 · 3e33244 · 3e33244
1 parent c65eb3f
commit 3e33244
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageNavAvatar/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageNavAvatar/index.tsx
@@ -5,6 +5,7 @@ import React, { useState } from "react";
 import { MainPageLayoutItem } from "../types";
 
 export interface MainPageNavAvatarProps {
+    userUUID: string;
     /** user avatar src*/
     avatarSrc: string;
     /** user name */
@@ -20,6 +21,7 @@ export interface MainPageNavAvatarProps {
 }
 
 export const MainPageNavAvatar: React.FC<MainPageNavAvatarProps> = ({
+    userUUID,
     avatarSrc,
     userName,
     onClick,
@@ -30,7 +32,7 @@ export const MainPageNavAvatar: React.FC<MainPageNavAvatarProps> = ({
     const [popMenuVisible, setPopMenuVisible] = useState(false);
     const [isAvatarLoadFailed, setAvatarLoadFailed] = useState(false);
 
-    const avatar = isAvatarLoadFailed ? generateAvatar(avatarSrc) : avatarSrc;
+    const avatar = isAvatarLoadFailed || !avatarSrc ? generateAvatar(userUUID) : avatarSrc;
 
     const togglePopMenuVisible = (): void => {
         setPopMenuVisible(!popMenuVisible);

diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageNavHorizontal/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageNavHorizontal/index.tsx
@@ -22,6 +22,7 @@ export interface MainPageNavHorizontalProps extends MainPageNavAvatarProps, Main
 }
 
 export const MainPageNavHorizontal: React.FC<MainPageNavHorizontalProps> = ({
+    userUUID,
     avatarSrc,
     userName,
     onClick,
@@ -101,6 +102,7 @@ export const MainPageNavHorizontal: React.FC<MainPageNavHorizontalProps> = ({
                             generateAvatar={generateAvatar}
                             popMenu={popMenu}
                             userName={userName}
+                            userUUID={userUUID}
                             onClick={onClick}
                         />
                     </div>

diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageTopBar/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageTopBar/index.tsx
@@ -15,6 +15,7 @@ export interface MainPageTopBarProps extends MainPageNavAvatarProps {
 }
 
 export const MainPageTopBar: React.FC<MainPageTopBarProps> = ({
+    userUUID,
     activeKeys,
     avatarSrc,
     popMenu,
@@ -36,6 +37,7 @@ export const MainPageTopBar: React.FC<MainPageTopBarProps> = ({
                         generateAvatar={generateAvatar}
                         popMenu={popMenu}
                         userName={userName}
+                        userUUID={userUUID}
                         onClick={onClick}
                     />
                 </div>

diff --git a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx
@@ -135,6 +135,7 @@ export const MainPageLayoutHorizontalContainer = observer<MainPageLayoutHorizont
                 subMenu={subMenu}
                 title={title}
                 userName={globalStore.userName ?? ""}
+                userUUID={globalStore.userUUID ?? ""}
                 onBackPreviousPage={onBackPreviousPage}
                 onClick={onMenuItemClick}
             >