showing devices in dropdown

packages/desktop/src/hooks/useDevices.tsx

@@ -0,0 +1,50 @@
+import { useEffect, useState } from 'react';
+
+export default function useDevices() {
+  const [devices, setDevices] = useState<{
+    audioInputDevices: MediaDeviceInfo[];
+    videoDevices: MediaDeviceInfo[];
+  }>({ audioInputDevices: [], videoDevices: [] });
+
+  useEffect(() => {
+    navigator.mediaDevices.enumerateDevices().then((devices) => {
+      const uniqueDevices: MediaDeviceInfo[] = [];
+
+      const uniqueGroupIds = [];
+      devices.forEach((device) => {
+        if (!uniqueGroupIds.includes(device.groupId)) {
+          uniqueDevices.push(device);
+          uniqueGroupIds.push(device.groupId);
+        }
+      });
+
+      const audioInputDevices: MediaDeviceInfo[] = [];
+      const videoInputDevices: MediaDeviceInfo[] = [];
+
+      uniqueDevices.map((uniqueDevice) => {
+        if (uniqueDevice.kind === 'audioinput') {
+          audioInputDevices.push(uniqueDevice);
+          return;
+        }
+
+        if (uniqueDevice.kind === 'videoinput') {
+          videoInputDevices.push(uniqueDevice);
+          return;
+        }
+      });
+
+      setDevices({ audioInputDevices: audioInputDevices, videoDevices: videoInputDevices });
+    });
+  }, []);
+
+  // navigator.mediaDevices
+  //   .getUserMedia({
+  //     video: videoConstraints,
+  //     audio: true,
+  //   })
+  //   .then((localMediaStream: MediaStream) => {
+  //     setUserLocalStream(localMediaStream);
+  //   });
+
+  return devices;
+}

packages/desktop/src/providers/ConversationProvider.tsx

@@ -419,37 +419,6 @@ const iceServers = [
   // },
 ];
 
-function useDevices() {
-  const [devices, setDevices] = useState<MediaDeviceInfo[]>([]);
-
-  useEffect(() => {
-    navigator.mediaDevices.enumerateDevices().then((devices) => {
-      const uniqueDevices: MediaDeviceInfo[] = [];
-
-      const uniqueGroupIds = [];
-      devices.forEach((device) => {
-        if (!uniqueGroupIds.includes(device.groupId)) {
-          uniqueDevices.push(device);
-          uniqueGroupIds.push(device.groupId);
-        }
-      });
-
-      setDevices(uniqueDevices);
-    });
-  }, []);
-
-  // navigator.mediaDevices
-  //   .getUserMedia({
-  //     video: videoConstraints,
-  //     audio: true,
-  //   })
-  //   .then((localMediaStream: MediaStream) => {
-  //     setUserLocalStream(localMediaStream);
-  //   });
-
-  return devices;
-}
-
 // renderless component to manage a room and send data upward for other components
 //   - decoupled from sockets and other data, render if you want to join x room
 //   - unmount if you want to leave room

packages/desktop/src/tree/FooterControls.tsx

@@ -44,6 +44,7 @@ import { SUPPORT_DISPLAY_NAME } from '../util/support';
 import { blueGrey } from '@mui/material/colors';
 import useAuth from '../providers/AuthProvider';
 import useConversations from '../providers/ConversationProvider';
+import useDevices from '../hooks/useDevices';
 import useSearch from '../providers/SearchProvider';
 import useZen from '../providers/ZenProvider';
 
@@ -242,8 +243,11 @@ export default function FooterControls() {
   );
 }
 
+const NO_DEVICE_SELECTION = 'NA';
+
 function UserSettingsDialog({ open, handleClose }: { handleClose: () => void; open: boolean }) {
   const { user, handleLogout } = useAuth();
+  const devices = useDevices();
 
   const { omniSearch } = useSearch();
   const handleQuickDialSupport = useCallback(() => {
@@ -289,15 +293,18 @@ function UserSettingsDialog({ open, handleClose }: { handleClose: () => void; op
 
           <FormControl fullWidth>
             <InputLabel>Microphone</InputLabel>
-            <Select value={'Macbook Pro High Definition'} label="Microphone">
+            <Select label="Microphone">
-              <MenuItem value="">
+              <MenuItem value={NO_DEVICE_SELECTION}>
                 <em>None</em>
               </MenuItem>
-              <MenuItem value={'Macbook Pro High Definition'}>
+              {devices.audioInputDevices.map((deviceInfo) => (
-                {'Macbook Pro High Definition'}
+                <MenuItem
-              </MenuItem>
+                  key={`micDeviceSelection-${deviceInfo.deviceId}`}
-              <MenuItem value={20}>Twenty</MenuItem>
+                  value={deviceInfo.deviceId}
-              <MenuItem value={30}>Thirty</MenuItem>
+                >
+                  {deviceInfo.label}
+                </MenuItem>
+              ))}
             </Select>
             <FormHelperText>
               Your speaker selection should be done on your computer status or taskbar. Please
@@ -308,25 +315,28 @@ function UserSettingsDialog({ open, handleClose }: { handleClose: () => void; op
 
           <FormControl fullWidth>
             <InputLabel>Video</InputLabel>
-            <Select value={'HD Macbook Pro'} label="Audio">
+            <Select label="Audio">
-              <MenuItem value="">
+              <MenuItem value={NO_DEVICE_SELECTION}>
                 <em>None</em>
               </MenuItem>
-              <MenuItem value={'HD Macbook Pro'}>{'HD Macbook Pro'}</MenuItem>
+              {devices.videoDevices.map((deviceInfo) => (
-              <MenuItem value={20}>Twenty</MenuItem>
+                <MenuItem
-              <MenuItem value={30}>Thirty</MenuItem>
+                  key={`videoDeviceSelection-${deviceInfo.deviceId}`}
+                  value={deviceInfo.deviceId}
+                >
+                  {deviceInfo.label}
+                </MenuItem>
+              ))}
             </Select>
           </FormControl>
 
           <FormControl fullWidth disabled>
             <InputLabel>Screen</InputLabel>
-            <Select value={'Chrome browser - stack overflow'} label="Audio">
+            <Select value={'coming soon'} label="Audio">
-              <MenuItem value="">
+              <MenuItem value={NO_DEVICE_SELECTION}>
                 <em>None</em>
               </MenuItem>
-              <MenuItem value={'Chrome browser - stack overflow'}>
+              <MenuItem value={'coming soon'}>{'coming soon'}</MenuItem>
-                {'Chrome browser - stack overflow'}
-              </MenuItem>
               <MenuItem value={20}>Twenty</MenuItem>
               <MenuItem value={30}>Thirty</MenuItem>
             </Select>