Merge pull request #1210 from WalletConnect/develop

1.9.5
WalletConnect · Nov 2, 2023 · 7cf45ea · 7cf45ea
2 parents 7488b11 + cea55e2
commit 7cf45ea
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestInteractor.swift
@@ -20,14 +20,18 @@ final class AuthRequestInteractor {
         try await Web3Wallet.instance.respond(requestId: request.id, signature: signature, from: account)
 
         /* Redirect */
-        WalletConnectRouter.goBack(uri: request.requester.redirect.native)
+        if let uri = request.requester.redirect?.native {
+            WalletConnectRouter.goBack(uri: uri)
+        }
     }
 
     func reject(request: AuthRequest) async throws {
         try await Web3Wallet.instance.reject(requestId: request.id)
 
         /* Redirect */
-        WalletConnectRouter.goBack(uri: request.requester.redirect.native)
+        if let uri = request.requester.redirect?.native {
+            WalletConnectRouter.goBack(uri: uri)
+        }
     }
 
     func formatted(request: AuthRequest, account: Account) -> String {

diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
@@ -31,13 +31,17 @@ final class SessionProposalInteractor {
         try await Web3Wallet.instance.approve(proposalId: proposal.id, namespaces: sessionNamespaces, sessionProperties: proposal.sessionProperties)
 
         /* Redirect */
-        WalletConnectRouter.goBack(uri: proposal.proposer.redirect.native)
+        if let uri = proposal.proposer.redirect?.native {
+            WalletConnectRouter.goBack(uri: uri)
+        }
     }
 
     func reject(proposal: Session.Proposal) async throws {
         try await Web3Wallet.instance.reject(proposalId: proposal.id, reason: .userRejected)
 
         /* Redirect */
-        WalletConnectRouter.goBack(uri: proposal.proposer.redirect.native)
+        if let uri = proposal.proposer.redirect?.native {
+            WalletConnectRouter.goBack(uri: uri)
+        }
     }
 }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestInteractor.swift
@@ -15,7 +15,7 @@ final class SessionRequestInteractor {
 
             /* Redirect */
             let session = getSession(topic: sessionRequest.topic)
-            if let uri = session?.peer.redirect.native {
+            if let uri = session?.peer.redirect?.native {
                 WalletConnectRouter.goBack(uri: uri)
             }
         } catch {
@@ -32,7 +32,7 @@ final class SessionRequestInteractor {
 
         /* Redirect */
         let session = getSession(topic: sessionRequest.topic)
-        if let uri = session?.peer.redirect.native {
+        if let uri = session?.peer.redirect?.native {
             WalletConnectRouter.goBack(uri: uri)
         }
     }

diff --git a/Sources/WalletConnectPairing/Types/AppMetadata.swift b/Sources/WalletConnectPairing/Types/AppMetadata.swift
@@ -13,7 +13,7 @@ public struct AppMetadata: Codable, Equatable {
 
     public struct Redirect: Codable, Equatable {
         /// Native deeplink URL string.
-        public let native: String
+        public let native: String?
 
         /// Universal link URL string.
         public let universal: String?
@@ -44,7 +44,7 @@ public struct AppMetadata: Codable, Equatable {
     public let icons: [String]
 
     /// Redirect links which could be manually used on wallet side.
-    public let redirect: Redirect
+    public let redirect: Redirect?
 
     /**
      Creates a new metadata object with the specified information.

diff --git a/Sources/WalletConnectRelay/PackageConfig.json b/Sources/WalletConnectRelay/PackageConfig.json
@@ -1 +1 @@
-{"version": "1.9.4"}
+{"version": "1.9.5"}