Merge branch 'develop'

Author: Lainaaa

Adamant.xcodeproj/project.pbxproj

@@ -157,14 +157,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window.rootViewController?.present(login, animated: false, completion: nil)
 
         if !welcomeIsShown {
-            if isMacOS {
-                var size: CGSize = .init(width: 900, height: 900)
-                window.frame = .init(origin: window.frame.origin, size: size)
-                window.windowScene?.sizeRestrictions?.minimumSize = size
-                window.windowScene?.sizeRestrictions?.maximumSize = size
-                window.windowScene?.sizeRestrictions?.allowsFullScreen = false
-            }
-            
             let welcome = screensFactory.makeOnboard()
             welcome.modalPresentationStyle = .overFullScreen
             login.present(welcome, animated: true, completion: nil)

Adamant/App/AppDelegate.swift

@@ -234,6 +234,12 @@ struct AppAssembly: MainThreadAssembly {
             ))
         }.inObjectScope(.container)
 
+        
+        // MARK: DashLastTransactionStorage
+        container.register(DashLastTransactionStorageProtocol.self) { r in
+            DashLastTransactionStorage(securedStore: r.resolve(SecuredStore.self)!)
+        }.inObjectScope(.container)
+        
         // MARK: LskNodeApiService
         container.register(KlyNodeApiService.self) { r in
             KlyNodeApiService(api: .init(

Adamant/App/DI/AppAssembly.swift

@@ -0,0 +1,33 @@
+//
+//  PasteInterceptingPasswordCell.swift
+//  Adamant
+//
+//  Created by Christian Benua on 23.02.2025.
+//  Copyright © 2025 Adamant. All rights reserved.
+//
+
+import UIKit
+import Eureka
+
+final class PasteInterceptingPasswordCell: CustomFieldCell<String, PasteInterceptingTextField>, CellType {
+    
+    required init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    override func setup() {
+        super.setup()
+        textField.autocorrectionType = .no
+        textField.autocapitalizationType = .none
+        textField.keyboardType = .asciiCapable
+        textField.isSecureTextEntry = true
+        textField.textContentType = .password
+        if let textLabel = textLabel {
+            textField.setContentHuggingPriority(textLabel.contentHuggingPriority(for: .horizontal) - 1, for: .horizontal)
+        }
+    }
+}

Adamant/Helpers/PasteInterceptingPasswordCell.swift

@@ -0,0 +1,15 @@
+//
+//  PasteInterceptingPasswordRow.swift
+//  Adamant
+//
+//  Created by Christian Benua on 23.02.2025.
+//  Copyright © 2025 Adamant. All rights reserved.
+//
+
+import Eureka
+
+final class PasteInterceptingPasswordRow: FieldRow<PasteInterceptingPasswordCell>, RowType {
+    required init(tag: String?) {
+        super.init(tag: tag)
+    }
+}

Adamant/Helpers/PasteInterceptingPasswordRow.swift

@@ -0,0 +1,62 @@
+//
+//  PasteInterceptingTextField.swift
+//  Adamant
+//
+//  Created by Christian Benua on 23.02.2025.
+//  Copyright © 2025 Adamant. All rights reserved.
+//
+
+import UIKit
+
+final class PasteInterceptingTextField: UITextField, UITextFieldDelegate {
+    
+    private var isAfterPaste: Bool = false
+    var pasteInterceptor: ((String?) -> Void)?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setup()
+    }
+    
+    private func setup() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(handlePasteNotification),
+            name: UITextField.textDidChangeNotification,
+            object: self
+        )
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func paste(_ sender: Any?) {
+        isAfterPaste = true
+        super.paste(sender)
+    }
+    
+    @objc func handlePasteNotification() {
+        if isAfterPaste {
+            pasteInterceptor?(text)
+        }
+        isAfterPaste = false
+    }
+    
+    func textField(
+        _ textField: UITextField,
+        shouldChangeCharactersIn range: NSRange,
+        replacementString string: String
+    ) -> Bool {
+        if isAfterPaste {
+            pasteInterceptor?(textField.text)
+        }
+        
+        isAfterPaste = false
+        return true
+    }
+}

Adamant/Helpers/PasteInterceptingTextField.swift

@@ -21,6 +21,7 @@ enum ChatAction {
     case react(id: String, emoji: String)
     case presentMenu(arg: ChatContextMenuArguments)
     case openFile(messageId: String, file: ChatFile)
+    case cancelUploading(messageId: String, file: ChatFile)
     case autoDownloadContentIfNeeded(messageId: String, files: [ChatFile])
     case forceDownloadAllFiles(messageId: String, files: [ChatFile])
 }

Adamant/Modules/Chat/View/Managers/ChatAction.swift

@@ -201,6 +201,8 @@ private extension ChatDataSourceManager {
             viewModel.copyTextInPartAction(text)
         case let .openFile(messageId, file):
             viewModel.openFile(messageId: messageId, file: file)
+        case let .cancelUploading(messageId, file):
+            viewModel.cancelFileUploading(messageId: messageId, file: file)
         case let .autoDownloadContentIfNeeded(messageId, files):
             viewModel.autoDownloadContentIfNeeded(
                 messageId: messageId,

Adamant/Modules/Chat/View/Managers/ChatDataSourceManager.swift

@@ -83,12 +83,18 @@ private extension FileListContainerView {
                 txStatus: model.txStatus
             )
             view?.buttonActionHandler = { [weak self, file, model] in
-                self?.actionHandler(
-                    .openFile(
-                        messageId: model.messageId,
-                        file: file
+                if file.isBusy, file.isUploading {
+                    self?.actionHandler(
+                        .cancelUploading(messageId: model.messageId, file: file)
                     )
-                )
+                } else {
+                    self?.actionHandler(
+                        .openFile(
+                            messageId: model.messageId,
+                            file: file
+                        )
+                    )
+                }
             }
         }
     }

Adamant/Modules/Chat/View/Subviews/ChatMedia/Content/Views/ChatFileContainerView/FileListContainerView.swift

@@ -131,12 +131,18 @@ private extension MediaContainerView {
                         txStatus: model.txStatus
                     )
                     mediaView.buttonActionHandler = { [weak self, file, model] in
-                        self?.actionHandler(
+                        let action: ChatAction = if file.isBusy, file.isUploading {
+                            .cancelUploading(
+                                messageId: model.messageId,
+                                file: file
+                            )
+                        } else {
                             .openFile(
                                 messageId: model.messageId,
                                 file: file
                             )
-                        )
+                        }
+                        self?.actionHandler(action)
                     }
 
                     if let resolution = file.file.resolution,