Update src/components/control-tray/ControlTray.tsx

src/components/control-tray/ControlTray.tsx

@@ -5,13 +5,17 @@ Copyright 2024 Google LLC
 import cn from "classnames";
 import React, { memo, RefObject, useEffect, useRef, useState, useCallback } from "react";
 import { useLiveAPIContext } from "../../contexts/LiveAPIContext";
-import { useScreenCapture } from "../../hooks/use-screen-capture"; // Keep if screen share is desired
+// import { useScreenCapture } from "../../hooks/use-screen-capture"; // اگر نیاز به اشتراک صفحه نیست، کامنت کنید
 import { AudioRecorder } from "../../lib/audio-recorder";
-import { isIOS } from "../../lib/platform";
-// import AudioPulse from "../audio-pulse/AudioPulse"; // Original pulse, we'll use CSS for mic
-// Make sure your App.scss or equivalent has the .mic-button-wrapper styles
+// import { isIOS } from "../../lib/platform"; // اگر منطق خاص iOS در این کامپوننت نداریم، می‌توان حذف کرد
 
-// SVG Icons for ControlTray
+// --- SVG Icons (Ensure these are correctly defined as in your HTML or converted to React components) ---
+// For brevity, I'll assume these are defined as React functional components similar to previous examples
+// e.g., const PauseIcon = () => <svg>...</svg>;
+// Make sure to import or define:
+// PauseIcon, MicrophoneIcon, CameraIcon, StopCamIcon, SwitchCameraIcon, HumanIconSVGSmall
+
+// آیکون‌ها باید اینجا تعریف یا وارد شوند
 const PauseIcon = () => <svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15.9872 29.6198V8.28342C15.9872 6.25781 15.132 5.44757 12.9713 5.44757H7.52469C5.36404 5.44757 4.50879 6.25781 4.50879 8.28342V29.6198C4.50879 31.6454 5.36404 32.4556 7.52469 32.4556H12.9713C15.132 32.4556 15.9872 31.6454 15.9872 29.6198Z" fill="#BE123C" /><path opacity="0.4" d="M31.5175 29.6198V8.28342C31.5175 6.25781 30.6622 5.44757 28.5016 5.44757H23.055C20.9093 5.44757 20.0391 6.25781 20.0391 8.28342V29.6198C20.0391 31.6454 20.8943 32.4556 23.055 32.4556H28.5016C30.6622 32.4556 31.5175 31.6454 31.5175 29.6198Z" fill="#BE123C" /></svg>;
 const MicrophoneIcon = () => <svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg"><path opacity="0.4" d="M49.9479 27.1824C49.0803 27.1824 48.3907 27.872 48.3907 28.7396V32.2544C48.3907 40.1293 41.984 46.5361 34.109 46.5361C26.234 46.5361 19.8273 40.1293 19.8273 32.2544V28.7173C19.8273 27.8497 19.1377 27.1601 18.2701 27.1601C17.4025 27.1601 16.7129 27.8497 16.7129 28.7173V32.2321C16.7129 41.2861 23.6758 48.7384 32.5518 49.5393V54.2776C32.5518 55.1452 33.2414 55.8348 34.109 55.8348C34.9766 55.8348 35.6662 55.1452 35.6662 54.2776V49.5393C44.52 48.7607 51.5051 41.2861 51.5051 32.2321V28.7173C51.4829 27.872 50.7933 27.1824 49.9479 27.1824Z" fill="#BE123C" /><path d="M34.1099 11.3434C28.682 11.3434 24.2773 15.7481 24.2773 21.176V32.5658C24.2773 37.9938 28.682 42.3984 34.1099 42.3984C39.5379 42.3984 43.9425 37.9938 43.9425 32.5658V21.176C43.9425 15.7481 39.5379 11.3434 34.1099 11.3434ZM37.0241 26.8042C36.8684 27.3826 36.3567 27.7608 35.7784 27.7608C35.6671 27.7608 35.5559 27.7385 35.4447 27.7163C34.5771 27.4716 33.665 27.4716 32.7974 27.7163C32.0856 27.9165 31.396 27.4938 31.218 26.8042C31.0178 26.1146 31.4404 25.4027 32.1301 25.2247C33.4426 24.8688 34.8218 24.8688 36.1343 25.2247C36.8017 25.4027 37.2021 26.1146 37.0241 26.8042ZM38.2031 22.4885C38.0029 23.0224 37.5135 23.3339 36.9796 23.3339C36.8239 23.3339 36.6904 23.3116 36.5347 23.2671C34.9775 22.6887 33.2423 22.6887 31.6852 23.2671C31.0178 23.5118 30.2614 23.1559 30.0167 22.4885C29.772 21.8212 30.128 21.0648 30.7953 20.8423C32.9309 20.0637 35.289 20.0637 37.4245 20.8423C38.0919 21.087 38.4478 21.8212 38.2031 22.4885Z" fill="#BE123C" /></svg>;
 const CameraIcon = () => <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path opacity="0.4" d="M21.8118 5.52235H11.9265C6.29183 5.52235 4.10059 7.7136 4.10059 13.3482V26.5286C4.10059 30.318 6.16002 34.3545 11.9265 34.3545H21.8118C27.4464 34.3545 29.6376 32.1633 29.6376 26.5286V13.3482C29.6376 7.7136 27.4464 5.52235 21.8118 5.52235Z" fill="#2252A0" /><path d="M19.3406 18.9169C21.0512 18.9169 22.438 17.5302 22.438 15.8195C22.438 14.1089 21.0512 12.7222 19.3406 12.7222C17.6299 12.7222 16.2432 14.1089 16.2432 15.8195C16.2432 17.5302 17.6299 18.9169 19.3406 18.9169Z" fill="#2252A0" /><path d="M36.0629 10.3332C35.3874 9.98721 33.9705 9.5918 32.0429 10.9428L29.6045 12.6562C29.621 12.8869 29.6374 13.1011 29.6374 13.3482V26.5286C29.6374 26.7758 29.6045 26.9899 29.6045 27.2206L32.0429 28.934C33.0643 29.659 33.954 29.8896 34.6625 29.8896C35.2721 29.8896 35.7499 29.7249 36.0629 29.5601C36.7384 29.2141 37.8752 28.275 37.8752 25.919V13.9743C37.8752 11.6183 36.7384 10.6792 36.0629 10.3332Z" fill="#2252A0" /></svg>;
