From f4bc5d4e8221d41933507adb0db552042fdbcc21 Mon Sep 17 00:00:00 2001
From: David Erwin <davidjerwin@gmail.com>
Date: Thu, 10 Nov 2016 13:20:21 -0500
Subject: [PATCH] Merge and resolve an initial state bug

---
 client/coral-embed-stream/src/CommentStream.js | 5 +++--
 client/coral-framework/store/reducers/items.js | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index 59a4cfac0..28b70841f 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -13,6 +13,7 @@ import Count from '../../coral-plugin-comment-count/CommentCount';
 import AuthorName from '../../coral-plugin-author-name/AuthorName';
 import {ReplyBox, ReplyButton} from '../../coral-plugin-replies';
 import Pym from 'pym.js';
+import FlagButton from '../../coral-plugin-flags/FlagButton';
 
 const {addItem, updateItem, postItem, getStream, postAction, appendItemArray} = itemActions;
 const {addNotification, clearNotification} = notificationActions;
@@ -118,7 +119,7 @@ class CommentStream extends Component {
                 <PubDate created_at={comment.created_at}/>
                 <Content body={comment.body}/>
                 <div className="commentActions">
-                  <Flag
+                  <FlagButton
                     addNotification={this.props.addNotification}
                     id={commentId}
                     flag={this.props.items.actions[comment.flag]}
@@ -148,7 +149,7 @@ class CommentStream extends Component {
                         <PubDate created_at={reply.created_at}/>
                         <Content body={reply.body}/>
                         <div className="replyActions">
-                          <Flag
+                          <FlagButton
                             addNotification={this.props.addNotification}
                             id={replyId}
                             flag={this.props.items.actions[reply.flag]}
diff --git a/client/coral-framework/store/reducers/items.js b/client/coral-framework/store/reducers/items.js
index 6daf09371..17569c545 100644
--- a/client/coral-framework/store/reducers/items.js
+++ b/client/coral-framework/store/reducers/items.js
@@ -3,7 +3,11 @@
 import {fromJS} from 'immutable';
 import * as actions from '../actions/items';
 
-const initialState = fromJS({});
+const initialState = fromJS({
+  comments: {},
+  users: {},
+  actions: {} 
+});
 
 export default (state = initialState, action) => {
   switch (action.type) {