Merge branch 'main' of github.com:vector-im/matrix-video-chat

src/Room.jsx

@@ -301,8 +301,8 @@ function RoomSetupView({
       </Header>
       <div className={styles.joinRoom}>
         <div className={styles.joinRoomContent}>
-          <h1>{roomName}</h1>
           <div className={styles.preview}>
+            <video ref={videoRef} muted playsInline disablePictureInPicture />
             {state === GroupCallState.LocalCallFeedUninitialized && (
               <p className={styles.webcamPermissions}>
                 Webcam/microphone permissions needed to join the call.
@@ -313,7 +313,6 @@ function RoomSetupView({
                 Accept webcam/microphone permissions to join the call.
               </p>
             )}
-            <video ref={videoRef} muted playsInline disablePictureInPicture />
             {state === GroupCallState.LocalCallFeedInitialized && (
               <>
                 <Button
@@ -442,7 +441,7 @@ function InRoomView({
         </LeftNav>
         <RightNav>
           <GridLayoutMenu layout={layout} setLayout={setLayout} />
-          <UserMenu />
+          <UserMenu disableLogout />
         </RightNav>
       </Header>
       {items.length === 0 ? (