Merge branch 'master' of github.com:coralproject/talk into load-more-comments

client/coral-embed-stream/src/Embed.js

@@ -16,6 +16,7 @@ import {Notification, notificationActions, authActions, assetActions, pym} from
 
 import Stream from './Stream';
 import InfoBox from 'coral-plugin-infobox/InfoBox';
+import {ModerationLink} from 'coral-plugin-moderation';
 import Count from 'coral-plugin-comment-count/CommentCount';
 import CommentBox from 'coral-plugin-commentbox/CommentBox';
 import UserBox from 'coral-sign-in/components/UserBox';
@@ -135,6 +136,7 @@ class Embed extends Component {
                         charCount={asset.settings.charCountEnable && asset.settings.charCount} />
                      : null
                    }
+                   <ModerationLink assetId={asset.id} isAdmin={isAdmin} />
                  </RestrictedContent>
                  </div>
                : <p>{asset.settings.closedMessage}</p>
@@ -207,7 +209,7 @@ const mapDispatchToProps = dispatch => ({
     });
   },
   clearNotification: () => dispatch(clearNotification()),
-  editName: (displayName) => dispatch(editName(displayName)),
+  editName: (username) => dispatch(editName(username)),
   showSignInDialog: (offset) => dispatch(showSignInDialog(offset)),
   logout: () => dispatch(logout()),
   dispatch: d => dispatch(d)

client/coral-embed-stream/src/Stream.js

@@ -10,7 +10,7 @@ class Stream extends React.Component {
     asset: PropTypes.object.isRequired,
     comments: PropTypes.array.isRequired,
     currentUser: PropTypes.shape({
-      displayName: PropTypes.string,
+      username: PropTypes.string,
       id: PropTypes.string
     })
   }