From 8779341bbd266d8718a56483186dc1ae343d42eb Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 14 Sep 2021 20:28:00 +0530
Subject: [PATCH] fix(core): match oldWidget objects using jsonEncode

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .../lib/src/channel_list_core.dart                   |  5 ++---
 .../lib/src/message_search_list_core.dart            | 12 ++++++------
 .../lib/src/user_list_core.dart                      |  5 ++---
 .../test/message_search_bloc_test.dart               |  2 +-
 .../test/message_search_list_core_test.dart          |  4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
index c5d3f69a..e79a7f1f 100644
--- a/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/channel_list_core.dart
@@ -214,15 +214,14 @@ class ChannelListCoreState extends State<ChannelListCore> {
   void didUpdateWidget(ChannelListCore oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (widget.filter?.toString() != oldWidget.filter?.toString() ||
+    if (jsonEncode(widget.filter) != jsonEncode(oldWidget.filter) ||
         jsonEncode(widget.sort) != jsonEncode(oldWidget.sort) ||
         widget.state != oldWidget.state ||
         widget.watch != oldWidget.watch ||
         widget.presence != oldWidget.presence ||
         widget.messageLimit != oldWidget.messageLimit ||
         widget.memberLimit != oldWidget.memberLimit ||
-        widget.pagination.toJson().toString() !=
-            oldWidget.pagination.toJson().toString()) {
+        jsonEncode(widget.pagination) != jsonEncode(oldWidget.pagination)) {
       loadData();
     }
 
diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
index 28e092a7..e5b91b6e 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_list_core.dart
@@ -185,13 +185,13 @@ class MessageSearchListCoreState extends State<MessageSearchListCore> {
   @override
   void didUpdateWidget(MessageSearchListCore oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.filters.toString() != oldWidget.filters.toString() ||
+    if (jsonEncode(widget.filters) != jsonEncode(oldWidget.filters) ||
         jsonEncode(widget.sortOptions) != jsonEncode(oldWidget.sortOptions) ||
-        widget.messageQuery?.toString() != oldWidget.messageQuery?.toString() ||
-        widget.messageFilters?.toString() !=
-            oldWidget.messageFilters?.toString() ||
-        widget.paginationParams.toJson().toString() !=
-            oldWidget.paginationParams.toJson().toString()) {
+        widget.messageQuery != oldWidget.messageQuery ||
+        jsonEncode(widget.messageFilters) !=
+            jsonEncode(oldWidget.messageFilters) ||
+        jsonEncode(widget.paginationParams) !=
+            jsonEncode(oldWidget.paginationParams)) {
       loadData();
     }
 
diff --git a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
index e403be4e..06ad7d80 100644
--- a/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
+++ b/packages/stream_chat_flutter_core/lib/src/user_list_core.dart
@@ -209,11 +209,10 @@ class UserListCoreState extends State<UserListCore>
   @override
   void didUpdateWidget(UserListCore oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.filter?.toString() != oldWidget.filter?.toString() ||
+    if (jsonEncode(widget.filter) != jsonEncode(oldWidget.filter) ||
         jsonEncode(widget.sort) != jsonEncode(oldWidget.sort) ||
         widget.presence != oldWidget.presence ||
-        widget.pagination.toJson().toString() !=
-            oldWidget.pagination.toJson().toString()) {
+        jsonEncode(widget.pagination) != jsonEncode(oldWidget.pagination)) {
       loadData();
     }
 
diff --git a/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart b/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
index c689d90c..332289ea 100644
--- a/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
+++ b/packages/stream_chat_flutter_core/test/message_search_bloc_test.dart
@@ -8,7 +8,7 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 import 'matchers/get_message_response_matcher.dart';
 import 'mocks.dart';
 
-const testFilter = Filter.custom(operator: '\$test', value: 'testValue');
+const testFilter = Filter.custom(key: 'test', value: 'testValue');
 
 void main() {
   List<GetMessageResponse> _generateMessages({
diff --git a/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart b/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
index 03396513..02a78412 100644
--- a/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
+++ b/packages/stream_chat_flutter_core/test/message_search_list_core_test.dart
@@ -6,8 +6,8 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 
 import 'mocks.dart';
 
-const testFilter = Filter.custom(operator: '\$test', value: 'testValue');
-const testMessageFilter = Filter.custom(operator: '\$test', value: 'testValue');
+const testFilter = Filter.custom(key: 'test', value: 'testValue');
+const testMessageFilter = Filter.custom(key: 'test', value: 'testValue');
 
 void main() {
   List<GetMessageResponse> _generateMessages({