[trello.com/c/R42vd9hV] interim update

Author: vovameister

Adamant.xcodeproj/project.pbxproj

@@ -1767,8 +1767,8 @@
 		6F1B8E7C2D4575B0004E902F /* AdmDialogService */ = {
 			isa = PBXGroup;
 			children = (
-				6F1B8E7D2D4575E0004E902F /* AdmDialogServiceExtension.swift */,
 				E9E7CD8E20026CD300DFC4DB /* AdamantDialogService.swift */,
+				6F1B8E7D2D4575E0004E902F /* AdmDialogServiceExtension.swift */,
 			);
 			path = AdmDialogService;
 			sourceTree = "<group>";

Adamant/Modules/AlertsFactory/AlertFactory.swift

@@ -9,42 +9,42 @@ import UIKit
 import CommonKit
 import SafariServices
 
-enum AlertFactory {
-    @MainActor
-    static func makeRenameAlert(
-        titleFormat: String,
-        placeholder: String,
-        initialText: String?,
-        onRename: @escaping (String) -> Void
-    ) -> UIAlertController {
-        let alert = UIAlertController(
-            title: titleFormat,
-            message: nil,
-            preferredStyle: .alert
-        )
-        alert.addTextField { textField in
-            textField.placeholder = placeholder
-            textField.autocapitalizationType = .words
-            textField.text = initialText
-        }
-        
-        let renameAction = UIAlertAction(
-            title: "Rename",
-            style: .default
-        ) { _ in
-            guard
-                let textField = alert.textFields?.first,
-                let newName = textField.text,
-                !newName.isEmpty
-            else { return }
-            
-            onRename(newName)
-            AlertPresenter.freeTokenAlertIfNeed()
-        }
-        
-        alert.addAction(renameAction)
-        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
-        alert.modalPresentationStyle = .overFullScreen
-        return alert
-    }
-}
+//enum AlertFactory {
+//    @MainActor
+//    static func makeRenameAlert(
+//        titleFormat: String,
+//        placeholder: String,
+//        initialText: String?,
+//        onRename: @escaping (String) -> Void
+//    ) -> UIAlertController {
+//        let alert = UIAlertController(
+//            title: titleFormat,
+//            message: nil,
+//            preferredStyle: .alert
+//        )
+//        alert.addTextField { textField in
+//            textField.placeholder = placeholder
+//            textField.autocapitalizationType = .words
+//            textField.text = initialText
+//        }
+//        
+//        let renameAction = UIAlertAction(
+//            title: "Rename",
+//            style: .default
+//        ) { _ in
+//            guard
+//                let textField = alert.textFields?.first,
+//                let newName = textField.text,
+//                !newName.isEmpty
+//            else { return }
+//            
+//            onRename(newName)
+//            AlertPresenter.freeTokenAlertIfNeed()
+//        }
+//        
+//        alert.addAction(renameAction)
+//        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+//        alert.modalPresentationStyle = .overFullScreen
+//        return alert
+//    }
+//}

Adamant/Modules/Chat/ChatFactory.swift

@@ -64,7 +64,8 @@ struct ChatFactory {
         let dialogManager = ChatDialogManager(
             viewModel: viewModel,
             dialogService: dialogService,
-            emojiService: emojiService
+            emojiService: emojiService,
+            accountService: accountService
         )
 
         let wallets = walletServiceCompose.getWallets()
@@ -83,9 +84,9 @@ struct ChatFactory {
             sendTransaction: makeSendTransactionAction(
                 viewModel: viewModel,
                 screensFactory: screensFactory
-            )
+            ),
+            dialogManager: dialogManager
         )
-        
         viewController.setupDelegates(delegates)
         delegates.cell.setupDelegate(
             collection: viewController.messagesCollectionView,

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -32,7 +32,7 @@ final class ChatViewController: MessagesViewController {
     private let admWalletService: WalletService?
     private let screensFactory: ScreensFactory
     private let chatSwipeManager: ChatSwipeManager
-    
+    private let dialogManager: ChatDialogManager
     let viewModel: ChatViewModel
 
     // MARK: Properties
@@ -92,7 +92,8 @@ final class ChatViewController: MessagesViewController {
         admWalletService: WalletService?,
         screensFactory: ScreensFactory,
         chatSwipeManager: ChatSwipeManager,
-        sendTransaction: @escaping SendTransaction
+        sendTransaction: @escaping SendTransaction,
+        dialogManager: ChatDialogManager
     ) {
         self.viewModel = viewModel
         self.storedObjects = storedObjects
@@ -101,6 +102,7 @@ final class ChatViewController: MessagesViewController {
         self.screensFactory = screensFactory
         self.sendTransaction = sendTransaction
         self.chatSwipeManager = chatSwipeManager
+        self.dialogManager = dialogManager
         super.init(nibName: nil, bundle: nil)
 
         inputBar.onAttachmentButtonTap = { [weak self] in
@@ -476,6 +478,11 @@ private extension ChatViewController {
                 self?.didTapSelectText(text: text)
             }
             .store(in: &subscriptions)
+        dialogManager.showBuyAndSellSubject
+                    .sink { [weak self] in
+                        self?.presentBuyAndSell()
+                    }
+                    .store(in: &subscriptions)
     }
 }
 
@@ -1097,7 +1104,12 @@ extension ChatViewController {
         viewModel.needToAnimateCellIndex = nil
     }
 }
-
+extension ChatViewController {
+    func presentBuyAndSell() {
+        let buyAndSellVC = screensFactory.makeBuyAndSell()
+        navigationController?.pushViewController(buyAndSellVC, animated: true)
+    }
+}
 private let scrollDownButtonInset: CGFloat = 20
 private let messagePadding: CGFloat = 12
 private let filesToolbarViewHeight: CGFloat = 140

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

@@ -19,21 +19,26 @@ final class ChatDialogManager {
     private let viewModel: ChatViewModel
     private let dialogService: DialogService
     private let emojiService: EmojiService?
+    private let accountService: AccountService
 
     private var subscription: AnyCancellable?
     private lazy var contextMenu = AdvancedContextMenuManager()
 
     typealias DidSelectEmojiAction = ((_ emoji: String, _ messageId: String) -> Void)?
     typealias ContextMenuAction = ((_ messageId: String) -> Void)?
 
+    let showBuyAndSellSubject = PassthroughSubject<Void, Never>()
+    
     init(
         viewModel: ChatViewModel,
         dialogService: DialogService,
-        emojiService: EmojiService
+        emojiService: EmojiService,
+        accountService: AccountService
     ) {
         self.viewModel = viewModel
         self.dialogService = dialogService
         self.emojiService = emojiService
+        self.accountService = accountService
         subscription = viewModel.dialog.sink { [weak self] in self?.showDialog($0) }
     }
 }
@@ -243,18 +248,24 @@ private extension ChatDialogManager {
     func showRenameAlert() {
         guard let address = address else { return }
 
-        let alert = AlertFactory.makeRenameAlert(
-            titleFormat: String(format: .adamant.chat.actionsBody, address),
-            placeholder: .adamant.chat.name,
-            initialText: viewModel.partnerName
-        ) { [weak viewModel] newName in
-            viewModel?.setNewName(newName)
-        }
+        let alert = dialogService.makeRenameAlert(
+            titleFormat:String(format: .adamant.chat.actionsBody, address),
+            initialText: viewModel.partnerName,
+            needToPresent: accountService.account?.isEnoughMoneyForTransaction,
+            url: accountService.account?.address,
+            showVC: { [weak self] in
+                self?.showBuyAndSellSubject.send()
+            },
+            onRename: handleRename(newName:)
+        )
 
         dialogService.present(alert, animated: true) { [weak self] in
             self?.dialogService.selectAllTextFields(in: alert)
         }
     }
+    private func handleRename(newName: String) {
+        viewModel.setNewName(newName)
+    }
 }
 
 // MARK: Alert actions
@@ -329,19 +340,6 @@ private extension ChatDialogManager {
         }
     }
 
-//    func makeFreeTokensAlertAction() -> UIAlertAction {
-//        .init(
-//            title: String.adamant.chat.freeTokens,
-//            style: .default
-//        ) { [weak self] _ in
-//            guard let self = self, let url = self.viewModel.freeTokensURL else { return }
-//            let safari = SFSafariViewController(url: url)
-//            safari.preferredControlTintColor = UIColor.adamant.primary
-//            safari.modalPresentationStyle = .overFullScreen
-//            self.dialogService.present(safari, animated: true, completion: nil)
-//        }
-//    }
-    
     func showAdmMenuAction(_ adm: AdamantAddress, partnerAddress: String) {
         let shareTypes: [AddressChatShareType] = adm.address == partnerAddress ? [.send] : [.chat, .send]
         let name = adm.name ?? adm.address

Adamant/Modules/ChatsList/ChatListViewController.swift

@@ -1296,10 +1296,14 @@ extension ChatListViewController {
         ) { [weak self] _ in
             guard let self = self else { return }
 
-            let alert = AlertFactory.makeRenameAlert(
+            let alert = dialogService.makeRenameAlert(
                 titleFormat: String(format: .adamant.chat.actionsBody, address),
-                placeholder: .adamant.chat.name,
-                initialText: self.addressBook.getName(for: address)
+                initialText: self.addressBook.getName(for: address),
+                needToPresent: accountService.account?.isEnoughMoneyForTransaction,
+                url: accountService.account?.address,
+                showVC: { [weak self] in
+                    self?.presentBuyAndSell()
+                }
             ) { newName in
                 Task {
                     await self.addressBook.set(name: newName, for: address)
@@ -1513,3 +1517,9 @@ private extension StateEnum {
         }
     }
 }
+private extension ChatListViewController {
+    func presentBuyAndSell() {
+            let buyAndSellVC = screensFactory.makeBuyAndSell()
+            navigationController?.pushViewController(buyAndSellVC, animated: true)
+        }
+}

Adamant/Modules/PartnerQR/PartnerQRFactory.swift

@@ -14,13 +14,12 @@ import CommonKit
 struct PartnerQRFactory {
     private let parent: Assembler
     private let assemblies = [PartnerQRAssembly()]
-    
     init(parent: Assembler) {
         self.parent = parent
     }
 
     @MainActor
-    func makeViewController(partner: CoreDataAccount) -> UIViewController {
+    func makeViewController(partner: CoreDataAccount, screenFactory: ScreensFactory) -> UIViewController {
         let assembler = Assembler(assemblies, parent: parent)
 
         let viewModel = {
@@ -29,7 +28,7 @@ struct PartnerQRFactory {
             return viewModel
         }
 
-        return UIHostingController(rootView: PartnerQRView(viewModel: viewModel, screenFactory: AdamantScreensFactory(assembler: parent)))
+        return UIHostingController(rootView: PartnerQRView(viewModel: viewModel, screenFactory: screenFactory))
     }
 }
 

Adamant/Modules/ScreensFactory/AdamantScreensFactory.swift

@@ -95,7 +95,7 @@ struct AdamantScreensFactory: ScreensFactory {
     }
 
     func makeBuyAndSell() -> UIViewController {
-        admWalletFactory.makeBuyAndSellVC()
+        admWalletFactory.makeBuyAndSellVC(screenFactory: self)
     }
 
     func makeChatList() -> UIViewController {
@@ -195,7 +195,7 @@ struct AdamantScreensFactory: ScreensFactory {
     }
 
     func makePartnerQR(partner: CoreDataAccount) -> UIViewController {
-        partnerQRFactory.makeViewController(partner: partner)
+        partnerQRFactory.makeViewController(partner: partner, screenFactory: self)
     }
 
     func makeCoinsNodesList(context: CoinsNodesListContext) -> UIViewController {

Adamant/Modules/Wallets/Adamant/AdmWalletFactory.swift

@@ -76,10 +76,11 @@ struct AdmWalletFactory: WalletFactory {
         return controller
     }
 
-    func makeBuyAndSellVC() -> UIViewController {
+    func makeBuyAndSellVC(screenFactory: ScreensFactory) -> UIViewController {
         let c = BuyAndSellViewController()
         c.accountService = assembler.resolve(AccountService.self)
         c.dialogService = assembler.resolve(DialogService.self)
+        c.screenFactory = screenFactory
         return c
     }
 }