From 34f2539595559c2773294b66ab9039e61bd8b676 Mon Sep 17 00:00:00 2001
From: Neevash Ramdial <mail@neevash.dev>
Date: Fri, 16 Apr 2021 09:33:24 -0400
Subject: [PATCH] wip stream_chat.dart

---
 .../lib/src/stream_channel.dart               | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
index f4b6e6c7..c119f207 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:rxdart/rxdart.dart';
@@ -27,9 +26,7 @@ class StreamChannel extends StatefulWidget {
     required this.channel,
     this.showLoading = true,
     this.initialMessageId,
-  })  : assert(child != null, 'Child should not be null'),
-        assert(channel != null, 'Channel should not be null'),
-        super(key: key);
+  }) : super(key: key);
 
   // ignore: public_member_api_docs
   final Widget child;
@@ -189,16 +186,21 @@ class StreamChannelState extends State<StreamChannel> {
 
   /// Query the channel members and watchers
   Future<void> queryMembersAndWatchers() async {
-    await widget.channel.query(
-      membersPagination: PaginationParams(
-        offset: channel.state.members?.length,
-        limit: 100,
-      ),
-      watchersPagination: PaginationParams(
-        offset: channel.state.watchers?.length,
-        limit: 100,
-      ),
-    );
+    final _members = channel.state?.members;
+    if (_members != null) {
+      await widget.channel.query(
+        membersPagination: PaginationParams(
+          offset: _members.length,
+          limit: 100,
+        ),
+        watchersPagination: PaginationParams(
+          offset: _members.length,
+          limit: 100,
+        ),
+      );
+    } else {
+      return;
+    }
   }
 
   /// Loads channel at specific message