Fix for last not correctly working merge - sorry for the mess!

app/lib/components/Peer.jsx

@@ -40,42 +40,19 @@ const Peer = (props) =>
 	if (screenConsumer)
 		screenProfile = screenConsumer.profile;
 
-	if (screenVisible && screenConsumer.supported)
+	return (
-	{
+		<div data-component='Peer'>
-		return (
+			<div className='indicators'>
-			<div data-component='Peer'>
+				{peer.raiseHandState ?
-				<PeerScreenView
+					<div className='icon raise-hand' />
-					videoTrack={screenConsumer ? screenConsumer.track : null}
+					:null
-					videoVisible={screenVisible}
+				}
-					videoProfile={screenProfile}
+				{!micEnabled ?
-					videoCodec={screenConsumer ? screenConsumer.codec : null}
+					<div className='icon mic-off' />
-				/>
+					:null
-			</div>
+				}
-		);
+				{!videoVisible ?
-	}
+					<div className='icon webcam-off' />
-	else
-	{
-		return (
-			<div data-component='Peer'>
-				<div className='indicators'>
-					{peer.raiseHandState ?
-						<div className='icon raise-hand' />
-						:null
-					}
-					{!micEnabled ?
-						<div className='icon mic-off' />
-						:null
-					}
-					{!videoVisible ?
-						<div className='icon webcam-off' />
-						:null
-					}
-				</div>
-
-				{videoVisible && !webcamConsumer.supported ?
-					<div className='incompatible-video'>
-						<p>incompatible video</p>
-					</div>
 					:null
 				}
 			</div>