@@ -25,10 +29,12 @@ const SmallLogoDisplay = ({ isHumanActive }: { isHumanActive: boolean }) => {
     if (!isHumanActive) return null;
     const size = 80; const iconSize = 35;
     const insetBase = { ping: 10, outer: 0, mid: 5, inner: 12, icon: 22.5 };
-    const bgColorBase = 'blue';
+    const bgColorBase = 'blue'; // Tailwind color prefix
 
     return (
         <div className="relative small-logo-container-inner" style={{ width: `${size}px`, height: `${size}px` }}>
+            {/* For Tailwind JIT detection. Use actual Tailwind classes on elements for styling. */}
+            {/* <div className="hidden bg-blue-200 bg-blue-300 bg-blue-400 dark:bg-blue-700 dark:bg-blue-600 dark:bg-blue-500"></div> */}
             <div className={`absolute rounded-full opacity-50 animate-ping bg-${bgColorBase}-200 dark:bg-${bgColorBase}-700`} style={{ inset: `${insetBase.ping}px` }}></div>
             <div className={`absolute rounded-full opacity-50 bg-${bgColorBase}-200 dark:bg-${bgColorBase}-700`} style={{ inset: `${insetBase.outer}px` }}></div>
             <div className={`absolute rounded-full opacity-50 bg-${bgColorBase}-300 dark:bg-${bgColorBase}-600`} style={{ inset: `${insetBase.mid}px` }}></div>
@@ -39,237 +45,242 @@ const SmallLogoDisplay = ({ isHumanActive }: { isHumanActive: boolean }) => {
         </div>
     );
 };
+// --- End SVG Icons ---
 
 
 export type ControlTrayProps = {
     videoRef: RefObject<HTMLVideoElement>;
     onVideoStreamChange: (stream: MediaStream | null) => void;
-    setIsMicActive: (isActive: boolean) => void; // To inform App.tsx
-    setIsCamActiveExternal: (isActive: boolean) => void; // To inform App.tsx
-    isCamActiveApp: boolean; // Cam state from App.tsx
+    setIsMicActive: (isActive: boolean) => void;
+    setIsCamActiveExternal: (isActive: boolean) => void;
+    isCamActiveApp: boolean; // Camera state from App.tsx, used for layout
 };
 
 function ControlTray({
     videoRef,
     onVideoStreamChange,
-    setIsMicActive: setIsMicActiveApp,
-    setIsCamActiveExternal: setIsCamActiveAppExternal,
-    isCamActiveApp,
+    setIsMicActive: setIsMicActiveApp, // Callback to inform App.tsx about mic state
+    setIsCamActiveExternal: setIsCamActiveAppExternal, // Callback to inform App.tsx about cam state
+    isCamActiveApp, // Camera state from App.tsx, used for layout decisions (e.g., small logo)
 }: ControlTrayProps) {
     const { client, connected, connect, disconnect } = useLiveAPIContext();
-    const screenCapture = useScreenCapture(); // Retain for potential screen share
 
     const [audioRecorder] = useState(() => new AudioRecorder());
-    const [inVolume, setInVolume] = useState(0); // For mic pulse animation
+    const [inVolume, setInVolume] = useState(0); // For mic pulse CSS animation
 
-    const [isMicEnabled, setIsMicEnabled] = useState(false); // Internal: is mic supposed to be on
-    const [isCamEnabled, setIsCamEnabled] = useState(false); // Internal: is cam supposed to be on
+    // Internal states for this component
+    const [micActuallyEnabled, setMicActuallyEnabled] = useState(false); // Is mic hardware/permission enabled?
+    const [camActuallyEnabled, setCamActuallyEnabled] = useState(false); // Is cam hardware/permission enabled?
     
-    const [activeLocalVideoStream, setActiveLocalVideoStream] = useState<MediaStream | null>(null);
+    const [localStream, setLocalStream] = useState<MediaStream | null>(null);
     const [currentFacingMode, setCurrentFacingMode] = useState<'user' | 'environment'>('user');
     const [isSwitchingCamera, setIsSwitchingCamera] = useState(false);
 
-    const renderCanvasRef = useRef<HTMLCanvasElement>(null);
+    const renderCanvasRef = useRef<HTMLCanvasElement>(null); // For sending video frames
 
-    // Sync internal mic/cam enabled state with App's state (via props)
+    // Effect to inform App.tsx about the actual state of mic/cam
     useEffect(() => {
-        setIsMicActiveApp(isMicEnabled && connected);
-    }, [isMicEnabled, connected, setIsMicActiveApp]);
+        setIsMicActiveApp(micActuallyEnabled && connected);
+    }, [micActuallyEnabled, connected, setIsMicActiveApp]);
 
     useEffect(() => {
-        setIsCamActiveAppExternal(isCamEnabled && !!activeLocalVideoStream);
-    }, [isCamEnabled, activeLocalVideoStream, setIsCamActiveAppExternal]);
-
+        setIsCamActiveAppExternal(camActuallyEnabled && !!localStream);
+    }, [camActuallyEnabled, localStream, setIsCamActiveAppExternal]);
 
