Fetch balance + Cleanup

Sample/Example.xcodeproj/project.pbxproj

@@ -322,7 +322,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -364,7 +364,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
 				DEVELOPMENT_TEAM = W5R8AG9K22;
 				ENABLE_HARDENED_RUNTIME = YES;

Sample/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -60,7 +60,7 @@
       "location" : "https://github.com/WalletConnect/WalletConnectSwiftV2",
       "state" : {
         "branch" : "remove-wcm",
-        "revision" : "0085250fd993f40a638f8d3e300f4af8cbf9e7a8"
+        "revision" : "04bcc547a61768598286cfa4cb0a06c0475c4d35"
       }
     }
   ],

Sources/Web3Modal/Core/BlockchainAPIInteractor.swift

@@ -1,16 +1,16 @@
 import Foundation
 import HTTPClient
 
+import JSONRPC
+
 final class BlockchainAPIInteractor: ObservableObject {
-
     private let store: Store
 
     init(store: Store = .shared) {
         self.store = store
     }
 
     func getIdentity() async throws {
-
         let account = store.session?.accounts.first
         let address = account?.address
         let chainId = account?.blockchainIdentifier
@@ -31,10 +31,95 @@ final class BlockchainAPIInteractor: ObservableObject {
             self.store.identity = response
         }
     }
+
+    func getBalance() async throws {
+        enum GetBalanceError: Error {
+            case noAddress, invalidValue, noChain
+        }
+
+        guard let address = store.session?.accounts.first?.address else {
+            throw GetBalanceError.noAddress
+        }
+
+        guard let chain = store.selectedChain else {
+            throw GetBalanceError.noChain
+        }
+
+        let request = RPCRequest(
+            method: "eth_getBalance", params: [
+                address, "latest"
+            ]
+        )
+
+        var urlRequest = URLRequest(url: URL(string: chain.rpcUrl)!)
+        urlRequest.httpMethod = "POST"
+        urlRequest.httpBody = try JSONEncoder().encode(request)
+        urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let (data, _) = try await URLSession.shared.data(for: urlRequest)
+        let decodedResponse = try JSONDecoder().decode(RPCResponse.self, from: data)
+        let weiFactor = pow(10, chain.token.decimal)
+
+        guard let decimalValue = try decodedResponse.result?
+            .get(String.self)
+            .convertBalanceHexToBigDecimal()?
+            .toWei(weiFactor: weiFactor)
+        else {
+            throw GetBalanceError.invalidValue
+        }
+
+        let doubleValue = Double(truncating: decimalValue as NSNumber)
+
+        DispatchQueue.main.async {
+            self.store.balance = doubleValue
+        }
+    }
 }
 
-
 struct Identity: Codable {
     let name: String?
     let avatar: String?
 }
+
+struct BalanceRequest: Encodable {
+    init(address: String) {
+        self.address = address
+
+        self.id = RPCID()
+        self.params = [
+            address, "latest"
+        ]
+    }
+
+    let address: String
+    let id: RPCID
+    let jsonrpc: String = "2.0"
+    let method: String = "eth_getBalance"
+    let params: [String]
+}
+
+struct BalanceRpcResponse: Codable {
+    let id: RPCID
+    let jsonrpc: String
+    let result: String?
+    let error: RpcError?
+
+    struct RpcError: Codable {
+        let code: Int
+        let message: String
+    }
+}
+
+private extension String {
+    func convertBalanceHexToBigDecimal() -> Decimal? {
+        let substring = dropFirst(2)
+        guard let longValue = UInt64(substring, radix: 16) else { return nil }
+        return Decimal(string: "\(longValue)")
+    }
+}
+
+extension Decimal {
+    func toWei(weiFactor: Decimal) -> Decimal {
+        return self / weiFactor
+    }
+}

Sources/Web3Modal/Core/SignInteractor.swift

@@ -31,6 +31,12 @@ class SignInteractor: ObservableObject {
             }
         }
 
-        try await Web3Modal.instance.disconnect(topic: store.session?.topic ?? "")
+        do {
+            try await Web3Modal.instance.disconnect(topic: store.session?.topic ?? "")
+        } catch {
+            print(error.localizedDescription)
+        }
+        try await Web3Modal.instance.cleanup()
+        try await createPairingAndConnect()
     }
 }

Sources/Web3Modal/Core/W3MAPIInteractor.swift

