Updated on 2026-08-14

features/send-v2/api/src/test/java/com/tangem/features/send/v2/api/subcomponents/feeSelector/utils/FeeCalculationUtilsTest.kt

@@ -168,7 +168,7 @@ class FeeCalculationUtilsTest {
                 fiatAmount = BigDecimal.ZERO,
                 fiatRate = BigDecimal.ZERO,
                 priceChange = BigDecimal.ZERO,
-                yieldBalance = null,
+                stakingBalance = null,
                 hasCurrentNetworkTransactions = false,
                 pendingTransactions = emptySet(),
                 networkAddress = mockk(relaxed = true),

features/staking/impl/detekt-baseline-debug.xml

@@ -5,7 +5,6 @@
     <ID>BooleanPropertyNaming:AddStakingNotificationsTransformer.kt$AddStakingNotificationsTransformer$val showNotification = sendingAmount + feeAmount &gt; balance</ID>
     <ID>BooleanPropertyNaming:AmountCurrencyChangeStateTransformer.kt$AmountCurrencyChangeStateTransformer$private val value: Boolean</ID>
     <ID>BooleanPropertyNaming:StakingModel.kt$StakingModel$val noBalanceState = balanceState == null</ID>
-    <ID>BooleanPropertyNaming:StakingModel.kt$StakingModel$val noYieldBalanceData = cryptoCurrencyStatus.value.yieldBalance !is YieldBalance.Data</ID>
     <ID>BooleanPropertyNaming:StakingUiState.kt$StakingStates.InitialInfoState.Data$val showBanner: Boolean</ID>
     <ID>BooleanPropertyNaming:StakingUiState.kt$StakingUiState$val showColdWalletInteractionIcon: Boolean</ID>
     <ID>CanBeNonNullable:StakingScreen.kt$bottomSheetConfig: TangemBottomSheetConfig?</ID>
@@ -42,7 +41,6 @@
     <ID>UnnecessaryLet:StakingTosText.kt$let { onTextClick(PRIVACY_POLICY_URL) }</ID>
     <ID>UnnecessaryLet:StakingTosText.kt$let { onTextClick(TERMS_OF_USE_URL) }</ID>
     <ID>UnsafeCallOnNullableType:StakingModel.kt$StakingModel$tonAccountInitializeTransaction!!</ID>
-    <ID>UseOrEmpty:StakingModel.kt$StakingModel$yieldBalance?.balance?.items ?: emptyList()</ID>
     <ID>UseOrEmpty:StakingTransactionSender.kt$StakingTransactionSender$getExplorerTransactionUrlUseCase( txHash = transactionHashes.last(), networkId = cryptoCurrencyStatus.currency.network.id, ).getOrNull() ?: ""</ID>
     <ID>VarCouldBeVal:StakingModel.kt$StakingModel$private var actionsJobHolder: JobHolder = JobHolder()</ID>
     <ID>VarCouldBeVal:StakingModel.kt$StakingModel$private var approvalJobHolder: JobHolder = JobHolder()</ID>

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt

@@ -190,9 +190,9 @@ internal class StakingModel @Inject constructor(
 
     private val balancesToShow: List<BalanceItem>
         get() {
-            val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
+            val stakeKitBalance = cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data.StakeKit
             return invalidatePendingTransactionsUseCase(
-                balanceItems = yieldBalance?.balance?.items ?: emptyList(),
+                balanceItems = stakeKitBalance?.balance?.items.orEmpty(),
                 stakingActions = stakingActions,
                 token = yield.token,
             ).getOrElse { emptyList() }
@@ -277,10 +277,10 @@ internal class StakingModel @Inject constructor(
         modelScope.launch {
             val isInitialInfoStep = value.currentStep == StakingStep.InitialInfo
             val noBalanceState = balanceState == null
-            val noYieldBalanceData = cryptoCurrencyStatus.value.yieldBalance !is YieldBalance.Data
+            val hasNoYieldBalanceData = cryptoCurrencyStatus.value.stakingBalance !is StakingBalance.Data.StakeKit
 
             when {
-                isInitialInfoStep && noBalanceState && yield.allValidatorsFull && noYieldBalanceData -> {
+                isInitialInfoStep && noBalanceState && yield.allValidatorsFull && hasNoYieldBalanceData -> {
                     stakingEventFactory.createStakingValidatorsUnavailableAlert()
                     return@launch
                 }
@@ -1116,7 +1116,7 @@ internal class StakingModel @Inject constructor(
     private suspend fun onDataLoaded(status: CryptoCurrencyStatus) {
         if (!isInitialInfoAnalyticSent) {
             isInitialInfoAnalyticSent = true
-            val balances = status.value.yieldBalance as? YieldBalance.Data
+            val balances = status.value.stakingBalance as? StakingBalance.Data.StakeKit
             paramsInterceptorHolder.addParamsInterceptor(
                 interceptor = StakingParamsInterceptor(status.currency.symbol),
             )

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/BalanceItemConverter.kt

@@ -10,7 +10,7 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.staking.BalanceItem
 import com.tangem.domain.models.staking.BalanceType
 import com.tangem.domain.models.staking.BalanceType.Companion.isClickable
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.models.staking.action.StakingActionType
 import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.utils.getRewardStakingBalance
@@ -77,11 +77,11 @@ internal class BalanceItemConverter(
         val isIncludeStakingTotalBalance = BlockchainUtils.isIncludeStakingTotalBalance(
             blockchainId = cryptoCurrencyStatus.currency.network.rawId,
         )
-        val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
+        val stakeKitBalance = cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data.StakeKit
         return if (isIncludeStakingTotalBalance) {
             amount
         } else {
-            amount - yieldBalance?.getRewardStakingBalance().orZero()
+            amount - stakeKitBalance?.getRewardStakingBalance().orZero()
         }
     }
 

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt

@@ -9,7 +9,7 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.staking.BalanceItem
 import com.tangem.domain.models.staking.BalanceType
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.features.staking.impl.presentation.state.BalanceState
 import com.tangem.features.staking.impl.presentation.state.StakingStates
@@ -24,9 +24,9 @@ internal class RewardsValidatorStateConverter(
     private val yield: Yield,
 ) : Converter<Unit, StakingStates.RewardsValidatorsState> {
     override fun convert(value: Unit): StakingStates.RewardsValidatorsState {
-        val yieldBalance = cryptoCurrencyStatus.value.yieldBalance
-        return if (yieldBalance is YieldBalance.Data) {
-            val balances = yieldBalance.balance.items
+        val stakingBalance = cryptoCurrencyStatus.value.stakingBalance
+        return if (stakingBalance is StakingBalance.Data.StakeKit) {
+            val balances = stakingBalance.balance.items
             StakingStates.RewardsValidatorsState.Data(
                 isPrimaryButtonEnabled = true,
                 rewards = balances
@@ -35,6 +35,7 @@ internal class RewardsValidatorStateConverter(
                     .toPersistentList(),
             )
         } else {
+            // TODO p2p
             StakingStates.RewardsValidatorsState.Empty()
         }
     }

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt

@@ -9,7 +9,7 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.staking.BalanceItem
 import com.tangem.domain.models.staking.BalanceType
 import com.tangem.domain.models.staking.RewardBlockType
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.models.staking.action.StakingActionType
 import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.utils.getRewardStakingBalance
@@ -36,11 +36,11 @@ internal class YieldBalancesConverter(
         val appCurrency = appCurrencyProvider()
 
         val cryptoCurrency = cryptoCurrencyStatus.currency
-        val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
+        val stakeKitBalance = cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data.StakeKit
         val balanceToShowItems = balancesToShowProvider()
 
-        return if (yieldBalance != null || balanceToShowItems.any { it.isPending }) {
-            val cryptoRewardsValue = yieldBalance?.getRewardStakingBalance()
+        return if (stakeKitBalance != null || balanceToShowItems.any { it.isPending }) {
+            val cryptoRewardsValue = stakeKitBalance?.getRewardStakingBalance()
 
             val fiatRate = cryptoCurrencyStatus.value.fiatRate
             val fiatRewardsValue = if (fiatRate != null && cryptoRewardsValue != null) {
@@ -49,13 +49,13 @@ internal class YieldBalancesConverter(
                 null
             }
             val type = getRewardBlockType()
-            val pendingRewardsConstraints = yieldBalance?.balance?.items
+            val pendingRewardsConstraints = stakeKitBalance?.balance?.items
                 ?.firstOrNull { it.type == BalanceType.REWARDS }
                 ?.pendingActionsConstraints
                 ?.firstOrNull { it.type == StakingActionType.CLAIM_REWARDS }
 
             InnerYieldBalanceState.Data(
-                integrationId = yieldBalance?.stakingId?.integrationId,
+                integrationId = stakeKitBalance?.stakingId?.integrationId,
                 reward = YieldReward(
                     rewardsCrypto = cryptoRewardsValue.format { crypto(cryptoCurrency) },
                     rewardsFiat = fiatRewardsValue.format {
@@ -71,6 +71,7 @@ internal class YieldBalancesConverter(
                 balances = balanceToShowItems.mapBalances(),
             )
         } else {
+            // TODO p2p
             InnerYieldBalanceState.Empty
         }
     }
@@ -84,8 +85,8 @@ internal class YieldBalancesConverter(
 
     private fun getRewardBlockType(): RewardBlockType {
         val blockchainId = cryptoCurrencyStatus.currency.network.rawId
-        val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
-        val rewards = yieldBalance?.balance?.items
+        val stakeKitBalance = cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data.StakeKit
+        val rewards = stakeKitBalance?.balance?.items
             ?.filter { it.type == BalanceType.REWARDS && !it.amount.isZero() }
 
         val isActionable = rewards?.any { it.pendingActions.isNotEmpty() } == true

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateAssentTransformer.kt

@@ -35,7 +35,7 @@ internal class SetConfirmationStateAssentTransformer(
                     isFeeApproximate = isFeeApproximate,
                 ),
                 isPrimaryButtonEnabled = with(cryptoCurrencyStatus.value) {
-                    sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+                    sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
                 },
             )
         } else {

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateCompletedTransformer.kt

@@ -26,7 +26,7 @@ internal class SetConfirmationStateCompletedTransformer(
         return if (this is StakingStates.ConfirmationState.Data) {
             copy(
                 isPrimaryButtonEnabled = with(cryptoCurrencyStatus.value) {
-                    sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+                    sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
                 },
                 innerState = InnerConfirmationStakingState.COMPLETED,
                 footerText = TextReference.EMPTY,

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateResetAssentTransformer.kt

@@ -15,7 +15,7 @@ internal class SetConfirmationStateResetAssentTransformer(
             confirmationState = if (confirmationState is StakingStates.ConfirmationState.Data) {
                 confirmationState.copy(
                     isPrimaryButtonEnabled = with(cryptoCurrencyStatus.value) {
-                        sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+                        sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
                     },
                     innerState = InnerConfirmationStakingState.ASSENT,
                 )

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt

@@ -90,7 +90,7 @@ internal class SetInitialDataStateTransformer(
         val status = cryptoCurrencyStatus.value
         return StakingStates.InitialInfoState.Data(
             isPrimaryButtonEnabled = with(status) {
-                !amount.isNullOrZero() && sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+                !amount.isNullOrZero() && sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
             },
             showBanner = !isAnyTokenStaked && yieldBalance == InnerYieldBalanceState.Empty,
             infoItems = getInfoItems(),

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetConfirmationStateAssentApprovalTransformer.kt

@@ -37,7 +37,7 @@ internal class SetConfirmationStateAssentApprovalTransformer(
                     isFeeApproximate = false,
                 ),
                 isPrimaryButtonEnabled = with(cryptoCurrencyStatus.value) {
-                    sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+                    sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
                 },
                 isApprovalNeeded = true,
             )

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/notifications/AddStakingNotificationsTransformer.kt

@@ -127,7 +127,7 @@ internal class AddStakingNotificationsTransformer(
         }
 
         val isActualSources = with(cryptoCurrencyStatus.value) {
-            sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
+            sources.stakingBalanceSource.isActual() && sources.networkSource.isActual()
         }
 
         return prevState.copy(

features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/notifications/StakingInfoNotificationsFactory.kt

@@ -6,7 +6,7 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.staking.BalanceType
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.models.staking.action.StakingActionType
 import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType
@@ -134,7 +134,7 @@ internal class StakingInfoNotificationsFactory(
     private fun MutableList<NotificationUM>.addTronRevoteNotification() {
         val cryptoCurrencyStatus = cryptoCurrencyStatusProvider()
         val isTron = isTron(cryptoCurrencyStatus.currency.network.rawId)
-        val hasStakedBalance = (cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data)?.balance
+        val hasStakedBalance = (cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data.StakeKit)?.balance
             ?.items?.any {
                 it.type == BalanceType.PREPARING ||
                     it.type == BalanceType.STAKED ||

features/tokendetails/impl/detekt-baseline-debug.xml

@@ -36,7 +36,6 @@
     <ID>NullableToStringCall:DefaultTokenDetailsDeepLinkHandler.kt$DefaultTokenDetailsDeepLinkHandler$$tokenId</ID>
     <ID>NullableToStringCall:TokenDetailsStakingInfoConverter.kt$TokenDetailsStakingInfoConverter$$stakingCryptoAmount</ID>
     <ID>NullableToStringCall:TokenDetailsStakingInfoConverter.kt$TokenDetailsStakingInfoConverter$$stakingEntryInfo</ID>
-    <ID>NullableToStringCall:TokenDetailsStakingInfoConverter.kt$TokenDetailsStakingInfoConverter$$yieldBalance</ID>
     <ID>PropertyUsedBeforeDeclaration:ExpressStatusBottomSheetStateProvider.kt$ExpressStatusBottomSheetStateProvider$network</ID>
     <ID>PropertyUsedBeforeDeclaration:ExpressStatusBottomSheetStateProvider.kt$ExpressStatusBottomSheetStateProvider$token</ID>
     <ID>PropertyUsedBeforeDeclaration:TokenDetailsModel.kt$TokenDetailsModel$uiState</ID>
@@ -48,7 +47,6 @@
     <ID>UseEmptyCounterpart:TokenDetailsAnalyticsEvent.kt$TokenDetailsAnalyticsEvent$mapOf()</ID>
     <ID>UseEmptyCounterpart:TokenDetailsAnalyticsEvent.kt$TokenDetailsAnalyticsEvent.Notice$mapOf()</ID>
     <ID>UseOrEmpty:ExchangeStatusFactory.kt$ExchangeStatusFactory$savedTransactions ?.flatMap { setOf(it.fromCryptoCurrency.id, it.toCryptoCurrency.id) } ?.toSet() ?.getQuotesOrEmpty() ?: emptySet()</ID>
-    <ID>UseOrEmpty:TokenDetailsStakingInfoConverter.kt$TokenDetailsStakingInfoConverter$yieldBalance?.balance?.items ?: emptyList()</ID>
     <ID>VarCouldBeVal:TokenDetailsModel.kt$TokenDetailsModel$private var expressTxStatusTaskScheduler = SingleTaskScheduler&lt;PersistentList&lt;ExpressTransactionStateUM&gt;&gt;()</ID>
   </CurrentIssues>
 </SmellBaseline>

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsBalanceSelectStateConverter.kt

@@ -5,7 +5,7 @@ import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.*
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.utils.getBalance
@@ -29,8 +29,8 @@ internal class TokenDetailsBalanceSelectStateConverter(
                 return this
             }
 
-            val yieldBalance = cryptoCurrencyStatus.value.yieldBalance as? YieldBalance.Data
-            val stakingCryptoAmount = yieldBalance?.getTotalWithRewardsStakingBalance(
+            val stakingBalance = cryptoCurrencyStatus.value.stakingBalance as? StakingBalance.Data
+            val stakingCryptoAmount = stakingBalance?.getTotalWithRewardsStakingBalance(
                 cryptoCurrencyStatus.currency.network.rawId,
             )
             val stakingFiatAmount = stakingCryptoAmount?.let { cryptoCurrencyStatus.value.fiatRate?.multiply(it) }

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt

@@ -9,7 +9,7 @@ import com.tangem.core.ui.format.bigdecimal.*
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.domain.tokens.error.CurrencyStatusError
 import com.tangem.feature.tokendetails.presentation.tokendetails.model.TokenDetailsClickIntents
@@ -73,7 +73,7 @@ internal class TokenDetailsLoadedBalanceConverter(
         status: CryptoCurrencyStatus,
     ): TokenDetailsBalanceBlockState {
         val stakingCryptoAmount =
-            (status.value.yieldBalance as? YieldBalance.Data)?.getTotalWithRewardsStakingBalance(
+            (status.value.stakingBalance as? StakingBalance.Data)?.getTotalWithRewardsStakingBalance(
                 status.currency.network.rawId,
             )
         val stakingFiatAmount = stakingCryptoAmount?.let { status.value.fiatRate?.multiply(it) }

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStakingInfoConverter.kt

@@ -10,7 +10,7 @@ import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.staking.RewardBlockType
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.model.StakingAvailability
 import com.tangem.domain.staking.model.StakingEntryInfo
 import com.tangem.domain.staking.utils.getRewardStakingBalance
@@ -54,18 +54,29 @@ internal class TokenDetailsStakingInfoConverter(
         }
     }
 
+    @Suppress("CyclomaticComplexMethod")
     private fun getStakingInfoBlock(status: CryptoCurrencyStatus, state: TokenDetailsState): StakingBlockUM? {
-        val yieldBalance = status.value.yieldBalance as? YieldBalance.Data
+        val stakingBalance = status.value.stakingBalance as? StakingBalance.Data
 
-        val stakingCryptoAmount = yieldBalance?.getTotalStakingBalance(status.currency.network.rawId)
-        val pendingBalances = yieldBalance?.balance?.items ?: emptyList()
+        val stakingCryptoAmount = stakingBalance?.getTotalStakingBalance(status.currency.network.rawId)
+
+        val hasPendingBalances = when (stakingBalance) {
+            is StakingBalance.Data.StakeKit -> stakingBalance.balance.items.isNotEmpty()
+            is StakingBalance.Data.P2P -> !stakingBalance.unstakingAmount.isNullOrZero()
+            null -> false
+        }
+        val pendingAmount = when (stakingBalance) {
+            is StakingBalance.Data.StakeKit -> stakingBalance.balance.items.sumOf { it.amount }
+            is StakingBalance.Data.P2P -> stakingBalance.unstakingAmount
+            null -> BigDecimal.ZERO
+        }
 
         val iconState = state.tokenInfoBlockState.iconState
 
         Timber.i(
             """
             getStakingInfoBlock:
-            – yieldBalance: $yieldBalance
+            – stakingBalance: ${stakingBalance ?: "null"}
             – stakingCryptoAmount: $stakingCryptoAmount
             – stakingEntryInfo: $stakingEntryInfo
             """.trimIndent(),
@@ -73,16 +84,24 @@ internal class TokenDetailsStakingInfoConverter(
 
         return when {
             stakingCryptoAmount.isNullOrZero() && stakingEntryInfo != null -> {
-                if (pendingBalances.isEmpty()) {
+                if (!hasPendingBalances) {
                     getStakeAvailableState(stakingEntryInfo, iconState, isStakingButtonEnabled(status))
                 } else {
-                    getStakedBlockWithFiatAmount(status, pendingBalances.sumOf { it.amount }, null)
+                    getStakedBlockWithFiatAmount(status, pendingAmount, null)
                 }
             }
             stakingCryptoAmount.isNullOrZero() && stakingEntryInfo == null -> {
                 null
             }
-            else -> getStakedBlockWithFiatAmount(status, stakingCryptoAmount, yieldBalance?.getRewardStakingBalance())
+            else -> getStakedBlockWithFiatAmount(
+                status = status,
+                stakingAmount = stakingCryptoAmount,
+                rewardAmount = when (stakingBalance) {
+                    is StakingBalance.Data.StakeKit -> stakingBalance.getRewardStakingBalance()
+                    is StakingBalance.Data.P2P -> stakingBalance.totalRewards
+                    else -> BigDecimal.ZERO
+                },
+            )
         }
     }
 

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt

@@ -8,7 +8,7 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
@@ -239,7 +239,7 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
                     token = currencyStatus.currency.symbol,
                     blockchain = currencyStatus.currency.network.name,
                     action = "Staking",
-                    state = if (currencyStatus.value.yieldBalance is YieldBalance.Data) {
+                    state = if (currencyStatus.value.stakingBalance is StakingBalance.Data) {
                         "Enabled"
                     } else {
                         "Disabled"

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt

@@ -31,7 +31,7 @@ import com.tangem.domain.quotes.multi.MultiQuoteStatusFetcher
 import com.tangem.domain.settings.NeverToSuggestRateAppUseCase
 import com.tangem.domain.settings.RemindToRateAppLaterUseCase
 import com.tangem.domain.staking.StakingIdFactory
-import com.tangem.domain.staking.multi.MultiYieldBalanceFetcher
+import com.tangem.domain.staking.multi.MultiStakingBalanceFetcher
 import com.tangem.domain.tokens.model.analytics.PromoAnalyticsEvent
 import com.tangem.domain.tokens.model.analytics.PromoAnalyticsEvent.Program
 import com.tangem.domain.tokens.model.analytics.PromoAnalyticsEvent.PromotionBannerClicked
@@ -128,7 +128,7 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
     private val urlOpener: UrlOpener,
     private val multiNetworkStatusFetcher: MultiNetworkStatusFetcher,
     private val multiQuoteStatusFetcher: MultiQuoteStatusFetcher,
-    private val multiYieldBalanceFetcher: MultiYieldBalanceFetcher,
+    private val multiStakingBalanceFetcher: MultiStakingBalanceFetcher,
     private val stakingIdFactory: StakingIdFactory,
     private val appRouter: AppRouter,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
@@ -529,8 +529,11 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
                         stakingIdFactory.create(userWalletId = userWalletId, cryptoCurrency = it).getOrNull()
                     }
 
-                    multiYieldBalanceFetcher(
-                        params = MultiYieldBalanceFetcher.Params(userWalletId = userWalletId, stakingIds = stakingIds),
+                    multiStakingBalanceFetcher(
+                        params = MultiStakingBalanceFetcher.Params(
+                            userWalletId = userWalletId,
+                            stakingIds = stakingIds,
+                        ),
                     )
                         .onLeft { Timber.e("Unable to fetch yield balances: $it") }
                 },

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverter.kt

@@ -8,7 +8,7 @@ import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.getGroupHeaderId
@@ -63,12 +63,12 @@ internal class CryptoCurrencyToDraggableItemConverter(
     }
 
     private fun getFormattedFiatAmount(currency: CryptoCurrencyStatus, appCurrency: AppCurrency): String {
-        val yieldBalance = currency.value.yieldBalance as? YieldBalance.Data
+        val stakingBalance = currency.value.stakingBalance as? StakingBalance.Data
         val fiatRate = currency.value.fiatRate ?: BigDecimal.ZERO
-        val fiatYieldBalance = yieldBalance?.getTotalWithRewardsStakingBalance(currency.currency.network.rawId)
+        val fiatStakingBalance = stakingBalance?.getTotalWithRewardsStakingBalance(currency.currency.network.rawId)
             ?.multiply(fiatRate).orZero()
 
         val fiatAmount = currency.value.fiatAmount ?: return BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
-        return (fiatAmount + fiatYieldBalance).format { fiat(appCurrency.code, appCurrency.symbol) }
+        return (fiatAmount + fiatStakingBalance).format { fiat(appCurrency.code, appCurrency.symbol) }
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/utils/converter/items/CryptoCurrencyToDraggableItemConverterV2.kt

@@ -9,7 +9,7 @@ import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.account.status.model.AccountCryptoCurrencyStatus
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.StakingBalance
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.feature.wallet.presentation.organizetokens.model.DraggableItem
 import com.tangem.feature.wallet.presentation.organizetokens.utils.common.getGroupHeaderId
@@ -56,12 +56,12 @@ internal class CryptoCurrencyToDraggableItemConverterV2(
     }
 
     private fun getFormattedFiatAmount(currency: CryptoCurrencyStatus, appCurrency: AppCurrency): String {
-        val yieldBalance = currency.value.yieldBalance as? YieldBalance.Data
+        val stakingBalance = currency.value.stakingBalance as? StakingBalance.Data
         val fiatRate = currency.value.fiatRate ?: BigDecimal.ZERO
-        val fiatYieldBalance = yieldBalance?.getTotalWithRewardsStakingBalance(currency.currency.network.rawId)
+        val fiatStakingBalance = stakingBalance?.getTotalWithRewardsStakingBalance(currency.currency.network.rawId)
             ?.multiply(fiatRate).orZero()
 
         val fiatAmount = currency.value.fiatAmount ?: return BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
-        return (fiatAmount + fiatYieldBalance).format { fiat(appCurrency.code, appCurrency.symbol) }
+        return (fiatAmount + fiatStakingBalance).format { fiat(appCurrency.code, appCurrency.symbol) }
     }
 }

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt

@@ -137,7 +137,7 @@ internal class SetVisaInfoTransformer(
                 fiatAmount = visaCurrency.balances.available.multiply(visaCurrency.fiatRate),
                 fiatRate = visaCurrency.fiatRate,
                 priceChange = visaCurrency.priceChange,
-                yieldBalance = null,
+                stakingBalance = null,
                 yieldSupplyStatus = null,
                 hasCurrentNetworkTransactions = false,
                 pendingTransactions = emptySet(),