Merge remote-tracking branch 'origin/develop' into v7.0.0

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

@@ -87,7 +87,6 @@ class Message extends Equatable {
   final MessageState state;
 
   /// The message type.
-  @JsonKey(includeToJson: false)
   final String type;
 
   /// The list of attachments, either provided by the user or generated from a

packages/stream_chat/lib/src/core/models/message.g.dart

@@ -74,6 +74,7 @@ Message _$MessageFromJson(Map<String, dynamic> json) => Message(
 Map<String, dynamic> _$MessageToJson(Message instance) => <String, dynamic>{
       'id': instance.id,
       'text': instance.text,
+      'type': instance.type,
       'attachments': instance.attachments.map((e) => e.toJson()).toList(),
       'mentioned_users': User.toIds(instance.mentionedUsers),
       'parent_id': instance.parentId,