From 33781c3d161bd99b9b1ae0be099a9e0dc39ae623 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Thu, 14 Dec 2017 20:01:33 +0100
Subject: [PATCH] Fix view new comments

---
 client/coral-admin/src/routes/Moderation/graphql.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Moderation/graphql.js b/client/coral-admin/src/routes/Moderation/graphql.js
index f76f28563..13ff2ed5a 100644
--- a/client/coral-admin/src/routes/Moderation/graphql.js
+++ b/client/coral-admin/src/routes/Moderation/graphql.js
@@ -55,7 +55,17 @@ function addCommentToQueue(root, queue, comment, sortOrder) {
   };
 
   if (shouldCommentBeAdded(root, queue, comment, sortOrder)) {
-    const nodes = root[queue].nodes.concat(comment);
+    const cursor = new Date(root[queue].startCursor);
+    const date = new Date(comment.created_at);
+
+    let append = sortOrder === 'ASC'
+      ? date >= cursor
+      : date <= cursor;
+
+    const nodes = append
+      ? root[queue].nodes.concat(comment)
+      : [comment].concat(...root[queue].nodes);
+
     changes[queue] = {
       nodes: {$set: nodes},
     };