Merge branch 'next' into next-respect

src/core/client/stream/tabs/comments/containers/ReplyListContainer.spec.tsx

@@ -35,14 +35,14 @@ it("renders correctly", () => {
   expect(wrapper).toMatchSnapshot();
 });
 
-it("renders correctly when replies are null", () => {
+it("renders correctly when replies are empty", () => {
   const props: PropTypesOf<typeof ReplyListContainerN> = {
     asset: {
       id: "asset-id",
     },
     comment: {
       id: "comment-id",
-      replies: null,
+      replies: { edges: [] },
     },
     relay: {
       hasMore: noop,

src/core/client/stream/tabs/comments/containers/__snapshots__/ReplyListContainer.spec.tsx.snap

@@ -45,7 +45,7 @@ exports[`renders correctly 1`] = `
 />
 `;
 
-exports[`renders correctly when replies are null 1`] = `""`;
+exports[`renders correctly when replies are empty 1`] = `""`;
 
 exports[`when has more replies renders hasMore 1`] = `
 <ReplyList

src/core/client/stream/test/comments/postComment.spec.tsx

@@ -39,6 +39,7 @@ beforeEach(() => {
                     edited: false,
                     editableUntil: "2018-07-06T18:24:30.000Z",
                   },
+                  replies: { edges: [], pageInfo: {} },
                 },
               },
               clientMutationId: "0",