fix your wallets presentable

novasamatech · Jan 7, 2025 · 0ff97bd · 0ff97bd
1 parent 57818bb
commit 0ff97bd
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/novawallet/Common/Protocols/YourWalletsPresentable.swift b/novawallet/Common/Protocols/YourWalletsPresentable.swift
@@ -7,7 +7,7 @@ protocol YourWalletsPresentable {
         address: AccountAddress?,
         delegate: YourWalletsDelegate
     )
-    func hideYourWallets(from view: ControllerBackedProtocol?)
+    func hideYourWallets(from view: YourWalletsPresentationProtocol)
 }
 
 extension YourWalletsPresentable {
@@ -32,7 +32,7 @@ extension YourWalletsPresentable {
         view?.controller.present(viewController.controller, animated: true)
     }
 
-    func hideYourWallets(from view: ControllerBackedProtocol?) {
-        view?.controller.dismiss(animated: true)
+    func hideYourWallets(from view: YourWalletsPresentationProtocol) {
+        view.controller.dismiss(animated: true)
     }
 }
diff --git a/novawallet/Modules/Staking/StakingProxy/Add/StakingSetupProxyPresenter.swift b/novawallet/Modules/Staking/StakingProxy/Add/StakingSetupProxyPresenter.swift
@@ -291,14 +291,18 @@ extension StakingSetupProxyPresenter: ModalPickerViewControllerDelegate {
 }
 
 extension StakingSetupProxyPresenter: YourWalletsDelegate {
-    func didSelectYourWallet(address: AccountAddress) {
-        wireframe.hideYourWallets(from: view)
+    func yourWallets(
+        selectionView: YourWalletsPresentationProtocol,
+        didSelect address: AccountAddress
+    ) {
+        wireframe.hideYourWallets(from: selectionView)
+
         view?.didReceiveYourWallets(state: .inactive)
         updateRecepientAddress(address)
         provideInputViewModel()
     }
 
-    func didCloseYourWalletSelection() {
+    func yourWalletsDidClose(selectionView _: YourWalletsPresentationProtocol) {
         view?.didReceiveYourWallets(state: .inactive)
     }
 }

diff --git a/novawallet/Modules/Transfer/TransferSetup/TransferSetupPresenter.swift b/novawallet/Modules/Transfer/TransferSetup/TransferSetupPresenter.swift
@@ -512,15 +512,20 @@ extension TransferSetupPresenter: AddressScanDelegate {
 }
 
 extension TransferSetupPresenter: YourWalletsDelegate {
-    func didSelectYourWallet(address: AccountAddress) {
-        wireframe.hideYourWallets(from: view)
+    func yourWallets(
+        selectionView: YourWalletsPresentationProtocol,
+        didSelect address: AccountAddress
+    ) {
+        wireframe.hideYourWallets(from: selectionView)
 
         childPresenter?.changeRecepient(address: address)
         view?.changeYourWalletsViewState(.inactive)
         recipientAddress = .address(address)
     }
 
-    func didCloseYourWalletSelection() {
+    func yourWalletsDidClose(
+        selectionView _: YourWalletsPresentationProtocol
+    ) {
         view?.changeYourWalletsViewState(.inactive)
     }
 }
diff --git a/novawallet/Modules/YourWallets/YourWalletsPresenter.swift b/novawallet/Modules/YourWallets/YourWalletsPresenter.swift
@@ -161,11 +161,19 @@ extension YourWalletsPresenter: YourWalletsPresenterProtocol {
     func didSelect(viewModel: YourWalletsCellViewModel.CommonModel) {
         selectedAddress = viewModel.displayAddress.address
         updateSelectedCell()
-        delegate?.didSelectYourWallet(address: viewModel.displayAddress.address)
+
+        if let view {
+            delegate?.yourWallets(
+                selectionView: view,
+                didSelect: viewModel.displayAddress.address
+            )
+        }
     }
 
     func viewWillDisappear() {
-        delegate?.didCloseYourWalletSelection()
+        if let view {
+            delegate?.yourWalletsDidClose(selectionView: view)
+        }
     }
 }
 

diff --git a/novawallet/Modules/YourWallets/YourWalletsProtocols.swift b/novawallet/Modules/YourWallets/YourWalletsProtocols.swift
@@ -1,6 +1,8 @@
 import UIKit
 
-protocol YourWalletsViewProtocol: ControllerBackedProtocol {
+protocol YourWalletsPresentationProtocol: ControllerBackedProtocol {}
+
+protocol YourWalletsViewProtocol: YourWalletsPresentationProtocol {
     func update(viewModel: [YourWalletsViewSectionModel])
     func update(header: String)
     func calculateEstimatedHeight(sections: Int, items: Int) -> CGFloat
@@ -13,8 +15,8 @@ protocol YourWalletsPresenterProtocol: AnyObject {
 }
 
 protocol YourWalletsDelegate: AnyObject {
-    func didSelectYourWallet(address: AccountAddress)
-    func didCloseYourWalletSelection()
+    func yourWallets(selectionView: YourWalletsPresentationProtocol, didSelect address: AccountAddress)
+    func yourWalletsDidClose(selectionView: YourWalletsPresentationProtocol)
 }
 
 extension YourWalletsDelegate {