From 185d94db61a781d4fe46171a713f912dc6425940 Mon Sep 17 00:00:00 2001 From: Taylor Ho Date: Fri, 5 Jun 2026 13:53:32 -1000 Subject: [PATCH] fix: gate huddles UI behind feature flag - Wrap HuddleIndicator in ChannelMembersBar with FeatureGate - Wrap HuddleBar in AppShell with FeatureGate - Keep HuddleProvider in place (useHuddle called unconditionally elsewhere) - Huddles now properly hidden when preview toggle is off Signed-off-by: Taylor Ho --- desktop/src/app/AppShell.tsx | 5 ++++- desktop/src/features/channels/ui/ChannelMembersBar.tsx | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/desktop/src/app/AppShell.tsx b/desktop/src/app/AppShell.tsx index 7b58a9fcc..b9321d565 100644 --- a/desktop/src/app/AppShell.tsx +++ b/desktop/src/app/AppShell.tsx @@ -54,6 +54,7 @@ import { type SettingsSection, } from "@/features/settings/ui/SettingsPanels"; import { HuddleBar, HuddleProvider } from "@/features/huddle"; +import { FeatureGate } from "@/shared/features"; import { useMeshRelayOrchestrator } from "@/features/mesh-compute/hooks/useMeshRelayOrchestrator"; import { AppSidebar } from "@/features/sidebar/ui/AppSidebar"; import { useChannelMutes } from "@/features/sidebar/lib/useChannelMutes"; @@ -887,7 +888,9 @@ export function AppShell() { }} /> - + + + diff --git a/desktop/src/features/channels/ui/ChannelMembersBar.tsx b/desktop/src/features/channels/ui/ChannelMembersBar.tsx index 7e128ea49..1b1412336 100644 --- a/desktop/src/features/channels/ui/ChannelMembersBar.tsx +++ b/desktop/src/features/channels/ui/ChannelMembersBar.tsx @@ -3,6 +3,7 @@ import * as React from "react"; import { useQueryClient } from "@tanstack/react-query"; import { useHuddle } from "@/features/huddle"; import { HuddleIndicator } from "@/features/huddle/components/HuddleIndicator"; +import { FeatureGate } from "@/shared/features"; import { useAvailableAcpRuntimes, useBackendProvidersQuery, @@ -144,7 +145,9 @@ export function ChannelMembersBar({ {memberCount} - {huddleIndicator} + + {huddleIndicator} + - {huddleIndicator} + + {huddleIndicator} +