Merge remote-tracking branch 'upstream/livekit' into SimonBrandner/feat/eula-config

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/room/GroupCallView.tsx

@@ -219,14 +219,7 @@ export function GroupCallView({
     undefined
   );
 
-  const [livekitServiceURL, setLivekitServiceURL] = useState<
-    string | undefined
-  >(groupCall.foci[0]?.livekitServiceUrl);
-
-  useEffect(() => {
-    setLivekitServiceURL(groupCall.foci[0]?.livekitServiceUrl);
-  }, [setLivekitServiceURL, groupCall]);
-
+  const livekitServiceURL = groupCall.foci[0]?.livekitServiceUrl;
   if (!livekitServiceURL) {
     return <ErrorView error={new Error("No livekit_service_url defined")} />;
   }

src/room/InCallView.tsx

@@ -84,6 +84,7 @@ import { useMediaDevices } from "../livekit/useMediaDevices";
 import { useFullscreen } from "./useFullscreen";
 import { useLayoutStates } from "../video-grid/Layout";
 import { useSFUConfig } from "../livekit/OpenIDLoader";
+import { E2EELock } from "../E2EELock";
 
 const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 // There is currently a bug in Safari our our code with cloning and sending MediaStreams
@@ -395,6 +396,7 @@ export function InCallView({
               users={unencryptedEventsFromUsers}
               room={groupCall.room}
             />
+            <E2EELock />
           </LeftNav>
           <RightNav>
             <GridLayoutMenu layout={layout} setLayout={setLayout} />