Merge pull request #726 from WalletConnect/chain-regex

Update regex for chains
WalletConnect · Feb 21, 2023 · 3ddaa3c · 3ddaa3c
2 parents fb8b5d1 + 277364a
commit 3ddaa3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
@@ -31,7 +31,7 @@ extension SessionProposalInteractor {
             if let chains = proposalNamespace.chains {
                 accounts = Set(
                     chains.compactMap {
-                        Account($0.absoluteString + ":\(self.accounts[$0.namespace]!)")
+                        Account($0.absoluteString + ":\(self.accounts[$0.namespace] ?? "\($0.namespace)")")
                     }
                 )
                 let sessionNamespace = SessionNamespace(chains: chains, accounts: accounts, methods: proposalNamespace.methods, events: proposalNamespace.events)

diff --git a/Sources/WalletConnectUtils/Extensions/String+CAIPs.swift b/Sources/WalletConnectUtils/Extensions/String+CAIPs.swift
@@ -3,7 +3,7 @@ import Foundation
 extension String {
 
     static let chainNamespaceRegex = "^[-a-z0-9]{3,8}$"
-    static let chainReferenceRegex = "^[-a-zA-Z0-9]{1,32}$"
+    static let chainReferenceRegex = "^[-a-zA-Z0-9_]{1,32}$"
     static let accountAddressRegex = "^[a-zA-Z0-9]{1,64}$"
 
     static func conformsToCAIP2(_ string: String) -> Bool {