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-11-18 08:25:45 +03:00
parent 3b04938e54
commit eda8c345cb
9 changed files with 17 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetMaxFeeUseCase.kt
View file

@ -61,20 +61,18 @@ class YieldSupplyGetMaxFeeUseCase(
.firstOrNull { it.yieldSupplyKey == token.yieldSupplyKey() }
val marketToken = cachedMarketToken ?: yieldSupplyRepository.getTokenStatus(token)
val maxFeeNative = marketToken.maxFeeNative
val maxFeeToken = maxFeeNative.multiply(nativeFiatRate)
val fiatMaxFee = maxFeeNative.multiply(nativeFiatRate)
val rateRatio = nativeFiatRate.divide(
val maxFeeToken = fiatMaxFee.divide(
fiatRate,
cryptoCurrencyStatus.currency.decimals,
RoundingMode.HALF_UP,
)
val tokenValue = rateRatio.multiply(maxFeeNative)
YieldSupplyMaxFee(
nativeMaxFee = maxFeeNative,
tokenMaxFee = maxFeeToken,
fiatMaxFee = tokenValue.stripTrailingZeros(),
fiatMaxFee = fiatMaxFee.stripTrailingZeros(),
)
}
}

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
View file

@ -15,7 +15,6 @@ internal sealed class YieldSupplyFeeUM {
val feeFiatValue: TextReference,
// TODO move to FeePolicyUM
val estimatedFiatValue: TextReference,
val tokenFeeFiatValue: TextReference,
val maxNetworkFeeFiatValue: TextReference,
val minTopUpFiatValue: TextReference,
val feeNoteValue: TextReference = TextReference.EMPTY,

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
View file

@ -149,7 +149,6 @@ private class YieldSupplyActionContentPreviewProvider : PreviewParameterProvider
yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
transactionDataList = persistentListOf(),
feeFiatValue = stringReference("$0.99"),
tokenFeeFiatValue = stringReference("$1.45"),
maxNetworkFeeFiatValue = stringReference("$8.50"),
minTopUpFiatValue = stringReference("$50"),
feeNoteValue = TextReference.EMPTY,

11
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/transformers/YieldSupplyActiveFeeContentTransformer.kt
View file

@ -37,11 +37,12 @@ internal class YieldSupplyActiveFeeContentTransformer(
val tokenFiatFeeValueText = tokenFiatFee.format { fiat(appCurrency.code, appCurrency.symbol) }
val maxFeeCryptoValueText = maxNetworkFee.tokenMaxFee.format { crypto(cryptoCurrency) }
val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format { fiat(
appCurrency.code,
appCurrency
.symbol,
) }
val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format {
fiat(
appCurrency.code,
appCurrency.symbol,
)
}
val feeNoteValue: TextReference = resourceReference(
id = R.string.yield_module_fee_policy_sheet_fee_note,

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
View file

@ -254,7 +254,6 @@ internal class YieldSupplyApproveModel @Inject constructor(
approvalTransitionData.copy(fee = transactionFee.normal),
),
feeFiatValue = stringReference(fiatFee),
tokenFeeFiatValue = TextReference.EMPTY,
maxNetworkFeeFiatValue = TextReference.EMPTY,
minTopUpFiatValue = TextReference.EMPTY,
feeNoteValue = TextReference.EMPTY,

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
View file

@ -171,7 +171,6 @@ private fun YieldSupplyFeePolicyContent_Preview() {
transactionDataList = persistentListOf(),
feeFiatValue = stringReference("$1.45"),
maxNetworkFeeFiatValue = stringReference("$8.50"),
tokenFeeFiatValue = stringReference("$1.45"),
minTopUpFiatValue = stringReference("$50"),
feeNoteValue = resourceReference(
id = R.string.yield_module_fee_policy_sheet_fee_note,

2
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
View file

@ -192,7 +192,7 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
updatedTransactionList = updatedTransactionList,
feeValue = feeSum,
maxNetworkFee = maxFee,
estimatedFeeValue = estimatedFee,
estimatedFeeValueInTokenCurrency = estimatedFee,
minAmount = minAmount,
),
)

20
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
View file

@ -16,7 +16,6 @@ import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
import com.tangem.utils.transformer.Transformer
import kotlinx.collections.immutable.toPersistentList
import java.math.BigDecimal
import java.math.RoundingMode
@Suppress("LongParameterList")
internal class YieldSupplyStartEarningFeeContentTransformer(
@ -25,7 +24,7 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
private val appCurrency: AppCurrency,
private val updatedTransactionList: List<TransactionData.Uncompiled>,
private val feeValue: BigDecimal,
private val estimatedFeeValue: BigDecimal,
private val estimatedFeeValueInTokenCurrency: BigDecimal,
private val maxNetworkFee: YieldSupplyMaxFee,
private val minAmount: BigDecimal,
) : Transformer<YieldSupplyActionUM> {
@ -37,14 +36,10 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
val feeFiat = feeFiatRate?.let(feeValue::multiply)
val feeFiatValueText = feeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
val estimatedFeeFiat = estimatedFeeValue
val estimatedFeeFiatValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
val tokenCryptoFee = tokenFiatRate?.let { rate ->
estimatedFeeFiat.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
}
val tokenCryptoFeeValueText = tokenCryptoFee.format { crypto(cryptoCurrency) }
val tokenFiatFeeValueText = estimatedFeeFiat.format { fiat(appCurrency.code, appCurrency.symbol) }
val estimatedFeeToken = estimatedFeeValueInTokenCurrency
val estimatedFeeTokenValueText = estimatedFeeToken.format { crypto(cryptoCurrency) }
val estimatedFiatFee = tokenFiatRate?.let(estimatedFeeToken::multiply)
val estimatedFeeFiatValueText = estimatedFiatFee.format { fiat(appCurrency.code, appCurrency.symbol) }
val maxFeeCryptoValueText = maxNetworkFee.tokenMaxFee.format { crypto(cryptoCurrency) }
val maxFiatFeeValueText = maxNetworkFee.fiatMaxFee.format { fiat(appCurrency.code, appCurrency.symbol) }
@ -56,8 +51,8 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
val feeNoteValue = resourceReference(
id = R.string.yield_module_fee_policy_sheet_fee_note,
formatArgs = wrappedList(
tokenFiatFeeValueText,
tokenCryptoFeeValueText,
estimatedFeeFiatValueText,
estimatedFeeTokenValueText,
maxFiatFeeValueText,
maxFeeCryptoValueText,
),
@ -78,7 +73,6 @@ internal class YieldSupplyStartEarningFeeContentTransformer(
yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
transactionDataList = updatedTransactionList.toPersistentList(),
feeFiatValue = stringReference(feeFiatValueText),
tokenFeeFiatValue = stringReference(tokenFiatFeeValueText),
maxNetworkFeeFiatValue = stringReference(maxFiatFeeValueText),
minTopUpFiatValue = stringReference(minAmountFiatText),
feeNoteValue = feeNoteValue,

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
View file

@ -34,7 +34,6 @@ internal class YieldSupplyStopEarningFeeContentTransformer(
yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
transactionDataList = transactions.toPersistentList(),
feeFiatValue = stringReference(fiatFeeText),
tokenFeeFiatValue = TextReference.EMPTY,
maxNetworkFeeFiatValue = TextReference.EMPTY,
minTopUpFiatValue = TextReference.EMPTY,
feeNoteValue = TextReference.EMPTY,