Merge branch 'master' into develop

packages/stream_chat_flutter/CHANGELOG.md

@@ -1,6 +1,9 @@
 ## 2.0.0-nullsafety.2
 
 - Migrate this package to null safety
+
+## 1.5.4
+
 - Updated `stream_chat_core` dependency
 
 ## 1.5.3

packages/stream_chat_flutter_core/CHANGELOG.md

@@ -3,6 +3,10 @@
 * Migrate this package to null safety
 * Update llc dependency
 
+## 1.5.3
+
+* Fix ChannelsBloc not performing calls if pagination ended
+
 ## 1.5.2
 
 * Update llc dependency

packages/stream_chat_flutter_core/lib/src/channels_bloc.dart

@@ -95,7 +95,10 @@ class ChannelsBlocState extends State<ChannelsBloc>
   }) async {
     final client = StreamChatCore.of(context).client;
 
-    if (_paginationEnded || _queryChannelsLoadingController.value == true) {
+    final clear = paginationParams.offset == 0;
+
+    if ((!clear && _paginationEnded) ||
+        _queryChannelsLoadingController.value == true) {
       return;
     }
 
@@ -104,7 +107,6 @@ class ChannelsBlocState extends State<ChannelsBloc>
     }
 
     try {
-      final clear = paginationParams.offset == 0;
       final oldChannels = List<Channel>.from(channels ?? []);
       var newChannels = <Channel>[];
       await for (final channels in client.queryChannels(
@@ -146,7 +148,11 @@ class ChannelsBlocState extends State<ChannelsBloc>
     final client = StreamChatCore.of(context).client;
 
     if (!widget.lockChannelsOrder) {
-      _subscriptions.add(client.on(EventType.messageNew).listen((e) {
+      _subscriptions.add(client
+          .on(
+        EventType.messageNew,
+      )
+          .listen((e) {
         final newChannels = List<Channel>.from(channels ?? []);
         final index = newChannels.indexWhere((c) => c.cid == e.cid);
         if (index != -1) {