Address unavailability banner showing up for SC flow

Hide send message unavailability banner for SC flow. MOB-3834
salemove · Dec 5, 2024 · 33fd68e · 33fd68e
1 parent 50ee073
commit 33fd68e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/...gets/SecureConversations/ChatTranscript/SecureConversations.ChatWithTranscriptModel.swift b/...gets/SecureConversations/ChatTranscript/SecureConversations.ChatWithTranscriptModel.swift
@@ -70,10 +70,10 @@ extension SecureConversations.ChatWithTranscriptModel {
         }
     }
 
-    var isSecureConversationsAvailable: Bool {
+    var isSendMessageAvailable: Bool {
         switch self {
-        case .chat:
-            false
+        case let .chat(model):
+            true
         case let .transcript(model):
             model.isSecureConversationsAvailable
         }

diff --git a/GliaWidgets/Sources/ViewController/Chat/ChatViewController.swift b/GliaWidgets/Sources/ViewController/Chat/ChatViewController.swift
@@ -266,11 +266,12 @@ final class ChatViewController: EngagementViewController, PopoverPresenter {
             // For regular chat engagement bottom banner is hidden.
             chatView.setSecureMessagingBottomBannerHidden(true)
             chatView.setSecureMessagingTopBannerHidden(true)
+            chatView.setSendingMessageUnavailabilityBannerHidden(viewModel.isSendMessageAvailable)
         case let .secureTranscript(needsTextInputEnabled):
             chatView.props = .init(header: props.secureTranscript)
             // Instead of hiding text input, we need to disable it and corresponding buttons.
             chatView.messageEntryView.isEnabled = needsTextInputEnabled
-            chatView.setSendingMessageUnavailabilityBannerHidden(viewModel.isSecureConversationsAvailable)
+            chatView.setSendingMessageUnavailabilityBannerHidden(viewModel.isSendMessageAvailable)
             // For secure messaging bottom banner is visible.
             chatView.setSecureMessagingBottomBannerHidden(false)
             chatView.setSecureMessagingTopBannerHidden(false)

diff --git a/...versations.ChatWithTranscriptModel/SecureConversations.ChatWithTranscriptModelTests.swift b/...versations.ChatWithTranscriptModel/SecureConversations.ChatWithTranscriptModelTests.swift
@@ -81,8 +81,13 @@ final class SecureConversationsChatWithTranscriptModelTests: XCTestCase {
                 interactor: .mock()
             )
         )
-        
+
         XCTAssertNil(chatViewModel.entryWidget)
         XCTAssertNotNil(transcriptViewModel.entryWidget)
     }
+
+    func test_isSendMessageAvailableReturnsTrueForChatViewModel() {
+        let chatViewModel = Model.chat(.mock())
+        XCTAssertTrue(chatViewModel.isSendMessageAvailable)
+    }
 }
diff --git a/GliaWidgetsTests/Sources/ChatViewModel/ChatViewModelTests.swift b/GliaWidgetsTests/Sources/ChatViewModel/ChatViewModelTests.swift
@@ -968,7 +968,7 @@ class ChatViewModelTests: XCTestCase {
 
         let upload = FileUpload.mock()
         upload.state.value = .uploaded(file: try .mock())
-        var fileUploadListViewModelEnv = SecureConversations.FileUploadListViewModel.Environment.mock
+        let fileUploadListViewModelEnv = SecureConversations.FileUploadListViewModel.Environment.mock
         fileUploadListViewModelEnv.uploader.uploads = [upload]
         viewModelEnv.createFileUploadListModel = { _ in .mock(environment: fileUploadListViewModelEnv) }
         viewModelEnv.createSendMessagePayload = { .mock(content: $0, attachment: $1) }

diff --git a/GliaWidgetsTests/Sources/EngagementLauncher/EngagementLauncherTests.swift b/GliaWidgetsTests/Sources/EngagementLauncher/EngagementLauncherTests.swift
@@ -6,43 +6,43 @@ final class EngagementLauncherTests: XCTestCase {
 
     func test_startChat() throws {
         var chatEngagement: EngagementKind?
-        var engagementLauncher = EngagementLauncher { engagementKind, _ in
+        let engagementLauncher = EngagementLauncher { engagementKind, _ in
             chatEngagement = engagementKind
         }
-        
+
         try engagementLauncher.startChat()
-        
+
         XCTAssertEqual(chatEngagement, .chat)
     }
 
     func test_startAudioCall() throws {
         var chatEngagement: EngagementKind?
-        var engagementLauncher = EngagementLauncher { engagementKind, _ in
+        let engagementLauncher = EngagementLauncher { engagementKind, _ in
             chatEngagement = engagementKind
         }
-        
+
         try engagementLauncher.startAudioCall()
-        
+
         XCTAssertEqual(chatEngagement, .audioCall)
     }
-    
+
     func test_startVideoCall() throws {
         var chatEngagement: EngagementKind?
-        var engagementLauncher = EngagementLauncher { engagementKind, _ in
+        let engagementLauncher = EngagementLauncher { engagementKind, _ in
             chatEngagement = engagementKind
         }
-        
+
         try engagementLauncher.startVideoCall()
 
         XCTAssertEqual(chatEngagement, .videoCall)
     }
-    
+
     func test_startSecureMessaging() throws {
         var chatEngagement: EngagementKind?
-        var engagementLauncher = EngagementLauncher { engagementKind, _ in
+        let engagementLauncher = EngagementLauncher { engagementKind, _ in
             chatEngagement = engagementKind
         }
-        
+
         try engagementLauncher.startSecureMessaging()
 
         XCTAssertEqual(chatEngagement, .messaging(.welcome))

diff --git a/GliaWidgetsTests/Sources/EntryWidget/EntryWidgetTests.swift b/GliaWidgetsTests/Sources/EntryWidget/EntryWidgetTests.swift
@@ -215,14 +215,14 @@ class EntryWidgetTests: XCTestCase {
         }
         let queuesMonitor = QueuesMonitor(environment: queueMonitorEnvironment)
         queuesMonitor.fetchAndMonitorQueues(queuesIds: [mockQueueId])
-        
+
         var environment = EntryWidget.Environment.mock()
         environment.queuesMonitor = queuesMonitor
         environment.observeSecureUnreadMessageCount = { result in
             result(.success(5))
             return UUID.mock.uuidString
         }
-        var configuration = EntryWidget.Configuration.mock(filterSecureConversation: true)
+        let configuration = EntryWidget.Configuration.mock(filterSecureConversation: true)
         let entryWidget = EntryWidget(
             queueIds: [mockQueueId],
             configuration: configuration,