@@ -103,7 +103,7 @@ final class W3MAPIInteractor: ObservableObject {
             request.setValue("ios-3.0.0-alpha.0", forHTTPHeaderField: "x-sdk-version")
 
             do {
-                let (data, _) = try await URLSession(configuration: .ephemeral).data(for: request)
+                let (data, _) = try await URLSession.shared.data(for: request)
                 return (wallet.imageId, UIImage(data: data))
             } catch {
                 print(error.localizedDescription)
@@ -125,4 +125,40 @@ final class W3MAPIInteractor: ObservableObject {
             }
         }
     }
+
+    func prefetchChainImages() async throws {
+        var chainImages: [String: UIImage] = [:]
+
+        try await ChainsPresets.ethChains.concurrentMap { chain in
+
+            let url = URL(string: "https://api.web3modal.com/public/getAssetImage/\(chain.imageId)")!
+            var request = URLRequest(url: url)
+
+            request.setValue(Web3Modal.config.projectId, forHTTPHeaderField: "x-project-id")
+            request.setValue("w3m", forHTTPHeaderField: "x-sdk-type")
+            request.setValue("ios-3.0.0-alpha.0", forHTTPHeaderField: "x-sdk-version")
+
+            do {
+                let (data, _) = try await URLSession.shared.data(for: request)
+                return (chain.imageId, UIImage(data: data))
+            } catch {
+                print(error.localizedDescription)
+            }
+
+            return ("", UIImage?.none)
+        }
+        .forEach { key, value in
+            if value == nil {
+                return
+            }
+
+            chainImages[key] = value
+        }
+
+        DispatchQueue.main.async { [chainImages] in
+            self.store.chainImages.merge(chainImages) { _, new in
+                new
+            }
+        }
+    }
 }

Sources/Web3Modal/Core/Web3Modal.swift

@@ -4,7 +4,6 @@ import SwiftUI
 import WalletConnectSign
 import WalletConnectVerify
 
-
 #if canImport(UIKit)
 import UIKit
 #endif
