Merge branch 'next' into flags-enh

client/coral-admin/src/components/ToastContainer.css

@@ -207,7 +207,7 @@
 
   .toastify__body {
     color: white;
-    overflow-x: scroll;
+    overflow-x: auto;
     font-size: 15px;
     font-weight: 400;
   }

client/coral-admin/src/containers/UserDetailComment.js

@@ -35,6 +35,9 @@ export default withFragments({
       editing {
         edited
       }
+      status_history {
+        type
+      }
       ...${getDefinitionName(CommentLabels.fragments.comment)}
       ...${getDefinitionName(CommentDetails.fragments.comment)}
     }

client/coral-admin/src/routes/Configure/components/Configure.css

@@ -20,7 +20,7 @@
 
 .mainContent {
   width: calc(100% - 300px);
-  padding: 10px 14px 80px 14px;
+  padding: 10px 14px 120px 14px;
   box-sizing: border-box;
   max-width: 718px;
 }

client/coral-admin/src/routes/Moderation/components/Moderation.js

@@ -176,7 +176,7 @@ class Moderation extends Component {
             hasNextPage={comments.hasNextPage}
             activeTab={activeTab}
             singleView={moderation.singleView}
-            selectedCommentId={this.state.selectedCommentId}
+            selectedCommentId={moderation.selectedCommentId}
             acceptComment={props.acceptComment}
             rejectComment={props.rejectComment}
             loadMore={this.loadMore}