From c355e10453e3fe6203847505f18017715cdcc9b8 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 29 Jan 2018 19:21:42 +0100
Subject: [PATCH 01/10] Refactor

---
 client/coral-embed-stream/src/AppRouter.js                    | 2 +-
 .../src}/containers/LoginContainer.js                         | 0
 .../coral-embed-stream/src/tabs/stream/components/Comment.js  | 2 +-
 .../src/tabs/stream/components}/InfoBox.js                    | 0
 .../src/tabs/stream/components/ModerationLink.css}            | 0
 .../src/tabs/stream/components}/ModerationLink.js             | 2 +-
 .../coral-embed-stream/src/tabs/stream/components/Stream.js   | 4 ++--
 .../src/tabs/stream/components}/TagLabel.js                   | 0
 .../src/tabs/stream/components}/__tests__/InfoBox.spec.js     | 0
 .../components}/__tests__/__snapshots__/InfoBox.spec.js.snap  | 0
 client/talk-plugin-moderation/index.js                        | 1 -
 11 files changed, 5 insertions(+), 6 deletions(-)
 rename client/{coral-sign-in => coral-embed-stream/src}/containers/LoginContainer.js (100%)
 rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/InfoBox.js (100%)
 rename client/{talk-plugin-moderation/styles.css => coral-embed-stream/src/tabs/stream/components/ModerationLink.css} (100%)
 rename client/{talk-plugin-moderation => coral-embed-stream/src/tabs/stream/components}/ModerationLink.js (94%)
 rename client/{talk-plugin-tag-label => coral-embed-stream/src/tabs/stream/components}/TagLabel.js (100%)
 rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/__tests__/InfoBox.spec.js (100%)
 rename client/{talk-plugin-infobox => coral-embed-stream/src/tabs/stream/components}/__tests__/__snapshots__/InfoBox.spec.js.snap (100%)
 delete mode 100644 client/talk-plugin-moderation/index.js

diff --git a/client/coral-embed-stream/src/AppRouter.js b/client/coral-embed-stream/src/AppRouter.js
index 4b101fb61..ec7b6300a 100644
--- a/client/coral-embed-stream/src/AppRouter.js
+++ b/client/coral-embed-stream/src/AppRouter.js
@@ -3,7 +3,7 @@ import { Router, Route } from 'react-router';
 import PropTypes from 'prop-types';
 
 import Embed from './containers/Embed';
-import { LoginContainer } from 'coral-sign-in/containers/LoginContainer';
+import { LoginContainer } from './containers/LoginContainer';
 
 const routes = (
   <div>
diff --git a/client/coral-sign-in/containers/LoginContainer.js b/client/coral-embed-stream/src/containers/LoginContainer.js
similarity index 100%
rename from client/coral-sign-in/containers/LoginContainer.js
rename to client/coral-embed-stream/src/containers/LoginContainer.js
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index cd0fab9e9..d285f9d83 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import TagLabel from 'talk-plugin-tag-label/TagLabel';
+import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
 import { ReplyBox, ReplyButton } from 'talk-plugin-replies';
 import { FlagComment } from 'talk-plugin-flags';
diff --git a/client/talk-plugin-infobox/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
similarity index 100%
rename from client/talk-plugin-infobox/InfoBox.js
rename to client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
diff --git a/client/talk-plugin-moderation/styles.css b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.css
similarity index 100%
rename from client/talk-plugin-moderation/styles.css
rename to client/coral-embed-stream/src/tabs/stream/components/ModerationLink.css
diff --git a/client/talk-plugin-moderation/ModerationLink.js b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
similarity index 94%
rename from client/talk-plugin-moderation/ModerationLink.js
rename to client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
index c40c50b82..d33f18a5e 100644
--- a/client/talk-plugin-moderation/ModerationLink.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ModerationLink.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import styles from './styles.css';
+import styles from './ModerationLink.css';
 import cn from 'classnames';
 
 import t from 'coral-framework/services/i18n';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index 6288a2b6b..4a6edbfe0 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -5,9 +5,9 @@ import Comment from '../containers/Comment';
 import BannedAccount from '../../../components/BannedAccount';
 import ChangeUsername from '../containers/ChangeUsername';
 import Slot from 'coral-framework/components/Slot';
-import InfoBox from 'talk-plugin-infobox/InfoBox';
+import InfoBox from './InfoBox';
 import { can } from 'coral-framework/services/perms';
-import { ModerationLink } from 'talk-plugin-moderation';
+import ModerationLink from './ModerationLink';
 import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox';
 import t, { timeago } from 'coral-framework/services/i18n';
 import CommentBox from 'talk-plugin-commentbox/CommentBox';
diff --git a/client/talk-plugin-tag-label/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
similarity index 100%
rename from client/talk-plugin-tag-label/TagLabel.js
rename to client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
diff --git a/client/talk-plugin-infobox/__tests__/InfoBox.spec.js b/client/coral-embed-stream/src/tabs/stream/components/__tests__/InfoBox.spec.js
similarity index 100%
rename from client/talk-plugin-infobox/__tests__/InfoBox.spec.js
rename to client/coral-embed-stream/src/tabs/stream/components/__tests__/InfoBox.spec.js
diff --git a/client/talk-plugin-infobox/__tests__/__snapshots__/InfoBox.spec.js.snap b/client/coral-embed-stream/src/tabs/stream/components/__tests__/__snapshots__/InfoBox.spec.js.snap
similarity index 100%
rename from client/talk-plugin-infobox/__tests__/__snapshots__/InfoBox.spec.js.snap
rename to client/coral-embed-stream/src/tabs/stream/components/__tests__/__snapshots__/InfoBox.spec.js.snap
diff --git a/client/talk-plugin-moderation/index.js b/client/talk-plugin-moderation/index.js
deleted file mode 100644
index 38426167a..000000000
--- a/client/talk-plugin-moderation/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ModerationLink } from './ModerationLink';

From 0799e9d8ee86b4c2374175ae29990116ceb6d8c5 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 29 Jan 2018 20:52:44 +0100
Subject: [PATCH 02/10] More refactor

