From a8bc400084df16350cd09f798d5fab9b5b4d4182 Mon Sep 17 00:00:00 2001 From: Alexander Osokin <4981841+tureck1y@users.noreply.github.com> Date: Tue, 15 Oct 2024 11:55:15 +0100 Subject: [PATCH 1/2] IOS-8275 Disable EWT EVM tokens (#4063) --- Podfile | 2 +- Podfile.lock | 8 ++++---- .../Modules/StakingDetails/StakingDetailsViewModel.swift | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index afa93fabc0..112234de07 100644 --- a/Podfile +++ b/Podfile @@ -31,7 +31,7 @@ end def blockchain_sdk_pods # 'TangemWalletCore' dependency must be added via SPM - pod 'BlockchainSdk', :git => 'https://github.com/tangem/blockchain-sdk-swift.git', :tag => 'develop-703' + pod 'BlockchainSdk', :git => 'https://github.com/tangem/blockchain-sdk-swift.git', :tag => 'develop-704' #pod 'BlockchainSdk', :path => '../blockchain-sdk-swift' pod 'Solana.Swift', :git => 'https://github.com/tangem/Solana.Swift', :tag => '1.2.0-tangem11' diff --git a/Podfile.lock b/Podfile.lock index dbf9c85656..1791b223a3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -222,7 +222,7 @@ DEPENDENCIES: - AmplitudeSwift (= 1.6.2) - BinanceChain (from `https://github.com/tangem/swiftbinancechain.git`, tag `0.0.11`) - BitcoinCore.swift (from `https://github.com/tangem/bitcoincore.git`, tag `0.0.20`) - - BlockchainSdk (from `https://github.com/tangem/blockchain-sdk-swift.git`, tag `develop-703`) + - BlockchainSdk (from `https://github.com/tangem/blockchain-sdk-swift.git`, tag `develop-704`) - BlockiesSwift (~> 0.1.2) - CombineExt (~> 1.8.0) - Firebase/Analytics (= 10.29.0) @@ -278,7 +278,7 @@ EXTERNAL SOURCES: :tag: 0.0.20 BlockchainSdk: :git: https://github.com/tangem/blockchain-sdk-swift.git - :tag: develop-703 + :tag: develop-704 Solana.Swift: :git: https://github.com/tangem/Solana.Swift :tag: 1.2.0-tangem11 @@ -301,7 +301,7 @@ CHECKOUT OPTIONS: :tag: 0.0.20 BlockchainSdk: :git: https://github.com/tangem/blockchain-sdk-swift.git - :tag: develop-703 + :tag: develop-704 Solana.Swift: :git: https://github.com/tangem/Solana.Swift :tag: 1.2.0-tangem11 @@ -354,6 +354,6 @@ SPEC CHECKSUMS: TangemSdk: 145675e87bf4720d13968510b19e03b5402ed028 WalletConnectSwiftV2: 5ea47db4d86e39fc749b66a05a661af9e87b277d -PODFILE CHECKSUM: 132799f98da8bc986f49e63c0731d125fa64189d +PODFILE CHECKSUM: e4a2ea1bf935bbce9f3121fada4fdd77c470da4c COCOAPODS: 1.15.2 diff --git a/Tangem/Modules/StakingDetails/StakingDetailsViewModel.swift b/Tangem/Modules/StakingDetails/StakingDetailsViewModel.swift index 36820e738c..881a50bfdd 100644 --- a/Tangem/Modules/StakingDetails/StakingDetailsViewModel.swift +++ b/Tangem/Modules/StakingDetails/StakingDetailsViewModel.swift @@ -268,7 +268,7 @@ private extension StakingDetailsViewModel { ) { [weak self] in if rewards.count == 1, let balance = rewards.first { self?.openFlow(balance: balance) - + let name = balance.validatorType.validator?.name Analytics.log(event: .stakingButtonRewards, params: [.validator: name ?? ""]) } else { From 14bcc89ebbfb1de134ecddb5daf21c164cbb05e5 Mon Sep 17 00:00:00 2001 From: Alexander Osokin Date: Tue, 15 Oct 2024 12:28:35 +0100 Subject: [PATCH 2/2] IOS-8275 BSDK Sync --- BlockchainSdk/Common/Blockchain.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BlockchainSdk/Common/Blockchain.swift b/BlockchainSdk/Common/Blockchain.swift index 38c23f9185..c9cb13666c 100644 --- a/BlockchainSdk/Common/Blockchain.swift +++ b/BlockchainSdk/Common/Blockchain.swift @@ -616,7 +616,8 @@ public indirect enum Blockchain: Equatable, Hashable { public var canHandleTokens: Bool { switch self { - case .taraxa: + case .taraxa, + .energyWebEVM: return false case .binance, .solana,