Merge remote-tracking branch 'origin/develop' into v4

# Conflicts:
#	packages/stream_chat/CHANGELOG.md
#	packages/stream_chat/lib/src/client/channel.dart
#	packages/stream_chat_flutter/CHANGELOG.md

packages/stream_chat/test/src/client/client_test.dart

@@ -645,8 +645,8 @@ void main() {
 
           when(() => persistence.getChannelThreads(any()))
               .thenAnswer((_) async => {});
-          when(() => persistence.updateMessages(any(), any()))
-              .thenAnswer((_) => Future.value());
+          when(() => persistence.updateChannelThreads(any(), any()))
+              .thenAnswer((_) async => {});
           when(() => persistence.getChannelStateByCid(any(),
               messagePagination: any(named: 'messagePagination'),
               pinnedMessagePagination:
@@ -692,7 +692,7 @@ void main() {
 
           verify(() => persistence.getChannelThreads(any()))
               .called((persistentChannelStates + channelStates).length);
-          verify(() => persistence.updateMessages(any(), any()))
+          verify(() => persistence.updateChannelThreads(any(), any()))
               .called((persistentChannelStates + channelStates).length);
           verify(
             () => persistence.getChannelStateByCid(any(),
@@ -733,8 +733,8 @@ void main() {
 
           when(() => persistence.getChannelThreads(any()))
               .thenAnswer((_) async => {});
-          when(() => persistence.updateMessages(any(), any()))
-              .thenAnswer((_) => Future.value());
+          when(() => persistence.updateChannelThreads(any(), any()))
+              .thenAnswer((_) async => {});
           when(() => persistence.getChannelStateByCid(any(),
               messagePagination: any(named: 'messagePagination'),
               pinnedMessagePagination:
@@ -775,7 +775,7 @@ void main() {
 
           verify(() => persistence.getChannelThreads(any()))
               .called(persistentChannelStates.length);
-          verify(() => persistence.updateMessages(any(), any()))
+          verify(() => persistence.updateChannelThreads(any(), any()))
               .called(persistentChannelStates.length);
           verify(
             () => persistence.getChannelStateByCid(any(),

packages/stream_chat/test/src/core/models/channel_mute_test.dart

@@ -0,0 +1,18 @@
+import 'package:stream_chat/src/core/models/channel_model.dart';
+import 'package:stream_chat/src/core/models/channel_mute.dart';
+import 'package:stream_chat/src/core/models/user.dart';
+import 'package:test/test.dart';
+
+import '../../utils.dart';
+
+void main() {
+  group('src/models/channel_mute', () {
+    test('should parse json correctly', () {
+      final mute = ChannelMute.fromJson(jsonFixture('channel_mute.json'));
+      expect(mute.user, isA<User>());
+      expect(mute.channel, isA<ChannelModel>());
+      expect(mute.createdAt, DateTime.parse('2020-12-04T10:39:06.512021Z'));
+      expect(mute.updatedAt, DateTime.parse('2020-12-04T10:39:06.512021Z'));
+    });
+  });
+}

packages/stream_chat/test/src/core/models/mute_test.dart

@@ -1,4 +1,3 @@
-import 'package:stream_chat/src/core/models/channel_model.dart';
 import 'package:stream_chat/src/core/models/mute.dart';
 import 'package:stream_chat/src/core/models/user.dart';
 import 'package:test/test.dart';
@@ -6,12 +5,13 @@ import 'package:test/test.dart';
 import '../../utils.dart';
 
 void main() {
-  group('src/models/mute', () {
+  group('src/models/channel_mute', () {
     test('should parse json correctly', () {
       final mute = Mute.fromJson(jsonFixture('mute.json'));
-      expect(mute.channel, isA<ChannelModel>());
       expect(mute.user, isA<User>());
+      expect(mute.target, isA<User>());
       expect(mute.createdAt, DateTime.parse('2020-12-04T10:39:06.512021Z'));
+      expect(mute.updatedAt, DateTime.parse('2020-12-04T10:39:06.512021Z'));
     });
   });
 }

packages/stream_chat/test/src/core/models/own_user_test.dart

@@ -1,4 +1,5 @@
 import 'package:mocktail/mocktail.dart';
+import 'package:stream_chat/src/core/models/channel_mute.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:test/test.dart';
 
@@ -6,12 +7,14 @@ import '../../utils.dart';
 
 class MockMute extends Mock implements Mute {}
 
+class ChannelMockMute extends Mock implements ChannelMute {}
+
 class MockDevice extends Mock implements Device {}
 
 void main() {
   final devices = [MockDevice(), MockDevice()];
   final mutes = [MockMute(), MockMute()];
-  final channelMutes = [MockMute()];
+  final channelMutes = [ChannelMockMute()];
   final createdAt = DateTime.parse('2021-05-03 12:39:21.817646');
   final updatedAt = DateTime.parse('2021-04-03 12:39:21.817646');
   final lastActive = DateTime.parse('2021-03-03 12:39:21.817646');

packages/stream_chat/test/src/db/chat_persistence_client_test.dart

@@ -162,6 +162,23 @@ void main() {
       expect(channelState, isNotNull);
     });
 
+    test('updateChannelThreads', () async {
+      const cid = 'test:cid';
+      final user = User(id: 'test-user-id');
+      final threads = {
+        'parent-test-message': [
+          Message(
+            id: 'test-message',
+            text: 'test-message',
+            user: user,
+            ownReactions: [Reaction(type: 'test', user: user)],
+            latestReactions: [Reaction(type: 'test', user: user)],
+          )
+        ]
+      };
+      persistenceClient.updateChannelThreads(cid, threads);
+    });
+
     test('updateChannelState', () async {
       final channelState = ChannelState();
       persistenceClient.updateChannelState(channelState);