trello.com/c/b82n6AMp fixing issues

Adamant-im · Jan 11, 2025 · 15ff53a · 15ff53a
1 parent 45f3a34
commit 15ff53a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Adamant/Modules/Chat/View/ChatViewController.swift b/Adamant/Modules/Chat/View/ChatViewController.swift
@@ -943,7 +943,6 @@ private extension ChatViewController {
     func closeFileToolbarView() {
         filesToolbarView.removeFromSuperview()
         messageInputBar.invalidateIntrinsicContentSize()
-        viewModel.inputTextFileUpdated()
     }
 
     func didTapTransfer(id: String) {

diff --git a/Adamant/Modules/Chat/ViewModel/ChatViewModel.swift b/Adamant/Modules/Chat/ViewModel/ChatViewModel.swift
@@ -938,8 +938,7 @@ final class ChatViewModel: NSObject {
             }
 
             filesPicked = oldFiles
-
-            inputTextFileUpdated()
+            inputContentUpdated()
 
         case .failure(let error):
             dialog.send(.alert(error.localizedDescription))
@@ -1064,8 +1063,7 @@ extension ChatViewModel {
             }
     }
 
-    func inputTextFileUpdated() {
-
+    func inputContentUpdated() {
         guard !inputText.isEmpty || filesPicked != nil else {
             fee = ""
             return
@@ -1074,9 +1072,9 @@ extension ChatViewModel {
         var filesText: String = ""
 
         if let filesPicked {
-            filesText = filesPicked.map{
-                ($0.name ?? "") + ($0.extenstion ?? "")
-            }.joined(separator: "")
+            filesText = filesPicked.map {
+               [$0.name, $0.extenstion].compactMap { $0 }.joined(separator: ".")
+            }.joined(separator: ";")
         }
 
         let feeString = AdamantBalanceFormat.full.format(
@@ -1121,7 +1119,7 @@ private extension ChatViewModel {
     func setupObservers() {
         $inputText
             .removeDuplicates()
-            .sink { [weak self] _ in self?.inputTextFileUpdated() }
+            .sink { [weak self] _ in self?.inputContentUpdated() }
             .store(in: &subscriptions)
 
         chatFileService.updateFileFields
@@ -1157,6 +1155,13 @@ private extension ChatViewModel {
             }
             .store(in: &subscriptions)
 
+        $filesPicked
+            .sink { [weak self] _ in
+                guard let self else { return }
+                inputContentUpdated()
+            }
+            .store(in: &subscriptions)
+
         NotificationCenter.default
             .notifications(named: .AdamantVisibleWalletsService.visibleWallets)
             .sink { @MainActor [weak self] _ in self?.updateAttachmentButtonAvailability() }