From 22acbab06779b683064a83b64872267de16989b3 Mon Sep 17 00:00:00 2001
From: gurmeetb <guri.topcoder@gmail.com>
Date: Mon, 15 Apr 2019 23:46:43 +0530
Subject: [PATCH 1/2] fix for issue #2934

---
 src/components/Feed/FeedComments.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Feed/FeedComments.jsx b/src/components/Feed/FeedComments.jsx
index 5e5e5879a..10018d2e4 100644
--- a/src/components/Feed/FeedComments.jsx
+++ b/src/components/Feed/FeedComments.jsx
@@ -177,10 +177,13 @@ class FeedComments extends React.Component {
 
   render() {
     const {
-      comments, currentUser, onLoadMoreComments, isLoadingComments, hasMoreComments, onAddNewComment,
+      currentUser, onLoadMoreComments, isLoadingComments, hasMoreComments, onAddNewComment,
       onNewCommentChange, error, avatarUrl, isAddingComment, allowComments, onSaveMessage, onDeleteMessage, allMembers,
       totalComments, isFullScreen, headerHeight, projectMembers
     } = this.props
+    let { comments } = this.props
+    comments = _.sortBy(comments, 'createdBy')
+    comments = comments.reverse()
     const { isNewCommentMobileOpen, stickyRowNext, stickyRowPrev } = this.state
     let authorName = currentUser.firstName
     if (authorName && currentUser.lastName) {

From 10b0c693c489b0af7df2c161f184f97aa8e39bac Mon Sep 17 00:00:00 2001
From: gurmeetb <guri.topcoder@gmail.com>
Date: Tue, 16 Apr 2019 14:48:33 +0530
Subject: [PATCH 2/2] move load earlier posts down for issue #2934

---
 src/components/Feed/FeedComments.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Feed/FeedComments.jsx b/src/components/Feed/FeedComments.jsx
index 10018d2e4..61fad4390 100644
--- a/src/components/Feed/FeedComments.jsx
+++ b/src/components/Feed/FeedComments.jsx
@@ -373,6 +373,7 @@ class FeedComments extends React.Component {
           {(matches) => (matches ? (
             <div>
               <div styleName="comments">
+                {commentRows}
                 {hasMoreComments &&
                   <div styleName="load-more" key="load-more">
                     <a href="javascript:" onClick={ handleLoadMoreClick } styleName="load-btn">
@@ -380,7 +381,6 @@ class FeedComments extends React.Component {
                     </a>
                   </div>
                 }
-                {commentRows}
               </div>
               {allowComments &&
                 <div styleName="add-comment" key="add-comment">