fix JS error and incorrect comment thread for SHIFT+UP (#6574)

webapp/components/common/comment_icon.jsx

@@ -21,7 +21,7 @@ export default function CommentIcon(props) {
         iconStyle = iconStyle + ' ' + props.searchStyle;
     }
 
-    let commentIconId = props.idPrefix;
+    let commentIconId = props.channelId + props.idPrefix;
     if (props.idCount > -1) {
         commentIconId += props.idCount;
     }
@@ -47,11 +47,13 @@ CommentIcon.propTypes = {
     idCount: PropTypes.number,
     handleCommentClick: PropTypes.func.isRequired,
     searchStyle: PropTypes.string,
-    commentCount: PropTypes.number
+    commentCount: PropTypes.number,
+    channelId: PropTypes.string
 };
 
 CommentIcon.defaultProps = {
     idCount: -1,
     searchStyle: '',
-    commentCount: 0
+    commentCount: 0,
+    channelId: ''
 };