Updated on 2026-08-14

core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt

@@ -76,7 +76,7 @@ fun InputRowRecipient(
     val (titleText, color) = if (isError && error != null) {
         error to TangemTheme.colors.text.warning
     } else {
-        title to TangemTheme.colors.text.secondary
+        title to TangemTheme.colors.text.tertiary
     }
     DividerContainer(
         modifier = modifier,

core/ui/src/main/java/com/tangem/core/ui/components/rows/SelectorRowItem.kt

@@ -2,7 +2,6 @@ package com.tangem.core.ui.components.rows
 
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -23,7 +22,7 @@ import com.tangem.core.ui.components.atoms.text.EllipsisText
 import com.tangem.core.ui.components.atoms.text.TextEllipsis
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.SelectNetworkFeeBottomSheetTestTags
@@ -31,7 +30,7 @@ import com.tangem.utils.StringsSigns
 
 @Composable
 fun SelectorRowItem(
-    @StringRes titleRes: Int,
+    title: TextReference,
     @DrawableRes iconRes: Int,
     modifier: Modifier = Modifier,
     paddingValues: PaddingValues = PaddingValues(TangemTheme.dimens.spacing12),
@@ -80,7 +79,7 @@ fun SelectorRowItem(
                 contentDescription = null,
             )
             Text(
-                text = stringResourceSafe(titleRes),
+                text = title.resolveReference(),
                 style = textStyle,
                 color = TangemTheme.colors.text.primary1,
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing8),
@@ -151,7 +150,7 @@ private fun RowScope.SelectorValueContent(
 private fun SelectorRowItemPreview() {
     TangemThemePreview {
         SelectorRowItem(
-            titleRes = R.string.common_fee_selector_option_slow,
+            title = resourceReference(R.string.common_fee_selector_option_slow),
             iconRes = R.drawable.ic_tortoise_24,
             preDot = TextReference.Str("1000 ETH"),
             postDot = TextReference.Str("1000 $"),

features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/entity/FeeSelectorUM.kt

@@ -5,8 +5,10 @@ import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.transaction.error.GetFeeError
+import com.tangem.features.send.v2.api.R
 import com.tangem.features.send.v2.api.entity.FeeItem.*
 import kotlinx.collections.immutable.ImmutableList
 import java.math.BigDecimal
@@ -72,14 +74,37 @@ sealed class FeeNonce {
 @Immutable
 sealed class FeeItem {
     abstract val fee: Fee
+    abstract val title: TextReference
+    abstract val iconRes: Int
 
     fun isSameClass(other: FeeItem): Boolean {
         return this::class == other::class
     }
 
-    data class Suggested(val title: TextReference, override val fee: Fee) : FeeItem()
-    data class Slow(override val fee: Fee) : FeeItem()
-    data class Market(override val fee: Fee) : FeeItem()
-    data class Fast(override val fee: Fee) : FeeItem()
-    data class Custom(override val fee: Fee, val customValues: ImmutableList<CustomFeeFieldUM>) : FeeItem()
+    data class Suggested(
+        override val title: TextReference,
+        override val fee: Fee,
+    ) : FeeItem() {
+        override val iconRes: Int = R.drawable.ic_star_mini_24
+    }
+
+    data class Slow(override val fee: Fee) : FeeItem() {
+        override val title: TextReference = resourceReference(R.string.common_fee_selector_option_slow)
+        override val iconRes: Int = R.drawable.ic_tortoise_24
+    }
+
+    data class Market(override val fee: Fee) : FeeItem() {
+        override val title: TextReference = resourceReference(R.string.common_fee_selector_option_market)
+        override val iconRes: Int = R.drawable.ic_bird_24
+    }
+
+    data class Fast(override val fee: Fee) : FeeItem() {
+        override val title: TextReference = resourceReference(R.string.common_fee_selector_option_fast)
+        override val iconRes: Int = R.drawable.ic_hare_24
+    }
+
+    data class Custom(override val fee: Fee, val customValues: ImmutableList<CustomFeeFieldUM>) : FeeItem() {
+        override val title: TextReference = resourceReference(R.string.common_custom)
+        override val iconRes: Int = R.drawable.ic_edit_v2_24
+    }
 }

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/FeeBlock.kt

@@ -0,0 +1,70 @@
+package com.tangem.features.send.v2.common.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import com.tangem.common.ui.amountScreen.utils.getFiatReference
+import com.tangem.core.ui.components.rows.SelectorRowItem
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fee
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.features.send.v2.api.entity.FeeSelectorUM
+import com.tangem.features.send.v2.impl.R
+
+@Composable
+internal fun FeeBlock(feeSelectorUM: FeeSelectorUM) {
+    if (feeSelectorUM !is FeeSelectorUM.Content) return
+    val feeExtraInfo = feeSelectorUM.feeExtraInfo
+    val feeFiatRateUM = feeSelectorUM.feeFiatRateUM
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(TangemTheme.shapes.roundedCornersXMedium)
+            .background(TangemTheme.colors.background.action)
+            .padding(TangemTheme.dimens.spacing12),
+    ) {
+        Text(
+            text = stringResourceSafe(R.string.common_network_fee_title),
+            style = TangemTheme.typography.subtitle2,
+            color = TangemTheme.colors.text.tertiary,
+        )
+
+        Box(modifier = Modifier.padding(top = TangemTheme.dimens.spacing8)) {
+            val feeItemUM = feeSelectorUM.selectedFeeItem
+            val feeAmount = feeItemUM.fee.amount
+            SelectorRowItem(
+                title = feeItemUM.title,
+                iconRes = feeItemUM.iconRes,
+                preDot = remember {
+                    stringReference(
+                        feeAmount.value.format {
+                            crypto(
+                                symbol = feeAmount.currencySymbol,
+                                decimals = feeAmount.decimals,
+                            ).fee(canBeLower = feeExtraInfo.isFeeApproximate)
+                        },
+                    )
+                },
+                postDot = remember {
+                    if (feeExtraInfo.isFeeConvertibleToFiat && feeFiatRateUM != null) {
+                        getFiatReference(feeAmount.value, feeFiatRateUM.rate, feeFiatRateUM.appCurrency)
+                    } else {
+                        null
+                    }
+                },
+                ellipsizeOffset = feeAmount.currencySymbol.length,
+                isSelected = true,
+                showDivider = false,
+                showSelectedAppearance = false,
+                paddingValues = PaddingValues(),
+            )
+        }
+    }
+}

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/SendContent.kt

@@ -18,8 +18,6 @@ import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.send.v2.common.CommonSendRoute
-import com.tangem.features.send.v2.send.confirm.SendConfirmComponent
-import com.tangem.features.send.v2.send.success.SendConfirmSuccessComponent
 
 @Composable
 internal fun SendContent(
@@ -38,9 +36,9 @@ internal fun SendContent(
         Children(
             stack = stackState,
             animation = stackAnimation { child ->
-                when (child.instance) {
-                    is SendConfirmSuccessComponent -> fade(minAlpha = 1.0f)
-                    is SendConfirmComponent -> fade()
+                when (child.configuration) {
+                    is CommonSendRoute.ConfirmSuccess -> fade(minAlpha = 1.0f)
+                    is CommonSendRoute.Confirm -> fade()
                     else -> slide()
                 }
             },

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

@@ -115,7 +115,6 @@ private fun FeeTitle(feeDisplaySource: FeeSelectorParams.FeeDisplaySource, onDis
     }
 }
 
-@Suppress("LongMethod", "CyclomaticComplexMethod")
 @Composable
 private fun FeeSelectorItems(
     state: FeeSelectorUM.Content,
@@ -144,110 +143,6 @@ private fun FeeSelectorItems(
                 .selectedBorder(isSelected = isSelected)
                 .clickableSingle(onClick = { feeSelectorIntents.onFeeItemSelected(item) })
             when (item) {
-                is FeeItem.Suggested -> RegularFeeItemContent(
-                    modifier = itemModifier,
-                    title = item.title,
-                    iconRes = R.drawable.ic_star_mini_24,
-                    iconBackgroundColor = iconBackgroundColor,
-                    iconTint = iconTint,
-                    preDot = stringReference(
-                        item.fee.amount.value.format {
-                            crypto(
-                                symbol = item.fee.amount.currencySymbol,
-                                decimals = item.fee.amount.decimals,
-                            ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate)
-                        },
-                    ),
-                    postDot = if (feeFiatRateUM != null) {
-                        getFiatReference(
-                            value = item.fee.amount.value,
-                            rate = feeFiatRateUM.rate,
-                            appCurrency = feeFiatRateUM.appCurrency,
-                        )
-                    } else {
-                        null
-                    },
-                    ellipsizeOffset = item.fee.amount.currencySymbol.length,
-                    showDivider = !isSelected && !lastItem,
-                )
-                is FeeItem.Slow -> RegularFeeItemContent(
-                    modifier = itemModifier,
-                    title = resourceReference(R.string.common_fee_selector_option_slow),
-                    iconRes = R.drawable.ic_tortoise_24,
-                    iconBackgroundColor = iconBackgroundColor,
-                    iconTint = iconTint,
-                    preDot = stringReference(
-                        item.fee.amount.value.format {
-                            crypto(
-                                symbol = item.fee.amount.currencySymbol,
-                                decimals = item.fee.amount.decimals,
-                            ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate)
-                        },
-                    ),
-                    postDot = if (feeFiatRateUM != null) {
-                        getFiatReference(
-                            value = item.fee.amount.value,
-                            rate = feeFiatRateUM.rate,
-                            appCurrency = feeFiatRateUM.appCurrency,
-                        )
-                    } else {
-                        null
-                    },
-                    ellipsizeOffset = item.fee.amount.currencySymbol.length,
-                    showDivider = !isSelected && !lastItem,
-                )
-                is FeeItem.Market -> RegularFeeItemContent(
-                    modifier = itemModifier,
-                    title = resourceReference(R.string.common_fee_selector_option_market),
-                    iconRes = R.drawable.ic_bird_24,
-                    iconBackgroundColor = iconBackgroundColor,
-                    iconTint = iconTint,
-                    preDot = stringReference(
-                        item.fee.amount.value.format {
-                            crypto(
-                                symbol = item.fee.amount.currencySymbol,
-                                decimals = item.fee.amount.decimals,
-                            ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate)
-                        },
-                    ),
-                    postDot = if (feeFiatRateUM != null) {
-                        getFiatReference(
-                            value = item.fee.amount.value,
-                            rate = feeFiatRateUM.rate,
-                            appCurrency = feeFiatRateUM.appCurrency,
-                        )
-                    } else {
-                        null
-                    },
-                    ellipsizeOffset = item.fee.amount.currencySymbol.length,
-                    showDivider = !isSelected && !lastItem,
-                )
-                is FeeItem.Fast -> RegularFeeItemContent(
-                    modifier = itemModifier,
-                    title = resourceReference(R.string.common_fee_selector_option_fast),
-                    iconRes = R.drawable.ic_hare_24,
-                    iconBackgroundColor = iconBackgroundColor,
-                    iconTint = iconTint,
-                    preDot = stringReference(
-                        item.fee.amount.value.format {
-                            crypto(
-                                symbol = item.fee.amount.currencySymbol,
-                                decimals = item.fee.amount.decimals,
-                            ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate)
-                        },
-                    ),
-                    postDot = if (feeFiatRateUM != null) {
-                        getFiatReference(
-                            value = item.fee.amount.value,
-                            rate = feeFiatRateUM.rate,
-                            appCurrency = feeFiatRateUM.appCurrency,
-                        )
-                    } else {
-                        null
-                    },
-                    ellipsizeOffset = item.fee.amount.currencySymbol.length,
-                    showDivider = !isSelected && !lastItem,
-                )
                 is FeeItem.Custom -> CustomFeeBlock(
                     modifier = itemModifier,
                     customFee = item,
@@ -257,6 +152,32 @@ private fun FeeSelectorItems(
                     onValueChange = feeSelectorIntents::onCustomFeeValueChange,
                     nonce = state.feeNonce,
                 )
+                else -> RegularFeeItemContent(
+                    modifier = itemModifier,
+                    title = item.title,
+                    iconRes = item.iconRes,
+                    iconBackgroundColor = iconBackgroundColor,
+                    iconTint = iconTint,
+                    preDot = stringReference(
+                        item.fee.amount.value.format {
+                            crypto(
+                                symbol = item.fee.amount.currencySymbol,
+                                decimals = item.fee.amount.decimals,
+                            ).fee(canBeLower = state.feeExtraInfo.isFeeApproximate)
+                        },
+                    ),
+                    postDot = if (feeFiatRateUM != null) {
+                        getFiatReference(
+                            value = item.fee.amount.value,
+                            rate = feeFiatRateUM.rate,
+                            appCurrency = feeFiatRateUM.appCurrency,
+                        )
+                    } else {
+                        null
+                    },
+                    ellipsizeOffset = item.fee.amount.currencySymbol.length,
+                    showDivider = !isSelected && !lastItem,
+                )
             }
         }
     }
@@ -491,7 +412,14 @@ private class FeeSelectorUMContentProvider : CollectionPreviewParameterProvider<
                     fee = Fee.Common(Amount(value = BigDecimal("0.1"), blockchain = Blockchain.Ethereum)),
                 ),
                 FeeItem.Slow(fee = Fee.Common(Amount(value = BigDecimal("0.01"), blockchain = Blockchain.Ethereum))),
-                FeeItem.Market(fee = Fee.Common(Amount(value = BigDecimal("0.02"), blockchain = Blockchain.Ethereum))),
+                FeeItem.Market(
+                    fee = Fee.Common(
+                        Amount(
+                            value = BigDecimal("0.02"),
+                            blockchain = Blockchain.Ethereum,
+                        ),
+                    ),
+                ),
                 FeeItem.Fast(fee = Fee.Common(Amount(value = BigDecimal("0.03"), blockchain = Blockchain.Ethereum))),
                 customFeeItem,
             ),

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/DefaultSendComponent.kt

@@ -38,7 +38,6 @@ import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponent
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponentParams
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
 import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponent
 import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
 import dagger.assisted.Assisted
@@ -254,7 +253,6 @@ internal class DefaultSendComponent @AssistedInject constructor(
         val destinationAddress = (state.destinationUM as? DestinationUM.Content)?.addressTextField?.value
         val txUrl = (state.confirmUM as? ConfirmUM.Success)?.txUrl
         val cryptoCurrencyStatus = model.cryptoCurrencyStatusFlow.value
-        val feeCryptoCurrencyStatus = model.feeCryptoCurrencyStatusFlow.value
 
         if (sendAmount == null ||
             destinationAddress == null ||
@@ -279,29 +277,10 @@ internal class DefaultSendComponent @AssistedInject constructor(
                 onClick = {},
             )
 
-        val feeBlockComponent = SendFeeBlockComponent(
-            appComponentContext = child("sendConfirmFeeBlock"),
-            params = SendFeeComponentParams.FeeBlockParams(
-                state = model.uiState.value.feeUM,
-                analyticsCategoryName = model.analyticCategoryName,
-                userWallet = model.userWallet,
-                cryptoCurrencyStatus = cryptoCurrencyStatus,
-                feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-                appCurrency = model.appCurrency,
-                sendAmount = sendAmount,
-                destinationAddress = destinationAddress,
-                blockClickEnableFlow = MutableStateFlow(true),
-                onLoadFee = model::loadFee,
-            ),
-            onResult = { },
-            onClick = {},
-        )
-
         return SendConfirmSuccessComponent(
             appComponentContext = factoryContext,
             params = SendConfirmSuccessComponent.Params(
                 sendUMFlow = model.uiState,
-                feeBlockComponent = feeBlockComponent,
                 destinationBlockComponent = destinationBlockComponent,
                 analyticsCategoryName = model.analyticCategoryName,
                 currentRoute = model.currentRoute,

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/SendConfirmSuccessComponent.kt

@@ -12,7 +12,6 @@ import com.tangem.features.send.v2.common.CommonSendRoute
 import com.tangem.features.send.v2.send.success.model.SendConfirmSuccessModel
 import com.tangem.features.send.v2.send.success.ui.SendConfirmSuccessContent
 import com.tangem.features.send.v2.send.ui.state.SendUM
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 
@@ -23,7 +22,6 @@ internal class SendConfirmSuccessComponent(
 
     private val model: SendConfirmSuccessModel = getOrCreateModel(params = params)
     private val destinationBlockComponent: SendDestinationBlockComponent = params.destinationBlockComponent
-    private val feeBlockComponent: SendFeeBlockComponent = params.feeBlockComponent
 
     @Composable
     override fun Content(modifier: Modifier) {
@@ -31,14 +29,12 @@ internal class SendConfirmSuccessComponent(
         SendConfirmSuccessContent(
             sendUM = state,
             destinationBlockComponent = destinationBlockComponent,
-            feeBlockComponent = feeBlockComponent,
         )
     }
 
     data class Params(
         val sendUMFlow: StateFlow<SendUM>,
         val destinationBlockComponent: SendDestinationBlockComponent,
-        val feeBlockComponent: SendFeeBlockComponent,
         val analyticsCategoryName: String,
         val currentRoute: Flow<CommonSendRoute>,
         val txUrl: String,

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/ui/SendConfirmSuccessContent.kt

@@ -21,18 +21,14 @@ import com.tangem.core.ui.utils.DateTimeFormatters
 import com.tangem.core.ui.utils.toPx
 import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationBlockComponent
+import com.tangem.features.send.v2.common.ui.FeeBlock
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.impl.R
 import com.tangem.features.send.v2.send.ui.state.SendUM
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
 import kotlinx.coroutines.delay
 
 @Composable
-internal fun SendConfirmSuccessContent(
-    sendUM: SendUM,
-    destinationBlockComponent: SendDestinationBlockComponent,
-    feeBlockComponent: SendFeeBlockComponent,
-) {
+internal fun SendConfirmSuccessContent(sendUM: SendUM, destinationBlockComponent: SendDestinationBlockComponent) {
     var visible by remember { mutableStateOf(false) }
 
     LaunchedEffect(Unit) {
@@ -84,7 +80,7 @@ internal fun SendConfirmSuccessContent(
                     onClick = {},
                 )
                 destinationBlockComponent.Content(modifier = Modifier)
-                feeBlockComponent.Content(modifier = Modifier)
+                FeeBlock(feeSelectorUM = sendUM.feeSelectorUM)
                 Spacer(Modifier.height(60.dp))
             }
             BottomFade(Modifier.align(Alignment.BottomCenter), TangemTheme.colors.background.tertiary)

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -14,6 +15,7 @@ import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.common.ui.amountScreen.utils.getFiatReference
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.rows.SelectorRowItem
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.format.bigdecimal.BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
@@ -62,20 +64,24 @@ internal fun FeeBlock(feeUM: FeeUM, isClickEnabled: Boolean, onClick: () -> Unit
                 R.string.common_fee_selector_option_market to R.drawable.ic_bird_24
             }
             SelectorRowItem(
-                titleRes = title,
+                title = resourceReference(title),
                 iconRes = icon,
-                preDot = stringReference(
-                    feeAmount?.value.format {
-                        crypto(
-                            symbol = feeAmount?.currencySymbol.orEmpty(),
-                            decimals = feeAmount?.decimals ?: 0,
-                        ).fee(canBeLower = feeUM.isFeeApproximate)
-                    },
-                ),
-                postDot = if (feeUM.isFeeConvertibleToFiat) {
-                    getFiatReference(feeAmount?.value, feeUM.rate, feeUM.appCurrency)
-                } else {
-                    null
+                preDot = remember {
+                    stringReference(
+                        feeAmount?.value.format {
+                            crypto(
+                                symbol = feeAmount?.currencySymbol.orEmpty(),
+                                decimals = feeAmount?.decimals ?: 0,
+                            ).fee(canBeLower = feeUM.isFeeApproximate)
+                        },
+                    )
+                },
+                postDot = remember {
+                    if (feeUM.isFeeConvertibleToFiat) {
+                        getFiatReference(feeAmount?.value, feeUM.rate, feeUM.appCurrency)
+                    } else {
+                        null
+                    }
                 },
                 ellipsizeOffset = feeAmount?.currencySymbol?.length,
                 isSelected = true,

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelectorItem.kt

@@ -16,6 +16,7 @@ import com.tangem.common.ui.amountScreen.utils.getFiatReference
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.rows.SelectorRowItem
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.format.bigdecimal.BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
 import com.tangem.core.ui.format.bigdecimal.crypto
@@ -52,7 +53,7 @@ internal fun SendSpeedSelectorItem(
                 .clickable { onSelect() },
         ) {
             SelectorRowItem(
-                titleRes = titleRes,
+                title = resourceReference(titleRes),
                 iconRes = iconRes,
                 onSelect = onSelect,
                 modifier = modifier,

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/StakingFeeBlock.kt

@@ -19,6 +19,7 @@ import com.tangem.common.ui.R
 import com.tangem.common.ui.amountScreen.utils.getFiatReference
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.rows.SelectorRowItem
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.format.bigdecimal.crypto
@@ -51,7 +52,7 @@ internal fun StakingFeeBlock(feeState: FeeState) {
                 is FeeState.Content -> {
                     val feeAmount = feeState.fee?.amount
                     SelectorRowItem(
-                        titleRes = R.string.common_fee_selector_option_market,
+                        title = resourceReference(R.string.common_fee_selector_option_market),
                         iconRes = R.drawable.ic_bird_24,
                         preDot = stringReference(
                             feeAmount?.value.format {
@@ -75,7 +76,7 @@ internal fun StakingFeeBlock(feeState: FeeState) {
                 }
                 is FeeState.Loading -> {
                     SelectorRowItem(
-                        titleRes = R.string.common_fee_selector_option_market,
+                        title = resourceReference(R.string.common_fee_selector_option_market),
                         iconRes = R.drawable.ic_bird_24,
                         isSelected = true,
                         paddingValues = PaddingValues(),
@@ -85,7 +86,7 @@ internal fun StakingFeeBlock(feeState: FeeState) {
                 }
                 is FeeState.Error -> {
                     SelectorRowItem(
-                        titleRes = R.string.common_fee_selector_option_market,
+                        title = resourceReference(R.string.common_fee_selector_option_market),
                         iconRes = R.drawable.ic_bird_24,
                         isSelected = true,
                         paddingValues = PaddingValues(),

features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt

@@ -202,16 +202,17 @@ private fun FeeBlock(feeSelectorUM: FeeSelectorUM.Content) {
             .padding(TangemTheme.dimens.spacing12),
     ) {
         Text(
-            text = stringResourceSafe(com.tangem.common.ui.R.string.common_network_fee_title),
+            text = stringResourceSafe(R.string.common_network_fee_title),
             style = TangemTheme.typography.subtitle2,
             color = TangemTheme.colors.text.tertiary,
         )
 
         Box(modifier = Modifier.padding(top = TangemTheme.dimens.spacing8)) {
-            val feeAmount = feeSelectorUM.selectedFeeItem.fee.amount
+            val feeItemUM = feeSelectorUM.selectedFeeItem
+            val feeAmount = feeItemUM.fee.amount
             SelectorRowItem(
-                titleRes = com.tangem.common.ui.R.string.common_fee_selector_option_market,
-                iconRes = com.tangem.common.ui.R.drawable.ic_bird_24,
+                title = feeItemUM.title,
+                iconRes = feeItemUM.iconRes,
                 preDot = stringReference(
                     feeAmount.value.format {
                         crypto(

features/swap/impl/src/main/java/com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
-import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.components.rows.SelectorRowItem
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
@@ -110,7 +110,7 @@ private fun FeeItemsBlock(content: ChooseFeeBottomSheetConfig) {
         when (feeItem.feeType) {
             FeeType.NORMAL -> {
                 SelectorRowItem(
-                    titleRes = R.string.common_fee_selector_option_market,
+                    title = resourceReference(R.string.common_fee_selector_option_market),
                     iconRes = R.drawable.ic_bird_24,
                     preDot = TextReference.Str(preDotText),
                     postDot = TextReference.Str(postDot),
@@ -122,7 +122,7 @@ private fun FeeItemsBlock(content: ChooseFeeBottomSheetConfig) {
             }
             FeeType.PRIORITY -> {
                 SelectorRowItem(
-                    titleRes = R.string.common_fee_selector_option_fast,
+                    title = resourceReference(R.string.common_fee_selector_option_fast),
                     iconRes = R.drawable.ic_hare_24,
                     preDot = TextReference.Str(preDotText),
                     postDot = TextReference.Str(postDot),