Merge branch 'develop' into fix/mutes

packages/stream_chat/CHANGELOG.md

@@ -5,6 +5,8 @@
 - Fixed reactions not working for threads in offline mode.
 - [[#1046]](https://github.com/GetStream/stream-chat-flutter/issues/1046) After `/mute` command on reload cannot access
   any channel.
+- [[#1047]](https://github.com/GetStream/stream-chat-flutter/issues/1047) `own_capabilities` extraData missing after
+  channel update.
 
 ✅ Added
 

packages/stream_chat/lib/src/client/channel.dart

@@ -1598,7 +1598,7 @@ class ChannelClientState {
     _subscriptions.add(_channel.on(EventType.channelUpdated).listen((Event e) {
       final channel = e.channel!;
       updateChannelState(channelState.copyWith(
-        channel: channel,
+        channel: channelState.channel?.merge(channel),
         members: channel.members,
       ));
     }));

packages/stream_chat/lib/src/core/models/channel_model.dart

@@ -172,7 +172,7 @@ class ChannelModel {
       updatedAt: other.updatedAt,
       deletedAt: other.deletedAt,
       memberCount: other.memberCount,
-      extraData: other.extraData,
+      extraData: {...extraData, ...other.extraData},
       team: other.team,
       cooldown: other.cooldown,
     );