Merge branch 'master' into whizard-whitelist

client/coral-embed-stream/src/Comment.js

@@ -38,7 +38,6 @@ class Comment extends React.Component {
     // id of currently opened ReplyBox. tracked in Stream.js
     activeReplyBox: PropTypes.string.isRequired,
     setActiveReplyBox: PropTypes.func.isRequired,
-    refetch: PropTypes.func.isRequired,
     showSignInDialog: PropTypes.func.isRequired,
     postFlag: PropTypes.func.isRequired,
     postLike: PropTypes.func.isRequired,
@@ -85,7 +84,6 @@ class Comment extends React.Component {
       asset,
       depth,
       postItem,
-      refetch,
       addNotification,
       showSignInDialog,
       postLike,
@@ -158,7 +156,6 @@ class Comment extends React.Component {
           comment.replies &&
           comment.replies.map(reply => {
             return <Comment
-              refetch={refetch}
               setActiveReplyBox={setActiveReplyBox}
               activeReplyBox={activeReplyBox}
               addNotification={addNotification}

client/coral-embed-stream/src/NewCount.js

@@ -19,12 +19,13 @@ const NewCount = (props) => {
 
   return <div className='coral-new-comments'>
     {
-      props.countCache && newComments > 0 &&
+      props.countCache && newComments > 0 ?
       <button onClick={onLoadMoreClick(props)} className='coral-load-more'>
         {newComments === 1
           ? lang.t('newCount', newComments, lang.t('comment'))
           : lang.t('newCount', newComments, lang.t('comments'))}
       </button>
+      : null
     }
   </div>;
 };