From 628d41772322f981452c776413ba846b36ca4906 Mon Sep 17 00:00:00 2001
From: Jannis Braun <151788261+TheZwiss@users.noreply.github.com>
Date: Mon, 23 Feb 2026 21:49:06 +0100
Subject: [PATCH] fix: restore VoiceControls and chat split-view in DM calls

VoiceControls was gated on server-only `currentVoiceChannelId`, now also
triggers on `activeDmCall`. Added VoiceChatPanel to DM call view matching
the server voice channel pattern.
---
 packages/web/src/components/layout/ChannelSidebar.tsx | 5 +++--
 packages/web/src/components/layout/MainContent.tsx    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/web/src/components/layout/ChannelSidebar.tsx b/packages/web/src/components/layout/ChannelSidebar.tsx
index 690fc816..6f064bd3 100644
--- a/packages/web/src/components/layout/ChannelSidebar.tsx
+++ b/packages/web/src/components/layout/ChannelSidebar.tsx
@@ -24,6 +24,7 @@ export function ChannelSidebar() {
   const user = useAuthStore((s) => s.user);
   const members = useServerStore((s) => s.members);
   const currentVoiceChannelId = useVoiceStore((s) => s.currentVoiceChannelId);
+  const activeDmCall = useVoiceStore((s) => s.activeDmCall);
   const setCurrentVoiceChannel = useVoiceStore((s) => s.setCurrentVoiceChannel);
   const isMuted = useVoiceStore((s) => s.isMuted);
   const isDeafened = useVoiceStore((s) => s.isDeafened);
@@ -97,9 +98,9 @@ export function ChannelSidebar() {
     <div className="fixed bottom-2 left-2 z-30 w-[296px]">
       <div className="bg-[#1a1b1e] rounded-lg shadow-[0_4px_20px_rgba(0,0,0,0.5)] ring-1 ring-white/[0.06]">
         {/* Voice controls (expands when connected) */}
-        {currentVoiceChannelId && <VoiceControls />}
+        {(currentVoiceChannelId || activeDmCall) && <VoiceControls />}
         {/* Separator between voice and user area */}
-        {currentVoiceChannelId && <div className="mx-3 border-t border-white/[0.06]" />}
+        {(currentVoiceChannelId || activeDmCall) && <div className="mx-3 border-t border-white/[0.06]" />}
         {/* User area (always visible) */}
         <UserAreaPanel
           user={user}
diff --git a/packages/web/src/components/layout/MainContent.tsx b/packages/web/src/components/layout/MainContent.tsx
index f35adcda..dc7dea07 100644
--- a/packages/web/src/components/layout/MainContent.tsx
+++ b/packages/web/src/components/layout/MainContent.tsx
@@ -112,6 +112,9 @@ export function MainContent() {
 
           <div className="flex-1 flex overflow-hidden pb-20">
             <VoiceGrid participants={participants} />
+            {voiceChatOpen && !voiceFullscreen && (
+              <VoiceChatPanel channelId={currentChannelId} channelName={`@${dmName}`} />
+            )}
           </div>
 
           <VoiceControlBar />