Merge remote-tracking branch 'origin/livekit' into dbkr/matrixrtcsession

src/room/InCallView.tsx

@@ -78,6 +78,7 @@ import { useEventEmitterThree } from "../useEvents";
 import { useWakeLock } from "../useWakeLock";
 import { useMergedRefs } from "../useMergedRefs";
 import { MuteStates } from "./MuteStates";
+import { useIsRoomE2EE } from "../e2ee/sharedKeyManagement";
 
 const canScreenshare = "getDisplayMedia" in (navigator.mediaDevices ?? {});
 // There is currently a bug in Safari our our code with cloning and sending MediaStreams
@@ -133,6 +134,8 @@ export function InCallView({
   usePreventScroll();
   useWakeLock();
 
+  const isRoomE2EE = useIsRoomE2EE(rtcSession.room.roomId);
+
   const containerRef1 = useRef<HTMLDivElement | null>(null);
   const [containerRef2, bounds] = useMeasure({ polyfill: ResizeObserver });
   const boundsValid = bounds.height > 0;
@@ -408,7 +411,7 @@ export function InCallView({
         <Header>
           <LeftNav>
             <RoomHeaderInfo roomName={rtcSession.room.name} />
-            <E2EELock />
+            {!isRoomE2EE && <E2EELock />}
           </LeftNav>
           <RightNav>
             <GridLayoutMenu layout={layout} setLayout={setLayout} />
@@ -445,12 +448,7 @@ export function InCallView({
         />
       )}
       {inviteModalState.isOpen && (
-        <InviteModal
-          roomIdOrAlias={
-            rtcSession.room.getCanonicalAlias() ?? rtcSession.room.roomId
-          }
-          {...inviteModalProps}
-        />
+        <InviteModal roomId={rtcSession.room.roomId} {...inviteModalProps} />
       )}
     </div>
   );