From 17bc396b06fea740c11d28177031f500d770570d Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Fri, 11 Aug 2017 20:55:23 +0700
Subject: [PATCH] Fix Ignored User in permalink

---
 client/coral-embed-stream/style/default.css | 2 +-
 client/coral-framework/hocs/withMutation.js | 4 ++--
 client/coral-framework/hocs/withQuery.js    | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index 802cd2e5b..6ba376096 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -13,7 +13,7 @@ body {
   width: 100%;
   font-size: 14px;
   margin: 0px;
-  padding: 0px 0px 50px 0px;
+  padding: 0px 0px 100px 0px;
   height: auto !important;
 }
 
diff --git a/client/coral-framework/hocs/withMutation.js b/client/coral-framework/hocs/withMutation.js
index c9108c0fe..7e2c3d09d 100644
--- a/client/coral-framework/hocs/withMutation.js
+++ b/client/coral-framework/hocs/withMutation.js
@@ -92,13 +92,13 @@ export default (document, config = {}) => (WrappedComponent) => {
                     // Do not run updates when we have mutation errors.
                     return prev;
                   }
-                  return map[key](prev, result);
+                  return map[key](prev, result) || prev;
                 };
               } else {
                 const existing = res[key];
                 res[key] = (prev, result) => {
                   const next = existing(prev, result);
-                  return map[key](next, result);
+                  return map[key](next, result) || next;
                 };
               }
             });
diff --git a/client/coral-framework/hocs/withQuery.js b/client/coral-framework/hocs/withQuery.js
index adb67b7b3..82c9c29d4 100644
--- a/client/coral-framework/hocs/withQuery.js
+++ b/client/coral-framework/hocs/withQuery.js
@@ -128,8 +128,10 @@ export default (document, config = {}) => (WrappedComponent) => {
 
       const reducer = withSkipOnErrors(
         reducerCallbacks.reduce(
-          (a, b) => (prev, ...rest) =>
-            b(a(prev, ...rest), ...rest),
+          (a, b) => (prev, ...rest) => {
+            const next = a(prev, ...rest);
+            return b(next, ...rest) || next;
+          }
         ));
 
       return {