diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageNavAvatar/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageNavAvatar/index.tsx index c482f5297b4..7599612cb0e 100644 --- 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 = ({ + userUUID, avatarSrc, userName, onClick, @@ -30,7 +32,7 @@ export const MainPageNavAvatar: React.FC = ({ 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 index 609cd3bcb8a..06e6942e975 100644 --- 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 = ({ + userUUID, avatarSrc, userName, onClick, @@ -101,6 +102,7 @@ export const MainPageNavHorizontal: React.FC = ({ generateAvatar={generateAvatar} popMenu={popMenu} userName={userName} + userUUID={userUUID} onClick={onClick} /> diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageTopBar/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageTopBar/index.tsx index c5efee4ca3e..844b7909c6c 100644 --- 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 = ({ + userUUID, activeKeys, avatarSrc, popMenu, @@ -36,6 +37,7 @@ export const MainPageTopBar: React.FC = ({ generateAvatar={generateAvatar} popMenu={popMenu} userName={userName} + userUUID={userUUID} onClick={onClick} /> diff --git a/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx b/packages/flat-pages/src/components/MainPageLayoutHorizontalContainer/index.tsx index e1844e5bb22..44bb434d85e 100644 --- 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