From 06eabf3699cd2a947e5441a4a33d8e6d1e37ba44 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 5 Sep 2024 22:17:47 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../staking/converters/YieldBalanceConverter.kt     |  6 +++++-
 .../ActionTypeActiveStakeTransformer.kt             | 13 +++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt
index 70577561ed..90b35354b7 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt
@@ -3,6 +3,7 @@ package com.tangem.data.staking.converters
 import com.tangem.data.staking.converters.action.PendingActionConverter
 import com.tangem.datasource.api.stakekit.models.response.model.YieldBalanceWrapperDTO
 import com.tangem.domain.staking.model.stakekit.*
+import com.tangem.domain.staking.model.stakekit.action.StakingActionType
 import com.tangem.utils.converter.Converter
 
 internal class YieldBalanceConverter : Converter<YieldBalanceWrapperDTO, YieldBalance> {
@@ -27,7 +28,10 @@ internal class YieldBalanceConverter : Converter<YieldBalanceWrapperDTO, YieldBa
                             // tron-specific. operates validatorAddresses instead of validatorAddress
                             validatorAddress = item.validatorAddress ?: item.validatorAddresses?.get(0),
                             date = item.date?.toDateTime(),
-                            pendingActions = pendingActionConverter.convertList(item.pendingActions),
+                            pendingActions = pendingActionConverter
+                                .convertList(item.pendingActions)
+                                // temporarily exclude VOTE_LOCKED, it will be implemented in future iterations
+                                .filterNot { it.type == StakingActionType.VOTE_LOCKED },
                         )
                     },
                     integrationId = value.integrationId,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ActionTypeActiveStakeTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ActionTypeActiveStakeTransformer.kt
index 1e451a27c2..31e1f97f96 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ActionTypeActiveStakeTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ActionTypeActiveStakeTransformer.kt
@@ -1,7 +1,9 @@
 package com.tangem.features.staking.impl.presentation.state.transformers
 
+import com.tangem.domain.staking.model.stakekit.BalanceType
 import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.tokens.model.Network
 import com.tangem.features.staking.impl.presentation.state.*
 import com.tangem.lib.crypto.BlockchainUtils.isTron
 import com.tangem.utils.transformer.Transformer
@@ -12,8 +14,11 @@ internal class ActionTypeActiveStakeTransformer(
 ) : Transformer<StakingUiState> {
 
     override fun transform(prevState: StakingUiState): StakingUiState {
-        val isTron = isTron(cryptoCurrencyStatus.currency.network.id.value)
-        val actionType = if (activeStake.pendingActions.isEmpty() || isTron) {
+        val isTronStakedBalance = isTronStakedBalance(
+            networkId = cryptoCurrencyStatus.currency.network.id,
+            activeStake = activeStake,
+        )
+        val actionType = if (activeStake.pendingActions.isEmpty() || isTronStakedBalance) {
             StakingActionCommonType.EXIT
         } else {
             StakingActionCommonType.PENDING_OTHER
@@ -21,4 +26,8 @@ internal class ActionTypeActiveStakeTransformer(
 
         return prevState.copy(actionType = actionType)
     }
+
+    private fun isTronStakedBalance(networkId: Network.ID, activeStake: BalanceState): Boolean {
+        return isTron(networkId.value) && activeStake.type == BalanceType.STAKED
+    }
 }
\ No newline at end of file