From cc7e491a90b0f48204d708bab9c7126f733e7daa Mon Sep 17 00:00:00 2001
From: Stefan Otto <stefan.otto@uninett.no>
Date: Tue, 24 Apr 2018 14:51:37 +0200
Subject: [PATCH] Fix for last not correctly working merge - sorry for the
 mess!

---
 app/lib/components/Peer.jsx | 49 ++++++++++---------------------------
 1 file changed, 13 insertions(+), 36 deletions(-)

diff --git a/app/lib/components/Peer.jsx b/app/lib/components/Peer.jsx
index f094977..b797b4d 100644
--- a/app/lib/components/Peer.jsx
+++ b/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'>
-				<PeerScreenView
-					videoTrack={screenConsumer ? screenConsumer.track : null}
-					videoVisible={screenVisible}
-					videoProfile={screenProfile}
-					videoCodec={screenConsumer ? screenConsumer.codec : null}
-				/>
-			</div>
-		);
-	}
-	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>
+	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>