Merge pull request #3407 from vladyslav-iosdev/#3403

Indicate which chain for each WalletConnect session more prominently by showing an icon for the chain for each session #3403

AlphaWallet/Assets.xcassets/Network/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-arbitrum.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-arbitrum.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-artis.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-artis.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-avalanche.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-avalanche.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-bsc.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-bsc.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-callisto.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-callisto.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-etc.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-etc.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-eth.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-eth.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-fantom.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-fantom.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-heco.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-heco.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-optimism.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-optimism.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-palm.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-palm.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-poa.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-poa.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-polygon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-polygon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/Assets.xcassets/Network/icons-network-xdai.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icons-network-xdai.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AlphaWallet/UI/TokenImageView.swift

@@ -2,6 +2,27 @@
 
 import UIKit
 
+class ImageView: UIImageView {
+    private var subscriptionKey: Subscribable<Image>.SubscribableKey?
+    var subscribable: Subscribable<Image>? {
+        didSet {
+            if let previousSubscribable = oldValue, let subscriptionKey = subscriptionKey {
+                previousSubscribable.unsubscribe(subscriptionKey)
+            }
+
+            if let subscribable = subscribable {
+                image = nil
+                subscriptionKey = subscribable.subscribe { [weak self] image in
+                    self?.image = image
+                }
+            } else {
+                subscriptionKey = nil
+                image = nil
+            }
+        }
+    }
+}
+
 class TokenImageView: UIView {
     private var subscriptionKey: Subscribable<TokenImage>.SubscribableKey?
     private let symbolLabel: UILabel = {

AlphaWallet/UI/TokenObject+UI.swift

@@ -4,6 +4,7 @@ import UIKit
 import PromiseKit
 
 typealias TokenImage = (image: UIImage, symbol: String, isFinal: Bool)
+typealias Image = UIImage
 
 private func programmaticallyGeneratedIconImage(for contractAddress: AlphaWallet.Address, server: RPCServer) -> UIImage {
     let backgroundColor = symbolBackgroundColor(for: contractAddress, server: server)
@@ -26,6 +27,78 @@ private func symbolBackgroundColor(for contractAddress: AlphaWallet.Address, ser
     }
 }
 
+extension RPCServer {
+    var walletConnectIconImage: Subscribable<Image> {
+        return RPCServerImageFetcher.instance.image(server: self)
+    }
+
+    fileprivate var _walletConnectIconImage: UIImage? {
+        switch self {
+        case .main:
+            return R.image.iconsNetworkEth()
+        case .xDai:
+            return R.image.iconsNetworkXdai()
+        case .poa:
+            return R.image.iconsNetworkPoa()
+        case .classic:
+            return nil
+        case .callisto:
+            return R.image.iconsNetworkCallisto()
+        case .artis_sigma1:
+            return nil
+        case .binance_smart_chain:
+            return R.image.iconsNetworkBsc()
+        case .kovan, .ropsten, .rinkeby, .sokol, .goerli, .artis_tau1, .binance_smart_chain_testnet, .cronosTestnet, .custom:
+            return nil
+        case .heco, .heco_testnet:
+            return R.image.iconsNetworkHeco()
+        case .fantom, .fantom_testnet:
+            return R.image.iconsNetworkFantom()
+        case .avalanche, .avalanche_testnet:
+            return R.image.iconsNetworkAvalanche()
+        case .polygon:
+            return R.image.iconsNetworkPolygon()
+        case .mumbai_testnet:
+            return nil
+        case .optimistic:
+            return R.image.iconsNetworkOptimism()
+        case .optimisticKovan:
+            return nil
+        case .arbitrum:
+            return R.image.iconsNetworkArbitrum()
+        case .palm, .palmTestnet:
+            return R.image.iconsTokensPalm()
+        }
+    }
+}
+
+class RPCServerImageFetcher {
+    static var instance = RPCServerImageFetcher()
+
+    private static var subscribables: ThreadSafeDictionary<Int, Subscribable<Image>> = .init()
+
+    private static func programmaticallyGenerateIcon(for server: RPCServer) -> Image {
+        return UIView.tokenSymbolBackgroundImage(backgroundColor: server.blockChainNameColor)
+    }
+
+    func image(server: RPCServer) -> Subscribable<Image> {
+        if let sub = Self.subscribables[server.chainID] {
+            return sub
+        } else {
+            let sub = Subscribable<Image>(nil)
+            Self.subscribables[server.chainID] = sub
+
+            if let value = server._walletConnectIconImage {
+                sub.value = value
+            } else {
+                sub.value = Self.programmaticallyGenerateIcon(for: server)
+            }
+
+            return sub
+        }
+    }
+}
+
 extension TokenObject {
     fileprivate static let numberOfCharactersOfSymbolToShowInIcon = 4
 

AlphaWallet/WalletConnect/View/WalletConnectSessionCell.swift

@@ -2,7 +2,7 @@
 
 import UIKit
 
-class RoundedImageView: UIImageView {
+class RoundedImageView: ImageView {
 
     init(size: CGSize) {
         super.init(frame: .zero)
@@ -34,6 +34,11 @@ class WalletConnectSessionCell: UITableViewCell {
         return imageView
     }()
 
+    private let serverIconImageView: RoundedImageView = {
+        let imageView = RoundedImageView(size: .init(width: 16, height: 16))
+        return imageView
+    }()
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
@@ -49,8 +54,11 @@ class WalletConnectSessionCell: UITableViewCell {
         ].asStackView(axis: .horizontal, alignment: .center)
         stackView.translatesAutoresizingMaskIntoConstraints = false
         contentView.addSubview(stackView)
+        contentView.addSubview(serverIconImageView)
 
         NSLayoutConstraint.activate([
+            serverIconImageView.centerXAnchor.constraint(equalTo: iconImageView.leadingAnchor, constant: 8),
+            serverIconImageView.centerYAnchor.constraint(equalTo: iconImageView.bottomAnchor, constant: -8),
             //NOTE: using edge insets to avoid braking constraints
             stackView.anchorsConstraint(to: contentView, edgeInsets: .init(top: 20, left: StyleLayout.sideMargin, bottom: 20, right: StyleLayout.sideMargin))
         ])
@@ -66,5 +74,6 @@ class WalletConnectSessionCell: UITableViewCell {
         nameLabel.attributedText = viewModel.sessionNameAttributedString
         urlLabel.attributedText = viewModel.sessionURLAttributedString
         iconImageView.setImage(url: viewModel.sessionIconURL, placeholder: R.image.walletConnectIcon())
+        serverIconImageView.subscribable = viewModel.serverIconImage
     }
 }

AlphaWallet/WalletConnect/ViewModel/WalletConnectSessionCellViewModel.swift

@@ -8,7 +8,11 @@ struct WalletConnectSessionCellViewModel {
 
     var backgroundColor: UIColor {
         Colors.appBackground
-    } 
+    }
+
+    var serverIconImage: Subscribable<Image> {
+        server.walletConnectIconImage
+    }
 
     var sessionNameAttributedString: NSAttributedString {
         return .init(string: "\(session.dAppInfo.peerMeta.name) (\(server.name))", attributes: [