Fixing broken thread issue

GetStream · Dec 23, 2019 · 3c1f62d · 3c1f62d
1 parent fcb543a
commit 3c1f62d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/components/MessageList.js b/src/components/MessageList.js
@@ -264,12 +264,14 @@ const MessageList = withChannelContext(
     insertDates = (messages) => {
       const newMessages = [];
       if (messages.length === 0) {
-        this.props.eventHistory.none.forEach((e) => {
-          newMessages.push({
-            type: 'channel.event',
-            event: e,
+        this.props.eventHistory &&
+          this.props.eventHistory.none &&
+          this.props.eventHistory.none.forEach((e) => {
+            newMessages.push({
+              type: 'channel.event',
+              event: e,
+            });
           });
-        });
 
         return newMessages;
       }