diff --git a/client/coral-configure/containers/ConfigureStreamContainer.js b/client/coral-configure/containers/ConfigureStreamContainer.js index c9d36e357..e7b937030 100644 --- a/client/coral-configure/containers/ConfigureStreamContainer.js +++ b/client/coral-configure/containers/ConfigureStreamContainer.js @@ -16,7 +16,7 @@ class ConfigureStreamContainer extends Component { this.state = { changed: false, dirtySettings: props.asset.settings, - closedAt: (props.asset.closedAt === null ? 'open' : 'closed') + closedAt: !props.asset.isClosed ? 'open' : 'closed' }; this.toggleStatus = this.toggleStatus.bind(this); diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js index 421a0cf7a..1e0ff7ea9 100644 --- a/client/coral-embed-stream/src/components/Stream.js +++ b/client/coral-embed-stream/src/components/Stream.js @@ -19,6 +19,7 @@ import cn from 'classnames'; import {getTopLevelParent, attachCommentToParent} from '../graphql/utils'; import AllCommentsPane from './AllCommentsPane'; +import AutomaticAssetClosure from '../containers/AutomaticAssetClosure'; import styles from './Stream.css'; @@ -101,7 +102,7 @@ class Stream extends React.Component { editName } = this.props; const {keepCommentBox} = this.state; - const open = asset.closedAt === null; + const open = !asset.isClosed; // even though the permalinked comment is the highlighted one, we're displaying its parent + replies let highlightedComment = comment && getTopLevelParent(comment); @@ -141,6 +142,7 @@ class Stream extends React.Component { return (
+ {comment &&