From 488e5aa09fda38c9b3c96b453a6cca1f64279296 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 12 Sep 2025 17:40:01 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../send/v2/feeselector/ui/FeeSelectorBlockContent.kt | 2 +- .../send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt | 2 +- .../SendConfirmationNotificationsTransformerV2.kt | 8 +++++--- .../NFTSendConfirmationNotificationsTransformerV2.kt | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt index 2f403f5b0c..793262545b 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt @@ -156,7 +156,7 @@ private fun FeeContent(state: FeeSelectorUM.Content, modifier: Modifier = Modifi val fiatRate = state.feeFiatRateUM Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) { EllipsisText( - text = if (fiatRate != null) { + text = if (state.feeExtraInfo.isFeeConvertibleToFiat && fiatRate != null) { getFiatString( value = state.selectedFeeItem.fee.amount.value, rate = fiatRate.rate, diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt index d9aea80f8c..0027bda872 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt @@ -170,7 +170,7 @@ private fun FeeSelectorItems( ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate) }, ), - postDot = if (feeFiatRateUM != null) { + postDot = if (state.feeExtraInfo.isFeeConvertibleToFiat && feeFiatRateUM != null) { getFiatReference( value = item.fee.amount.value, rate = feeFiatRateUM.rate, diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt index 22e99488fc..163e6764b0 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt @@ -71,7 +71,9 @@ internal class SendConfirmationNotificationsTransformerV2( val fiatAmountValue = amountUM.amountTextField.fiatAmount.value val fiatFeeValue = feeSelectorUM.feeFiatRateUM?.rate?.let { fee.amount.value?.multiply(it) } - val fiatSendingValue = if (feeSelectorUM.feeFiatRateUM != null) { + val isFeeConvertibleToFiat = feeSelectorUM.feeExtraInfo.isFeeConvertibleToFiat + + val fiatSendingValue = if (isFeeConvertibleToFiat) { fiatFeeValue?.let { fiatAmountValue?.plus(it) } } else { fiatAmountValue @@ -85,7 +87,7 @@ internal class SendConfirmationNotificationsTransformerV2( } val fiatFee = formatFooterFiatFee( amount = fee.amount.copy(value = fiatFeeValue), - isFeeConvertibleToFiat = feeSelectorUM.feeFiatRateUM != null, + isFeeConvertibleToFiat = isFeeConvertibleToFiat, isFeeApproximate = feeSelectorUM.feeExtraInfo.isFeeApproximate, appCurrency = appCurrency, ) @@ -98,7 +100,7 @@ internal class SendConfirmationNotificationsTransformerV2( ) } else { resourceReference( - id = if (feeSelectorUM.feeFiatRateUM != null) { + id = if (isFeeConvertibleToFiat) { R.string.send_summary_transaction_description } else { R.string.send_summary_transaction_description_no_fiat_fee diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt index d69431a549..2aeb3ab7e0 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt @@ -61,10 +61,11 @@ internal class NFTSendConfirmationNotificationsTransformerV2( val fee = feeSelectorUM?.selectedFeeItem?.fee ?: return TextReference.EMPTY val fiatFeeValue = feeSelectorUM.feeFiatRateUM?.rate?.let { fee.amount.value?.multiply(it) } + val isFeeConvertibleToFiat = feeSelectorUM.feeExtraInfo.isFeeConvertibleToFiat val fiatFee = formatFooterFiatFee( amount = fee.amount.copy(value = fiatFeeValue), - isFeeConvertibleToFiat = feeSelectorUM.feeFiatRateUM != null, + isFeeConvertibleToFiat = isFeeConvertibleToFiat, isFeeApproximate = feeSelectorUM.feeExtraInfo.isFeeApproximate, appCurrency = appCurrency, ) @@ -77,7 +78,7 @@ internal class NFTSendConfirmationNotificationsTransformerV2( ) } else { resourceReference( - id = if (feeSelectorUM.feeFiatRateUM != null) { + id = if (isFeeConvertibleToFiat) { R.string.send_summary_transaction_description } else { R.string.send_summary_transaction_description_no_fiat_fee