diff --git a/frontend/app/components/Session_/Player/Player.js b/frontend/app/components/Session_/Player/Player.js index 8e9c38d2c..0f0b51786 100644 --- a/frontend/app/components/Session_/Player/Player.js +++ b/frontend/app/components/Session_/Player/Player.js @@ -13,11 +13,14 @@ import EventsToggleButton from '../../Session/EventsToggleButton'; @connectPlayer(state => ({ live: state.live, })) -@connect(state => ({ - fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), - nextId: state.getIn([ 'sessions', 'nextId' ]), - closedLive: !!state.getIn([ 'sessions', 'errors' ]) || !state.getIn([ 'sessions', 'current', 'live' ]), -}), { +@connect(state => { + const isAssist = window.location.pathname.includes('/assist/'); + return { + fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), + nextId: state.getIn([ 'sessions', 'nextId' ]), + closedLive: !!state.getIn([ 'sessions', 'errors' ]) || (isAssist && !state.getIn([ 'sessions', 'current', 'live' ])), + } +}, { hideTargetDefiner, fullscreenOff, }) diff --git a/frontend/app/components/Session_/PlayerBlock.js b/frontend/app/components/Session_/PlayerBlock.js index 02ee08c75..ab95c11fd 100644 --- a/frontend/app/components/Session_/PlayerBlock.js +++ b/frontend/app/components/Session_/PlayerBlock.js @@ -33,7 +33,6 @@ import styles from './playerBlock.css'; @connect(state => ({ fullscreen: state.getIn([ 'components', 'player', 'fullscreen' ]), bottomBlock: state.getIn([ 'components', 'player', 'bottomBlock' ]), - closedLive: !!state.getIn([ 'sessions', 'errors' ]) || !state.getIn([ 'sessions', 'current', 'live' ]), })) export default class PlayerBlock extends React.PureComponent { componentDidUpdate(prevProps) { @@ -44,14 +43,13 @@ export default class PlayerBlock extends React.PureComponent { } render() { - const { fullscreen, bottomBlock, closedLive } = this.props; + const { fullscreen, bottomBlock } = this.props; return (
{ !fullscreen && !!bottomBlock &&
diff --git a/frontend/app/components/Session_/PlayerBlockHeader.js b/frontend/app/components/Session_/PlayerBlockHeader.js index b6295ed70..1a0735f5f 100644 --- a/frontend/app/components/Session_/PlayerBlockHeader.js +++ b/frontend/app/components/Session_/PlayerBlockHeader.js @@ -44,7 +44,7 @@ const ASSIST_ROUTE = assistRoute(); siteId: state.getIn([ 'user', 'siteId' ]), hasSessionsPath: hasSessioPath && !isAssist, metaList: state.getIn(['customFields', 'list']).map(i => i.key), - closedLive: !!state.getIn([ 'sessions', 'errors' ]) || !session.live, + closedLive: !!state.getIn([ 'sessions', 'errors' ]) || (isAssist && !session.live), } }, { toggleFavorite, fetchListIntegration, setSessionPath