wallet connect fixes

Author: bnsports

fearless/Modules/WalletConnectConfirmation/WalletConnectConfirmationPresenter.swift

@@ -108,8 +108,8 @@ final class WalletConnectConfirmationPresenter {
     private func approveTonConnect() async throws {
         _ = try await interactor.approve()
         Task { @MainActor in
-            router.dismiss(view: view)
-            view?.controller.onInteractionDismiss()
+            showAllDone(hash: nil)
+            view?.didStopLoading()
         }
     }
 

fearless/Modules/WalletConnectProposal/Model/WalletConnectProposalViewModel.swift

@@ -114,12 +114,14 @@ enum WalletConnectProposalCellModel {
         let metaId: String
         let walletName: String
         var isSelected: Bool
+        let icon: UIImage
 
         func toggle() -> Self {
             WalletViewModel(
                 metaId: metaId,
                 walletName: walletName,
-                isSelected: !isSelected
+                isSelected: !isSelected,
+                icon: icon
             )
         }
     }

fearless/Modules/WalletConnectProposal/Model/WalletConnectProposalViewModelFactory.swift

@@ -32,6 +32,7 @@ final class WalletConnectProposalViewModelFactoryImpl: WalletConnectProposalView
         wallets: [MetaAccountModel],
         locale: Locale
     ) throws -> WalletConnectProposalViewModel {
+        let wallets = filterWallets(wallets: wallets)
         switch status {
         case let .proposal(connectProposal):
             switch connectProposal {
@@ -109,6 +110,27 @@ final class WalletConnectProposalViewModelFactoryImpl: WalletConnectProposalView
     }
 
     // MARK: - Private methods
+    
+    private func filterWallets(wallets: [MetaAccountModel]) -> [MetaAccountModel] {
+        return wallets.filter { wallet in
+            switch status {
+            case .proposal(let connectProposal):
+                switch connectProposal {
+                case .walletConnect:
+                    return wallet.ecosystem.isRegular
+                case .tonJsBridge, .tonConnect:
+                    return wallet.ecosystem.isTon
+                }
+            case .active(let actionConnect):
+                switch actionConnect {
+                case .walletConnect:
+                    return wallet.ecosystem.isRegular
+                case .tonConnect:
+                    return wallet.ecosystem.isTon
+                }
+            }
+        }
+    }
 
     private func createDAppViewModel() -> WalletConnectProposalCellModel.DetailsViewModel {
         switch status {
@@ -376,11 +398,13 @@ final class WalletConnectProposalViewModelFactoryImpl: WalletConnectProposalView
         from wallets: [MetaAccountModel],
         forActiveSession: Bool
     ) -> [WalletConnectProposalCellModel] {
-        wallets.enumerated().map { index, wallet in
+        let selectedWallet = SelectedWalletSettings.shared.value
+        return wallets.enumerated().map { index, wallet in
             let viewModel = WalletConnectProposalCellModel.WalletViewModel(
                 metaId: wallet.metaId,
                 walletName: wallet.name,
-                isSelected: forActiveSession ? true : index == 0
+                isSelected: forActiveSession ? true : wallet.metaId == selectedWallet?.metaId,
+                icon: wallet.ecosystem.isRegular ? R.image.iconBirdGreen()! : R.image.tonIcon()!
             )
             return WalletConnectProposalCellModel.wallet(viewModel)
         }

fearless/Modules/WalletConnectProposal/WalletConnectProposalWalletsTableCell.swift

@@ -15,7 +15,6 @@ final class WalletConnectProposalWalletsTableCell: UITableViewCell {
         view.borderWidth = 2
         view.layout = .singleTitle
         view.highlightedStrokeColor = R.color.colorPink()!
-        view.iconImage = R.image.iconBirdGreen()
         view.isUserInteractionEnabled = false
         view.triangularedBackgroundView?.gradientBorderColors = UIColor.walletBorderGradientColors
         return view
@@ -38,6 +37,7 @@ final class WalletConnectProposalWalletsTableCell: UITableViewCell {
         view.title = viewModel.walletName
         view.layoutIfNeeded()
         view.triangularedBackgroundView?.setGradientBorder(highlighted: viewModel.isSelected, animated: true)
+        view.iconImage = viewModel.icon
     }
 
     // MARK: - Private methods