From abed842c23b40ff33e90f894f38c9ead08cf1003 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 21 Jul 2017 02:27:59 +0700
Subject: [PATCH 1/4] Quick fix inconsistent state

---
 .../client/containers/Comment.js                   | 14 ++++++++++++++
 .../client/containers/TabPane.js                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-featured-comments/client/containers/Comment.js b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
index bba764a1d..a5c250d60 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/Comment.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
@@ -31,6 +31,20 @@ export default withFragments({
           name
         }
       }
+
+      ##
+      # Figure out why do we need this.
+      # Currently without this loading more featured comments
+      # brings apollo into an inconsistent state.
+      action_summaries {
+        __typename
+        count
+        current_user {
+          id
+        }
+      }
+      ##
+
       user {
         id
         username
diff --git a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
index e9d466061..3a082e732 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/TabPane.js
@@ -47,7 +47,7 @@ class TabPaneContainer extends React.Component {
 }
 
 const LOAD_MORE_QUERY = gql`
-  query CoralEmbedStream_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
+  query TalkFeaturedComments_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
     comments(query: {limit: $limit, cursor: $cursor, tags: ["FEATURED"], asset_id: $asset_id, sort: $sort, excludeIgnored: $excludeIgnored}) {
       nodes {
         ...${getDefinitionName(Comment.fragments.comment)}

From 0e37f36e020c61d2da8ad67b91f97e98ef26075a Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 21 Jul 2017 02:36:04 +0700
Subject: [PATCH 2/4] Show featured tag on replies too

---
 plugins/talk-plugin-featured-comments/client/components/Tag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-featured-comments/client/components/Tag.js b/plugins/talk-plugin-featured-comments/client/components/Tag.js
index 4afa9629a..8e1cb428d 100644
--- a/plugins/talk-plugin-featured-comments/client/components/Tag.js
+++ b/plugins/talk-plugin-featured-comments/client/components/Tag.js
@@ -6,7 +6,7 @@ import {isTagged} from 'plugin-api/beta/client/utils';
 export default (props) => (
   <span>
     {
-      isTagged(props.comment.tags, 'FEATURED') && props.depth === 0 ? (
+      isTagged(props.comment.tags, 'FEATURED') ? (
         <span className={styles.tag}>
           {t('talk-plugin-featured-comments.featured')}
         </span>

From 65500eda64919bfdfbb7994953520e5167fccca3 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 21 Jul 2017 03:57:32 +0700
Subject: [PATCH 3/4] Remove remaining username alias in post comment mutation

---
 client/coral-embed-stream/src/graphql/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 7ca22a5f4..79d13ecac 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -84,7 +84,7 @@ const extension = {
         }
         user {
           id
-          name: username
+          username
         }
         action_summaries {
           count
@@ -143,7 +143,7 @@ const extension = {
             user: {
               __typename: 'User',
               id: auth.toJS().user.id,
-              name: auth.toJS().user.username
+              username: auth.toJS().user.username
             },
             created_at: new Date().toISOString(),
             body,

From 7ca7166c7a18e16013a819b2515a82e980f9caf7 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 21 Jul 2017 04:08:43 +0700
Subject: [PATCH 4/4] Add clarification

---
 .../talk-plugin-featured-comments/client/containers/Comment.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-featured-comments/client/containers/Comment.js b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
index a5c250d60..2b3de19b5 100644
--- a/plugins/talk-plugin-featured-comments/client/containers/Comment.js
+++ b/plugins/talk-plugin-featured-comments/client/containers/Comment.js
@@ -33,7 +33,7 @@ export default withFragments({
       }
 
       ##
-      # Figure out why do we need this.
+      # TODO: Remove this when we have the IntrospectionFragmentMatcher.
       # Currently without this loading more featured comments
       # brings apollo into an inconsistent state.
       action_summaries {