-    // Connect/Disconnect based on mic/cam state
+    // Auto-connect/disconnect based on whether mic or cam is requested to be active
     useEffect(() => {
-        const shouldBeConnected = isMicEnabled || isCamEnabled;
+        const shouldBeConnected = micActuallyEnabled || camActuallyEnabled;
         if (shouldBeConnected && !connected) {
-            connect().catch(err => console.error("Failed to connect:", err));
+            console.log("ControlTray: Mic or Cam active, attempting to connect...");
+            connect().catch(err => console.error("ControlTray: Connection failed", err));
         } else if (!shouldBeConnected && connected) {
-            disconnect().catch(err => console.error("Failed to disconnect:", err));
+            console.log("ControlTray: Mic and Cam inactive, attempting to disconnect...");
+            disconnect().catch(err => console.error("ControlTray: Disconnection failed", err));
         }
-    }, [isMicEnabled, isCamEnabled, connected, connect, disconnect]);
+    }, [micActuallyEnabled, camActuallyEnabled, connected, connect, disconnect]);
 
-    // Audio recording
+    // Audio Recorder Logic
     useEffect(() => {
         const onData = (base64: string) => {
-            if (client && connected && isMicEnabled) { // Send only if mic is intended to be active
+            if (client && connected && micActuallyEnabled) {
                 client.sendRealtimeInput([{ mimeType: "audio/pcm;rate=16000", data: base64 }]);
             }
         };
-        if (connected && isMicEnabled && audioRecorder) {
+        if (connected && micActuallyEnabled && audioRecorder) {
             audioRecorder.on("data", onData).on("volume", setInVolume).start();
+            console.log("Audio recorder started");
         } else if (audioRecorder) {
             audioRecorder.stop();
-            setInVolume(0); // Reset volume when stopped
+            setInVolume(0);
+            console.log("Audio recorder stopped");
         }
         return () => {
             if (audioRecorder) {
                 audioRecorder.off("data", onData).off("volume", setInVolume).stop();
             }
         };
-    }, [connected, client, isMicEnabled, audioRecorder]);
+    }, [connected, client, micActuallyEnabled, audioRecorder]);
 
