From d06f44d1d48883354e8da7eefc2a316c75cff9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@majd.eu>
Date: Thu, 23 Apr 2020 21:56:27 +0200
Subject: [PATCH] Remove redundant browser state, and tidy

---
 app/src/components/Settings/Settings.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js
index 1945ef2..5a4a09a 100644
--- a/app/src/components/Settings/Settings.js
+++ b/app/src/components/Settings/Settings.js
@@ -58,7 +58,6 @@ const Settings = ({
 	room,
 	me,
 	settings,
-	browser,
 	onToggleAdvancedMode,
 	onTogglePermanentTopBar,
 	handleCloseSettings,
@@ -235,8 +234,8 @@ const Settings = ({
 				</FormControl>
 			</form>
 			{ 	
-				window.config.audioOutputSupportedBrowsers && 
-				window.config.audioOutputSupportedBrowsers.includes(browser.name) &&
+				'audioOutputSupportedBrowsers' in window.config &&
+				window.config.audioOutputSupportedBrowsers.includes(me.browser.name) &&
 				<form className={classes.setting} autoComplete='off'>
 					<FormControl className={classes.formControl}>
 						<Select
@@ -414,7 +413,6 @@ Settings.propTypes =
 	me                      : appPropTypes.Me.isRequired,
 	room                    : appPropTypes.Room.isRequired,
 	settings                : PropTypes.object.isRequired,
-	browser                 : PropTypes.object.isRequired,
 	onToggleAdvancedMode    : PropTypes.func.isRequired,
 	onTogglePermanentTopBar : PropTypes.func.isRequired,
 	handleChangeMode        : PropTypes.func.isRequired,
@@ -427,8 +425,7 @@ const mapStateToProps = (state) =>
 	return {
 		me       : state.me,
 		room     : state.room,
-		settings : state.settings,
-		browser  : state.me.browser
+		settings : state.settings
 	};
 };
 
@@ -448,7 +445,6 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.me === next.me &&
-				prev.me.browser === next.me.browser &&
 				prev.room === next.room &&
 				prev.settings === next.settings
 			);