Fixing broken thread issue

GetStream · Dec 23, 2019 · 4da5a25 · 4da5a25
1 parent fcb543a
commit 4da5a25
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,12 @@
 
 - Changes to add compatibility for Expo 36. Adding [netinfo](https://github.com/react-native-community/react-native-netinfo) as peer dependency - https://github.com/GetStream/stream-chat-react-native/issues/97
 - Disabling the longpress on image viewer (in Attachment) - https://github.com/GetStream/stream-chat-react-native/issues/100 to avoid freezing of UI.
+- Fixing broken threads issue
 
 #### stream-chat-react-native (Native package)
 
 - Disabling the longpress on image viewer (in Attachment) - https://github.com/GetStream/stream-chat-react-native/issues/100 to avoid freezing of UI.
+- Fixing broken threads issue
 
 ## [0.4.0] 2019-12-16
 

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;
       }