From aab0c74c6bbbeee71a12ea1dccf11c444b3027ae Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2024 21:15:42 +0100 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../src/main/assets/configs/feature_toggles_config.json | 4 ++-- gradle/dependencies.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json index 244c40eadf..8f0373cabb 100644 --- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json @@ -17,7 +17,7 @@ }, { "name": "LOCAL_USER_LOGS_ENABLED", - "version": "5.11.0" + "version": "5.12.0" }, { "name": "GENERATE_XPUB_ENABLED", @@ -25,6 +25,6 @@ }, { "name": "WC_SOLANA_TX_SIGN_ENABLED", - "version": "5.11.0" + "version": "undefined" } ] diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index a7d306c92d..0a72018550 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -86,9 +86,9 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.10-639" +tangemBlockchainSdk = "release-app_5.11-657" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "release-app_5.10-363" +tangemCardSdk = "release-app_5.11-365" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ # endregion Tangem From 0c6aa6f862d6d331905fefd20b2c214c1a53decc Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 6 Jun 2024 19:11:52 +0100 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../com/tangem/feature/swap/models/states/FeeItemState.kt | 4 ++++ .../main/java/com/tangem/feature/swap/ui/StateBuilder.kt | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/FeeItemState.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/FeeItemState.kt index e01a8b8058..8c3218aa96 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/FeeItemState.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/states/FeeItemState.kt @@ -5,6 +5,10 @@ import com.tangem.feature.swap.domain.models.ui.FeeType sealed class FeeItemState { + /** + * @param amountCrypto - crypto amount formatted with symbol + * @param amountFiatFormatted - formatted fiat amount + */ data class Content( val feeType: FeeType, val title: TextReference, diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt index e65136aa1a..bfb07ed4a0 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt @@ -472,9 +472,7 @@ internal class StateBuilder( warnings.add( SwapWarning.GeneralWarning( createNetworkFeeCoverageNotificationConfig( - quoteModel.fromTokenInfo.tokenAmount.getFormattedCryptoAmount( - quoteModel.fromTokenInfo.cryptoCurrencyStatus.currency, - ), + fee.feeCryptoFormatted, fee.feeFiatFormatted, ), ), @@ -572,7 +570,7 @@ internal class StateBuilder( warnings.add(getWarningForError(dataError, fromToken.cryptoCurrencyStatus.currency)) if (includeFeeInAmount is IncludeFeeInAmount.Included && uiStateHolder.fee is FeeItemState.Content) { val feeCoverageNotification = createNetworkFeeCoverageNotificationConfig( - fromToken.tokenAmount.getFormattedCryptoAmount(fromToken.cryptoCurrencyStatus.currency), + uiStateHolder.fee.amountCrypto, uiStateHolder.fee.amountFiatFormatted, ) warnings.add(SwapWarning.GeneralWarning(feeCoverageNotification)) From 856a1409bb3bc1b26b7ce18d712451745845bccb Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 7 Jun 2024 12:00:03 +0100 Subject: [PATCH 3/3] Updated on 2026-08-14 --- domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt | 1 - gradle/dependencies.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt b/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt index 32faeb03aa..a7b9ab2d90 100644 --- a/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt +++ b/domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt @@ -1,6 +1,5 @@ package com.tangem.domain.demo -import com.tangem.blockchain.BuildConfig import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.Blockchain import java.math.BigDecimal diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 0a72018550..17cdd58c30 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -86,7 +86,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.11-657" +tangemBlockchainSdk = "release-app_5.11-661" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.11-365" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^