Merge branch 'dev' into publish-alpha

100mslive · Feb 19, 2025 · 88438c0 · 88438c0
2 parents 5668288 + 3a5770b
commit 88438c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/packages/hms-video-store/src/media/tracks/HMSLocalAudioTrack.ts b/packages/hms-video-store/src/media/tracks/HMSLocalAudioTrack.ts
@@ -404,19 +404,19 @@ export class HMSLocalAudioTrack extends HMSAudioTrack {
       );
       await this.replaceTrackWith(settings);
       const groupId = this.nativeTrack.getSettings().groupId;
+      this.eventBus.deviceChange.publish({
+        isUserSelection: !internal,
+        type: 'audioInput',
+        selection: {
+          deviceId: settings.deviceId,
+          groupId: groupId,
+        },
+      });
       if (!internal && settings.deviceId) {
         DeviceStorageManager.updateSelection('audioInput', {
           deviceId: settings.deviceId,
           groupId,
         });
-        this.eventBus.deviceChange.publish({
-          isUserSelection: true,
-          type: 'audioInput',
-          selection: {
-            deviceId: settings.deviceId,
-            groupId: groupId,
-          },
-        });
       }
     }
   };

diff --git a/packages/roomkit-react/src/Prebuilt/components/Settings/DeviceSettings.jsx b/packages/roomkit-react/src/Prebuilt/components/Settings/DeviceSettings.jsx
@@ -1,17 +1,14 @@
-import React, { Fragment, useEffect, useRef, useState } from 'react';
-import { useMedia } from 'react-use';
+import React, { Fragment, useRef, useState } from 'react';
 import {
   DeviceType,
   selectIsLocalVideoEnabled,
   selectLocalVideoTrackID,
   selectVideoTrackByID,
   useDevices,
-  useHMSActions,
   useHMSStore,
 } from '@100mslive/react-sdk';
 import { MicOnIcon, SpeakerIcon, VideoOnIcon } from '@100mslive/react-icons';
 import { Box, Button, Dropdown, Flex, StyledVideoTile, Text, Video } from '../../../';
-import { config as cssConfig } from '../../../Theme';
 import { DialogDropdownTrigger } from '../../primitives/DropdownTrigger';
 import { useUISettings } from '../AppData/useUISettings';
 import { useAudioOutputTest } from '../hooks/useAudioOutputTest';
@@ -34,15 +31,7 @@ const Settings = ({ setHide }) => {
   const shouldShowAudioOutput = 'setSinkId' in HTMLMediaElement.prototype;
   const mirrorLocalVideo = useUISettings(UI_SETTINGS.mirrorLocalVideo);
   const trackSelector = selectVideoTrackByID(videoTrackId);
-  const hmsActions = useHMSActions();
   const track = useHMSStore(trackSelector);
-  const isMobile = useMedia(cssConfig.media.md);
-
-  useEffect(() => {
-    if (isMobile) {
-      hmsActions.refreshDevices();
-    }
-  }, [hmsActions, isMobile]);
 
   /**
    * Chromium browsers return an audioOutput with empty label when no permissions are given