@@ -29,10 +28,25 @@ public class Web3Modal {
         guard let config = Web3Modal.config else {
             fatalError("Error - you must call Web3Modal.configure(_:) before accessing the shared instance.")
         }
-        return Web3ModalClient(
+
+        let client = Web3ModalClient(
             signClient: Sign.instance,
             pairingClient: Pair.instance as! (PairingClientProtocol & PairingInteracting & PairingRegisterer)
         )
+
+        if let session = client.getSessions().first {
+            Store.shared.session = session
+
+            if let blockchain = session.accounts.first?.blockchain {
+                let matchingChain = ChainsPresets.ethChains.first(where: {
+                    $0.chainNamespace == blockchain.namespace && $0.chainReference == blockchain.reference
+                })
+
+                Store.shared.selectedChain = matchingChain
+            }
+        }
+
+        return client
     }()
 
     struct Config {
@@ -68,7 +82,12 @@ public class Web3Modal {
             includeWebWallets: includeWebWallets,
             recommendedWalletIds: recommendedWalletIds,
             excludedWalletIds: excludedWalletIds
-        )        
+        )
+
+        Task {
+            try? await W3MAPIInteractor().fetchFeaturedWallets()
+            try? await W3MAPIInteractor().prefetchChainImages()
+        }
     }
 
     public static func set(sessionParams: SessionParams) {
@@ -79,7 +98,6 @@ public class Web3Modal {
 #if canImport(UIKit)
 
 extension Web3Modal {
-
     public static func present(from presentingViewController: UIViewController? = nil) {
         guard let vc = presentingViewController ?? topViewController() else {
             assertionFailure("No controller found for presenting modal")
@@ -91,7 +109,6 @@ extension Web3Modal {
     }
 
     private static func topViewController(_ base: UIViewController? = nil) -> UIViewController? {
-
         let base = base ?? UIApplication
             .shared
             .connectedScenes
@@ -121,10 +138,8 @@ extension Web3Modal {
 
 import AppKit
 
-extension Web3Modal {
-
-    public static func present(from presentingViewController: NSViewController? = nil) {
-
+public extension Web3Modal {
+    static func present(from presentingViewController: NSViewController? = nil) {
         let modal = Web3ModalSheetController()
         presentingViewController!.presentAsModalWindow(modal)
     }
@@ -137,7 +152,7 @@ public struct SessionParams {
     public let optionalNamespaces: [String: ProposalNamespace]?
     public let sessionProperties: [String: String]?
 
-    public init(requiredNamespaces: [String : ProposalNamespace], optionalNamespaces: [String : ProposalNamespace]? = nil, sessionProperties: [String : String]? = nil) {
+    public init(requiredNamespaces: [String: ProposalNamespace], optionalNamespaces: [String: ProposalNamespace]? = nil, sessionProperties: [String: String]? = nil) {
         self.requiredNamespaces = requiredNamespaces
         self.optionalNamespaces = optionalNamespaces
         self.sessionProperties = sessionProperties
@@ -162,4 +177,3 @@ public struct SessionParams {
         )
     }()
 }
-

Sources/Web3Modal/Networking/Web3ModalAPI.swift

@@ -40,6 +40,7 @@ enum Web3ModalAPI: HTTPService {
                 "search": params.search ?? "",
                 "recommendedIds": params.recommendedIds.joined(separator: ","),
                 "excludedIds": params.excludedIds.joined(separator: ","),
+                "platform": "ios",
             ]
             .compactMapValues { value in
                 value.isEmpty ? nil : value

Sources/Web3Modal/Screens/ChainSwitch/WhatIsNetworkView.swift

@@ -0,0 +1,78 @@
+import SwiftUI
+import Web3ModalUI
+
+struct WhatIsNetworkView: View {
+
+    @Environment(\.verticalSizeClass) var verticalSizeClass
+
+    @EnvironmentObject var router: Router
+
+    var body: some View {
+        content()
+            .onAppear {
+                UIPageControl.appearance().currentPageIndicatorTintColor = UIColor(Color.Foreground100)
+                UIPageControl.appearance().pageIndicatorTintColor = UIColor(Color.Foreground100).withAlphaComponent(0.2)
+            }
+    }
+
+    func content() -> some View {
+        VStack(spacing: 0) {
+            if verticalSizeClass == .compact {
+                TabView {
+                    ForEach(sections(), id: \.title) { section in
+                        section
+                            .padding(.bottom, 40)
+                    }
+                }
+                .transform {
+                    #if os(iOS)
+                    $0.tabViewStyle(.page(indexDisplayMode: .always))
+                    #endif
+                }
+                .scaledToFill()
+                .layoutPriority(1)
+
+            } else {
+                ForEach(sections(), id: \.title) { section in
+                    section
+                        .padding(.bottom, Spacing.s)
+                }
+            }
+
+            Button(action: {
+                router.navigateToExternalLink(URL(string: "https://ethereum.org/en/developers/docs/networks/")!)
+            }) {
+                HStack {
+                    Text("Learn More")
+                    Image.ExternalLink
+                }
+            }
+            .buttonStyle(W3MButtonStyle(size: .m))
+        }
+        .padding(.vertical, Spacing.xxl)
+        .padding(.horizontal, Spacing.xl)
+    }
+
+    func sections() -> [HelpSection] {
+        [
+            HelpSection(
+                title: "The system’s nuts and bolts",
+                description: "A network is what brings the blockchain to life, as this technical infrastructure allows apps to access the ledger and smart contract services.",
+                assets: [.imageNetwork, .imageLayers, .imageSystem]
+            ),
+            HelpSection(
+                title: "Designed for different uses",
+                description: "Each network is designed differently, and may therefore suit certain apps and experiences.",
+                assets: [.imageNoun, .imageDefiAlt, .imageDao]
+            ),
+        ]
+    }
+}
+
+#if DEBUG
+struct WhatIsNetworkView_Previews: PreviewProvider {
+    static var previews: some View {
+        WhatIsNetworkView()
+    }
+}
+#endif

Sources/Web3Modal/Screens/ConnectWallet/GetAWalletView.swift

@@ -33,12 +33,7 @@ struct GetAWalletView: View {
             })
             .buttonStyle(W3MListSelectStyle(
                 imageContent: { _ in
-                    W3MAllWalletsImage(images: [
-                        .init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Metamask"),
-                        .init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Trust"),
-                        .init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Safe"),
-                        .init(image: Image("MockWalletImage", bundle: .UIModule), walletName: "Rainbow"),
-                    ])
+                    Image.optionAll
                 }
             ))
         }