From 13c1db212ebee713ac3c63c37faaac1c1a35b91a Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 30 Aug 2023 10:54:36 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../impl/domain/DefaultCustomTokenInteractor.kt | 2 +- .../impl/domain/DefaultTokensListInteractor.kt | 2 +- .../tokens/legacy/redux/TokensMiddleware.kt | 2 +- .../tangem/tap/proxy/DerivationManagerImpl.kt | 16 +++++++++------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt index 186e712a30..fe1bb63d2a 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/DefaultCustomTokenInteractor.kt @@ -127,7 +127,7 @@ class DefaultCustomTokenInteractor( val bothCandidates = (manageTokensCandidates + customTokensCandidates).distinct().toMutableList() if (bothCandidates.isEmpty()) return null - currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano } ?.let { currency -> + currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano }?.let { currency -> currency.derivationPath?.let { bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it))) } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt index 6757fceb65..9610727483 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/domain/DefaultTokensListInteractor.kt @@ -194,7 +194,7 @@ internal class DefaultTokensListInteractor( val bothCandidates = (manageTokensCandidates + customTokensCandidates).distinct().toMutableList() if (bothCandidates.isEmpty()) return null - currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano } ?.let { currency -> + currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano }?.let { currency -> currency.derivationPath?.let { bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it))) } diff --git a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt index d6bd27491f..1a5eb1fd45 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt @@ -183,7 +183,7 @@ object TokensMiddleware { val bothCandidates = (manageTokensCandidates + customTokensCandidates).distinct().toMutableList() if (bothCandidates.isEmpty()) return null - currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano } ?.let { currency -> + currencyList.find { it is Currency.Blockchain && it.blockchain == Blockchain.Cardano }?.let { currency -> currency.derivationPath?.let { bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it))) } diff --git a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt index 7406d1b883..174dd3762d 100644 --- a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt +++ b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt @@ -30,6 +30,7 @@ import com.tangem.tap.scope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlin.coroutines.suspendCoroutine +import com.tangem.tap.features.wallet.models.Currency as WalletModelCurrency class DerivationManagerImpl( private val appStateHolder: AppStateHolder, @@ -51,7 +52,7 @@ class DerivationManagerImpl( val scanResponse = appStateHolder.scanResponse if (scanResponse != null) { val blockchainNetwork = BlockchainNetwork(blockchain, scanResponse.derivationStyleProvider) - val appCurrency = com.tangem.tap.features.wallet.models.Currency.fromBlockchainNetwork( + val appCurrency = WalletModelCurrency.fromBlockchainNetwork( blockchainNetwork, appToken, ) @@ -91,7 +92,7 @@ class DerivationManagerImpl( private fun deriveMissingBlockchains( scanResponse: ScanResponse, - currencyList: List, + currencyList: List, onSuccess: (ScanResponse) -> Unit, onFailure: (Exception) -> Unit, ) { @@ -158,7 +159,7 @@ class DerivationManagerImpl( private fun getDerivations( curve: EllipticCurve, scanResponse: ScanResponse, - currencyList: List, + currencyList: List, ): DerivationData? { val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null @@ -183,11 +184,12 @@ class DerivationManagerImpl( val toDerive = bothCandidates.filterNot { alreadyDerivedPaths.contains(it) } if (toDerive.isEmpty()) return null - currencyList.find { it is com.tangem.tap.features.wallet.models.Currency.Blockchain && it.blockchain == Blockchain.Cardano } ?.let { currency -> - currency.derivationPath?.let { - bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it))) + currencyList.find { it is WalletModelCurrency.Blockchain && it.blockchain == Blockchain.Cardano } + ?.let { currency -> + currency.derivationPath?.let { + bothCandidates.add(CardanoUtils.extendedDerivationPath(DerivationPath(it))) + } } - } return DerivationData( derivations = mapKeyOfWalletPublicKey to toDerive,