From 3031884e52d8f88368d24c301c8ddb0d8ec0a6cc Mon Sep 17 00:00:00 2001
From: Jon <jon@daily.co>
Date: Tue, 15 Jun 2021 18:07:38 +0100
Subject: [PATCH] squashed conflict

---
 dailyjs/basic-call/components/Room/Room.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dailyjs/basic-call/components/Room/Room.js b/dailyjs/basic-call/components/Room/Room.js
index 212fd09..b78228b 100644
--- a/dailyjs/basic-call/components/Room/Room.js
+++ b/dailyjs/basic-call/components/Room/Room.js
@@ -7,11 +7,7 @@ import { useCallState } from '@dailyjs/shared/contexts/CallProvider';
 import { useMediaDevices } from '@dailyjs/shared/contexts/MediaDeviceProvider';
 import { useParticipants } from '@dailyjs/shared/contexts/ParticipantsProvider';
 import { useUIState } from '@dailyjs/shared/contexts/UIStateProvider';
-<<<<<<< HEAD
 import { useWaitingRoom } from '@dailyjs/shared/contexts/WaitingRoomProvider';
-
-=======
->>>>>>> e47ada8fa4389bbfbeb7c97a6d80731a33d24b01
 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 IconLeave } from '@dailyjs/shared/icons/leave-md.svg';
@@ -30,6 +26,7 @@ export const Room = ({ onLeave }) => {
   const { setShowDeviceModal } = useUIState();
   const { isCamMuted, isMicMuted } = useMediaDevices();
   const { setShowModal, showModal } = useWaitingRoom();
+  const { localParticipant } = useParticipants();
 
   const toggleCamera = (newState) => {
     if (!callObject) return false;