From 71e3159e38de573433e02e8494f4a763dd86562e Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 22 Jun 2024 10:22:58 +0800 Subject: [PATCH] Updated on 2026-08-14 --- .../feature/swap/domain/SwapInteractorImpl.kt | 23 +++++++++++++++---- gradle/dependencies.toml | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt index d0c95883bb..401cdab01a 100644 --- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt +++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt @@ -393,6 +393,7 @@ internal class SwapInteractorImpl @Inject constructor( warnings = warnings, fromToken = fromToken, amount = amount, + feeState = feeState, userWalletId = userWalletId, minAdaValue = minAdaValue, ) @@ -478,12 +479,24 @@ internal class SwapInteractorImpl @Inject constructor( warnings: MutableList, fromToken: CryptoCurrency, amount: SwapAmount, + feeState: TxFeeState, userWalletId: UserWalletId, minAdaValue: BigDecimal?, ) { + val fee = Fee.Common( + amount = Amount( + value = when (feeState) { + TxFeeState.Empty -> BigDecimal.ZERO + is TxFeeState.MultipleFeeState -> feeState.normalFee.feeValue + is TxFeeState.SingleFeeState -> feeState.fee.feeValue + }, + blockchain = Blockchain.fromId(fromToken.network.id.value), + ), + ) + transactionRepository.validateTransaction( amount = amount.value.convertToAmount(fromToken), - fee = null, + fee = fee, memo = null, txExtras = null, destination = getTokenAddress(fromToken), @@ -1260,10 +1273,10 @@ internal class SwapInteractorImpl @Inject constructor( swapState.copy( permissionState = PermissionDataState.Empty, warnings = manageWarnings( - fromToken, - amount, - txFeeState, - (feeData as? ProxyFees.SingleFee)?.let { + fromTokenStatus = fromToken, + amount = amount, + feeState = txFeeState, + minAdaValue = (feeData as? ProxyFees.SingleFee)?.let { (it.singleFee as? ProxyFee.CardanoToken)?.minAdaValue }, ), diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 97a7d53183..fd64bed28e 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -87,7 +87,7 @@ markdown = "0.7.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.12-682" +tangemBlockchainSdk = "release-app_5.12-683" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.12-364" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^