diff --git a/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.pbxproj b/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.pbxproj index 4db35d084..2d3a45cca 100644 --- a/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.pbxproj +++ b/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.pbxproj @@ -11778,7 +11778,7 @@ repositoryURL = "https://github.com/WalletConnect/WalletConnectSwiftV2"; requirement = { kind = exactVersion; - version = 1.18.4; + version = 1.18.5; }; }; 29BF9FDF2A6ED48A00EDA0DF /* XCRemoteSwiftPackageReference "Boilertalk-Web3.swift" */ = { diff --git a/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index ad14023f6..000000000 --- a/unstoppable-ios-app/domains-manager-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,364 +0,0 @@ -{ - "originHash" : "57712317d52b57378eb742d2fbaf64669df05a363013ace30768d4859c34d342", - "pins" : [ - { - "identity" : "amplitude-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/amplitude/Amplitude-iOS", - "state" : { - "branch" : "main", - "revision" : "f780c123ca21339d37277f00449cb0f6494e676a" - } - }, - { - "identity" : "analytics-connector-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/amplitude/analytics-connector-ios.git", - "state" : { - "revision" : "e2ca17ac735bcbc48b13062484541702ef45153d", - "version" : "1.0.3" - } - }, - { - "identity" : "bigint", - "kind" : "remoteSourceControl", - "location" : "https://github.com/attaswift/BigInt", - "state" : { - "revision" : "0ed110f7555c34ff468e72e1686e59721f2b0da6", - "version" : "5.3.0" - } - }, - { - "identity" : "boilertalk-web3.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/unstoppabledomains/Boilertalk-Web3.swift.git", - "state" : { - "branch" : "0-5-3-Version", - "revision" : "a8994a08bc598187ed06cd97b20df9745d263df3" - } - }, - { - "identity" : "bugsnag-cocoa", - "kind" : "remoteSourceControl", - "location" : "https://github.com/bugsnag/bugsnag-cocoa", - "state" : { - "revision" : "16b9145fc66e5296f16e733f6feb5d0e450574e8", - "version" : "6.28.1" - } - }, - { - "identity" : "connect-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/bufbuild/connect-swift", - "state" : { - "revision" : "1701d3d1b2c4c63fcccfd7094f86a88672fa5acb", - "version" : "0.12.0" - } - }, - { - "identity" : "cryptoswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", - "state" : { - "revision" : "c9c3df6ab812de32bae61fc0cd1bf6d45170ebf0", - "version" : "1.8.2" - } - }, - { - "identity" : "generic-json-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/iwill/generic-json-swift", - "state" : { - "revision" : "0a06575f4038b504e78ac330913d920f1630f510", - "version" : "2.0.2" - } - }, - { - "identity" : "gzipswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/1024jp/GzipSwift", - "state" : { - "revision" : "7a7f17761c76a932662ab77028a4329f67d645a4", - "version" : "5.2.0" - } - }, - { - "identity" : "ios-client-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/launchdarkly/ios-client-sdk.git", - "state" : { - "revision" : "cf82f0687ee505b291f8e8f5fe978122892b74ab", - "version" : "9.5.0" - } - }, - { - "identity" : "libxmtp-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/xmtp/libxmtp-swift", - "state" : { - "revision" : "fa57437cc1a84df566c91bbd5df1d0619d404e09", - "version" : "0.4.3-beta4" - } - }, - { - "identity" : "objectivepgp", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/ObjectivePGP.git", - "state" : { - "revision" : "5629d849ec6c8f8ec733dffa9949c507468ec0b4", - "version" : "0.99.4" - } - }, - { - "identity" : "promisekit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/mxcl/PromiseKit.git", - "state" : { - "revision" : "8a98e31a47854d3180882c8068cc4d9381bf382d", - "version" : "6.22.1" - } - }, - { - "identity" : "push-swift-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ethereum-push-notification-service/push-swift-sdk", - "state" : { - "revision" : "45113991bb3eb6e7ab54556918a8aa523da85ce8" - } - }, - { - "identity" : "qrcode", - "kind" : "remoteSourceControl", - "location" : "https://github.com/WalletConnect/QRCode", - "state" : { - "revision" : "263f280d2c8144adfb0b6676109846cfc8dd552b", - "version" : "14.3.1" - } - }, - { - "identity" : "secp256k1.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/GigaBitcoin/secp256k1.swift.git", - "state" : { - "revision" : "48fb20fce4ca3aad89180448a127d5bc16f0e44c", - "version" : "0.10.0" - } - }, - { - "identity" : "socket.io-client-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/socketio/socket.io-client-swift", - "state" : { - "revision" : "175da8b5156f6b132436f0676cc84c2f6a766b6e", - "version" : "16.1.0" - } - }, - { - "identity" : "starscream", - "kind" : "remoteSourceControl", - "location" : "https://github.com/daltoniam/Starscream", - "state" : { - "revision" : "ac6c0fc9da221873e01bd1a0d4818498a71eef33", - "version" : "4.0.6" - } - }, - { - "identity" : "stripe-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/stripe/stripe-ios", - "state" : { - "revision" : "febc79a4c5e02afce39d68211268cbad7c304a8f", - "version" : "23.27.0" - } - }, - { - "identity" : "svgkit-light", - "kind" : "remoteSourceControl", - "location" : "https://github.com/unstoppabledomains/SVGKit-Light", - "state" : { - "branch" : "v3/removed_lumberjack", - "revision" : "769f897e797adebfe429a5bdc777160c5e1762c9" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "cd142fd2f64be2100422d658e7411e39489da985", - "version" : "1.2.0" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb", - "version" : "1.1.0" - } - }, - { - "identity" : "swift-eventsource", - "kind" : "remoteSourceControl", - "location" : "https://github.com/LaunchDarkly/swift-eventsource.git", - "state" : { - "revision" : "3d45eacab476f9bb2c58662cfb2d35088140b25b", - "version" : "3.1.1" - } - }, - { - "identity" : "swift-http-types", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-http-types", - "state" : { - "revision" : "12358d55a3824bd5fed310b999ea8cf83a9a1a65", - "version" : "1.0.3" - } - }, - { - "identity" : "swift-log", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", - "state" : { - "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5", - "version" : "1.5.4" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "fc63f0cf4e55a4597407a9fc95b16a2bc44b4982", - "version" : "2.64.0" - } - }, - { - "identity" : "swift-nio-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-extras.git", - "state" : { - "revision" : "a3b640d7dc567225db7c94386a6e71aded1bfa63", - "version" : "1.22.0" - } - }, - { - "identity" : "swift-nio-http2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-http2.git", - "state" : { - "revision" : "0904bf0feb5122b7e5c3f15db7df0eabe623dd87", - "version" : "1.30.0" - } - }, - { - "identity" : "swift-nio-ssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-ssl.git", - "state" : { - "revision" : "7c381eb6083542b124a6c18fae742f55001dc2b5", - "version" : "2.26.0" - } - }, - { - "identity" : "swift-nio-transport-services", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-transport-services.git", - "state" : { - "revision" : "6cbe0ed2b394f21ab0d46b9f0c50c6be964968ce", - "version" : "1.20.1" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb", - "version" : "1.26.0" - } - }, - { - "identity" : "swift-qrcode-generator", - "kind" : "remoteSourceControl", - "location" : "https://github.com/dagronf/swift-qrcode-generator", - "state" : { - "revision" : "5ca09b6a2ad190f94aa3d6ddef45b187f8c0343b", - "version" : "1.0.3" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system.git", - "state" : { - "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496", - "version" : "1.2.1" - } - }, - { - "identity" : "swiftimagereadwrite", - "kind" : "remoteSourceControl", - "location" : "https://github.com/dagronf/SwiftImageReadWrite", - "state" : { - "revision" : "5596407d1cf61b953b8e658fa8636a471df3c509", - "version" : "1.1.6" - } - }, - { - "identity" : "valet-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/unstoppabledomains/Valet-ios.git", - "state" : { - "branch" : "master", - "revision" : "d680470731ada7ae48d9ca29756c9df792530e7f" - } - }, - { - "identity" : "walletconnectswiftv2", - "kind" : "remoteSourceControl", - "location" : "https://github.com/WalletConnect/WalletConnectSwiftV2", - "state" : { - "revision" : "c9ea7a1836e5a58636c3df528a21997187bd54ac", - "version" : "1.18.4" - } - }, - { - "identity" : "web3.swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/argentlabs/web3.swift", - "state" : { - "revision" : "1e75f98a5738c470b23bbfffa9314e9f788df76b", - "version" : "1.6.1" - } - }, - { - "identity" : "web3swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/unstoppabledomains/web3swift.git", - "state" : { - "branch" : "develop", - "revision" : "e75faaf3e2889627aeca1090b07a30be5ff3388f" - } - }, - { - "identity" : "websocket-kit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/vapor/websocket-kit.git", - "state" : { - "revision" : "4232d34efa49f633ba61afde365d3896fc7f8740", - "version" : "2.15.0" - } - }, - { - "identity" : "xmtp-ios", - "kind" : "remoteSourceControl", - "location" : "https://github.com/xmtp/xmtp-ios", - "state" : { - "revision" : "0a625c91e56538280363c43900b91266554fa515" - } - } - ], - "version" : 3 -} diff --git a/unstoppable-ios-app/domains-manager-ios/Entities/Wallets/WalletEntity.swift b/unstoppable-ios-app/domains-manager-ios/Entities/Wallets/WalletEntity.swift index c9346edad..201bca6dc 100644 --- a/unstoppable-ios-app/domains-manager-ios/Entities/Wallets/WalletEntity.swift +++ b/unstoppable-ios-app/domains-manager-ios/Entities/Wallets/WalletEntity.swift @@ -150,7 +150,7 @@ extension Array where Element == WalletEntity { func findWithAddress(_ address: HexAddress?) -> Element? { guard let address = address?.normalized else { return nil } - return first(where: { $0.address == address }) + return first(where: { $0.address.normalized == address }) } func combinedDomains() -> [DomainDisplayInfo] { diff --git a/unstoppable-ios-app/domains-manager-ios/Services/WalletConnect/WalletConnectService_V2/WalletConnectServiceV2.swift b/unstoppable-ios-app/domains-manager-ios/Services/WalletConnect/WalletConnectService_V2/WalletConnectServiceV2.swift index 2bc389d64..40f3c810c 100644 --- a/unstoppable-ios-app/domains-manager-ios/Services/WalletConnect/WalletConnectService_V2/WalletConnectServiceV2.swift +++ b/unstoppable-ios-app/domains-manager-ios/Services/WalletConnect/WalletConnectService_V2/WalletConnectServiceV2.swift @@ -935,7 +935,9 @@ extension WalletConnectServiceV2 { chainId: Int, request: WalletConnectSign.Request, transaction: EthereumTransaction) async throws -> (WCConnectedAppsStorageV2.ConnectedApp, UDWallet) { - guard let cost = SignPaymentTransactionUIConfiguration.TxDisplayDetails(tx: transaction) else { throw WalletConnectRequestError.failedToBuildCompleteTransaction } + guard let cost = SignPaymentTransactionUIConfiguration.TxDisplayDetails(tx: transaction) else { + throw WalletConnectRequestError.failedToBuildCompleteTransaction + } return try await getClientAfterConfirmation_generic(address: address, request: request) { WCRequestUIConfiguration.payment(SignPaymentTransactionUIConfiguration(connectionConfig: $0, walletAddress: address,