Updated on 2026-08-14

app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt

@@ -185,7 +185,6 @@ abstract class BaseTestCase : TestCase(
                 "SWAP_REDESIGN_ENABLED" to false,
                 "ACCOUNTS_FEATURE_ENABLED" to true,
                 "MAIN_SCREEN_QR_SCANNING_ENABLED" to true,
-                "ADD_AND_MANAGE_TOKENS_ENABLED" to true,
                 "ASSETS_DISCOVERY_ENABLED" to true,
                 "VISA_ONBOARDING_ENABLED" to true,
                 // Version-gated toggles released in versions <= 6.0 — forced on so tests run against the actual

core/config-toggles/src/main/assets/configs/feature_toggles_config.json

@@ -47,10 +47,6 @@
         "name": "HEDERA_ERC20_ENABLED",
         "version": "5.37"
     },
-    {
-        "name": "ADD_AND_MANAGE_TOKENS_ENABLED",
-        "version": "5.38"
-    },
     {
         "name": "WALLET_CONNECT_BITCOIN_ENABLED",
         "version": "undefined"

core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt

@@ -39,7 +39,6 @@ internal class FeatureTogglesNamingConventionTest {
         /** Toggles created before the AND_/TWI_ naming convention. Do NOT add new entries. */
         val EXCLUDED_TOGGLES_LIST = setOf(
             "ADDRESS_SYNC_ENABLED",
-            "ADD_AND_MANAGE_TOKENS_ENABLED",
             "APP_REDESIGN_ENABLED",
             "ASSETS_DISCOVERY_ENABLED",
             "DYNAMIC_ADDRESSES_ENABLED",

features/wallet/api/src/main/kotlin/com/tangem/features/wallet/featuretoggles/WalletFeatureToggles.kt

@@ -7,8 +7,6 @@ package com.tangem.features.wallet.featuretoggles
  */
 interface WalletFeatureToggles {
 
-    val isAddAndManageTokensEnabled: Boolean
-
     val isAddFundsStage1Enabled: Boolean
 
     val isManageFundsEnabled: Boolean

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

@@ -37,7 +37,6 @@ import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBot
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.OpenBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.converter.MultiWalletCurrencyActionsConverter
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.flow.collectLatest
@@ -114,7 +113,6 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
     private val yieldSupplySetShouldShowMainPromoUseCase: YieldSupplySetShouldShowMainPromoUseCase,
     private val tokenListAnalyticsSender: TokenListAnalyticsSender,
     private val uiMessageSender: UiMessageSender,
-    private val walletFeatureToggles: WalletFeatureToggles,
 ) : BaseWalletClickIntents(), WalletContentClickIntents {
 
     override fun onDetailsClick() {
@@ -123,12 +121,8 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
 
     override fun onOrganizeTokensClick() {
         val userWalletId = stateHolder.getSelectedWalletId()
-        if (walletFeatureToggles.isAddAndManageTokensEnabled) {
         analyticsEventHandler.send(PortfolioAnalyticsEvent.ButtonAddManage())
         router.openAddAndManageBottomSheet(userWalletId = userWalletId)
-        } else {
-            router.openOrganizeTokensScreen(userWalletId = userWalletId)
-        }
     }
 
     override fun onDismissMarketsTooltip() {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt

@@ -9,9 +9,6 @@ internal class DefaultWalletFeatureToggles @Inject constructor(
     private val featureToggles: FeatureTogglesManager,
 ) : WalletFeatureToggles {
 
-    override val isAddAndManageTokensEnabled: Boolean
-        get() = featureToggles.isFeatureEnabled(FeatureToggles.ADD_AND_MANAGE_TOKENS_ENABLED)
-
     override val isAddFundsStage1Enabled: Boolean
         get() = featureToggles.isFeatureEnabled(FeatureToggles.AND_15310_ADD_FUNDS_STAGE1)
 

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

@@ -27,7 +27,6 @@ internal class SetTokenListTransformer(
     private val shouldShowMainPromo: Boolean,
     private val isAccountsModeEnabled: Boolean,
     private val isRedesignEnabled: Boolean,
-    private val isAddAndManageTokensEnabled: Boolean,
     private val isMultipleCardsEnabled: Boolean,
 ) : WalletStateTransformer(userWallet.walletId) {
 
@@ -123,7 +122,6 @@ internal class SetTokenListTransformer(
             yieldModuleApyMap = yieldSupplyApyMap,
             stakingAvailabilityMap = stakingAvailabilityMap,
             shouldShowMainPromo = shouldShowMainPromo,
-            isAddAndManageTokensEnabled = isAddAndManageTokensEnabled,
         ).convert(value = this)
     }
 
@@ -167,7 +165,6 @@ internal class SetTokenListTransformer(
             shouldShowMainPromo = shouldShowMainPromo,
             isAccountsModeEnabled = isAccountsModeEnabled,
             expandedAccounts = params.expandedAccounts,
-            isAddAndManageTokensEnabled = isAddAndManageTokensEnabled,
         ).convert(value = params.accountList)
     }
 }

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

@@ -8,7 +8,6 @@ import com.tangem.core.ui.components.tokenlist.state.PortfolioTokensListItemUM
 import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.models.AccountStatusList
-import com.tangem.domain.account.models.hasMultiCurrencyAccount
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.models.TotalFiatBalance
@@ -42,7 +41,6 @@ internal class TokenListStateConverter(
     private val yieldModuleApyMap: Map<String, BigDecimal>,
     private val stakingAvailabilityMap: Map<CryptoCurrency, StakingAvailability>,
     shouldShowMainPromo: Boolean,
-    private val isAddAndManageTokensEnabled: Boolean,
 ) : Converter<WalletTokensListState, WalletTokensListState> {
 
     private val yieldSupplyPromoBannerConverter = YieldSupplyPromoBannerConverter(
@@ -170,8 +168,7 @@ internal class TokenListStateConverter(
     }
 
     private fun getOrganizeTokensButtonStateV2(accountList: AccountStatusList): WalletOrganizeTokensButtonConfig? {
-        val shouldShowOrganizeIfOldButton = accountList.hasMultiCurrencyAccount() || isAddAndManageTokensEnabled
+        return if (!isSingleCurrencyWalletWithToken()) {
-        return if (shouldShowOrganizeIfOldButton && !isSingleCurrencyWalletWithToken()) {
             WalletOrganizeTokensButtonConfig(
                 textRes = organizeButtonTextRes(),
                 iconRes = organizeButtonIconRes(),
@@ -183,17 +180,9 @@ internal class TokenListStateConverter(
         }
     }
 
-    private fun organizeButtonTextRes(): Int = if (isAddAndManageTokensEnabled) {
+    private fun organizeButtonTextRes(): Int = R.string.main_add_and_manage_tokens
-        R.string.main_add_and_manage_tokens
-    } else {
-        R.string.organize_tokens_title
-    }
 
-    private fun organizeButtonIconRes(): Int = if (isAddAndManageTokensEnabled) {
+    private fun organizeButtonIconRes(): Int = R.drawable.ic_filter_default_24
-        R.drawable.ic_filter_default_24
-    } else {
-        R.drawable.ic_filter_24
-    }
 
     private fun isSingleCurrencyWalletWithToken(): Boolean {
         return selectedWallet is UserWallet.Cold &&

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

@@ -38,7 +38,6 @@ internal class WalletTokensListUMConverter(
     private val isAccountsModeEnabled: Boolean,
     private val expandedAccounts: Set<AccountId>,
     private val stakingAvailabilityMap: Map<CryptoCurrency, StakingAvailability>,
-    private val isAddAndManageTokensEnabled: Boolean,
     shouldShowMainPromo: Boolean,
 ) : Converter<AccountStatusList, WalletTokensListUM> {
 
@@ -161,16 +160,8 @@ internal class WalletTokensListUMConverter(
     }
 
     private fun getOrganizeButtonUM(accountList: AccountStatusList): TangemButtonUM? {
-        val textRes = if (isAddAndManageTokensEnabled) {
+        val textRes = R.string.main_add_and_manage_tokens
-            R.string.main_add_and_manage_tokens
+        val iconRes = R.drawable.ic_filter_default_24
-        } else {
-            R.string.organize_tokens_title
-        }
-        val iconRes = if (isAddAndManageTokensEnabled) {
-            R.drawable.ic_filter_default_24
-        } else {
-            R.drawable.ic_filter_24
-        }
         return if (accountList.flattenCurrencies().isNotEmpty() && !selectedWallet.isSingleWalletWithToken()) {
             TangemButtonUM(
                 text = resourceReference(textRes),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/AccountListSubscriber.kt

@@ -13,7 +13,6 @@ import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.features.tangempay.TangemPayFeatureToggles
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.utils.coroutines.combine7
 import com.tangem.utils.logging.TangemLogger
 import dagger.assisted.Assisted
@@ -39,13 +38,9 @@ internal class AccountListSubscriber @AssistedInject constructor(
     private val stakingAvailabilityListUseCase: StakingAvailabilityListUseCase,
     private val yieldSupplyGetShouldShowMainPromoUseCase: YieldSupplyGetShouldShowMainPromoUseCase,
     private val designFeatureToggles: DesignFeatureToggles,
-    private val walletFeatureToggles: WalletFeatureToggles,
     private val tangemPayFeatureToggles: TangemPayFeatureToggles,
 ) : BasicAccountListSubscriber() {
 
-    override val isAddAndManageTokensEnabled: Boolean
-        get() = walletFeatureToggles.isAddAndManageTokensEnabled
-
     override fun create(coroutineScope: CoroutineScope): Flow<*> {
         val walletId = userWallet.walletId.stringValue
         TangemLogger.i("$TAG[$walletId]: create() called, building combine7")

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicAccountListSubscriber.kt

@@ -34,7 +34,6 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
     abstract val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase
     abstract val stateController: WalletStateController
     abstract val clickIntents: WalletClickIntents
-    abstract val isAddAndManageTokensEnabled: Boolean
 
     override val singleAccountStatusListSupplier: SingleAccountStatusListSupplier
         get() = accountDependencies.singleAccountStatusListSupplier
@@ -107,7 +106,6 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
                 shouldShowMainPromo = shouldShowMainPromo,
                 isAccountsModeEnabled = isAccountMode,
                 isRedesignEnabled = true,
-                isAddAndManageTokensEnabled = isAddAndManageTokensEnabled,
                 isMultipleCardsEnabled = isMultipleCardsEnabled,
             ),
         )
@@ -172,7 +170,6 @@ internal abstract class BasicAccountListSubscriber : BasicWalletSubscriber() {
                 shouldShowMainPromo = shouldShowMainPromo,
                 isAccountsModeEnabled = false,
                 isRedesignEnabled = false,
-                isAddAndManageTokensEnabled = isAddAndManageTokensEnabled,
                 isMultipleCardsEnabled = false,
             ),
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletSubscriber.kt

@@ -6,7 +6,6 @@ import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.features.tangempay.TangemPayFeatureToggles
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -22,13 +21,9 @@ internal class SingleWalletSubscriber @AssistedInject constructor(
     override val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     override val stateController: WalletStateController,
     override val clickIntents: WalletClickIntents,
-    private val walletFeatureToggles: WalletFeatureToggles,
     private val tangemPayFeatureToggles: TangemPayFeatureToggles,
 ) : BasicAccountListSubscriber() {
 
-    override val isAddAndManageTokensEnabled: Boolean
-        get() = walletFeatureToggles.isAddAndManageTokensEnabled
-
     override fun create(coroutineScope: CoroutineScope): Flow<Unit> = combine(
         flow = getAccountStatusListFlow(),
         flow2 = getAppCurrencyFlow(),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenSubscriberLegacy.kt

@@ -5,7 +5,6 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.utils.annotations.RemoveWithToggle
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -22,12 +21,8 @@ internal class SingleWalletWithTokenSubscriberLegacy @AssistedInject constructor
     override val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     override val stateController: WalletStateController,
     override val clickIntents: WalletClickIntents,
-    private val walletFeatureToggles: WalletFeatureToggles,
 ) : BasicAccountListSubscriber() {
 
-    override val isAddAndManageTokensEnabled: Boolean
-        get() = walletFeatureToggles.isAddAndManageTokensEnabled
-
     override fun create(coroutineScope: CoroutineScope): Flow<Unit> = combine(
         flow = getAccountStatusListFlow(),
         flow2 = getAppCurrencyFlow(),

features/wallet/impl/src/test/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformerTest.kt

@@ -74,7 +74,6 @@ class SetTokenListTransformerTest {
             shouldShowMainPromo = false,
             isAccountsModeEnabled = false,
             isRedesignEnabled = true,
-            isAddAndManageTokensEnabled = false,
             isMultipleCardsEnabled = false,
         )
     }

features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntentsAnalyticsTest.kt

@@ -6,7 +6,6 @@ import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
@@ -21,7 +20,6 @@ internal class WalletContentClickIntentsAnalyticsTest {
 
     private val stateHolder: WalletStateController = mockk(relaxed = true)
     private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
-    private val walletFeatureToggles: WalletFeatureToggles = mockk(relaxed = true)
     private val router: InnerWalletRouter = mockk(relaxed = true)
 
     private val userWalletId = UserWalletId(stringValue = "0123456789ABCDEF")
@@ -45,16 +43,14 @@ internal class WalletContentClickIntentsAnalyticsTest {
             yieldSupplySetShouldShowMainPromoUseCase = mockk(relaxed = true),
             tokenListAnalyticsSender = mockk(relaxed = true),
             uiMessageSender = mockk(relaxed = true),
-            walletFeatureToggles = walletFeatureToggles,
         )
         implementor.initialize(router = router, coroutineScope = TestScope())
         return implementor
     }
 
     @Test
-    fun `GIVEN add and manage toggle enabled WHEN onOrganizeTokensClick THEN sends ButtonAddManage event and opens bottom sheet`() =
+    fun `WHEN onOrganizeTokensClick THEN sends ButtonAddManage event and opens bottom sheet`() =
         runTest {
-            every { walletFeatureToggles.isAddAndManageTokensEnabled } returns true
             val implementor = createImplementor()
             val captured = slot<AnalyticsEvent>()
 
@@ -67,17 +63,4 @@ internal class WalletContentClickIntentsAnalyticsTest {
             verify(exactly = 1) { router.openAddAndManageBottomSheet(userWalletId = userWalletId) }
             verify(exactly = 0) { router.openOrganizeTokensScreen(any()) }
         }
-
-    @Test
-    fun `GIVEN add and manage toggle disabled WHEN onOrganizeTokensClick THEN does not send analytics and opens organize screen`() =
-        runTest {
-            every { walletFeatureToggles.isAddAndManageTokensEnabled } returns false
-            val implementor = createImplementor()
-
-            implementor.onOrganizeTokensClick()
-
-            verify(exactly = 0) { analyticsEventHandler.send(any<AnalyticsEvent>()) }
-            verify(exactly = 1) { router.openOrganizeTokensScreen(userWalletId = userWalletId) }
-            verify(exactly = 0) { router.openAddAndManageBottomSheet(any()) }
-        }
 }