From e52e79bafa6d84afa0e66d8de4affa7f5397dd86 Mon Sep 17 00:00:00 2001
From: Neevash Ramdial <mail@neevash.dev>
Date: Fri, 16 Apr 2021 09:31:50 -0400
Subject: [PATCH] wip message_list_core

---
 .../lib/src/message_list_core.dart                       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
index 219b4ab1..c376dddc 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_list_core.dart
@@ -128,7 +128,7 @@ class MessageListCoreState extends State<MessageListCore> {
         : _streamChannel.channel.state?.messagesStream;
 
     bool defaultFilter(Message m) {
-      final isMyMessage = m.user.id == _currentUser.id;
+      final isMyMessage = m.user?.id == _currentUser?.id;
       final isDeletedOrShadowed = m.isDeleted == true || m.shadowed == true;
       if (isDeletedOrShadowed && !isMyMessage) return false;
       return true;
@@ -136,14 +136,17 @@ class MessageListCoreState extends State<MessageListCore> {
 
     return StreamBuilder<List<Message>?>(
       stream: messagesStream?.map((messages) =>
-          messages?.where(widget.messageFilter ?? defaultFilter)?.toList()),
+          messages?.where(widget.messageFilter ?? defaultFilter).toList(
+                growable: false,
+              )),
       builder: (context, snapshot) {
         if (snapshot.hasError) {
           return widget.errorWidgetBuilder(context, snapshot.error);
         } else if (!snapshot.hasData) {
           return widget.loadingBuilder(context);
         } else {
-          final messageList = snapshot.data?.reversed?.toList() ?? [];
+          final messageList =
+              snapshot.data?.reversed.toList(growable: false) ?? [];
           if (messageList.isEmpty && !_isThreadConversation) {
             if (_upToDate) {
               return widget.emptyBuilder(context);