Merge pull request #1157 from novasamatech/fix/wallet-connect

Fix wallet connect

Podfile

@@ -22,7 +22,7 @@ abstract_target 'novawalletAll' do
   pod 'Starscream', :git => 'https://github.com/ERussel/Starscream.git', :tag => '4.0.10'
   pod 'CDMarkdownKit', :git => 'https://github.com/nova-wallet/CDMarkdownKit.git', :tag => '2.5.2'
   pod 'web3swift', :git => 'https://github.com/web3swift-team/web3swift.git', :tag => '3.0.6'
-  pod 'WalletConnectSwiftV2', :git => 'https://github.com/WalletConnect/WalletConnectSwiftV2.git', :tag => '1.5.14'
+  pod 'WalletConnectSwiftV2', :git => 'https://github.com/novasamatech/WalletConnectSwiftV2.git', :tag => 'rc1.9.6'
   pod 'EthereumSignTypedDataUtil', :git => 'https://github.com/ERussel/EthereumSignTypedDataUtil.git', :tag => '0.1.3'
   pod 'SwiftAlgorithms', '~> 1.0.0'
   pod 'ZMarkupParser', '= 1.6.1'

Podfile.lock

@@ -903,25 +903,51 @@ PODS:
     - BigInt (~> 5.0)
   - SwiftyBeaver (1.9.3)
   - TweetNacl (1.0.2)
-  - WalletConnectSwiftV2 (1.5.14):
-    - WalletConnectSwiftV2/WalletConnect (= 1.5.14)
-  - WalletConnectSwiftV2/Commons (1.5.14)
-  - WalletConnectSwiftV2/JSONRPC (1.5.14):
+  - WalletConnectSwiftV2 (1.19.5):
+    - WalletConnectSwiftV2/WalletConnect (= 1.19.5)
+  - WalletConnectSwiftV2/Commons (1.19.5)
+  - WalletConnectSwiftV2/Events (1.19.5):
+    - WalletConnectSwiftV2/WalletConnectNetworking
+    - WalletConnectSwiftV2/WalletConnectUtils
+  - WalletConnectSwiftV2/HTTPClient (1.19.5)
+  - WalletConnectSwiftV2/JSONRPC (1.19.5):
     - WalletConnectSwiftV2/Commons
-  - WalletConnectSwiftV2/WalletConnect (1.5.14):
+  - WalletConnectSwiftV2/WalletConnect (1.19.5):
+    - WalletConnectSwiftV2/WalletConnectAuth
+    - WalletConnectSwiftV2/WalletConnectPush
+    - WalletConnectSwiftV2/WalletConnectSign
+    - WalletConnectSwiftV2/WalletConnectVerify
+  - WalletConnectSwiftV2/WalletConnectAuth (1.19.5):
     - WalletConnectSwiftV2/WalletConnectPairing
-  - WalletConnectSwiftV2/WalletConnectJWT (1.5.14):
+    - WalletConnectSwiftV2/WalletConnectSigner
+    - WalletConnectSwiftV2/WalletConnectVerify
+  - WalletConnectSwiftV2/WalletConnectJWT (1.19.5):
     - WalletConnectSwiftV2/WalletConnectKMS
-  - WalletConnectSwiftV2/WalletConnectKMS (1.5.14):
+  - WalletConnectSwiftV2/WalletConnectKMS (1.19.5):
     - WalletConnectSwiftV2/WalletConnectUtils
-  - WalletConnectSwiftV2/WalletConnectNetworking (1.5.14):
+  - WalletConnectSwiftV2/WalletConnectNetworking (1.19.5):
+    - WalletConnectSwiftV2/HTTPClient
     - WalletConnectSwiftV2/WalletConnectRelay
-  - WalletConnectSwiftV2/WalletConnectPairing (1.5.14):
+  - WalletConnectSwiftV2/WalletConnectPairing (1.19.5):
+    - WalletConnectSwiftV2/Events
+    - WalletConnectSwiftV2/WalletConnectNetworking
+  - WalletConnectSwiftV2/WalletConnectPush (1.19.5):
+    - WalletConnectSwiftV2/WalletConnectJWT
     - WalletConnectSwiftV2/WalletConnectNetworking
