From 5c768e1ae6e8faabc21d6467c069eba5947097eb Mon Sep 17 00:00:00 2001
From: Stefan Otto <stefan.otto@uninett.no>
Date: Tue, 20 Nov 2018 12:17:02 +0100
Subject: [PATCH 1/2] remove SET_CONSUMER_VOLUME actions from log

---
 app/lib/store.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/lib/store.js b/app/lib/store.js
index 1208e8c..f3652f2 100644
--- a/app/lib/store.js
+++ b/app/lib/store.js
@@ -18,7 +18,9 @@ if (process.env.NODE_ENV === 'development')
 {
 	const reduxLogger = createLogger(
 		{
-			predicate : (getState, action) => action.type !== 'SET_PRODUCER_VOLUME',
+			// filter VOLUME level actions from log
+			predicate : (getState, action) => ! (action.type == 'SET_PRODUCER_VOLUME'
+				|| action.type == 'SET_CONSUMER_VOLUME'),
 			duration  : true,
 			timestamp : false,
 			level     : 'log',

From 02af6627ca2a5b5daba646145f7023dbd5f20a5b Mon Sep 17 00:00:00 2001
From: Stefan Otto <stefan.otto@uninett.no>
Date: Tue, 20 Nov 2018 13:13:02 +0100
Subject: [PATCH 2/2] Muted controls on Me.jsx don't fade out anymore

---
 app/lib/components/Me.jsx     | 15 +++++++--------
 app/stylus/components/Me.styl |  8 ++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/lib/components/Me.jsx b/app/lib/components/Me.jsx
index dcedb94..3a71a34 100644
--- a/app/lib/components/Me.jsx
+++ b/app/lib/components/Me.jsx
@@ -15,14 +15,14 @@ class Me extends React.Component
 		controlsVisible : false
 	};
 
-	handleMouseOver = () => 
+	handleMouseOver = () =>
 	{
 		this.setState({
 			controlsVisible : true
 		});
 	};
 
-	handleMouseOut = () => 
+	handleMouseOut = () =>
 	{
 		this.setState({
 			controlsVisible : false
@@ -108,13 +108,11 @@ class Me extends React.Component
 			>
 				<div className={classnames('view-container', 'webcam')}>
 					{connected ?
-						<div className={classnames('controls', {
-							visible : this.state.controlsVisible
-						})}
-						>
+						<div className={classnames('controls', 'visible')}>
 							<div
 								className={classnames('button', 'mic', micState, {
-									disabled : me.audioInProgress
+									disabled : me.audioInProgress,
+									visible  : micState == 'off' || this.state.controlsVisible
 								})}
 								onClick={() =>
 								{
@@ -124,7 +122,8 @@ class Me extends React.Component
 
 							<div
 								className={classnames('button', 'webcam', webcamState, {
-									disabled : me.webcamInProgress
+									disabled : me.webcamInProgress,
+									visible  : webcamState == 'off' || this.state.controlsVisible
 								})}
 								onClick={() =>
 								{
diff --git a/app/stylus/components/Me.styl b/app/stylus/components/Me.styl
index 31fe5a6..2d70e8f 100644
--- a/app/stylus/components/Me.styl
+++ b/app/stylus/components/Me.styl
@@ -33,7 +33,7 @@
 			&.visible {
 				opacity: 1;
 			}
-			
+
 			> .button {
 				flex: 0 0 auto;
 				margin: 0.2vmin;
@@ -43,13 +43,17 @@
 				background-repeat: no-repeat;
 				background-color: rgba(#000, 0.5);
 				cursor: pointer;
+				opacity: 0;
 				transition-property: opacity, background-color;
 				transition-duration: 0.15s;
 
+				&.visible {
+					opacity: 0.85;
+				}
+
 				+desktop() {
 					width: 24px;
 					height: 24px;
-					opacity: 0.85;
 
 					&:hover {
 						opacity: 1;