From 2f4595c379beb0b061bf07ee67609d4cff24a588 Mon Sep 17 00:00:00 2001
From: Neevash Ramdial <mail@neevash.dev>
Date: Fri, 16 Apr 2021 09:30:54 -0400
Subject: [PATCH] migrate message_search_bloc.dart

---
 .../lib/src/message_search_bloc.dart             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
index 9f55b7e8..fc858e5b 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
@@ -72,9 +72,7 @@ class MessageSearchBlocState extends State<MessageSearchBloc>
       _queryMessagesLoadingController.add(true);
     }
     try {
-      final clear = pagination == null ||
-          pagination.offset == null ||
-          pagination.offset == 0;
+      final clear = pagination == null || pagination.offset == 0;
 
       final oldMessages = List<GetMessageResponse>.from(messageResponses ?? []);
 
@@ -86,11 +84,13 @@ class MessageSearchBlocState extends State<MessageSearchBloc>
         messageFilters: messageFilter!,
       );
 
-      if (clear) {
-        _messageResponses.add(messages.results);
-      } else {
-        final temp = oldMessages + messages.results;
-        _messageResponses.add(temp);
+      if (messages.results != null) {
+        if (clear) {
+          _messageResponses.add(messages.results!);
+        } else {
+          final temp = oldMessages + messages.results!;
+          _messageResponses.add(temp);
+        }
       }
       if (_messageResponses.hasValue &&
           _queryMessagesLoadingController.value!) {