From c6190d936685f2bfe839880ba8f9fe0323dfa5cb Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 29 Jun 2026 16:25:24 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../kotlin/com/tangem/common/BaseTestCase.kt | 1 - .../assets/configs/feature_toggles_config.json | 4 ---- .../FeatureTogglesNamingConventionTest.kt | 1 - .../toggles/DefaultStakingFeatureToggles.kt | 2 +- .../toggles/DefaultStakingFeatureTogglesTest.kt | 16 ++-------------- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt index 680df9eddc..6b62173e97 100644 --- a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt +++ b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt @@ -193,7 +193,6 @@ abstract class BaseTestCase : TestCase( // 5.37 "HEDERA_ERC20_ENABLED" to true, // 5.39 - "STAKING_ETH_ENABLED" to true, "DYNAMIC_ADDRESSES_ENABLED" to true, "SOLANA_TX_HISTORY_ENABLED" to true, "SOLANA_SCALED_UI_AMOUNT_ENABLED" to true, diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json index 10c1e5776d..0e7b71c7fb 100644 --- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json @@ -11,10 +11,6 @@ "name": "VISA_ONBOARDING_ENABLED", "version": "undefined" }, - { - "name": "STAKING_ETH_ENABLED", - "version": "5.39" - }, { "name": "TWI_485_USEDESK_ENABLED", "version": "undefined" diff --git a/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt index 27482ab781..6447ddacc1 100644 --- a/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt +++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt @@ -46,7 +46,6 @@ internal class FeatureTogglesNamingConventionTest { "NEW_CARD_SCANNING_ENABLED", "SOLANA_SCALED_UI_AMOUNT_ENABLED", "SOLANA_TX_HISTORY_ENABLED", - "STAKING_ETH_ENABLED", "SWAP_AB_ENABLED", "VIRTUAL_ACCOUNTS_ENABLED", "VISA_ONBOARDING_ENABLED", diff --git a/data/staking/src/main/java/com/tangem/data/staking/toggles/DefaultStakingFeatureToggles.kt b/data/staking/src/main/java/com/tangem/data/staking/toggles/DefaultStakingFeatureToggles.kt index 6f62c8bc06..2ac6d5e339 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/toggles/DefaultStakingFeatureToggles.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/toggles/DefaultStakingFeatureToggles.kt @@ -15,7 +15,7 @@ internal class DefaultStakingFeatureToggles( } private fun StakingIntegrationID.getFeatureToggle(): FeatureToggles? = when (this) { - is StakingIntegrationID.P2PEthPool -> FeatureToggles.STAKING_ETH_ENABLED + is StakingIntegrationID.P2PEthPool -> null is StakingIntegrationID.StakeKit -> this.getStakeKitFeatureToggle() } diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/toggles/DefaultStakingFeatureTogglesTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/toggles/DefaultStakingFeatureTogglesTest.kt index ca6766c8c8..6ec391fa7b 100644 --- a/data/staking/src/test/kotlin/com/tangem/data/staking/toggles/DefaultStakingFeatureTogglesTest.kt +++ b/data/staking/src/test/kotlin/com/tangem/data/staking/toggles/DefaultStakingFeatureTogglesTest.kt @@ -1,6 +1,5 @@ package com.tangem.data.staking.toggles -import com.tangem.core.configtoggle.FeatureToggles import com.tangem.core.configtoggle.feature.FeatureTogglesManager import com.tangem.domain.staking.model.StakingIntegrationID import com.google.common.truth.Truth.assertThat @@ -24,21 +23,10 @@ internal class DefaultStakingFeatureTogglesTest { } @Test - fun `P2PEthPool returns true when STAKING_ETH_ENABLED is enabled`() { - every { featureTogglesManager.isFeatureEnabled(FeatureToggles.STAKING_ETH_ENABLED) } returns true - + fun `P2PEthPool integration is always enabled`() { assertThat(toggles.isIntegrationEnabled(StakingIntegrationID.P2PEthPool)).isTrue() - verify(exactly = 1) { featureTogglesManager.isFeatureEnabled(FeatureToggles.STAKING_ETH_ENABLED) } - } - - @Test - fun `P2PEthPool returns false when STAKING_ETH_ENABLED is disabled`() { - every { featureTogglesManager.isFeatureEnabled(FeatureToggles.STAKING_ETH_ENABLED) } returns false - - assertThat(toggles.isIntegrationEnabled(StakingIntegrationID.P2PEthPool)).isFalse() - - verify(exactly = 1) { featureTogglesManager.isFeatureEnabled(FeatureToggles.STAKING_ETH_ENABLED) } + verify(exactly = 0) { featureTogglesManager.isFeatureEnabled(any()) } } @Test