-    // Update CSS --volume for mic pulse
+    // Update CSS --volume for mic pulse animation
     useEffect(() => {
         document.documentElement.style.setProperty(
             "--volume",
-            `${Math.max(5, Math.min(inVolume * 200, 15))}px` // Adjusted max for new design
+            // The pulse visibility should be controlled by micActuallyEnabled && connected
+            // The value of --volume can be based on inVolume
+            micActuallyEnabled && connected ? `${Math.max(5, Math.min(inVolume * 200, 15))}px` : "0px"
         );
-    }, [inVolume]);
-
+    }, [inVolume, micActuallyEnabled, connected]);
 
-    // Video frame sending
+    // Video Frame Sending Logic
     useEffect(() => {
         let frameTimeoutId = -1;
         function sendVideoFrame() {
-            if (connected && isCamEnabled && activeLocalVideoStream && client) {
-                 frameTimeoutId = window.setTimeout(sendVideoFrame, 1000 / 2); // Approx 2 FPS
-                const video = videoRef.current;
-                const canvas = renderCanvasRef.current;
-                if (!video || !canvas || video.readyState < video.HAVE_METADATA || video.paused || video.ended) return;
+            if (connected && camActuallyEnabled && localStream && client && videoRef.current && renderCanvasRef.current) {
+                frameTimeoutId = window.setTimeout(sendVideoFrame, 1000 / 2); // ~2 FPS
+                const videoEl = videoRef.current;
+                const canvasEl = renderCanvasRef.current;
+                if (videoEl.readyState < videoEl.HAVE_METADATA || videoEl.paused || videoEl.ended) return;
 
                 try {
-                    const ctx = canvas.getContext("2d");
+                    const ctx = canvasEl.getContext("2d");
                     if (!ctx) return;
-                    const scale = 0.25; // Lower scale for performance
-                    canvas.width = video.videoWidth * scale;
-                    canvas.height = video.videoHeight * scale;
-                    if (canvas.width > 0 && canvas.height > 0) {
-                        ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
-                        const base64 = canvas.toDataURL("image/jpeg", 0.7); // Adjust quality
+                    const scale = 0.25;
+                    canvasEl.width = videoEl.videoWidth * scale;
+                    canvasEl.height = videoEl.videoHeight * scale;
+                    if (canvasEl.width > 0 && canvasEl.height > 0) {
+                        ctx.drawImage(videoEl, 0, 0, canvasEl.width, canvasEl.height);
+                        const base64 = canvasEl.toDataURL("image/jpeg", 0.7);
                         const data = base64.slice(base64.indexOf(",") + 1);
                         client.sendRealtimeInput([{ mimeType: "image/jpeg", data }]);
                     }
                 } catch (error) {
-                    console.error("Error processing video frame:", error);
+                    console.error("Error processing/sending video frame:", error);
                 }
             }
         }
-
-        if (connected && isCamEnabled && activeLocalVideoStream) {
+        if (connected && camActuallyEnabled && localStream) {
             frameTimeoutId = window.setTimeout(sendVideoFrame, 200); // Initial delay
         }
-        return () => {
-            clearTimeout(frameTimeoutId);
-        };
-    }, [connected, client, isCamEnabled, activeLocalVideoStream, videoRef, renderCanvasRef]);
-
+        return () => { clearTimeout(frameTimeoutId); };
+    }, [connected, client, camActuallyEnabled, localStream, videoRef, renderCanvasRef]);
 
-    const stopAllVideo = useCallback(() => {
-        if (activeLocalVideoStream) {
-            activeLocalVideoStream.getTracks().forEach(track => track.stop());
-            setActiveLocalVideoStream(null);
+    const stopAllLocalVideo = useCallback(() => {
+        if (localStream) {
+            localStream.getTracks().forEach(track => track.stop());
+            setLocalStream(null);
         }
-        onVideoStreamChange(null); // Inform App.tsx
-    }, [activeLocalVideoStream, onVideoStreamChange]);
+        if (videoRef.current) videoRef.current.srcObject = null;
+        onVideoStreamChange(null); // Inform App.tsx the stream is gone
+    }, [localStream, onVideoStreamChange, videoRef]);
 
+    // Toggle Mic Button
+    const handleMicToggle = () => {
+        setMicActuallyEnabled(prev => !prev);
+    };
 
-    // Start/Stop Webcam
-    const toggleWebcam = async () => {
+    // Toggle Cam Button (Start/Stop Webcam)
+    const handleCamToggle = async () => {
         if (isSwitchingCamera) return;
 
-        if (isCamEnabled) { // Turning off
-            setIsCamEnabled(false);
-            stopAllVideo();
-        } else { // Turning on
-            setIsCamEnabled(true);
+        if (camActuallyEnabled) { // Turning OFF
+            console.log("Turning camera OFF");
+            setCamActuallyEnabled(false);
+            stopAllLocalVideo();
+        } else { // Turning ON
+            console.log("Turning camera ON, currentFacingMode:", currentFacingMode);
+            setCamActuallyEnabled(true); // Optimistically set to true
             try {
-                const mediaStream = await navigator.mediaDevices.getUserMedia({
+                const stream = await navigator.mediaDevices.getUserMedia({
                     video: { facingMode: currentFacingMode },
-                    audio: false // Audio is handled by AudioRecorder
+                    audio: false // Audio is separate
                 });
-                setActiveLocalVideoStream(mediaStream);
-                onVideoStreamChange(mediaStream); // Inform App.tsx
+                setLocalStream(stream);
+                onVideoStreamChange(stream); // Inform App.tsx
+                console.log("Camera stream acquired:", stream.id);
             } catch (error) {
-                console.error(`Error starting webcam with ${currentFacingMode}:`, error);
-                setIsCamEnabled(false); // Revert state on error
-                // Try fallback if OverconstrainedError (e.g., exact facingMode not available)
-                if ((error as Error).name === 'OverconstrainedError' || (error as Error).name === 'NotAllowedError' || (error as Error).name === 'NotFoundError') {
+                console.error(`Error starting webcam (${currentFacingMode}):`, error);
+                setCamActuallyEnabled(false); // Revert on error
+                stopAllLocalVideo(); // Ensure cleanup
+                // Optionally, try fallback if specific facing mode failed
+                if ((error as Error).name === 'OverconstrainedError' || (error as Error).name === 'NotFoundError') {
+                    const fallbackMode = currentFacingMode === 'user' ? 'environment' : 'user';
+                    console.log(`Attempting fallback to ${fallbackMode} camera`);
                     try {
-                        const fallbackMode = currentFacingMode === 'user' ? 'environment' : 'user';
-                        console.log(`Attempting fallback to ${fallbackMode} camera`);
-                        const fallbackStream = await navigator.mediaDevices.getUserMedia({
-                            video: { facingMode: fallbackMode },
-                            audio: false,
-                        });
-                        setActiveLocalVideoStream(fallbackStream);
+                        const fallbackStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: fallbackMode }, audio: false });
+                        setLocalStream(fallbackStream);
                         onVideoStreamChange(fallbackStream);
                         setCurrentFacingMode(fallbackMode);
-                        setIsCamEnabled(true); // Set true on successful fallback
+                        setCamActuallyEnabled(true); // Success with fallback
+                        console.log("Camera fallback stream acquired:", fallbackStream.id);
                     } catch (fallbackError) {
-                        console.error('Webcam fallback also failed:', fallbackError);
-                        onVideoStreamChange(null);
+                        console.error("Webcam fallback also failed:", fallbackError);
                     }
-                } else {
-                    onVideoStreamChange(null);
                 }
             }
         }
     };
 
-    const rotateWebcam = async () => {
-        if (isSwitchingCamera || !isCamEnabled || !activeLocalVideoStream) return;
+    // Rotate Webcam
+    const handleRotateWebcam = async () => {
+        if (isSwitchingCamera || !camActuallyEnabled || !localStream) return;
 
         setIsSwitchingCamera(true);
         const targetFacingMode = currentFacingMode === 'user' ? 'environment' : 'user';
-        
+        console.log(`Attempting to switch camera to: ${targetFacingMode}`);
+
         // Stop current tracks before requesting new ones
-        activeLocalVideoStream.getTracks().forEach(track => track.stop());
+        localStream.getTracks().forEach(track => track.stop());
 
         try {
-            console.log(`Switching camera to: ${targetFacingMode}`);
             const newStream = await navigator.mediaDevices.getUserMedia({
                 video: { facingMode: { exact: targetFacingMode } },
                 audio: false
             });
-            setActiveLocalVideoStream(newStream);
+            setLocalStream(newStream);
             onVideoStreamChange(newStream);
             setCurrentFacingMode(targetFacingMode);
+            console.log(`Camera switched to ${targetFacingMode}. New stream:`, newStream.id);
         } catch (error: any) {
             console.error(`Error switching camera to ${targetFacingMode}: ${error.name}`, error);
-            // Attempt to recover with the previous facing mode or any available camera
+            // Attempt to recover with the previous (now current) facing mode or any available camera
+            console.log(`Fallback: trying previous mode ${currentFacingMode} or any video again`);
             try {
-                console.log(`Fallback: trying previous mode ${currentFacingMode} or any video`);
                 const recoveryStream = await navigator.mediaDevices.getUserMedia({
-                    video: true, // Try with non-specific facing mode
+                    video: { facingMode: currentFacingMode }, // Try previous again
                     audio: false
                 });
-                setActiveLocalVideoStream(recoveryStream);
+                setLocalStream(recoveryStream);
                 onVideoStreamChange(recoveryStream);
-                // Try to determine the facing mode of the recovery stream if possible, or reset
-                const settings = recoveryStream.getVideoTracks()[0]?.getSettings();
-                if (settings?.facingMode) {
-                    setCurrentFacingMode(settings.facingMode as 'user' | 'environment');
-                }
+                // currentFacingMode is already set to the one we tried to recover
+                console.log("Camera recovery stream acquired:", recoveryStream.id);
             } catch (recoveryError) {
-                console.error('Camera recovery failed:', recoveryError);
-                setIsCamEnabled(false); // Disable cam if all attempts fail
-                stopAllVideo();
+                console.error('Camera recovery after switch failed:', recoveryError);
+                setCamActuallyEnabled(false); // Disable cam if all attempts fail
+                stopAllLocalVideo();
             }
         } finally {
             setIsSwitchingCamera(false);
         }
     };
-    
-    // Cleanup on unmount or when connection drops externally
+
+    // Cleanup on unmount or if connection drops externally (e.g., server disconnects)
     useEffect(() => {
+        const isComponentMounted = true;
+        if (!connected && isComponentMounted) {
+            // If connection drops externally, reset mic/cam states
+            // This might be too aggressive if there are retries, adjust as needed
+            if (micActuallyEnabled) setMicActuallyEnabled(false);
+            if (camActuallyEnabled) {
+                 setCamActuallyEnabled(false);
+                 stopAllLocalVideo();
+            }
+        }
         return () => {
-            stopAllVideo();
+            // isComponentMounted = false; // This pattern is for classes, not hooks directly
+            stopAllLocalVideo();
             if (audioRecorder) audioRecorder.stop();
         };
-    }, [stopAllVideo, audioRecorder]);
-
-    useEffect(() => {
-        if (!connected) { // If connection drops for any reason
-            setIsMicEnabled(false); // Assume mic should be off
-             // Optionally, also turn off camera if connection is lost
-            // if (isCamEnabled) {
-            //    toggleWebcam(); // This will set isCamEnabled to false and stop video
-            // }
-        }
-    }, [connected]);
+    }, [connected, stopAllLocalVideo, audioRecorder, micActuallyEnabled, camActuallyEnabled]); // Added mic/cam states to dependencies
 
 
     return (
@@ -277,54 +288,88 @@ function ControlTray({
             <canvas style={{ display: "none" }} ref={renderCanvasRef} />
             <div
                 id="footer-controls"
-                className={cn("footer-controls", {
-                    "layout-default": !isCamActiveApp, // Use App's view of cam state for layout
-                    "layout-with-small-logo": isCamActiveApp,
-                })}
+                className={cn(
+                    "footer-controls", // from App.scss or your global styles
+                    // Tailwind classes for layout based on HTML structure:
+                    "w-full flex gap-4 absolute bottom-0 px-6 sm:px-12 py-8 items-center",
+                    isCamActiveApp // Use state from App.tsx for layout: shows small logo or not
+                        ? "justify-around layout-with-small-logo" // Corresponds to layout-with-small-logo
+                        : "justify-between layout-default"       // Corresponds to layout-default
+                )}
             >
-                {/* Cam Button Wrapper (Left) */}
+                {/* Cam Button Wrapper (Now on the Left) */}
                 <div id="cam-button-wrapper" className="relative flex justify-center">
+                    {/* Main Camera Toggle Button */}
                     <button
                         id="cam-button"
-                        className="control-button cam-button-color"
-                        onClick={toggleWebcam}
+                        onClick={handleCamToggle}
                         disabled={isSwitchingCamera}
-                        title={isCamEnabled ? "Stop Camera" : "Start Camera"}
+                        title={camActuallyEnabled ? "Stop Camera" : "Start Camera"}
+                        // Tailwind classes for the button itself
+                        className={cn(
+                            "control-button cam-button-color", // Base classes from App.scss or your CSS
+                            "h-20 w-20 rounded-full p-0 flex items-center justify-center border",
+                            "shadow-md hover:scale-105 hover:shadow-lg transition-transform transition-shadow ease-out",
+                            "dark:border-neutral-700 border-neutral-300" // Example border colors
+                        )}
                     >
-                        {isCamEnabled ? <StopCamIcon /> : <CameraIcon />}
+                        {camActuallyEnabled ? <StopCamIcon /> : <CameraIcon />}
                     </button>
+
+                    {/* Switch Camera Button (Appears above cam button when cam is active) */}
                     <div
                         id="switch-camera-button-container"
-                        className={cn("switch-camera-button-container", { visible: isCamEnabled && activeLocalVideoStream })}
+                        // Tailwind classes for positioning and visibility
+                        className={cn(
+                            "switch-camera-button-container", // Base class for CSS transitions from App.scss
+                            "absolute bottom-[calc(100%+0.65rem)] left-1/2 z-[5] transform -translate-x-1/2",
+                            "transition-opacity duration-300 ease-[cubic-bezier(0.68,-0.55,0.27,1.55)]",
+                            "transform-origin-center-bottom",
+                            (camActuallyEnabled && localStream) ? "opacity-100 scale-100 pointer-events-auto translate-y-0 visible"
+                                             : "opacity-0 scale-75 pointer-events-none translate-y-[15px]"
+                        )}
                     >
                         <button
                             id="switch-camera-button"
                             aria-label="Switch Camera"
-                            className="switch-camera-button-content"
-                            onClick={rotateWebcam}
-                            disabled={isSwitchingCamera || !isCamEnabled || !activeLocalVideoStream}
+                            onClick={handleRotateWebcam}
+                            disabled={isSwitchingCamera || !camActuallyEnabled || !localStream}
+                            // Tailwind classes for the switch camera button content
+                            className={cn(
+                                "switch-camera-button-content", // Base class from App.scss
+                                "w-12 h-12 bg-background dark:bg-neutral-800 border dark:border-neutral-700 border-neutral-300",
+                                "rounded-full flex items-center justify-center shadow-lg hover:scale-110 hover:rotate-[-6deg]",
+                                "active:scale-105 active:rotate-0 transition-transform transform-origin-center"
+                            )}
                         >
-                            <SwitchCameraIcon />
+                            <SwitchCameraIcon /> {/* SVG should have stroke set by CSS (var --foreground) */}
                         </button>
                     </div>
                 </div>
 
-                {/* Small Logo (Center when cam is active) */}
-                {isCamActiveApp && ( // Use App's view of cam state for layout
-                    <div id="small-logo-container" className="small-logo-container">
+                {/* Small Logo Container (middle) */}
+                {isCamActiveApp && ( // Displayed when cam is active (based on App.tsx's perspective)
+                    <div id="small-logo-container" className="flex items-center justify-center">
                          <SmallLogoDisplay isHumanActive={true} />
                     </div>
                 )}
 
-                {/* Mic Button (Right) */}
+                {/* Mic Button (Now on the Right) */}
                 <div id="mic-button-wrapper" className="mic-button-wrapper relative flex justify-center">
-                    <button
+                     <button
                         id="mic-button"
-                        className={cn("control-button mic-button-color", { active: isMicEnabled && connected })}
-                        onClick={() => setIsMicEnabled(!isMicEnabled)}
-                        title={isMicEnabled ? "Mute Microphone" : "Unmute Microphone"}
+                        onClick={handleMicToggle}
+                        title={micActuallyEnabled ? "Mute Microphone" : "Unmute Microphone"}
+                        // Tailwind classes for the button itself
+                        className={cn(
+                            "control-button mic-button-color", // Base classes from App.scss
+                            "h-20 w-20 rounded-full p-0 flex items-center justify-center border",
+                            "shadow-md hover:scale-105 hover:shadow-lg transition-transform transition-shadow ease-out",
+                            "dark:border-neutral-700 border-neutral-300", // Example border colors
+                            { 'active': micActuallyEnabled && connected } // For CSS pulse via .mic-button-wrapper .active:before
+                        )}
                     >
-                        {(isMicEnabled && connected) ? <PauseIcon /> : <MicrophoneIcon />}
+                        {(micActuallyEnabled && connected) ? <PauseIcon /> : <MicrophoneIcon />}
                     </button>
                 </div>
             </div>