Merge branch 'master' into action-label-fix

2026-07-21 12:51:03 +08:00 · 2017-04-19 11:11:21 -06:00
parent c72a5c6df9 82927b77be
commit 1535f10450
2 changed files with 2 additions and 2 deletions
@@ -116,7 +116,7 @@ class ModerationContainer extends Component {

    let asset;

-    if (data.loading) {
+    if (!('premodCount' in data)) {
      return <div><Spinner/></div>;
    }

@@ -55,7 +55,7 @@ export const loadMore = (fetchMore) => ({limit, cursor, sort, tab, asset_id}) =>
      statuses,
      asset_id
    },
-    updateQuery: (oldData, {fetchMoreResult:{data:{comments}}}) => {
+    updateQuery: (oldData, {fetchMoreResult:{comments}}) => {
      return {
        ...oldData,
        [tab]: [