-  - WalletConnectSwiftV2/WalletConnectRelay (1.5.14):
+  - WalletConnectSwiftV2/WalletConnectRelay (1.19.5):
     - WalletConnectSwiftV2/WalletConnectJWT
-  - WalletConnectSwiftV2/WalletConnectUtils (1.5.14):
+  - WalletConnectSwiftV2/WalletConnectSign (1.19.5):
+    - WalletConnectSwiftV2/Events
+    - WalletConnectSwiftV2/WalletConnectPairing
+    - WalletConnectSwiftV2/WalletConnectSigner
+    - WalletConnectSwiftV2/WalletConnectVerify
+  - WalletConnectSwiftV2/WalletConnectSigner (1.19.5):
+    - WalletConnectSwiftV2/WalletConnectNetworking
+  - WalletConnectSwiftV2/WalletConnectUtils (1.19.5):
     - WalletConnectSwiftV2/JSONRPC
+  - WalletConnectSwiftV2/WalletConnectVerify (1.19.5):
+    - WalletConnectSwiftV2/WalletConnectNetworking
+    - WalletConnectSwiftV2/WalletConnectUtils
   - Web3Core (3.0.6):
     - BigInt (~> 5.2.0)
     - CryptoSwift (~> 1.5.1)
@@ -962,7 +988,7 @@ DEPENDENCIES:
   - SwiftLint
   - SwiftRLP (from `https://github.com/ERussel/SwiftRLP.git`)
   - SwiftyBeaver
-  - WalletConnectSwiftV2 (from `https://github.com/WalletConnect/WalletConnectSwiftV2.git`, tag `1.5.14`)
+  - WalletConnectSwiftV2 (from `https://github.com/novasamatech/WalletConnectSwiftV2.git`, tag `rc1.9.6`)
   - web3swift (from `https://github.com/web3swift-team/web3swift.git`, tag `3.0.6`)
   - ZMarkupParser (= 1.6.1)
 
@@ -1051,8 +1077,8 @@ EXTERNAL SOURCES:
   SwiftRLP:
     :git: https://github.com/ERussel/SwiftRLP.git
   WalletConnectSwiftV2:
-    :git: https://github.com/WalletConnect/WalletConnectSwiftV2.git
-    :tag: 1.5.14
+    :git: https://github.com/novasamatech/WalletConnectSwiftV2.git
+    :tag: rc1.9.6
   web3swift:
     :git: https://github.com/web3swift-team/web3swift.git
     :tag: 3.0.6
@@ -1092,8 +1118,8 @@ CHECKOUT OPTIONS:
     :commit: 809e68a002d19ee3d8bbeb72577224b7513e7e8e
     :git: https://github.com/ERussel/SwiftRLP.git
   WalletConnectSwiftV2:
-    :git: https://github.com/WalletConnect/WalletConnectSwiftV2.git
-    :tag: 1.5.14
+    :git: https://github.com/novasamatech/WalletConnectSwiftV2.git
+    :tag: rc1.9.6
   web3swift:
     :git: https://github.com/web3swift-team/web3swift.git
     :tag: 3.0.6
@@ -1154,13 +1180,13 @@ SPEC CHECKSUMS:
   SwiftRLP: f58417bfceecd45394fc619ccad14cf16e4ae6c1
   SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02
   TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
-  WalletConnectSwiftV2: ff5cb17196b583a72c8ab826dd236ab3aa7b2c39
+  WalletConnectSwiftV2: 52356e22c518bfc6deb0bb93e71f915be1c33536
   Web3Core: 4a62a109cac056915d2d5023606438c89e229a1e
   web3swift: 944e76579b953a7b7e81dbb351c6dc0ed1defe63
   xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7
   ZMarkupParser: a92d31ba40695b790f1da5fec98c3d4505341aff
   ZNSTextAttachment: 1ddd53660a8d3c42dbb716bf6866ffce22c44181
 
-PODFILE CHECKSUM: 65dd64d36e6c0b46ddacb7d2629960ec17b1a716
+PODFILE CHECKSUM: 1f7ae2cfe12988c301a18c94f5cf13b157b58f07
 
 COCOAPODS: 1.15.2

novawallet/Common/Services/WalletConnect/WalletConnectMetadata.swift

@@ -2,7 +2,7 @@ import Foundation
 
 struct WalletConnectMetadata {
     struct Redirect {
-        let native: String?
+        let native: String
         let universal: String?
     }