diff --git a/projects/app/src/pageComponents/chat/ChatWindow/HomeChatWindow.tsx b/projects/app/src/pageComponents/chat/ChatWindow/HomeChatWindow.tsx index ecddc8594..bbbadc45a 100644 --- a/projects/app/src/pageComponents/chat/ChatWindow/HomeChatWindow.tsx +++ b/projects/app/src/pageComponents/chat/ChatWindow/HomeChatWindow.tsx @@ -190,7 +190,7 @@ const HomeChatWindow = ({ myApps }: Props) => { }; useMount(() => { - if (!feConfigs?.isPlus || !chatSettings?.enableHome) { + if (!feConfigs?.isPlus) { handlePaneChange(ChatSidebarPaneEnum.TEAM_APPS); } }); diff --git a/projects/app/src/pageComponents/chat/UserAvatarPopover.tsx b/projects/app/src/pageComponents/chat/UserAvatarPopover.tsx index 131bf3a2f..0d8c15138 100644 --- a/projects/app/src/pageComponents/chat/UserAvatarPopover.tsx +++ b/projects/app/src/pageComponents/chat/UserAvatarPopover.tsx @@ -63,7 +63,7 @@ const UserAvatarPopover = ({ gap={2} > - + {userInfo?.username ?? '-'} diff --git a/projects/app/src/pageComponents/chat/slider/index.tsx b/projects/app/src/pageComponents/chat/slider/index.tsx index f53536340..43669c352 100644 --- a/projects/app/src/pageComponents/chat/slider/index.tsx +++ b/projects/app/src/pageComponents/chat/slider/index.tsx @@ -255,7 +255,10 @@ const NavigationSection = () => { const { t } = useTranslation(); const { feConfigs } = useSystemStore(); - const isEnableHome = useContextSelector(ChatSettingContext, (v) => v.chatSettings?.enableHome); + const isEnableHome = useContextSelector( + ChatSettingContext, + (v) => v.chatSettings?.enableHome ?? true + ); const isCollapsed = useContextSelector(ChatSettingContext, (v) => v.collapse === 1); const onTriggerCollapse = useContextSelector(ChatSettingContext, (v) => v.onTriggerCollapse); const isHomeActive = useContextSelector( diff --git a/projects/app/src/web/core/chat/context/chatSettingContext.tsx b/projects/app/src/web/core/chat/context/chatSettingContext.tsx index 820210f09..2e931f020 100644 --- a/projects/app/src/web/core/chat/context/chatSettingContext.tsx +++ b/projects/app/src/web/core/chat/context/chatSettingContext.tsx @@ -67,6 +67,11 @@ export const ChatSettingContextProvider = ({ children }: { children: React.React onSuccess: (data) => { if (!data) return; + if (!data.enableHome && pane === ChatSidebarPaneEnum.HOME) { + handlePaneChange(ChatSidebarPaneEnum.TEAM_APPS); + return; + } + if ( pane === ChatSidebarPaneEnum.HOME && appId !== data.appId &&