Merge pull request #514 from vector-im/SimonBrandner/fix/name-11

src/room/InCallView.tsx

@@ -197,7 +197,6 @@ export function InCallView({
             key={item.id}
             item={item}
             getAvatar={renderAvatar}
-            showName={items.length > 2 || item.focused}
             audioOutputDevice={audioOutput}
             audioContext={audioContext}
             audioDestination={audioDestination}

src/video-grid/VideoTile.jsx

@@ -29,12 +29,10 @@ export const VideoTile = forwardRef(
       isLocal,
       speaking,
       audioMuted,
-      noVideo,
       videoMuted,
       screenshare,
       avatar,
       name,
-      showName,
       mediaRef,
       onOptionsPress,
       showOptions,
@@ -75,7 +73,7 @@ export const VideoTile = forwardRef(
             )}
           </div>
         )}
-        {(videoMuted || noVideo) && (
+        {videoMuted && (
           <>
             <div className={styles.videoMutedOverlay} />
             {avatar}
@@ -86,15 +84,12 @@ export const VideoTile = forwardRef(
             <span>{`${name} is presenting`}</span>
           </div>
         ) : (
-          (showName || audioMuted || (videoMuted && !noVideo)) && (
+          <div className={classNames(styles.infoBubble, styles.memberName)}>
-            <div className={classNames(styles.infoBubble, styles.memberName)}>
+            {audioMuted && !videoMuted && <MicMutedIcon />}
-              {audioMuted && !(videoMuted && !noVideo) && <MicMutedIcon />}
+            {videoMuted && <VideoMutedIcon />}
-              {videoMuted && !noVideo && <VideoMutedIcon />}
+            <span title={name}>{name}</span>
-              {showName && <span title={name}>{name}</span>}
+          </div>
-            </div>
-          )
         )}
-
         <video ref={mediaRef} playsInline disablePictureInPicture />
       </animated.div>
     );

src/video-grid/VideoTileContainer.jsx

@@ -29,7 +29,6 @@ export function VideoTileContainer({
   width,
   height,
   getAvatar,
-  showName,
   audioOutputDevice,
   audioContext,
   audioDestination,
@@ -43,7 +42,6 @@ export function VideoTileContainer({
     audioMuted,
     videoMuted,
     localVolume,
-    noVideo,
     speaking,
     stream,
     purpose,
@@ -79,11 +77,9 @@ export function VideoTileContainer({
         isLocal={isLocal}
         speaking={speaking && !disableSpeakingIndicator}
         audioMuted={audioMuted}
-        noVideo={noVideo}
         videoMuted={videoMuted}
         screenshare={purpose === SDPStreamMetadataPurpose.Screenshare}
         name={rawDisplayName}
-        showName={showName}
         ref={tileRef}
         mediaRef={mediaRef}
         avatar={getAvatar && getAvatar(member, width, height)}

src/video-grid/useCallFeed.js

@@ -22,9 +22,6 @@ function getCallFeedState(callFeed) {
     member: callFeed ? callFeed.getMember() : null,
     isLocal: callFeed ? callFeed.isLocal() : false,
     speaking: callFeed ? callFeed.isSpeaking() : false,
-    noVideo: callFeed
-      ? !callFeed.stream || callFeed.stream.getVideoTracks().length === 0
-      : true,
     videoMuted: callFeed ? callFeed.isVideoMuted() : true,
     audioMuted: callFeed ? callFeed.isAudioMuted() : true,
     localVolume: callFeed ? callFeed.getLocalVolume() : 0,