Fix sending message with attachments

GliaWidgets/Sources/ViewModel/Chat/ChatViewModel.swift

@@ -432,7 +432,7 @@ extension ChatViewModel {
         let uploads = fileUploadListModel.succeededUploads
         let files = uploads.map { $0.localFile }
 
-        let payload = environment.createSendMessagePayload(messageText, nil)
+        let payload = environment.createSendMessagePayload(messageText, attachment)
 
         let outgoingMessage = OutgoingMessage(
             payload: payload,
@@ -446,17 +446,9 @@ extension ChatViewModel {
             fileUploadListModel.succeededUploads.forEach { action?(.removeUpload($0)) }
             fileUploadListModel.removeSucceededUploads()
             action?(.scrollToBottom(animated: true))
-            let messageTextTemp = messageText
             messageText = ""
 
-            // In order to keep using same payload, with its
-            // initial ID, we make mutable copy of it
-            // and assign attachment and content accordingly
-            // before passing payload to send-message request.
-            var messagePayload = outgoingMessage.payload
-            messagePayload.content = messageTextTemp
-            messagePayload.attachment = attachment
-            interactor.send(messagePayload: messagePayload) { [weak self] result in
+            interactor.send(messagePayload: outgoingMessage.payload) { [weak self] result in
                 guard let self else { return }
 
                 switch result {

GliaWidgetsTests/Sources/ChatViewModel/ChatViewModelTests.swift

@@ -941,6 +941,39 @@ class ChatViewModelTests: XCTestCase {
         viewModel.update(for: .engaged(.mock()))
         XCTAssertTrue(viewModel.getPendingMessageForTesting().isEmpty)
     }
+
+    func test_messageAttachmentIsKeptAfterFailureSending() throws {
+        var interactorEnv = Interactor.Environment.mock
+        interactorEnv.coreSdk.sendMessageWithMessagePayload = { _, callback in
+            callback(.failure(.mock()))
+        }
+        interactorEnv.coreSdk.sendMessagePreview = { _, _ in }
+        let interactor = Interactor.mock(environment: interactorEnv)
+        interactor.state = .engaged(nil)
+
+        var viewModelEnv = ChatViewModel.Environment.failing()
+        viewModelEnv.fileManager.urlsForDirectoryInDomainMask = { _, _ in [.mock] }
+        viewModelEnv.fileManager.createDirectoryAtUrlWithIntermediateDirectories = { _, _, _ in }
+
+        let upload = FileUpload.mock()
+        upload.state.value = .uploaded(file: try .mock())
+        var fileUploadListViewModelEnv = SecureConversations.FileUploadListViewModel.Environment.mock
+        fileUploadListViewModelEnv.uploader.uploads = [upload]
+        viewModelEnv.createFileUploadListModel = { _ in .mock(environment: fileUploadListViewModelEnv) }
+        viewModelEnv.createSendMessagePayload = { .mock(content: $0, attachment: $1) }
+        let viewModel = ChatViewModel.mock(interactor: interactor, environment: viewModelEnv)
+
+        let messageContent = "Mock"
+        viewModel.invokeSetTextAndSendMessage(text: messageContent)
+
+        switch viewModel.messagesSection.items.last?.kind {
+        case let .outgoingMessage(message, _):
+            XCTAssertNotNil(message.payload.attachment)
+            XCTAssertEqual(message.payload.content, messageContent)
+        default:
+            XCTFail("message kind should be `visitorMessage`")
+        }
+    }
 }
 
 extension ChatChoiceCardOption {