Fixed PR comments

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/ChatChannelViewModel.swift

@@ -88,6 +88,8 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
     @Published public var reactionsShown = false {
         didSet {
+            // When reactions are shown, the navigation bar is hidden.
+            // Check the header type and trigger an update.
             checkHeaderType()
         }
     }
@@ -271,11 +273,13 @@ open class ChatChannelViewModel: ObservableObject, MessagesDataSource {
 
     private func checkHeaderType() {
         let type: ChannelHeaderType
+        let typingUsers = channel.currentlyTypingUsersFiltered(
+            currentUserId: chatClient.currentUserId
+        )
+        
         if !reactionsShown && isMessageThread {
             type = .messageThread
-        } else if !channel.currentlyTypingUsersFiltered(
-            currentUserId: chatClient.currentUserId
-        ).isEmpty {
+        } else if !typingUsers.isEmpty {
             type = .typingIndicator
         } else {
             type = .regular

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.stringsdict

@@ -15,7 +15,7 @@
 			<key>zero</key>
 			<string> is typing</string>
 			<key>one</key>
-			<string> and %2$d more is typing</string>
+			<string> and %2$d more are typing</string>
 			<key>other</key>
 			<string> and %2$d more are typing</string>
 		</dict>

StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelExtensions_Tests.swift

@@ -65,8 +65,8 @@ class ChatChannelExtensions_Tests: XCTestCase {
 
         // Then
         XCTAssert(
-            typingIndicatorString == "Stefan and 1 more is typing"
-                || typingIndicatorString == "Martin and 1 more is typing"
+            typingIndicatorString == "Stefan and 1 more are typing"
+                || typingIndicatorString == "Martin and 1 more are typing"
         ) // Any of the names can appear first.
     }
 }