GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-09-12 17:40:01 +05:00
parent 8b9642ba7e
commit 488e5aa09f
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt
View file

@ -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,

2
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt
View file

@ -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,

8
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt
View file

@ -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

5
features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt
View file

@ -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