---
 client/coral-embed-stream/src/components/Embed.js               | 2 +-
 .../src/tabs/profile/components}/Comment.css                    | 0
 .../src/tabs/profile/components}/Comment.js                     | 2 +-
 .../src/tabs/profile/components}/CommentHistory.js              | 0
 .../src/tabs/profile/components}/LoadMore.js                    | 0
 .../src/tabs/profile}/components/NotLoggedIn.css                | 0
 .../src/tabs/profile}/components/NotLoggedIn.js                 | 0
 .../src/tabs/profile}/containers/ProfileContainer.js            | 2 +-
 services/comments.js                                            | 2 ++
 9 files changed, 5 insertions(+), 3 deletions(-)
 rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/Comment.css (100%)
 rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/Comment.js (99%)
 rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/CommentHistory.js (100%)
 rename client/{talk-plugin-history => coral-embed-stream/src/tabs/profile/components}/LoadMore.js (100%)
 rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/components/NotLoggedIn.css (100%)
 rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/components/NotLoggedIn.js (100%)
 rename client/{coral-settings => coral-embed-stream/src/tabs/profile}/containers/ProfileContainer.js (98%)

diff --git a/client/coral-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js
index e64a54caa..980e5745e 100644
--- a/client/coral-embed-stream/src/components/Embed.js
+++ b/client/coral-embed-stream/src/components/Embed.js
@@ -9,7 +9,7 @@ import AutomaticAssetClosure from '../containers/AutomaticAssetClosure';
 
 import ExtendableTabPanel from '../containers/ExtendableTabPanel';
 import { Tab, TabPane } from 'coral-ui';
-import ProfileContainer from 'coral-settings/containers/ProfileContainer';
+import ProfileContainer from '../tabs/profile/containers/ProfileContainer';
 import Popup from 'coral-framework/components/Popup';
 import IfSlotIsNotEmpty from 'coral-framework/components/IfSlotIsNotEmpty';
 import cn from 'classnames';
diff --git a/client/talk-plugin-history/Comment.css b/client/coral-embed-stream/src/tabs/profile/components/Comment.css
similarity index 100%
rename from client/talk-plugin-history/Comment.css
rename to client/coral-embed-stream/src/tabs/profile/components/Comment.css
diff --git a/client/talk-plugin-history/Comment.js b/client/coral-embed-stream/src/tabs/profile/components/Comment.js
similarity index 99%
rename from client/talk-plugin-history/Comment.js
rename to client/coral-embed-stream/src/tabs/profile/components/Comment.js
index 015044b37..fec5863a2 100644
--- a/client/talk-plugin-history/Comment.js
+++ b/client/coral-embed-stream/src/tabs/profile/components/Comment.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Icon } from '../coral-ui';
+import { Icon } from 'coral-ui';
 import styles from './Comment.css';
 import Slot from 'coral-framework/components/Slot';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
diff --git a/client/talk-plugin-history/CommentHistory.js b/client/coral-embed-stream/src/tabs/profile/components/CommentHistory.js
similarity index 100%
rename from client/talk-plugin-history/CommentHistory.js
rename to client/coral-embed-stream/src/tabs/profile/components/CommentHistory.js
diff --git a/client/talk-plugin-history/LoadMore.js b/client/coral-embed-stream/src/tabs/profile/components/LoadMore.js
similarity index 100%
rename from client/talk-plugin-history/LoadMore.js
rename to client/coral-embed-stream/src/tabs/profile/components/LoadMore.js
diff --git a/client/coral-settings/components/NotLoggedIn.css b/client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.css
similarity index 100%
rename from client/coral-settings/components/NotLoggedIn.css
rename to client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.css
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.js
similarity index 100%
rename from client/coral-settings/components/NotLoggedIn.js
rename to client/coral-embed-stream/src/tabs/profile/components/NotLoggedIn.js
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js
similarity index 98%
rename from client/coral-settings/containers/ProfileContainer.js
rename to client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js
index e1bcf7f13..a818ebec4 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/ProfileContainer.js
@@ -8,7 +8,7 @@ import cn from 'classnames';
 import { link } from 'coral-framework/services/pym';
 import NotLoggedIn from '../components/NotLoggedIn';
 import { Spinner } from 'coral-ui';
-import CommentHistory from 'talk-plugin-history/CommentHistory';
+import CommentHistory from '../components/CommentHistory';
 
 // TODO: Auth logic needs refactoring.
 import {
diff --git a/services/comments.js b/services/comments.js
index e18e04970..ea8f3bd96 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -84,6 +84,7 @@ module.exports = class CommentsService {
    * @param {String} status     the new Comment status
    */
   static async edit({ id, author_id, body, status }) {
+    console.log(status);
     const EDITABLE_STATUSES = ['NONE', 'PREMOD', 'ACCEPTED'];
 
     const query = {
@@ -209,6 +210,7 @@ module.exports = class CommentsService {
 
     await events.emitAsync(COMMENTS_EDIT, originalComment, editedComment);
 
+    console.log(editedComment);
     return editedComment;
   }
 

From 0a889fd1b3aa2637a1214c2f75c121624757dd37 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Mon, 29 Jan 2018 21:26:44 +0100
Subject: [PATCH 03/10] More Refactoring

---
 .../src/actions/commentBox.js}                              | 0
 client/coral-embed-stream/src/constants/commentBox.js       | 5 +++++
 .../src/reducers/commentBox.js}                             | 2 +-
 client/coral-embed-stream/src/reducers/index.js             | 2 +-
 .../src/tabs/stream/components/Comment.js                   | 3 ++-
 .../src/tabs/stream/components/CommentForm.css}             | 0
 .../src/tabs/stream/components}/CommentForm.js              | 5 +++--
 .../src/tabs/stream/components/EditableCommentContent.js    | 6 ++++--
 .../src/tabs/stream/components/InfoBox.js                   | 1 +
 .../src/tabs/stream/components}/ReplyBox.js                 | 3 ++-
 .../coral-embed-stream/src/tabs/stream/components/Stream.js | 2 +-
 .../src/tabs/stream/components/TagLabel.js                  | 2 ++
 .../src/tabs/stream/containers}/CommentBox.js               | 3 ++-
 client/talk-plugin-commentbox/constants.js                  | 3 ---
 client/talk-plugin-commentbox/index.js                      | 1 -
 client/talk-plugin-replies/index.js                         | 5 +----
 plugin-api/alpha/client/actions/index.js                    | 2 +-
 services/comments.js                                        | 2 --
 18 files changed, 26 insertions(+), 21 deletions(-)
 rename client/{talk-plugin-commentbox/actions.js => coral-embed-stream/src/actions/commentBox.js} (100%)
 create mode 100644 client/coral-embed-stream/src/constants/commentBox.js
 rename client/{talk-plugin-commentbox/reducer.js => coral-embed-stream/src/reducers/commentBox.js} (87%)
 rename client/{talk-plugin-commentbox/styles.css => coral-embed-stream/src/tabs/stream/components/CommentForm.css} (100%)
 rename client/{talk-plugin-commentbox => coral-embed-stream/src/tabs/stream/components}/CommentForm.js (97%)
 rename client/{talk-plugin-replies => coral-embed-stream/src/tabs/stream/components}/ReplyBox.js (94%)
 rename client/{talk-plugin-commentbox => coral-embed-stream/src/tabs/stream/containers}/CommentBox.js (98%)
 delete mode 100644 client/talk-plugin-commentbox/constants.js
 delete mode 100644 client/talk-plugin-commentbox/index.js

