Updated on 2026-08-14

app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt

@@ -10,7 +10,6 @@ import com.tangem.domain.tokens.operations.BaseCurrencyStatusOperations
 import com.tangem.domain.tokens.operations.CachedCurrenciesStatusesOperations
 import com.tangem.domain.tokens.repository.*
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.features.swap.SwapFeatureToggles
 import com.tangem.tap.domain.tokens.DefaultTokensFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -211,7 +210,6 @@ internal object TokensDomainModule {
         currenciesRepository: CurrenciesRepository,
         stakingRepository: StakingRepository,
         promoRepository: PromoRepository,
-        swapFeatureToggles: SwapFeatureToggles,
         dispatchers: CoroutineDispatcherProvider,
         currencyStatusOperations: BaseCurrencyStatusOperations,
     ): GetCryptoCurrencyActionsUseCase {
@@ -221,7 +219,6 @@ internal object TokensDomainModule {
             currenciesRepository = currenciesRepository,
             stakingRepository = stakingRepository,
             promoRepository = promoRepository,
-            swapFeatureToggles = swapFeatureToggles,
             dispatchers = dispatchers,
             currencyStatusOperations = currencyStatusOperations,
         )

app/src/main/java/com/tangem/tap/domain/walletconnect2/app/TangemWcBlockchainHelper.kt

@@ -5,17 +5,10 @@ import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.tap.domain.walletconnect2.domain.WcBlockchainHelper
 import com.tangem.tap.domain.walletconnect2.domain.models.Account
-import com.tangem.tap.domain.walletconnect2.toggles.WalletConnectFeatureToggles
 
-internal class TangemWcBlockchainHelper(
-    featureToggles: WalletConnectFeatureToggles,
-) : WcBlockchainHelper {
+internal class TangemWcBlockchainHelper : WcBlockchainHelper {
 
-    private val supportedNonEvmBlockchains = if (featureToggles.isSolanaTxSignEnabled) {
-        setOf(Blockchain.Solana, Blockchain.SolanaTestnet)
-    } else {
-        emptySet()
-    }
+    private val supportedNonEvmBlockchains = setOf(Blockchain.Solana, Blockchain.SolanaTestnet)
 
     override fun chainIdToNetworkIdOrNull(chainId: String): String? {
         val parsedId = chainId.parseId() ?: return null

app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt

@@ -16,7 +16,6 @@ import com.tangem.tap.domain.walletconnect2.domain.WcJrpcMethods
 import com.tangem.tap.domain.walletconnect2.domain.WcJrpcRequestsDeserializer
 import com.tangem.tap.domain.walletconnect2.domain.WcRequest
 import com.tangem.tap.domain.walletconnect2.domain.models.*
-import com.tangem.tap.domain.walletconnect2.toggles.WalletConnectFeatureToggles
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction.OpenSession.SourceType
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.Flow
@@ -28,7 +27,6 @@ internal class DefaultLegacyWalletConnectRepository(
     private val application: Application,
     private val wcRequestDeserializer: WcJrpcRequestsDeserializer,
     private val analyticsHandler: AnalyticsEventHandler,
-    private val walletConnectFeatureToggles: WalletConnectFeatureToggles,
 ) : LegacyWalletConnectRepository {
 
     private var sessionProposal: Wallet.Model.SessionProposal? = null
@@ -40,7 +38,7 @@ internal class DefaultLegacyWalletConnectRepository(
 
     private val _activeSessions: MutableSharedFlow<List<WalletConnectSession>> = MutableSharedFlow()
     override val activeSessions: Flow<List<WalletConnectSession>> = _activeSessions
-    private val blockchainHelper by lazy { TangemWcBlockchainHelper(walletConnectFeatureToggles) }
+    private val blockchainHelper by lazy { TangemWcBlockchainHelper() }
 
     override var currentSessions: List<WalletConnectSession> = emptyList()
         private set

app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt

@@ -33,7 +33,6 @@ internal object WalletConnectInteractorModule {
     fun provideWalletConnectInteractor(
         wcRepository: LegacyWalletConnectRepository,
         wcSessionsRepository: WalletConnectSessionsRepository,
-        walletConnectFeatureToggles: WalletConnectFeatureToggles,
         currenciesRepository: CurrenciesRepository,
         walletManagersFacade: WalletManagersFacade,
         userWalletsListManager: UserWalletsListManager,
@@ -44,7 +43,7 @@ internal object WalletConnectInteractorModule {
             walletConnectRepository = wcRepository,
             sessionsRepository = wcSessionsRepository,
             sdkHelper = WalletConnectSdkHelper(),
-            blockchainHelper = TangemWcBlockchainHelper(walletConnectFeatureToggles),
+            blockchainHelper = TangemWcBlockchainHelper(),
             currenciesRepository = currenciesRepository,
             walletManagersFacade = walletManagersFacade,
             userWalletsListManager = userWalletsListManager,
@@ -69,13 +68,11 @@ internal object WalletConnectModule {
         application: Application,
         wcRequestDeserializer: WcJrpcRequestsDeserializer,
         analyticsHandler: AnalyticsEventHandler,
-        walletConnectFeatureToggles: WalletConnectFeatureToggles,
     ): LegacyWalletConnectRepository {
         return DefaultLegacyWalletConnectRepository(
             application = application,
             wcRequestDeserializer = wcRequestDeserializer,
             analyticsHandler = analyticsHandler,
-            walletConnectFeatureToggles = walletConnectFeatureToggles,
         )
     }
 

app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt

@@ -6,9 +6,6 @@ internal class WalletConnectFeatureToggles(
     private val featureTogglesManager: FeatureTogglesManager,
 ) {
 
-    val isSolanaTxSignEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "WC_SOLANA_TX_SIGN_ENABLED")
-
     val isRedesignedWalletConnectEnabled: Boolean
         get() = featureTogglesManager.isFeatureEnabled("WALLET_CONNECT_REDESIGN_ENABLED")
 }

app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt

@@ -30,8 +30,6 @@ import com.tangem.domain.settings.usercountry.FetchUserCountryUseCase
 import com.tangem.domain.staking.FetchStakingTokensUseCase
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.feature.swap.analytics.StoriesEvents
-import com.tangem.features.onramp.OnrampFeatureToggles
-import com.tangem.features.swap.SwapFeatureToggles
 import com.tangem.tap.common.extensions.setContext
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -60,8 +58,6 @@ internal class MainViewModel @Inject constructor(
     private val getStoryContentUseCase: GetStoryContentUseCase,
     private val imagePreloader: ImagePreloader,
     private val fetchHotCryptoUseCase: FetchHotCryptoUseCase,
-    private val swapFeatureToggles: SwapFeatureToggles,
-    onrampFeatureToggles: OnrampFeatureToggles,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
 ) : ViewModel() {
 
@@ -82,9 +78,7 @@ internal class MainViewModel @Inject constructor(
             }
         }
 
-        if (onrampFeatureToggles.isHotTokensEnabled) {
-            viewModelScope.launch { fetchHotCryptoUseCase() }
-        }
+        viewModelScope.launch { fetchHotCryptoUseCase() }
 
         updateAppCurrencies()
         observeFlips()
@@ -301,23 +295,21 @@ internal class MainViewModel @Inject constructor(
     private fun preloadImages() {
         try {
             viewModelScope.launch {
-                if (swapFeatureToggles.isPromoStoriesEnabled) {
-                    val swapStories = getStoryContentUseCase.invokeSync(
-                        id = StoryContentIds.STORY_FIRST_TIME_SWAP.id,
-                        refresh = true,
-                    ).getOrNull()
+                val swapStories = getStoryContentUseCase.invokeSync(
+                    id = StoryContentIds.STORY_FIRST_TIME_SWAP.id,
+                    refresh = true,
+                ).getOrNull()
 
-                    if (swapStories == null) {
-                        analyticsEventHandler.send(
-                            StoriesEvents.Error(
-                                type = StoryContentIds.STORY_FIRST_TIME_SWAP.analyticType,
-                            ),
-                        )
-                    } else {
-                        val storiesImages = swapStories.getImageUrls()
-                        // try to preload images for stories
-                        storiesImages.forEach(imagePreloader::preload)
-                    }
+                if (swapStories == null) {
+                    analyticsEventHandler.send(
+                        StoriesEvents.Error(
+                            type = StoryContentIds.STORY_FIRST_TIME_SWAP.analyticType,
+                        ),
+                    )
+                } else {
+                    val storiesImages = swapStories.getImageUrls()
+                    // try to preload images for stories
+                    storiesImages.forEach(imagePreloader::preload)
                 }
             }
         } catch (ex: Exception) {