From 27fd5458d13d63752febb59a3e1c0d99c58b3202 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 19 Dec 2025 13:03:44 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 .../data/staking/DefaultP2PEthPoolRepository.kt    | 14 ++++++++++----
 .../tangem/data/staking/di/StakingDataModule.kt    |  2 ++
 .../staking/usecase/StakingApyFlowUseCase.kt       | 13 ++++++++++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultP2PEthPoolRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultP2PEthPoolRepository.kt
index 54d82d69e9..2a04a06ae3 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultP2PEthPoolRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultP2PEthPoolRepository.kt
@@ -17,6 +17,7 @@ import com.tangem.domain.staking.model.StakingOption
 import com.tangem.domain.staking.model.ethpool.*
 import com.tangem.domain.staking.repositories.P2PEthPoolRepository
 import com.tangem.domain.staking.model.stakekit.StakingError
+import com.tangem.domain.staking.toggles.StakingFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -31,6 +32,7 @@ internal class DefaultP2PEthPoolRepository(
     private val p2pEthPoolApi: P2PEthPoolApi,
     private val p2pEthPoolVaultsStore: P2PEthPoolVaultsStore,
     private val dispatchers: CoroutineDispatcherProvider,
+    private val stakingFeatureToggles: StakingFeatureToggles,
 ) : P2PEthPoolRepository {
 
     private val vaultConverter = P2PEthPoolVaultConverter
@@ -40,17 +42,21 @@ internal class DefaultP2PEthPoolRepository(
     private val errorConverter = P2PEthPoolErrorConverter
 
     override suspend fun fetchVaults(network: P2PEthPoolNetwork) {
-        val vaults = getVaults(network).getOrElse { error ->
-            Timber.e("Error fetching P2PEthPool vaults: $error")
+        val vaults = if (stakingFeatureToggles.isEthStakingEnabled) {
+            getVaults(network).getOrElse { error ->
+                Timber.e("Error fetching P2PEthPool vaults: $error")
+                emptyList()
+            }
+        } else {
             emptyList()
         }
+
         p2pEthPoolVaultsStore.store(vaults.filter { !it.isPrivate }) // TODO eth isSmoothingPool?
     }
 
     override suspend fun getVaults(network: P2PEthPoolNetwork): Either<StakingError, List<P2PEthPoolVault>> = either {
         withContext(dispatchers.io) {
-            val response = p2pEthPoolApi.getVaults(network.value)
-            when (response) {
+            when (val response = p2pEthPoolApi.getVaults(network.value)) {
                 is ApiResponse.Success -> {
                     val data = response.data
                     ensure(data.error == null) {
diff --git a/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt b/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
index fd25f57d71..2f4f5b754a 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/di/StakingDataModule.kt
@@ -78,11 +78,13 @@ internal object StakingDataModule {
         p2pEthPoolApi: P2PEthPoolApi,
         p2pEthPoolVaultsStore: P2PEthPoolVaultsStore,
         dispatchers: CoroutineDispatcherProvider,
+        stakingFeatureToggles: StakingFeatureToggles,
     ): P2PEthPoolRepository {
         return DefaultP2PEthPoolRepository(
             p2pEthPoolApi = p2pEthPoolApi,
             p2pEthPoolVaultsStore = p2pEthPoolVaultsStore,
             dispatchers = dispatchers,
+            stakingFeatureToggles = stakingFeatureToggles,
         )
     }
 
diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/usecase/StakingApyFlowUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/usecase/StakingApyFlowUseCase.kt
index 357ec88fa5..6754dab6c3 100644
--- a/domain/staking/src/main/java/com/tangem/domain/staking/usecase/StakingApyFlowUseCase.kt
+++ b/domain/staking/src/main/java/com/tangem/domain/staking/usecase/StakingApyFlowUseCase.kt
@@ -29,15 +29,22 @@ class StakingApyFlowUseCase(
             p2pEthPoolRepository.getVaultsFlow(),
         ) { yields, p2pVaults ->
             val stakeKitMap = yields.filterNot { yield ->
-                val isCardanoYield = yield.token.coinGeckoId == Blockchain.Cardano.toCoinId()
-                isCardanoYield && !stakingFeatureToggles.isCardanoStakingEnabled
+                val coinGeckoId = yield.token.coinGeckoId
+                val isCardanoYield = coinGeckoId == Blockchain.Cardano.toCoinId()
+                val isEthYield = coinGeckoId == Blockchain.Ethereum.toCoinId()
+
+                when {
+                    isCardanoYield && !stakingFeatureToggles.isCardanoStakingEnabled -> true
+                    isEthYield && !stakingFeatureToggles.isEthStakingEnabled -> true
+                    else -> false
+                }
             }.associate { yield ->
                 val key = "${yield.token.coinGeckoId}_${yield.token.symbol}"
                 val targets = yield.validators.map { it.toStakingTarget() }
                 key to targets
             }
 
-            val p2pMap = if (p2pVaults.isNotEmpty()) {
+            val p2pMap = if (p2pVaults.isNotEmpty() && stakingFeatureToggles.isEthStakingEnabled) {
                 val ethKey = "${Blockchain.Ethereum.toCoinId()}_${Blockchain.Ethereum.currency}"
                 val targets = p2pVaults.map { it.toStakingTarget() }
                 mapOf(ethKey to targets)