From e16020ec34849daae8942ee21e00cd1ae7359acc Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Oct 2024 18:11:05 +0400 Subject: [PATCH 1/4] Updated on 2026-08-14 --- gradle/dependencies.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index ab6f07950a..e029565698 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -89,7 +89,7 @@ markdownComposeView = "0.5.4" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.16-807" +tangemBlockchainSdk = "release-app_5.16-813" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.16-386" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ From bc1b6fecbcc5c1643d8eb39fd8db06a034b6ae72 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Oct 2024 18:10:00 +0400 Subject: [PATCH 2/4] Updated on 2026-08-14 --- .../data/managetokens/utils/ManagedCryptoCurrencyFactory.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt index ffdbb9e58d..22ff299187 100644 --- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt +++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt @@ -137,7 +137,7 @@ internal class ManagedCryptoCurrencyFactory { createSource( networkId = network.networkId, contractAddress = network.contractAddress, - decimals = network.decimalCount?.toInt() ?: return@mapNotNull null, + decimals = network.decimalCount?.toInt(), derivationStyleProvider = derivationStyleProvider, ) }, @@ -148,7 +148,7 @@ internal class ManagedCryptoCurrencyFactory { private fun createSource( networkId: String, contractAddress: String?, - decimals: Int, + decimals: Int?, derivationStyleProvider: DerivationStyleProvider?, extraDerivationPath: String? = null, ): SourceNetwork? { @@ -167,7 +167,7 @@ internal class ManagedCryptoCurrencyFactory { } else { SourceNetwork.Default( network = network, - decimals = decimals, + decimals = decimals ?: return null, contractAddress = contractAddress, ) } From c5038eecb6b174c915b1b024995006dd162974c9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Oct 2024 18:24:35 +0400 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../utils/ManagedCryptoCurrencyFactory.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt index 22ff299187..4ac4e2bdd2 100644 --- a/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt +++ b/data/manage-tokens/src/main/kotlin/com/tangem/data/managetokens/utils/ManagedCryptoCurrencyFactory.kt @@ -127,20 +127,24 @@ internal class ManagedCryptoCurrencyFactory { ): ManagedCryptoCurrency? { if (coinResponse.networks.isEmpty() || !coinResponse.active) return null - val updatedNetworks = coinResponse.networks.applyL2Compatibility(coinResponse.id) - return ManagedCryptoCurrency.Token( - id = ManagedCryptoCurrency.ID(coinResponse.id), - name = coinResponse.name, - symbol = coinResponse.symbol, - iconUrl = getIconUrl(coinResponse.id, imageHost), - availableNetworks = updatedNetworks.mapNotNull { network -> + val availableNetworks = coinResponse.networks + .applyL2Compatibility(coinResponse.id) + .mapNotNull { network -> createSource( networkId = network.networkId, contractAddress = network.contractAddress, decimals = network.decimalCount?.toInt(), derivationStyleProvider = derivationStyleProvider, ) - }, + } + .ifEmpty { return null } + + return ManagedCryptoCurrency.Token( + id = ManagedCryptoCurrency.ID(coinResponse.id), + name = coinResponse.name, + symbol = coinResponse.symbol, + iconUrl = getIconUrl(coinResponse.id, imageHost), + availableNetworks = availableNetworks, addedIn = findAddedInNetworks(coinResponse.id, tokensResponse, derivationStyleProvider), ) } @@ -158,18 +162,18 @@ internal class ManagedCryptoCurrencyFactory { val network = getNetwork(blockchain, extraDerivationPath, derivationStyleProvider) ?: return null - return if (contractAddress.isNullOrBlank()) { - SourceNetwork.Main( + return when { + contractAddress.isNullOrBlank() -> SourceNetwork.Main( network = network, decimals = blockchain.decimals(), isL2Network = l2BlockchainsList.contains(blockchain), ) - } else { - SourceNetwork.Default( + network.canHandleTokens -> SourceNetwork.Default( network = network, decimals = decimals ?: return null, contractAddress = contractAddress, ) + else -> null } } From aa0e58070c0ce5740b082916ab0282c12f697037 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Oct 2024 19:18:37 +0500 Subject: [PATCH 4/4] Updated on 2026-08-14 --- .../common/ui/navigationButtons/NavigationButtonsBlock.kt | 2 ++ core/res/src/main/res/values-ru/strings.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt index 8cb08d87c0..ab24037ad8 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt @@ -79,6 +79,7 @@ fun NavigationPrimaryButton(primaryButton: NavigationButton?, modifier: Modifier onClick = button.onClick, showProgress = button.showProgress, colors = TangemButtonsDefaults.primaryButtonColors, + textStyle = TangemTheme.typography.subtitle1, icon = icon, modifier = Modifier.fillMaxWidth(), ) @@ -134,6 +135,7 @@ private fun ExtraButtons(extraButtons: ImmutableList?, txUrl: TangemButton( text = button.textReference.resolveReference(), icon = icon, + textStyle = TangemTheme.typography.subtitle1, onClick = rememberHapticFeedback(state = button, onAction = button.onClick), modifier = Modifier.weight(1f), enabled = button.isEnabled, diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index e8db31eab3..57db1a7c37 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -766,7 +766,7 @@ Застейкать еще Вы стейкаете %1$s и будете получать %2$s ежегодно Нажмите для разблокировки - Нажмите для разблокировки или голосования + Нажмите для разблокировки Нажмите для вывода Застейкать %s Вывести %s