mirror of
https://github.com/block/buzz.git
synced 2026-10-29 21:41:33 +00:00
Merge refreshed Bestie floating-chat size fix
On-behalf-of: mahanti <arjun.mahanti@gmail.com> Signed-off-by: Fizz <fizz@buzz.local>
This commit is contained in:
7
desktop/src/app/AppBestiePopover.tsx
Normal file
7
desktop/src/app/AppBestiePopover.tsx
Normal file
@@ -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;
|
||||
}
|
||||
@@ -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}>
|
||||
|
||||
Reference in New Issue
Block a user