diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendEventStateFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendEventStateFactory.kt index 2faa56655f..23c9aec225 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendEventStateFactory.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/SendEventStateFactory.kt @@ -50,10 +50,10 @@ internal class SendEventStateFactory( is TransactionFee.Single -> fee.normal is TransactionFee.Choosable -> { when (feeSelector.selectedFee) { - FeeType.SLOW -> fee.minimum - FeeType.MARKET -> fee.normal - FeeType.FAST -> fee.priority - FeeType.CUSTOM -> return state + FeeType.Slow -> fee.minimum + FeeType.Market -> fee.normal + FeeType.Fast -> fee.priority + FeeType.Custom -> return state } } } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeConverter.kt index c14db17575..7b55e0100d 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeConverter.kt @@ -28,10 +28,10 @@ internal class FeeConverter( return when (val fees = value.fees) { is TransactionFee.Choosable -> { when (value.selectedFee) { - FeeType.SLOW -> fees.minimum - FeeType.MARKET -> fees.normal - FeeType.FAST -> fees.priority - FeeType.CUSTOM -> convertCustom(value, fees) + FeeType.Slow -> fees.minimum + FeeType.Market -> fees.normal + FeeType.Fast -> fees.priority + FeeType.Custom -> convertCustom(value, fees) } } is TransactionFee.Single -> fees.normal diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeNotificationFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeNotificationFactory.kt index d95031bd4e..fd4fa1da94 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeNotificationFactory.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeNotificationFactory.kt @@ -69,7 +69,7 @@ internal class FeeNotificationFactory( val minimumValue = multipleFees.minimum.amount.value ?: return val customAmount = customFee.firstOrNull() ?: return val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals) - if (selectedFee == FeeType.CUSTOM && minimumValue > customValue) { + if (selectedFee == FeeType.Custom && minimumValue > customValue) { add(SendFeeNotification.Warning.TooLow) } } @@ -84,7 +84,7 @@ internal class FeeNotificationFactory( val customAmount = customFee.firstOrNull() ?: return val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals) val diff = customValue / highValue - if (selectedFee == FeeType.CUSTOM && diff > FEE_MAX_DIFF) { + if (selectedFee == FeeType.Custom && diff > FEE_MAX_DIFF) { add(SendFeeNotification.Warning.TooHigh(diff.toFormattedString(HIGH_FEE_DIFF_DECIMALS))) } } diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeSelectorState.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeSelectorState.kt index 9751e61eae..e0cda82bfa 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeSelectorState.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeSelectorState.kt @@ -13,7 +13,7 @@ internal sealed class FeeSelectorState { data class Content( val fees: TransactionFee, - val selectedFee: FeeType = FeeType.MARKET, + val selectedFee: FeeType = FeeType.Market, val customValues: ImmutableList = persistentListOf(), ) : FeeSelectorState() @@ -21,8 +21,8 @@ internal sealed class FeeSelectorState { } enum class FeeType { - SLOW, - MARKET, - FAST, - CUSTOM, + Slow, + Market, + Fast, + Custom, } \ No newline at end of file diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeStateFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeStateFactory.kt index 91ad0f8eba..b8f99a5511 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeStateFactory.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/FeeStateFactory.kt @@ -191,7 +191,7 @@ internal class FeeStateFactory( val fee = feeConverter.convert(feeSelectorState) val feeValue = fee.amount.value ?: BigDecimal.ZERO - val isNotCustom = feeSelectorState.selectedFee != FeeType.CUSTOM + val isNotCustom = feeSelectorState.selectedFee != FeeType.Custom val isNotEmptyCustom = if (customValue != null) { !customValue.value.parseToBigDecimal(customValue.decimals).isZero() && !isNotCustom } else { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt index 8dbb522573..207b6ee43e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendCustomFeeEthereum.kt @@ -20,7 +20,7 @@ internal fun SendCustomFeeEthereum( selectedFee: FeeType, modifier: Modifier = Modifier, ) { - if (selectedFee == FeeType.CUSTOM && customValues.isNotEmpty()) { + if (selectedFee == FeeType.Custom && customValues.isNotEmpty()) { Column( verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12), modifier = modifier, diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt index 0c1316c178..95a469975a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedAndFeeContent.kt @@ -175,7 +175,7 @@ internal fun LazyListScope.subtractButton( item { val feeStateContent = feeSendState as? FeeSelectorState.Content val isCustomAvailable = feeStateContent?.customValues.isNullOrEmpty().not() - val isCustomSelected = feeStateContent?.selectedFee == FeeType.CUSTOM + val isCustomSelected = feeStateContent?.selectedFee == FeeType.Custom val topPadding = if (isCustomSelected && isCustomAvailable) { TangemTheme.dimens.spacing12 } else { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedSelector.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedSelector.kt index 2721c1698e..0bac355bb7 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedSelector.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/ui/fee/SendSpeedSelector.kt @@ -88,8 +88,8 @@ internal fun SendSpeedSelector( amount = getCryptoReference(minimumAmount, state.isFeeApproximate), fiatAmount = getFiatReference(minimumAmount, state.rate, state.appCurrency), symbolLength = minimumAmount.currencySymbol.length, - isSelected = isSelected == FeeType.SLOW, - onSelect = { clickIntents.onFeeSelectorClick(FeeType.SLOW) }, + isSelected = isSelected == FeeType.Slow, + onSelect = { clickIntents.onFeeSelectorClick(FeeType.Slow) }, ) val normalAmount = fees.normal.amount SendSpeedSelectorItem( @@ -98,8 +98,8 @@ internal fun SendSpeedSelector( amount = getCryptoReference(normalAmount, state.isFeeApproximate), fiatAmount = getFiatReference(normalAmount, state.rate, state.appCurrency), symbolLength = normalAmount.currencySymbol.length, - isSelected = isSelected == FeeType.MARKET, - onSelect = { clickIntents.onFeeSelectorClick(FeeType.MARKET) }, + isSelected = isSelected == FeeType.Market, + onSelect = { clickIntents.onFeeSelectorClick(FeeType.Market) }, ) val priorityAmount = fees.priority.amount SendSpeedSelectorItem( @@ -108,8 +108,8 @@ internal fun SendSpeedSelector( amount = getCryptoReference(priorityAmount, state.isFeeApproximate), fiatAmount = getFiatReference(priorityAmount, state.rate, state.appCurrency), symbolLength = priorityAmount.currencySymbol.length, - isSelected = isSelected == FeeType.FAST, - onSelect = { clickIntents.onFeeSelectorClick(FeeType.FAST) }, + isSelected = isSelected == FeeType.Fast, + onSelect = { clickIntents.onFeeSelectorClick(FeeType.Fast) }, showDivider = fees.normal is Fee.Ethereum, ) AnimatedVisibility( @@ -123,8 +123,8 @@ internal fun SendSpeedSelector( SendSpeedSelectorItem( titleRes = R.string.common_fee_selector_option_custom, iconRes = R.drawable.ic_edit_24, - isSelected = isSelected == FeeType.CUSTOM, - onSelect = { clickIntents.onFeeSelectorClick(FeeType.CUSTOM) }, + isSelected = isSelected == FeeType.Custom, + onSelect = { clickIntents.onFeeSelectorClick(FeeType.Custom) }, showDivider = fees.normal !is Fee.Ethereum, showWarning = showWarning, ) @@ -139,7 +139,7 @@ internal fun SendSpeedSelector( amount = getCryptoReference(normalAmount, state.isFeeApproximate), fiatAmount = getFiatReference(normalAmount, state.rate, state.appCurrency), symbolLength = normalAmount.currencySymbol.length, - onSelect = { clickIntents.onFeeSelectorClick(FeeType.MARKET) }, + onSelect = { clickIntents.onFeeSelectorClick(FeeType.Market) }, showDivider = false, ) }