Merge branch 'develop' into fix/mutes

2022-04-01 13:59:16 +05:30
parent 4cd8d6b00f af8c188301
commit 8758dc862c
3 changed files with 4 additions and 2 deletions
@@ -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,
    );