From 6c6ce3d05efe8394c10c49de9122f1f27b907803 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 31 Jul 2024 13:49:32 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../repository/DefaultCurrenciesRepository.kt | 15 ++------------- .../repository/paging/TxHistoryPagingSource.kt | 1 + gradle/dependencies.toml | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt index dcfd66e7a7..d1a7d70fcf 100644 --- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt +++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt @@ -61,18 +61,6 @@ internal class DefaultCurrenciesRepository( private val isMultiCurrencyWalletCurrenciesFetching = MutableStateFlow( value = emptyMap(), ) - private val parallelTransactionsEnabledBlockchains = setOf( - Blockchain.Ethereum, - Blockchain.EthereumTestnet, - Blockchain.Polygon, - Blockchain.PolygonTestnet, - Blockchain.Arbitrum, - Blockchain.ArbitrumTestnet, - Blockchain.Binance, - Blockchain.BinanceTestnet, - Blockchain.Tron, - Blockchain.TronTestnet, - ) override suspend fun saveTokens( userWalletId: UserWalletId, @@ -391,7 +379,8 @@ internal class DefaultCurrenciesRepository( val outgoingTransactions = cryptoCurrencyStatus.value.pendingTransactions.filter { it.isOutgoing } outgoingTransactions.isNotEmpty() } - parallelTransactionsEnabledBlockchains.contains(blockchain) -> false + blockchain.isEvm() -> false + blockchain == Blockchain.Tron || blockchain == Blockchain.TronTestnet -> false else -> coinStatus?.value?.hasCurrentNetworkTransactions == true } } diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt index d534e238ec..87d2138b87 100644 --- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt +++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/paging/TxHistoryPagingSource.kt @@ -85,6 +85,7 @@ internal class TxHistoryPagingSource( currency = sourceParams.currency, ) .filterUnconfirmedTransaction() + .sortedByDescending { it.timestampInMillis } .filterIfTxAlreadyAdded(apiItems = items) return if (recentItems.isEmpty()) { diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 74fab9ccbd..061ea006d3 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -88,7 +88,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.13-707" +tangemBlockchainSdk = "release-app_5.13-714" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.13-376" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^