Merge pull request #586 from appirio-tech/feature/comments_remove_restriction_being_memeber

Github issue #572, Messaging: Owner response post missing from status update

Author: vikasrohit

src/components/Feed/Feed.jsx

@@ -36,8 +36,8 @@ const Feed = (props) => {
           <div className="card-body draftjs-post" dangerouslySetInnerHTML={{__html: html}} />
         </div>
       </Panel.Body>
-      {allowComments &&
       <FeedComments
+        allowComments={ allowComments }
         totalComments={totalComments}
         hasMoreComments={hasMoreComments}
         onLoadMoreComments={onLoadMoreComments}
@@ -49,7 +49,7 @@ const Feed = (props) => {
         avatarUrl={currentUser.photoURL}
         comments={comments}
         isAddingComment={ isAddingComment }
-      />}
+      />
       {children}
     </ActionCard>
   )

src/components/Feed/FeedComments.jsx

@@ -25,7 +25,7 @@ class FeedComments extends React.Component {
   render() {
     const {
     comments, currentUser, totalComments, onLoadMoreComments, isLoadingComments, hasMoreComments, onAdd,
-    onChange, content, avatarUrl, isAddingComment
+    onChange, content, avatarUrl, isAddingComment, allowComments
   } = this.props
     let authorName = currentUser.firstName
     if (authorName && currentUser.lastName) {
@@ -77,6 +77,7 @@ class FeedComments extends React.Component {
           <div dangerouslySetInnerHTML={{__html: item.content}} />
         </Comment>
       )}
+      {allowComments &&
       <AddComment
         placeholder="Create a new comment..."
         onAdd={onAdd}
@@ -85,7 +86,7 @@ class FeedComments extends React.Component {
         avatarUrl={avatarUrl}
         authorName={ authorName }
         isAdding={ isAddingComment }
-      />
+      />}
     </div>
   )
   }