Remove redundant browser state, and tidy
parent
3caa505d08
commit
d06f44d1d4
|
|
@ -58,7 +58,6 @@ const Settings = ({
|
||||||
room,
|
room,
|
||||||
me,
|
me,
|
||||||
settings,
|
settings,
|
||||||
browser,
|
|
||||||
onToggleAdvancedMode,
|
onToggleAdvancedMode,
|
||||||
onTogglePermanentTopBar,
|
onTogglePermanentTopBar,
|
||||||
handleCloseSettings,
|
handleCloseSettings,
|
||||||
|
|
@ -235,8 +234,8 @@ const Settings = ({
|
||||||
</FormControl>
|
</FormControl>
|
||||||
</form>
|
</form>
|
||||||
{
|
{
|
||||||
window.config.audioOutputSupportedBrowsers &&
|
'audioOutputSupportedBrowsers' in window.config &&
|
||||||
window.config.audioOutputSupportedBrowsers.includes(browser.name) &&
|
window.config.audioOutputSupportedBrowsers.includes(me.browser.name) &&
|
||||||
<form className={classes.setting} autoComplete='off'>
|
<form className={classes.setting} autoComplete='off'>
|
||||||
<FormControl className={classes.formControl}>
|
<FormControl className={classes.formControl}>
|
||||||
<Select
|
<Select
|
||||||
|
|
@ -414,7 +413,6 @@ Settings.propTypes =
|
||||||
me : appPropTypes.Me.isRequired,
|
me : appPropTypes.Me.isRequired,
|
||||||
room : appPropTypes.Room.isRequired,
|
room : appPropTypes.Room.isRequired,
|
||||||
settings : PropTypes.object.isRequired,
|
settings : PropTypes.object.isRequired,
|
||||||
browser : PropTypes.object.isRequired,
|
|
||||||
onToggleAdvancedMode : PropTypes.func.isRequired,
|
onToggleAdvancedMode : PropTypes.func.isRequired,
|
||||||
onTogglePermanentTopBar : PropTypes.func.isRequired,
|
onTogglePermanentTopBar : PropTypes.func.isRequired,
|
||||||
handleChangeMode : PropTypes.func.isRequired,
|
handleChangeMode : PropTypes.func.isRequired,
|
||||||
|
|
@ -427,8 +425,7 @@ const mapStateToProps = (state) =>
|
||||||
return {
|
return {
|
||||||
me : state.me,
|
me : state.me,
|
||||||
room : state.room,
|
room : state.room,
|
||||||
settings : state.settings,
|
settings : state.settings
|
||||||
browser : state.me.browser
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -448,7 +445,6 @@ export default withRoomContext(connect(
|
||||||
{
|
{
|
||||||
return (
|
return (
|
||||||
prev.me === next.me &&
|
prev.me === next.me &&
|
||||||
prev.me.browser === next.me.browser &&
|
|
||||||
prev.room === next.room &&
|
prev.room === next.room &&
|
||||||
prev.settings === next.settings
|
prev.settings === next.settings
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue