From 577b7317683bd084d7c196c51235c8f270c7f7b0 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Fri, 26 Nov 2021 12:33:31 +0100
Subject: [PATCH] remove listener from channel

---
 packages/stream_chat/lib/src/client/channel.dart | 8 --------
 packages/stream_chat/lib/src/client/client.dart  | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 95eddab7..c219a120 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1462,8 +1462,6 @@ class ChannelClientState {
 
     _listenChannelUpdated();
 
-    _listenChannelDeleted();
-
     _listenMemberAdded();
 
     _listenMemberRemoved();
@@ -1565,12 +1563,6 @@ class ChannelClientState {
     }));
   }
 
-  void _listenChannelDeleted() {
-    _subscriptions.add(_channel.on(EventType.channelDeleted).listen((Event e) {
-      _channel.dispose();
-    }));
-  }
-
   void _listenChannelTruncated() {
     _subscriptions.add(_channel
         .on(EventType.channelTruncated, EventType.notificationChannelTruncated)
diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index c9bdebc1..334b60c2 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -1432,6 +1432,8 @@ class ClientState {
         .listen((Event event) async {
       final eventChannel = event.channel!;
       await _client.chatPersistenceClient?.deleteChannels([eventChannel.cid]);
+      final channel = channels[eventChannel.cid];
+      channel?.dispose();
       channels = channels..remove(eventChannel.cid);
     }));
   }