Fixed dismissing the channel when leaving a group (#519)

martinmitrevski · web-flow · commit 17d17e9844b6 · 2024-06-19T11:59:42.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Thread replies shown in channel indicator [#518](https://github.com/GetStream/stream-chat-swiftui/pull/518)
 
 ### 🐞 Fixed
+- Dismiss the channel when leaving a group [#519](https://github.com/GetStream/stream-chat-swiftui/pull/519)
 - Dismiss keyboard when tapping on the empty message list [#513](https://github.com/GetStream/stream-chat-swiftui/pull/513)
 - Reset composer text when there is provisional text (e.g. Japanese - kana keyboard) but the text is reset to empty string [#512](https://github.com/GetStream/stream-chat-swiftui/pull/512)
 
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
@@ -160,6 +160,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"
 

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,9 @@ public struct ChatChannelInfoView: View, KeyboardReadable {`
`84`	`84`	`message: Text(message),`
`85`	`85`	`primaryButton: .destructive(Text(buttonTitle)) {`
`86`	`86`	`viewModel.leaveConversationTapped {`
	`87`	`+ presentationMode.wrappedValue.dismiss()`
`87`	`88`	`if shownFromMessageList {`
`88`	`89`	`notifyChannelDismiss()`
`89`		`- } else {`
`90`		`- presentationMode.wrappedValue.dismiss()`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`},`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ open class ChatChannelListViewModel: ObservableObject, ChatChannelListController`
`435`	`435`	`}`
`436`	`436`	`}`
`437`	`437`
`438`		`-private let dismissChannel = "io.getstream.dismissChannel"`
	`438`	`+internal let dismissChannel = "io.getstream.dismissChannel"`
`439`	`439`
`440`	`440`	`private let hideTabBarNotification = "io.getstream.hideTabBar"`
`441`	`441`