GH-2464 revert package to previous version

safe-global · Apr 19, 2024 · 5bf8bd2 · 5bf8bd2
1 parent 4bdbbc6
commit 5bf8bd2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/Multisig.xcodeproj/project.pbxproj b/Multisig.xcodeproj/project.pbxproj
@@ -7403,8 +7403,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/WalletConnect/WalletConnectSwiftV2";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.9.9;
+				kind = exactVersion;
+				version = 1.18.4;
 			};
 		};
 		04AECBB52A744B21008D5A35 /* XCRemoteSwiftPackageReference "mobile-sdk-ios" */ = {

diff --git a/Multisig.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Multisig.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -411,8 +411,8 @@
         "repositoryURL": "https://github.com/WalletConnect/WalletConnectSwiftV2",
         "state": {
           "branch": null,
-          "revision": "963473b0f431a880c00a59eeda9760df02950379",
-          "version": "1.18.5"
+          "revision": "58d2b49eeac5cf94432e2647b9107577c156a25c",
+          "version": "1.9.9"
         }
       },
       {

diff --git a/Multisig/UI/WalletConnectV2/WalletConnectManager.swift b/Multisig/UI/WalletConnectV2/WalletConnectManager.swift
@@ -37,7 +37,7 @@ class WalletConnectManager {
 
     func config() {
         let projectId = App.configuration.protected[.WALLETCONNECT_PROJECT_ID]
-        Networking.configure(groupIdentifier: "", projectId: projectId, socketFactory: SocketFactory())
+        Networking.configure(projectId: projectId, socketFactory: SocketFactory())
         Pair.configure(metadata: metadata)
         Web3Wallet.configure(metadata: metadata, crypto: NullCryptoProvider())
         setUpAuthSubscribing()
@@ -107,17 +107,12 @@ class WalletConnectManager {
     }
 
     private func wcURI(string: String) -> WalletConnectURI? {
-        do {
-            if string.hasPrefix("safe://wc?uri=") {
-                let wcString = string.replacingOccurrences(of: "safe://wc?uri=", with: "wc://wc?uri=").removingPercentEncoding!
-                let url = URL(string: wcString)!
-                return try WalletConnectURI(deeplinkUri: url)
-            } else {
-                return try WalletConnectURI(uriString: string)
-            }
-        } catch {
-            LogService.shared.error("WC URI: \(error)")
-            return nil
+        if string.hasPrefix("safe://wc?uri=") {
+            let wcString = string.replacingOccurrences(of: "safe://wc?uri=", with: "wc://wc?uri=").removingPercentEncoding!
+            let url = URL(string: wcString)!
+            return WalletConnectURI(deeplinkUri: url)
+        } else {
+            return WalletConnectURI(string: string)
         }
     }
 
@@ -221,8 +216,8 @@ class WalletConnectManager {
         let accounts = chains.compactMap { Account(blockchain: $0, address: address) }
 
         let creme = SessionNamespace(
-            chains: chains,
-            accounts: accounts,
+            chains: Set(chains),
+            accounts: Set(accounts),
             methods: Set(methods),
             events: Set(events)
         )
@@ -274,19 +269,19 @@ class WalletConnectManager {
                 switch failure {
                 case .preconditionsNotSatisfied(let id):
                     App.shared.snackbar.show(error: GSError.WC2SessionApprovalFailed())
-                    try? await Web3Wallet.instance.rejectSession(proposalId: id, reason: .userRejected)
+                    try? await Web3Wallet.instance.reject(proposalId: id, reason: .userRejected)
 
                 case .chainNotFound(let id):
                     App.shared.snackbar.show(error: GSError.WC2SessionApprovalFailedWrongChain())
-                    try? await Web3Wallet.instance.rejectSession(proposalId: id, reason: .unsupportedChains)
+                    try? await Web3Wallet.instance.reject(proposalId: id, reason: .userRejectedChains)
                 }
             }
         }
 
         override func approve(proposalId: String, namespaces: [String: SessionNamespace]) {
             Task { @MainActor in
                 do {
-                    _ = try await Web3Wallet.instance.approve(proposalId: proposalId, namespaces: namespaces)
+                    try await Web3Wallet.instance.approve(proposalId: proposalId, namespaces: namespaces)
                 } catch {
                     LogService.shared.error("Approval failed: \(error)")
                     App.shared.snackbar.show(error: GSError.WC2SessionApprovalFailed())