diff --git a/client/talk-plugin-commentbox/actions.js b/client/coral-embed-stream/src/actions/commentBox.js
similarity index 100%
rename from client/talk-plugin-commentbox/actions.js
rename to client/coral-embed-stream/src/actions/commentBox.js
diff --git a/client/coral-embed-stream/src/constants/commentBox.js b/client/coral-embed-stream/src/constants/commentBox.js
new file mode 100644
index 000000000..51130d6c0
--- /dev/null
+++ b/client/coral-embed-stream/src/constants/commentBox.js
@@ -0,0 +1,5 @@
+const prefix = 'TALK_EMBED_STREAM_COMMENT_BOX';
+
+export const ADD_TAG = `${prefix}_ADD_TAG`;
+export const REMOVE_TAG = `${prefix}_REMOVE_TAG`;
+export const CLEAR_TAGS = `${prefix}_CLEAR_TAGS`;
diff --git a/client/talk-plugin-commentbox/reducer.js b/client/coral-embed-stream/src/reducers/commentBox.js
similarity index 87%
rename from client/talk-plugin-commentbox/reducer.js
rename to client/coral-embed-stream/src/reducers/commentBox.js
index 4c6e496ed..9621f1447 100644
--- a/client/talk-plugin-commentbox/reducer.js
+++ b/client/coral-embed-stream/src/reducers/commentBox.js
@@ -1,4 +1,4 @@
-import { ADD_TAG, REMOVE_TAG, CLEAR_TAGS } from './constants';
+import { ADD_TAG, REMOVE_TAG, CLEAR_TAGS } from '../constants/commentBox';
 
 const initialState = {
   tags: [],
diff --git a/client/coral-embed-stream/src/reducers/index.js b/client/coral-embed-stream/src/reducers/index.js
index e895a70df..0152c837d 100644
--- a/client/coral-embed-stream/src/reducers/index.js
+++ b/client/coral-embed-stream/src/reducers/index.js
@@ -4,7 +4,7 @@ import embed from './embed';
 import config from './config';
 import configure from './configure';
 import stream from './stream';
-import { reducer as commentBox } from '../../../talk-plugin-commentbox';
+import commentBox from './commentBox';
 
 export default {
   auth,
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index d285f9d83..68cba9bc9 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 
 import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
-import { ReplyBox, ReplyButton } from 'talk-plugin-replies';
+import { ReplyButton } from 'talk-plugin-replies';
+import ReplyBox from './ReplyBox';
 import { FlagComment } from 'talk-plugin-flags';
 import { can } from 'coral-framework/services/perms';
 import { TransitionGroup } from 'react-transition-group';
diff --git a/client/talk-plugin-commentbox/styles.css b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.css
similarity index 100%
rename from client/talk-plugin-commentbox/styles.css
rename to client/coral-embed-stream/src/tabs/stream/components/CommentForm.css
diff --git a/client/talk-plugin-commentbox/CommentForm.js b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
similarity index 97%
rename from client/talk-plugin-commentbox/CommentForm.js
rename to client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
index 62604d88f..ac9abc446 100644
--- a/client/talk-plugin-commentbox/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -4,8 +4,9 @@ import { Button } from 'coral-ui';
 import cn from 'classnames';
 import Slot from 'coral-framework/components/Slot';
 
-import { name } from './CommentBox';
-import styles from './styles.css';
+// TODO: need to change this.
+import { name } from '../containers/CommentBox';
+import styles from './CommentForm.css';
 
 import t from 'coral-framework/services/i18n';
 
diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index f4cfc42e8..7d3ae6600 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -1,7 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { notifyForNewCommentStatus } from 'talk-plugin-commentbox/CommentBox';
-import { CommentForm } from 'talk-plugin-commentbox/CommentForm';
+
+// TODO: move this function.
+import { notifyForNewCommentStatus } from '../containers/CommentBox';
+import { CommentForm } from './CommentForm';
 import styles from './Comment.css';
 import { CountdownSeconds } from './CountdownSeconds';
 import { getEditableUntilDate } from './util';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
index 8577dbc9b..5e76c9911 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import Markdown from 'coral-framework/components/Markdown';
 
+// TODO: remove this.
 const packagename = 'talk-plugin-infobox';
 
 const InfoBox = ({ enable, content }) => (
diff --git a/client/talk-plugin-replies/ReplyBox.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
similarity index 94%
rename from client/talk-plugin-replies/ReplyBox.js
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
index 2a6bd017b..03b56d990 100644
--- a/client/talk-plugin-replies/ReplyBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import CommentBox from '../talk-plugin-commentbox/CommentBox';
+import CommentBox from '../containers/CommentBox';
 
+// TODO: remove this..
 const name = 'talk-plugin-replies';
 
 class ReplyBox extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Stream.js b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
index 4a6edbfe0..4492e7b53 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Stream.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Stream.js
@@ -10,7 +10,7 @@ import { can } from 'coral-framework/services/perms';
 import ModerationLink from './ModerationLink';
 import RestrictedMessageBox from 'coral-framework/components/RestrictedMessageBox';
 import t, { timeago } from 'coral-framework/services/i18n';
-import CommentBox from 'talk-plugin-commentbox/CommentBox';
+import CommentBox from '../containers/CommentBox';
 import QuestionBox from '../../../components/QuestionBox';
 import { isCommentActive } from 'coral-framework/utils';
 import { Tab, TabCount, TabPane } from 'coral-ui';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
index 27d6bdde4..bbb324c22 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
@@ -1,5 +1,7 @@
 import React from 'react';
 
+// TODO: change className.
+
 const TagLabel = ({ children }) => (
   <div className="talk-plugin-tag-label">{children}</div>
 );
diff --git a/client/talk-plugin-commentbox/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
similarity index 98%
rename from client/talk-plugin-commentbox/CommentBox.js
rename to client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 8eac1ff2f..9c04801c6 100644
--- a/client/talk-plugin-commentbox/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -6,8 +6,9 @@ import { can } from 'coral-framework/services/perms';
 
 import Slot from 'coral-framework/components/Slot';
 import { connect } from 'react-redux';
-import { CommentForm } from './CommentForm';
+import { CommentForm } from '../components/CommentForm';
 
+// TODO: change this...
 export const name = 'talk-plugin-commentbox';
 
 const notifyReasons = ['LINKS', 'TRUST'];
diff --git a/client/talk-plugin-commentbox/constants.js b/client/talk-plugin-commentbox/constants.js
deleted file mode 100644
index 4a80bfe4f..000000000
--- a/client/talk-plugin-commentbox/constants.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const ADD_TAG = 'ADD_TAG';
-export const REMOVE_TAG = 'REMOVE_TAG';
-export const CLEAR_TAGS = 'CLEAR_TAGS';
diff --git a/client/talk-plugin-commentbox/index.js b/client/talk-plugin-commentbox/index.js
deleted file mode 100644
index cbc56ade5..000000000
--- a/client/talk-plugin-commentbox/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as reducer } from './reducer';
diff --git a/client/talk-plugin-replies/index.js b/client/talk-plugin-replies/index.js
index 813d96672..f099e742b 100644
--- a/client/talk-plugin-replies/index.js
+++ b/client/talk-plugin-replies/index.js
@@ -1,4 +1 @@
-import ReplyBox from './ReplyBox';
-import ReplyButton from './ReplyButton';
-
-export { ReplyBox, ReplyButton };
+export { default as ReplyButton } from './ReplyButton';
diff --git a/plugin-api/alpha/client/actions/index.js b/plugin-api/alpha/client/actions/index.js
index 20bd2b9e3..9de7b5de3 100644
--- a/plugin-api/alpha/client/actions/index.js
+++ b/plugin-api/alpha/client/actions/index.js
@@ -1,4 +1,4 @@
-export { addTag, removeTag } from 'talk-plugin-commentbox/actions';
+export { addTag, removeTag } from 'coral-embed-stream/src/actions/commentBox';
 export {
   addCommentClassName,
   removeCommentClassName,
diff --git a/services/comments.js b/services/comments.js
index ea8f3bd96..e18e04970 100644
--- a/services/comments.js
+++ b/services/comments.js
@@ -84,7 +84,6 @@ module.exports = class CommentsService {
    * @param {String} status     the new Comment status
    */
   static async edit({ id, author_id, body, status }) {
-    console.log(status);
     const EDITABLE_STATUSES = ['NONE', 'PREMOD', 'ACCEPTED'];
 
     const query = {
@@ -210,7 +209,6 @@ module.exports = class CommentsService {
 
     await events.emitAsync(COMMENTS_EDIT, originalComment, editedComment);
 
-    console.log(editedComment);
     return editedComment;
   }
 

From ebb85d17ce992f6cd54a5762bfe1c07e72d89e98 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 15:13:14 +0100
Subject: [PATCH 04/10] Refactor

---
 .../src/tabs/stream/components/Comment.js          | 14 +++++++++++++-
 .../src/tabs/stream/components}/ReplyButton.css    |  0
 .../src/tabs/stream/components}/ReplyButton.js     |  1 +
 client/talk-plugin-replies/index.js                |  1 -
 .../client/components/FakeComment.js               |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)
 rename client/{talk-plugin-replies => coral-embed-stream/src/tabs/stream/components}/ReplyButton.css (100%)
 rename client/{talk-plugin-replies => coral-embed-stream/src/tabs/stream/components}/ReplyButton.js (96%)
 delete mode 100644 client/talk-plugin-replies/index.js

diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 68cba9bc9..34334567f 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
-import { ReplyButton } from 'talk-plugin-replies';
+import ReplyButton from './ReplyButton';
 import ReplyBox from './ReplyBox';
 import { FlagComment } from 'talk-plugin-flags';
 import { can } from 'coral-framework/services/perms';
@@ -80,6 +80,11 @@ const ActionButton = ({ children }) => {
   );
 };
 
+ActionButton.propTypes = {
+  // id of currently opened ReplyBox. tracked in Stream.js
+  children: PropTypes.node,
+};
+
 // Determine whether the comment with id is in the part of the comments tree.
 function containsCommentId(props, id) {
   if (props.comment.id === id) {
@@ -155,6 +160,7 @@ export default class Comment extends React.Component {
 
   static propTypes = {
     // id of currently opened ReplyBox. tracked in Stream.js
+    children: PropTypes.node,
     activeReplyBox: PropTypes.string.isRequired,
     disableReply: PropTypes.bool,
     setActiveReplyBox: PropTypes.func.isRequired,
@@ -173,6 +179,12 @@ export default class Comment extends React.Component {
     }),
     charCountEnable: PropTypes.bool.isRequired,
     maxCharCount: PropTypes.number,
+    data: PropTypes.object,
+    root: PropTypes.object,
+    loadMore: PropTypes.func,
+    postDontAgree: PropTypes.func,
+    animateEnter: PropTypes.bool,
+    commentClassNames: PropTypes.array,
     comment: PropTypes.shape({
       depth: PropTypes.number,
       action_summaries: PropTypes.array.isRequired,
diff --git a/client/talk-plugin-replies/ReplyButton.css b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.css
similarity index 100%
rename from client/talk-plugin-replies/ReplyButton.css
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyButton.css
diff --git a/client/talk-plugin-replies/ReplyButton.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
similarity index 96%
rename from client/talk-plugin-replies/ReplyButton.js
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
index 66433bdba..a19799a7c 100644
--- a/client/talk-plugin-replies/ReplyButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
@@ -6,6 +6,7 @@ import t from 'coral-framework/services/i18n';
 import cn from 'classnames';
 import styles from './ReplyButton.css';
 
+// @TODO: remove this.
 const name = 'talk-plugin-replies';
 
 const ReplyButton = ({ onClick }) => {
diff --git a/client/talk-plugin-replies/index.js b/client/talk-plugin-replies/index.js
deleted file mode 100644
index f099e742b..000000000
--- a/client/talk-plugin-replies/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ReplyButton } from './ReplyButton';
diff --git a/plugins/talk-plugin-auth/client/components/FakeComment.js b/plugins/talk-plugin-auth/client/components/FakeComment.js
index d7367e838..82c61182b 100644
--- a/plugins/talk-plugin-auth/client/components/FakeComment.js
+++ b/plugins/talk-plugin-auth/client/components/FakeComment.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import t from 'coral-framework/services/i18n';
-import { ReplyButton } from 'talk-plugin-replies';
+import ReplyButton from 'coral-embed-stream/src/tabs/stream/components/ReplyButton';
 import styles from './FakeComment.css';
 import { Icon } from 'plugin-api/beta/client/components/ui';
 import { CommentTimestamp } from 'plugin-api/beta/client/components';

From d80cd6f0a2a11f95584f59a0929f7be9eba5872d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 15:49:28 +0100
Subject: [PATCH 05/10] More Refactor

---
 .../src/routes/Community/components/FlaggedUser.js           | 2 +-
 .../coral-embed-stream/src/tabs/stream/components/Comment.js | 2 +-
 .../src/tabs/stream/components/FlagButton.css}               | 0
 .../src/tabs/stream}/components/FlagButton.js                | 5 +++--
 .../src/tabs/stream}/components/FlagComment.js               | 2 +-
 .../helpers => coral-framework/graphql}/flagReasons.js       | 0
 client/talk-plugin-flags/index.js                            | 1 -
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename client/{talk-plugin-flags/components/styles.css => coral-embed-stream/src/tabs/stream/components/FlagButton.css} (100%)
 rename client/{talk-plugin-flags => coral-embed-stream/src/tabs/stream}/components/FlagButton.js (98%)
 rename client/{talk-plugin-flags => coral-embed-stream/src/tabs/stream}/components/FlagComment.js (95%)
 rename client/{talk-plugin-flags/helpers => coral-framework/graphql}/flagReasons.js (100%)
 delete mode 100644 client/talk-plugin-flags/index.js

diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index 00377e679..72a46e27e 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -3,7 +3,7 @@ import styles from './FlaggedUser.css';
 import PropTypes from 'prop-types';
 import cn from 'classnames';
 import t from 'coral-framework/services/i18n';
-import { username } from 'talk-plugin-flags/helpers/flagReasons';
+import { username } from 'coral-framework/graphql/flagReasons';
 import ApproveButton from 'coral-admin/src/components/ApproveButton';
 import RejectButton from 'coral-admin/src/components/RejectButton';
 import { isFlaggedUserDangling } from '../utils';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 34334567f..1b4beb14d 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -5,7 +5,7 @@ import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
 import ReplyButton from './ReplyButton';
 import ReplyBox from './ReplyBox';
-import { FlagComment } from 'talk-plugin-flags';
+import FlagComment from './FlagComment';
 import { can } from 'coral-framework/services/perms';
 import { TransitionGroup } from 'react-transition-group';
 import cn from 'classnames';
diff --git a/client/talk-plugin-flags/components/styles.css b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.css
similarity index 100%
rename from client/talk-plugin-flags/components/styles.css
rename to client/coral-embed-stream/src/tabs/stream/components/FlagButton.css
diff --git a/client/talk-plugin-flags/components/FlagButton.js b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
similarity index 98%
rename from client/talk-plugin-flags/components/FlagButton.js
rename to client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
index b2048e105..6ab4a8d74 100644
--- a/client/talk-plugin-flags/components/FlagButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
@@ -6,11 +6,12 @@ import { can } from 'coral-framework/services/perms';
 import { PopupMenu, Button } from 'coral-ui';
 import ClickOutside from 'coral-framework/components/ClickOutside';
 import cn from 'classnames';
-import styles from './styles.css';
-import * as REASONS from '../helpers/flagReasons';
+import styles from './FlagButton.css';
+import * as REASONS from 'coral-framework/graphql/flagReasons';
 
 import { getErrorMessages, forEachError } from 'coral-framework/utils';
 
+// TODO: remove this.
 const name = 'talk-plugin-flags';
 
 export default class FlagButton extends Component {
diff --git a/client/talk-plugin-flags/components/FlagComment.js b/client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
similarity index 95%
rename from client/talk-plugin-flags/components/FlagComment.js
rename to client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
index bd8607c6b..48379f7dd 100644
--- a/client/talk-plugin-flags/components/FlagComment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagComment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import FlagButton from './FlagButton';
 
 import t from 'coral-framework/services/i18n';
-import { username, comment } from '../helpers/flagReasons';
+import { username, comment } from 'coral-framework/graphql/flagReasons';
 
 const FlagComment = props => (
   <FlagButton {...props} getPopupMenu={getPopupMenu} />
diff --git a/client/talk-plugin-flags/helpers/flagReasons.js b/client/coral-framework/graphql/flagReasons.js
similarity index 100%
rename from client/talk-plugin-flags/helpers/flagReasons.js
rename to client/coral-framework/graphql/flagReasons.js
diff --git a/client/talk-plugin-flags/index.js b/client/talk-plugin-flags/index.js
deleted file mode 100644
index 8385ce482..000000000
--- a/client/talk-plugin-flags/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as FlagComment } from './components/FlagComment';

From b33cde03c321fabd0dceeaef5d102c37dccc8d28 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 15:59:02 +0100
Subject: [PATCH 06/10] Removes some weird characters

---
 client/coral-admin/src/constants/install.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/constants/install.js b/client/coral-admin/src/constants/install.js
index fb2cc4bef..034453ecc 100644
--- a/client/coral-admin/src/constants/install.js
+++ b/client/coral-admin/src/constants/install.js
@@ -2,8 +2,8 @@ export const NEXT_STEP = 'NEXT_STEP';
 export const GO_TO_STEP = 'GO_TO_STEP';
 export const PREVIOUS_STEP = 'PREVIOUS_STEP';
 export const ADD_ERROR = 'ADD_ERROR';
-export const HAS_ERROR = 'HAS_ERROR';
-export const SHOW_ERRORS = 'SHOW_ERRORS';
+export const HAS_ERROR = 'HAS_ERROR';
+export const SHOW_ERRORS = 'SHOW_ERRORS';
 export const CLEAR_ERRORS = 'CLEAR_ERRORS';
 export const INSTALL_REQUEST = 'INSTALL_REQUEST';
 export const INSTALL_SUCCESS = 'INSTALL_SUCCESS';

From cb5a41f11925949bee3bbaf6d40de7a51077ce45 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 17:18:09 +0100
Subject: [PATCH 07/10] Refactor

---
 .../src/actions/commentBox.js                 | 13 ---------
 .../coral-embed-stream/src/actions/stream.js  | 14 ++++++++++
 .../src/constants/commentBox.js               |  5 ----
 .../src/constants/stream.js                   |  5 ++++
 .../coral-embed-stream/src/graphql/index.js   |  3 ---
 .../src/reducers/commentBox.js                | 27 -------------------
 .../coral-embed-stream/src/reducers/index.js  |  2 --
 .../coral-embed-stream/src/reducers/stream.js | 19 +++++++++++++
 .../src/tabs/stream/containers/CommentBox.js  |  8 +++---
 plugin-api/alpha/client/actions/index.js      |  3 ++-
 plugin-api/alpha/client/selectors/index.js    |  2 +-
 11 files changed, 46 insertions(+), 55 deletions(-)
 delete mode 100644 client/coral-embed-stream/src/actions/commentBox.js
 delete mode 100644 client/coral-embed-stream/src/constants/commentBox.js
 delete mode 100644 client/coral-embed-stream/src/reducers/commentBox.js

diff --git a/client/coral-embed-stream/src/actions/commentBox.js b/client/coral-embed-stream/src/actions/commentBox.js
deleted file mode 100644
index 7a6aa3249..000000000
--- a/client/coral-embed-stream/src/actions/commentBox.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const addTag = tag => ({
-  type: 'ADD_TAG',
-  tag,
-});
-
-export const removeTag = idx => ({
-  type: 'REMOVE_TAG',
-  idx,
-});
-
-export const clearTags = () => ({
-  type: 'CLEAR_TAGS',
-});
diff --git a/client/coral-embed-stream/src/actions/stream.js b/client/coral-embed-stream/src/actions/stream.js
index 8af2dfef2..bc31c90e9 100644
--- a/client/coral-embed-stream/src/actions/stream.js
+++ b/client/coral-embed-stream/src/actions/stream.js
@@ -70,3 +70,17 @@ export const removeCommentClassName = idx => ({
 export const setActiveTab = tab => dispatch => {
   dispatch({ type: actions.SET_ACTIVE_TAB, tab });
 };
+
+export const addCommentBoxTag = tag => ({
+  type: actions.ADD_COMMENT_BOX_TAG,
+  tag,
+});
+
+export const removeCommentBoxTag = idx => ({
+  type: actions.REMOVE_COMMENT_BOX_TAG,
+  idx,
+});
+
+export const clearCommentBoxTags = () => ({
+  type: actions.CLEAR_COMMENT_BOX_TAGS,
+});
diff --git a/client/coral-embed-stream/src/constants/commentBox.js b/client/coral-embed-stream/src/constants/commentBox.js
deleted file mode 100644
index 51130d6c0..000000000
--- a/client/coral-embed-stream/src/constants/commentBox.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const prefix = 'TALK_EMBED_STREAM_COMMENT_BOX';
-
-export const ADD_TAG = `${prefix}_ADD_TAG`;
-export const REMOVE_TAG = `${prefix}_REMOVE_TAG`;
-export const CLEAR_TAGS = `${prefix}_CLEAR_TAGS`;
diff --git a/client/coral-embed-stream/src/constants/stream.js b/client/coral-embed-stream/src/constants/stream.js
index b4deb24e1..09d069851 100644
--- a/client/coral-embed-stream/src/constants/stream.js
+++ b/client/coral-embed-stream/src/constants/stream.js
@@ -1,3 +1,5 @@
+const prefix = 'TALK_EMBED_STREAM';
+
 export const SET_ACTIVE_REPLY_BOX = 'SET_ACTIVE_REPLY_BOX';
 export const ADDTL_COMMENTS_ON_LOAD_MORE = 10;
 export const VIEW_ALL_COMMENTS = 'VIEW_ALL_COMMENTS';
@@ -7,3 +9,6 @@ export const REMOVE_COMMENT_CLASSNAME = 'REMOVE_COMMENT_CLASSNAME';
 export const THREADING_LEVEL = process.env.TALK_THREADING_LEVEL;
 export const SET_ACTIVE_TAB = 'CORAL_STREAM_SET_ACTIVE_TAB';
 export const SET_SORT = 'CORAL_STREAM_SET_SORT';
+export const ADD_COMMENT_BOX_TAG = `${prefix}_COMMENT_BOX_ADD_TAG`;
+export const REMOVE_COMMENT_BOX_TAG = `${prefix}_COMMENT_BOX_REMOVE_TAG`;
+export const CLEAR_COMMENT_BOX_TAGS = `${prefix}_COMMENT_BOX_CLEAR_TAGS`;
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index dcded6b45..db4f92671 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -93,9 +93,6 @@ export default {
             name
             created_at
           }
-          assigned_by {
-            id
-          }
         }
         user {
           id
diff --git a/client/coral-embed-stream/src/reducers/commentBox.js b/client/coral-embed-stream/src/reducers/commentBox.js
deleted file mode 100644
index 9621f1447..000000000
--- a/client/coral-embed-stream/src/reducers/commentBox.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { ADD_TAG, REMOVE_TAG, CLEAR_TAGS } from '../constants/commentBox';
-
-const initialState = {
-  tags: [],
-};
-
-export default function commentBox(state = initialState, action) {
-  switch (action.type) {
-    case ADD_TAG:
-      return {
-        ...state,
-        tags: [...state.tags, action.tag],
-      };
-    case REMOVE_TAG:
-      return {
-        ...state,
-        tags: [
-          ...state.tags.slice(0, action.idx),
-          ...state.tags.slice(action.idx + 1),
-        ],
-      };
-    case CLEAR_TAGS:
-      return initialState;
-    default:
-      return state;
-  }
-}
diff --git a/client/coral-embed-stream/src/reducers/index.js b/client/coral-embed-stream/src/reducers/index.js
index 0152c837d..ac581557b 100644
--- a/client/coral-embed-stream/src/reducers/index.js
+++ b/client/coral-embed-stream/src/reducers/index.js
@@ -4,12 +4,10 @@ import embed from './embed';
 import config from './config';
 import configure from './configure';
 import stream from './stream';
-import commentBox from './commentBox';
 
 export default {
   auth,
   asset,
-  commentBox,
   embed,
   config,
   configure,
diff --git a/client/coral-embed-stream/src/reducers/stream.js b/client/coral-embed-stream/src/reducers/stream.js
index b5afddafc..42af4453a 100644
--- a/client/coral-embed-stream/src/reducers/stream.js
+++ b/client/coral-embed-stream/src/reducers/stream.js
@@ -25,6 +25,7 @@ const initialState = {
   previousTab: '',
   sortBy: 'CREATED_AT',
   sortOrder: 'DESC',
+  commentBoxTags: [],
 };
 
 export default function stream(state = initialState, action) {
@@ -74,6 +75,24 @@ export default function stream(state = initialState, action) {
         sortOrder: action.sortOrder ? action.sortOrder : state.sortOrder,
         sortBy: action.sortBy ? action.sortBy : state.sortBy,
       };
+    case actions.ADD_COMMENT_BOX_TAG:
+      return {
+        ...state,
+        commentBoxTags: [...state.commentBoxTags, action.tag],
+      };
+    case actions.REMOVE_COMMENT_BOX_TAG:
+      return {
+        ...state,
+        commentBoxTags: [
+          ...state.commentBoxTags.slice(0, action.idx),
+          ...state.commentBoxTags.slice(action.idx + 1),
+        ],
+      };
+    case actions.CLEAR_COMMENT_BOX_TAGS:
+      return {
+        ...state,
+        commentBoxTags: [],
+      };
     default:
       return state;
   }
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 9c04801c6..b280ce741 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -71,7 +71,7 @@ class CommentBox extends React.Component {
       asset_id: assetId,
       parent_id: parentId,
       body: this.state.body,
-      ...this.props.commentBox,
+      tags: this.props.tags,
     };
 
     // Execute preSubmit Hooks
@@ -203,9 +203,11 @@ CommentBox.propTypes = {
   isReply: PropTypes.bool.isRequired,
   canPost: PropTypes.bool,
   notify: PropTypes.func.isRequired,
-  commentBox: PropTypes.object,
+  tags: PropTypes.array,
 };
 
-const mapStateToProps = ({ commentBox }) => ({ commentBox });
+const mapStateToProps = state => ({
+  tags: state.stream.commentBoxTags,
+});
 
 export default connect(mapStateToProps, null)(CommentBox);
diff --git a/plugin-api/alpha/client/actions/index.js b/plugin-api/alpha/client/actions/index.js
index 9de7b5de3..9ef89f11b 100644
--- a/plugin-api/alpha/client/actions/index.js
+++ b/plugin-api/alpha/client/actions/index.js
@@ -1,5 +1,6 @@
-export { addTag, removeTag } from 'coral-embed-stream/src/actions/commentBox';
 export {
   addCommentClassName,
   removeCommentClassName,
+  addCommentBoxTag as addTag,
+  removeCommentBoxTag as removeTag,
 } from 'coral-embed-stream/src/actions/stream';
diff --git a/plugin-api/alpha/client/selectors/index.js b/plugin-api/alpha/client/selectors/index.js
index 988155308..214a07d0c 100644
--- a/plugin-api/alpha/client/selectors/index.js
+++ b/plugin-api/alpha/client/selectors/index.js
@@ -1,3 +1,3 @@
-export const commentBoxTagsSelector = state => state.commentBox.tags;
+export const commentBoxTagsSelector = state => state.stream.commentBoxTags;
 export const commentClassNamesSelector = state =>
   state.stream.commentClassNames;

From 81e68c8ef4dea60e143ba4438fc0a6bac0998053 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 17:34:18 +0100
Subject: [PATCH 08/10] Fix edited comment not showing notifications

---
 .../components/EditableCommentContent.js      |  9 +++++--
 .../src/tabs/stream/containers/CommentBox.js  | 25 ++-----------------
 .../src/tabs/stream/helpers.js                | 23 +++++++++++++++++
 3 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 client/coral-embed-stream/src/tabs/stream/helpers.js

diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index 7d3ae6600..877ca7aea 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 // TODO: move this function.
-import { notifyForNewCommentStatus } from '../containers/CommentBox';
+import { notifyForNewCommentStatus } from '../helpers';
 import { CommentForm } from './CommentForm';
 import styles from './Comment.css';
 import { CountdownSeconds } from './CountdownSeconds';
@@ -45,6 +45,8 @@ export class EditableCommentContent extends React.Component {
     stopEditing: PropTypes.func,
   };
 
+  unmounted = false;
+
   constructor(props) {
     super(props);
     this.editWindowExpiryTimeout = null;
@@ -64,6 +66,7 @@ export class EditableCommentContent extends React.Component {
     }
   }
   componentWillUnmount() {
+    this.unmounted = true;
     if (this.editWindowExpiryTimeout) {
       this.editWindowExpiryTimeout = clearTimeout(this.editWindowExpiryTimeout);
     }
@@ -88,7 +91,9 @@ export class EditableCommentContent extends React.Component {
     let response;
     try {
       response = await editComment({ body: this.state.body });
-      this.setState({ loadingState: 'success' });
+      if (!this.unmounted) {
+        this.setState({ loadingState: 'success' });
+      }
       const status = response.data.editComment.comment.status;
       notifyForNewCommentStatus(this.props.notify, status);
       if (typeof stopEditing === 'function') {
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index b280ce741..745b651e9 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -7,32 +7,11 @@ import { can } from 'coral-framework/services/perms';
 import Slot from 'coral-framework/components/Slot';
 import { connect } from 'react-redux';
 import { CommentForm } from '../components/CommentForm';
+import { notifyForNewCommentStatus } from '../helpers';
 
 // TODO: change this...
 export const name = 'talk-plugin-commentbox';
 
-const notifyReasons = ['LINKS', 'TRUST'];
-
-function shouldNotify(actions = []) {
-  return actions.some(
-    ({ __typename, reason }) =>
-      __typename === 'FlagAction' && notifyReasons.includes(reason)
-  );
-}
-
-// Given a newly posted comment's status, show a notification to the user
-// if needed
-export const notifyForNewCommentStatus = (notify, comment, actions) => {
-  if (comment.status === 'REJECTED') {
-    notify('error', t('comment_box.comment_post_banned_word'));
-  } else if (
-    comment.status === 'PREMOD' ||
-    (comment.status === 'SYSTEM_WITHHELD' && shouldNotify(actions))
-  ) {
-    notify('success', t('comment_box.comment_post_notif_premod'));
-  }
-};
-
 /**
  * Container for posting a new Comment
  */
@@ -87,7 +66,7 @@ class CommentBox extends React.Component {
         // Execute postSubmit Hooks
         this.state.hooks.postSubmit.forEach(hook => hook(data));
 
-        notifyForNewCommentStatus(notify, postedComment, actions);
+        notifyForNewCommentStatus(notify, postedComment.status, actions);
 
         if (commentPostedHandler) {
           commentPostedHandler();
diff --git a/client/coral-embed-stream/src/tabs/stream/helpers.js b/client/coral-embed-stream/src/tabs/stream/helpers.js
new file mode 100644
index 000000000..f44f777e4
--- /dev/null
+++ b/client/coral-embed-stream/src/tabs/stream/helpers.js
@@ -0,0 +1,23 @@
+import t from 'coral-framework/services/i18n';
+
+const notifyReasons = ['LINKS', 'TRUST'];
+
+function shouldNotify(actions = []) {
+  return actions.some(
+    ({ __typename, reason }) =>
+      __typename === 'FlagAction' && notifyReasons.includes(reason)
+  );
+}
+
+// Given a newly posted or edited comment's status, show a notification to the user
+// if needed
+export const notifyForNewCommentStatus = (notify, status, actions) => {
+  if (status === 'REJECTED') {
+    notify('error', t('comment_box.comment_post_banned_word'));
+  } else if (
+    status === 'PREMOD' ||
+    (status === 'SYSTEM_WITHHELD' && shouldNotify(actions))
+  ) {
+    notify('success', t('comment_box.comment_post_notif_premod'));
+  }
+};

From 665d8c1ef0017ee69ec057f437604da6eabbad6d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 17:42:30 +0100
Subject: [PATCH 09/10] Fix gender translation

---
 locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/en.yml b/locales/en.yml
index 8a9ce4bcb..8f858ee24 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -65,7 +65,7 @@ en:
     notify_approved: '{0} approved username {1}'
     notify_rejected: '{0} rejected username {1}'
     notify_flagged: '{0} reported username {1}'
-    notify_changed: 'user {0} changed his username to {1}'
+    notify_changed: 'user {0} changed their username to {1}'
   community:
     account_creation_date: "Account Creation Date"
     active: Active

From feeaa8ee8baaa2cd7ddd90b19b354918a803b415 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 30 Jan 2018 18:19:31 +0100
Subject: [PATCH 10/10] Better todo descr

---
 .../src/tabs/stream/components/CommentForm.js                   | 2 +-
 .../src/tabs/stream/components/EditableCommentContent.js        | 1 -
 .../coral-embed-stream/src/tabs/stream/components/FlagButton.js | 2 +-
 client/coral-embed-stream/src/tabs/stream/components/InfoBox.js | 2 +-
 .../coral-embed-stream/src/tabs/stream/components/ReplyBox.js   | 2 +-
 .../src/tabs/stream/components/ReplyButton.js                   | 2 +-
 .../coral-embed-stream/src/tabs/stream/components/TagLabel.js   | 2 +-
 .../coral-embed-stream/src/tabs/stream/containers/CommentBox.js | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
index ac9abc446..9a84bdbe8 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/CommentForm.js
@@ -4,7 +4,7 @@ import { Button } from 'coral-ui';
 import cn from 'classnames';
 import Slot from 'coral-framework/components/Slot';
 
-// TODO: need to change this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 import { name } from '../containers/CommentBox';
 import styles from './CommentForm.css';
 
diff --git a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
index 877ca7aea..ac50df9af 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/EditableCommentContent.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-// TODO: move this function.
 import { notifyForNewCommentStatus } from '../helpers';
 import { CommentForm } from './CommentForm';
 import styles from './Comment.css';
diff --git a/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
index 6ab4a8d74..bc673ba28 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/FlagButton.js
@@ -11,7 +11,7 @@ import * as REASONS from 'coral-framework/graphql/flagReasons';
 
 import { getErrorMessages, forEachError } from 'coral-framework/utils';
 
-// TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-flags';
 
 export default class FlagButton extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
index 5e76c9911..7b811b63c 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/InfoBox.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Markdown from 'coral-framework/components/Markdown';
 
-// TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const packagename = 'talk-plugin-infobox';
 
 const InfoBox = ({ enable, content }) => (
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
index 03b56d990..6c93cb7fe 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyBox.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import CommentBox from '../containers/CommentBox';
 
-// TODO: remove this..
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-replies';
 
 class ReplyBox extends Component {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
index a19799a7c..812811741 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
@@ -6,7 +6,7 @@ import t from 'coral-framework/services/i18n';
 import cn from 'classnames';
 import styles from './ReplyButton.css';
 
-// @TODO: remove this.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 const name = 'talk-plugin-replies';
 
 const ReplyButton = ({ onClick }) => {
diff --git a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
index bbb324c22..2b2bee48a 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/TagLabel.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-// TODO: change className.
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 
 const TagLabel = ({ children }) => (
   <div className="talk-plugin-tag-label">{children}</div>
diff --git a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
index 745b651e9..a9f9123c5 100644
--- a/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
+++ b/client/coral-embed-stream/src/tabs/stream/containers/CommentBox.js
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { CommentForm } from '../components/CommentForm';
 import { notifyForNewCommentStatus } from '../helpers';
 
-// TODO: change this...
+// TODO: (kiwi) Need to adapt CSS classes post refactor to match the rest.
 export const name = 'talk-plugin-commentbox';
 
 /**