From 06ad43e6c0c14e388ac14bc2718794ac6977ff05 Mon Sep 17 00:00:00 2001
From: Fizz <fizz@buzz.local>
Date: Fri, 28 Aug 2026 11:36:32 -0400
Subject: [PATCH] refactor(desktop): isolate Bestie app popover

On-behalf-of: mahanti <arjun.mahanti@gmail.com>
Signed-off-by: Fizz <fizz@buzz.local>
Co-authored-by: Codex <noreply@openai.com>
---
 desktop/src/app/AppBestiePopover.tsx |  7 +++++++
 desktop/src/app/AppShell.tsx         | 10 ++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 desktop/src/app/AppBestiePopover.tsx

diff --git a/desktop/src/app/AppBestiePopover.tsx b/desktop/src/app/AppBestiePopover.tsx
new file mode 100644
index 0000000000..d07fb0f986
--- /dev/null
+++ b/desktop/src/app/AppBestiePopover.tsx
@@ -0,0 +1,7 @@
+import { BestieChatPopover } from "@/features/messages/ui/BestieChatPopover";
+import { useFeatureEnabled } from "@/shared/features";
+
+export function AppBestiePopover({ hidden }: { hidden: boolean }) {
+  const bestieEnabled = useFeatureEnabled("bestie");
+  return bestieEnabled ? <BestieChatPopover showTrigger={!hidden} /> : null;
+}
diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx
index ccc16202c1..dd8c54ae48 100644
--- a/desktop/src/app/AppShell.tsx
+++ b/desktop/src/app/AppShell.tsx
@@ -7,13 +7,12 @@ import { AppShellProvider } from "@/app/AppShellContext";
 import { AppShellOverlays, TerminalBootstrap } from "@/app/AppShellOverlays";
 import { AppShellChannelSurface } from "@/app/AppShellChannelSurface";
 import { AppHuddleShell } from "@/app/AppHuddleShell";
+import { AppBestiePopover } from "@/app/AppBestiePopover";
 import { AppTopChrome } from "@/app/AppTopChrome";
-import { BestieChatPopover } from "@/features/messages/ui/BestieChatPopover";
 import {
   type TerminalContextOverride,
   TerminalContextOverrideProvider,
 } from "@/app/TerminalContextOverrideContext";
-import { useFeatureEnabled } from "@/shared/features";
 import { useAppNavigation } from "@/app/navigation/useAppNavigation";
 import { useBackForwardControls } from "@/app/navigation/useBackForwardControls";
 import { useCommunityNavigationTransitions } from "@/app/useCommunityNavigationTransitions";
@@ -109,7 +108,6 @@ import { AppWorkflowEditorOverlayProvider } from "@/app/AppWorkflowEditorOverlay
 import { LazySettingsScreen } from "@/app/LazySettingsScreen";
 const EMPTY_CHANNELS: Channel[] = [];
 export function AppShell() {
-  const bestieEnabled = useFeatureEnabled("bestie");
   useWebviewZoomShortcuts();
   useTauriWindowDrag();
   useWebviewScrollBoundaryLock();
@@ -790,11 +788,7 @@ export function AppShell() {
                       onGoForward={goForward}
                     />
                   ) : null}
-                  {bestieEnabled ? (
-                    <BestieChatPopover
-                      showTrigger={!settingsOpen && !isHuddleRoom}
-                    />
-                  ) : null}
+                  <AppBestiePopover hidden={settingsOpen || isHuddleRoom} />
                   {settingsOpen ? (
                     <div className="flex min-h-0 flex-1 overflow-hidden">
                       <React.Suspense fallback={null}>