Fix wallet connection.

Revert swap functional.
horizontalsystems · Aug 23, 2023 · 3ce98ce · 3ce98ce
1 parent 52e73dd
commit 3ce98ce
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Evm/EvmTransactionsAdapter.swift
@@ -42,7 +42,7 @@ class EvmTransactionsAdapter: BaseEvmAdapter {
         case .all: ()
         case .incoming: type = .incoming
         case .outgoing: type = .outgoing
-//        case .swap: type = .swap
+        case .swap: type = .swap
         case .approve: type = .approve
         }
 

diff --git a/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift b/UnstoppableWallet/UnstoppableWallet/Core/Adapters/Tron/TronTransactionAdapter.swift
@@ -38,7 +38,7 @@ class TronTransactionsAdapter: BaseTronAdapter {
             case .all: ()
             case .incoming: type = .incoming
             case .outgoing: type = .outgoing
-//            case .swap: type = .swap
+            case .swap: type = .swap
             case .approve: type = .approve
         }
 

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Transactions/TransactionTypeFilter.swift
@@ -1,4 +1,4 @@
 enum TransactionTypeFilter: String, CaseIterable {
-//    case all, incoming, outgoing, swap, approve
-    case all, incoming, outgoing, approve
+    case all, incoming, outgoing, swap, approve
+//    case all, incoming, outgoing, approve
 }
diff --git a/...pableWallet/UnstoppableWallet/Modules/WalletConnect/List/V2/WalletConnectV2ListView.swift b/...pableWallet/UnstoppableWallet/Modules/WalletConnect/List/V2/WalletConnectV2ListView.swift
@@ -70,6 +70,7 @@ class WalletConnectV2ListView {
             .image32 { component in
                 component.imageView.cornerRadius = .cornerRadius8
                 component.imageView.layer.cornerCurve = .continuous
+                component.imageView.contentMode = .scaleAspectFit
                 component.setImage(urlString: viewItem.imageUrl, placeholder: UIImage(named: "placeholder_rectangle_32"))
             },
             .vStackCentered([

diff --git a/...leWallet/UnstoppableWallet/Modules/WalletConnect/Main/V2/WalletConnectV2MainService.swift b/...leWallet/UnstoppableWallet/Modules/WalletConnect/Main/V2/WalletConnectV2MainService.swift
@@ -330,7 +330,7 @@ extension WalletConnectV2MainService: IWalletConnectMainService {
         }
 
         let accounts = chains.compactMap { chain in
-            if let firstBlockchainItem = blockchains.items.first,
+            if let firstBlockchainItem = blockchains.items.first(where: { item in item.chainId == chain.id }),
                     let wcBlockchain = WalletConnectUtils.Blockchain(namespace: firstBlockchainItem.namespace, reference: chain.id.description),
                     let wcAccount = WalletConnectUtils.Account(blockchain: wcBlockchain, address: firstBlockchainItem.address) {
                         return wcAccount

diff --git a/...ppableWallet/Modules/WalletConnect/Pairings/V2/WalletConnectV2PairingViewController.swift b/...ppableWallet/Modules/WalletConnect/Pairings/V2/WalletConnectV2PairingViewController.swift
@@ -79,6 +79,7 @@ class WalletConnectV2PairingViewController: ThemeViewController {
             .image32 { component in
                 component.imageView.layer.cornerCurve = .continuous
                 component.imageView.cornerRadius = .cornerRadius8
+                component.imageView.contentMode = .scaleAspectFit
                 component.setImage(urlString: viewItem.imageUrl, placeholder: UIImage(named: "placeholder_rectangle_32"))
             },
             .vStackCentered([

diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/LogoHeaderCell.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/LogoHeaderCell.swift
@@ -25,11 +25,11 @@ class LogoHeaderCell: UITableViewCell {
             maker.size.equalTo(Self.logoSize)
         }
 
-        logoImageView.contentMode = .scaleAspectFill
+        logoImageView.contentMode = .scaleAspectFit
         logoImageView.cornerRadius = .cornerRadius16
         logoImageView.layer.cornerCurve = .continuous
         logoImageView.clipsToBounds = true
-        logoImageView.backgroundColor = .themeSteel20
+        logoImageView.backgroundColor = .clear
 
         contentView.addSubview(stackView)
         stackView.snp.makeConstraints { maker in
@@ -76,8 +76,8 @@ class LogoHeaderCell: UITableViewCell {
         }
     }
 
-    func set(imageUrl: String?, placeholderImage: UIImage? = nil) {
-        logoImageView.kf.setImage(with: imageUrl.flatMap { URL(string: $0) }, placeholder: placeholderImage)
+    func set(imageUrl: String?) {
+        logoImageView.kf.setImage(with: imageUrl.flatMap { URL(string: $0) }, placeholder: UIImage(named: "placeholder_rectangle_32"))
     }
 
 }