Fixed dismissing the channel when leaving a group

GetStream · Jun 19, 2024 · cc5657b · cc5657b
1 parent 2f07f70
commit cc5657b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoView.swift
@@ -84,10 +84,9 @@ public struct ChatChannelInfoView: View, KeyboardReadable {
                                 message: Text(message),
                                 primaryButton: .destructive(Text(buttonTitle)) {
                                     viewModel.leaveConversationTapped {
+                                        presentationMode.wrappedValue.dismiss()
                                         if shownFromMessageList {
                                             notifyChannelDismiss()
-                                        } else {
-                                            presentationMode.wrappedValue.dismiss()
                                         }
                                     }
                                 },

diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift
@@ -159,6 +159,11 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
         .onReceive(keyboardWillChangePublisher, perform: { visible in
             keyboardShown = visible
         })
+        .onReceive(NotificationCenter.default.publisher(
+            for: NSNotification.Name(dismissChannel)
+        ), perform: { _ in
+            presentationMode.wrappedValue.dismiss()
+        })
         .onAppear {
             viewModel.onViewAppear()
             if utils.messageListConfig.becomesFirstResponderOnOpen {

diff --git a/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListViewModel.swift b/Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListViewModel.swift
@@ -435,7 +435,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController
     }
 }
 
-private let dismissChannel = "io.getstream.dismissChannel"
+internal let dismissChannel = "io.getstream.dismissChannel"
 
 private let hideTabBarNotification = "io.getstream.hideTabBar"