jeffemmett
/
daily-examples
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

squashed conflict

This commit is contained in:
Jon 2021-06-15 18:07:38 +01:00
parent 4e1d032c96
commit 3031884e52
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dailyjs/basic-call/components/Room/Room.js
View File

@ -7,11 +7,7 @@ import { useCallState } from '@dailyjs/shared/contexts/CallProvider';
import { useMediaDevices } from '@dailyjs/shared/contexts/MediaDeviceProvider'; import { useMediaDevices } from '@dailyjs/shared/contexts/MediaDeviceProvider';
import { useParticipants } from '@dailyjs/shared/contexts/ParticipantsProvider'; import { useParticipants } from '@dailyjs/shared/contexts/ParticipantsProvider';
import { useUIState } from '@dailyjs/shared/contexts/UIStateProvider'; import { useUIState } from '@dailyjs/shared/contexts/UIStateProvider';
<<<<<<< HEAD
import { useWaitingRoom } from '@dailyjs/shared/contexts/WaitingRoomProvider'; import { useWaitingRoom } from '@dailyjs/shared/contexts/WaitingRoomProvider';
=======
>>>>>>> e47ada8fa4389bbfbeb7c97a6d80731a33d24b01
import { ReactComponent as IconCameraOff } from '@dailyjs/shared/icons/camera-off-md.svg'; import { ReactComponent as IconCameraOff } from '@dailyjs/shared/icons/camera-off-md.svg';
import { ReactComponent as IconCameraOn } from '@dailyjs/shared/icons/camera-on-md.svg'; import { ReactComponent as IconCameraOn } from '@dailyjs/shared/icons/camera-on-md.svg';
import { ReactComponent as IconLeave } from '@dailyjs/shared/icons/leave-md.svg'; import { ReactComponent as IconLeave } from '@dailyjs/shared/icons/leave-md.svg';
@ -30,6 +26,7 @@ export const Room = ({ onLeave }) => {
const { setShowDeviceModal } = useUIState(); const { setShowDeviceModal } = useUIState();
const { isCamMuted, isMicMuted } = useMediaDevices(); const { isCamMuted, isMicMuted } = useMediaDevices();
const { setShowModal, showModal } = useWaitingRoom(); const { setShowModal, showModal } = useWaitingRoom();
const { localParticipant } = useParticipants();
const toggleCamera = (newState) => { const toggleCamera = (newState) => {
if (!callObject) return false; if (!callObject) return false;