From 24d9b244f2517a53dcf11c389893cc8c1b83520b Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Thu, 15 Oct 2020 11:43:07 +0200
Subject: [PATCH] check if channel.membercount is null

---
 lib/src/channel_info.dart      | 2 +-
 lib/src/message_list_view.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/channel_info.dart b/lib/src/channel_info.dart
index af1915a3..a4f0272e 100644
--- a/lib/src/channel_info.dart
+++ b/lib/src/channel_info.dart
@@ -16,7 +16,7 @@ class ChannelInfo extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (channel.memberCount > 2) {
+    if (channel.memberCount != null && channel.memberCount > 2) {
       return Text(
         '${channel.memberCount} Members, ${channel.state.watcherCount} Online',
         style: StreamChatTheme.of(context)
diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index 081ca004..85fba5a8 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -446,7 +446,7 @@ class _MessageListViewState extends State<MessageListView> {
                 read.lastRead.isBefore(messages[index - 1].createdAt)))
         ?.toList();
 
-    final allRead = readList.length == channel.memberCount - 1;
+    final allRead = readList.length >= (channel.memberCount ?? 0) - 1;
 
     return MessageWidget(
       message: message,