Updated on 2026-08-14

features/details/api/src/main/kotlin/com/tangem/features/details/DetailsFeatureToggles.kt

@@ -1,6 +0,0 @@
-package com.tangem.features.details
-
-interface DetailsFeatureToggles {
-
-    val isRedesignEnabled: Boolean
-}

features/details/impl/src/main/kotlin/com/tangem/features/details/DefaultDetailsFeatureToggles.kt

@@ -1,11 +0,0 @@
-package com.tangem.features.details
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-
-internal class DefaultDetailsFeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : DetailsFeatureToggles {
-
-    override val isRedesignEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled("DETAILS_REDESIGN_ENABLED")
-}

features/details/impl/src/main/kotlin/com/tangem/features/details/di/FeatureModule.kt

@@ -1,21 +0,0 @@
-package com.tangem.features.details.di
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.features.details.DefaultDetailsFeatureToggles
-import com.tangem.features.details.DetailsFeatureToggles
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object FeatureModule {
-
-    @Provides
-    @Singleton
-    fun provideFeatureToggles(featureTogglesManager: FeatureTogglesManager): DetailsFeatureToggles {
-        return DefaultDetailsFeatureToggles(featureTogglesManager)
-    }
-}

features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt

@@ -151,6 +151,7 @@ internal class TokenActionsHandler @AssistedInject constructor(
             AppRoute.Swap(
                 currency = cryptoCurrencyData.status.currency,
                 userWalletId = cryptoCurrencyData.userWallet.walletId,
+                isInitialReverseOrder = true,
             ),
         )
     }

features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/featuretoggles/PushNotificationsFeatureToggles.kt

@@ -1,9 +0,0 @@
-package com.tangem.features.pushnotifications.api.featuretoggles
-
-/**
- * Push notifications feature toggles
- */
-interface PushNotificationsFeatureToggles {
-    /** Availability of push notifications */
-    val isPushNotificationsEnabled: Boolean
-}

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/di/PushNotificationsFeatureTogglesModule.kt

@@ -1,24 +0,0 @@
-package com.tangem.features.pushnotifications.impl.di
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.features.pushnotifications.api.featuretoggles.PushNotificationsFeatureToggles
-import com.tangem.features.pushnotifications.impl.featuretoggles.DefaultPushNotificationsFeatureToggles
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-/**
- * DI module provides implementation of [PushNotificationsFeatureToggles]
- */
-@Module
-@InstallIn(SingletonComponent::class)
-internal object PushNotificationsFeatureTogglesModule {
-
-    @Provides
-    @Singleton
-    fun provideSendFeatureToggles(featureTogglesManager: FeatureTogglesManager): PushNotificationsFeatureToggles {
-        return DefaultPushNotificationsFeatureToggles(featureTogglesManager = featureTogglesManager)
-    }
-}

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/featuretoggles/DefaultPushNotificationsFeatureToggles.kt

@@ -1,11 +0,0 @@
-package com.tangem.features.pushnotifications.impl.featuretoggles
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.features.pushnotifications.api.featuretoggles.PushNotificationsFeatureToggles
-
-internal class DefaultPushNotificationsFeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : PushNotificationsFeatureToggles {
-    override val isPushNotificationsEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled("PUSH_NOTIFICATIONS_ENABLED")
-}

features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataStateExpress.kt

@@ -18,6 +18,14 @@ data class TokensDataStateExpress(
     }
 }
 
+fun TokensDataStateExpress.getGroupWithReverse(isReverseFromTo: Boolean): CurrenciesGroup {
+    return if (isReverseFromTo) {
+        this.fromGroup
+    } else {
+        this.toGroup
+    }
+}
+
 data class CurrenciesGroup(
     val available: List<CryptoCurrencySwapInfo>,
     val unavailable: List<CryptoCurrencySwapInfo>,

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/DefaultInitialToCurrencyResolver.kt

@@ -2,31 +2,34 @@ package com.tangem.feature.swap.domain
 
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
-import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
+import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.swap.domain.models.ui.TokensDataStateExpress
+import com.tangem.feature.swap.domain.models.ui.getGroupWithReverse
 import java.math.BigDecimal
 
 internal class DefaultInitialToCurrencyResolver(
-    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
     private val swapTransactionRepository: SwapTransactionRepository,
 ) : InitialToCurrencyResolver {
 
     override suspend fun tryGetFromCache(
+        userWallet: UserWallet,
         initialCryptoCurrency: CryptoCurrency,
         state: TokensDataStateExpress,
+        isReverseFromTo: Boolean,
     ): CryptoCurrencyStatus? {
-        val selectedId = getSelectedWalletSyncUseCase().getOrNull() ?: return null
-        val id = swapTransactionRepository.getLastSwappedCryptoCurrencyId(selectedId.walletId) ?: return null
+        val id = swapTransactionRepository.getLastSwappedCryptoCurrencyId(userWallet.walletId) ?: return null
 
         return if (id != initialCryptoCurrency.id.value) {
-            state.toGroup.available.find { it.currencyStatus.currency.id.value == id }?.currencyStatus
+            val group = state.getGroupWithReverse(isReverseFromTo)
+            group.available.find { it.currencyStatus.currency.id.value == id }?.currencyStatus
         } else {
             null
         }
     }
 
-    override fun tryGetWithMaxAmount(state: TokensDataStateExpress): CryptoCurrencyStatus? {
-        return state.toGroup.available.maxByOrNull {
+    override fun tryGetWithMaxAmount(state: TokensDataStateExpress, isReverseFromTo: Boolean): CryptoCurrencyStatus? {
+        val group = state.getGroupWithReverse(isReverseFromTo)
+        return group.available.maxByOrNull {
             it.currencyStatus.value.fiatAmount ?: BigDecimal.ZERO
         }?.currencyStatus
     }

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/InitialToCurrencyResolver.kt

@@ -2,14 +2,17 @@ package com.tangem.feature.swap.domain
 
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
+import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.swap.domain.models.ui.TokensDataStateExpress
 
 interface InitialToCurrencyResolver {
 
     suspend fun tryGetFromCache(
+        userWallet: UserWallet,
         initialCryptoCurrency: CryptoCurrency,
         state: TokensDataStateExpress,
+        isReverseFromTo: Boolean,
     ): CryptoCurrencyStatus?
 
-    fun tryGetWithMaxAmount(state: TokensDataStateExpress): CryptoCurrencyStatus?
+    fun tryGetWithMaxAmount(state: TokensDataStateExpress, isReverseFromTo: Boolean): CryptoCurrencyStatus?
 }

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt

@@ -79,9 +79,10 @@ interface SwapInteractor {
      */
     fun getTokenBalance(token: CryptoCurrencyStatus): SwapAmount
 
-    suspend fun selectInitialCurrencyToSwap(
+    suspend fun getInitialCurrencyToSwap(
         initialCryptoCurrency: CryptoCurrency,
         state: TokensDataStateExpress,
+        isReverseFromTo: Boolean,
     ): CryptoCurrencyStatus?
 
     fun getNativeToken(networkId: String): CryptoCurrency

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt

@@ -965,13 +965,15 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         return SwapAmount(token.value.amount ?: BigDecimal.ZERO, token.currency.decimals)
     }
 
-    override suspend fun selectInitialCurrencyToSwap(
+    override suspend fun getInitialCurrencyToSwap(
         initialCryptoCurrency: CryptoCurrency,
         state: TokensDataStateExpress,
+        isReverseFromTo: Boolean,
     ): CryptoCurrencyStatus? {
-        return initialToCurrencyResolver.tryGetFromCache(initialCryptoCurrency, state)
-            ?: initialToCurrencyResolver.tryGetWithMaxAmount(state)
-            ?: state.toGroup.available.firstOrNull()?.currencyStatus
+        val group = state.getGroupWithReverse(isReverseFromTo)
+        return initialToCurrencyResolver.tryGetFromCache(userWallet, initialCryptoCurrency, state, isReverseFromTo)
+            ?: initialToCurrencyResolver.tryGetWithMaxAmount(state, isReverseFromTo)
+            ?: group.available.firstOrNull()?.currencyStatus
     }
 
     override fun getNativeToken(networkId: String): CryptoCurrency {

features/swap/domain/src/main/java/com/tangem/feature/swap/domain/di/SwapDomainModule.kt

@@ -5,8 +5,6 @@ import com.tangem.domain.tokens.GetCryptoCurrencyStatusesSyncUseCase
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.NetworksRepository
 import com.tangem.domain.tokens.repository.QuotesRepository
-import com.tangem.domain.transaction.usecase.*
-import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.feature.swap.domain.*
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -60,11 +58,9 @@ internal class SwapDomainModule {
     @Provides
     @Singleton
     fun provideInitialToCurrencyResolver(
-        getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
         swapTransactionRepository: SwapTransactionRepository,
     ): InitialToCurrencyResolver {
         return DefaultInitialToCurrencyResolver(
-            getSelectedWalletSyncUseCase = getSelectedWalletSyncUseCase,
             swapTransactionRepository = swapTransactionRepository,
         )
     }

features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt

@@ -84,6 +84,9 @@ internal class SwapViewModel @Inject constructor(
         ?.unbundle(UserWalletId.serializer())
         ?: error("no expected parameter UserWalletId found")
 
+    private val isInitiallyReversed: Boolean = savedStateHandle.get<Boolean>(AppRoute.Swap.IS_INITIAL_REVERSE_ORDER)
+        ?: false
+
     private val swapInteractor = swapInteractorFactory.create(userWalletId)
 
     private lateinit var initialCryptoCurrencyStatus: CryptoCurrencyStatus
@@ -137,7 +140,7 @@ internal class SwapViewModel @Inject constructor(
                 uiState = stateBuilder.addAlert(uiState = uiState, onClick = swapRouter::back)
             } else {
                 initialCryptoCurrencyStatus = cryptoCurrencyStatus
-                initTokens()
+                initTokens(isInitiallyReversed)
             }
         }
     }
@@ -180,18 +183,21 @@ internal class SwapViewModel @Inject constructor(
         analyticsEventHandler.send(SwapEvents.ChooseTokenScreenOpened(availableTokens = isAnyAvailableTokens))
     }
 
-    private fun initTokens() {
+    private fun initTokens(isReverseFromTo: Boolean) {
         viewModelScope.launch(dispatchers.main) {
             runCatching(dispatchers.io) {
                 swapInteractor.getTokensDataState(initialCryptoCurrency)
             }.onSuccess { state ->
                 updateTokensState(state)
+                val selectedCurrency = swapInteractor.getInitialCurrencyToSwap(
+                    initialCryptoCurrency = initialCryptoCurrency,
+                    state = state,
+                    isReverseFromTo = isReverseFromTo,
+                )
                 applyInitialTokenChoice(
-                    state,
-                    swapInteractor.selectInitialCurrencyToSwap(
-                        initialCryptoCurrency,
-                        state,
-                    ),
+                    state = state,
+                    selectedCurrency = selectedCurrency,
+                    isReverseFromTo = isReverseFromTo,
                 )
 
                 (dataState.fromCryptoCurrency?.currency as? CryptoCurrency.Coin)?.let {
@@ -215,6 +221,7 @@ internal class SwapViewModel @Inject constructor(
                 applyInitialTokenChoice(
                     state = TokensDataStateExpress.EMPTY,
                     selectedCurrency = null,
+                    isReverseFromTo = isReverseFromTo,
                 )
 
                 uiState = stateBuilder.createInitialErrorState(
@@ -227,33 +234,43 @@ internal class SwapViewModel @Inject constructor(
                             initialCryptoCurrency.network.backendId,
                         ),
                     )
-                    initTokens()
+                    initTokens(isReverseFromTo)
                 }
             }
         }
     }
 
-    private fun applyInitialTokenChoice(state: TokensDataStateExpress, selectedCurrency: CryptoCurrencyStatus?) {
-        val fromCurrencyStatus = initialCryptoCurrencyStatus
-        dataState = dataState.copy(
-            fromCryptoCurrency = fromCurrencyStatus,
-            toCryptoCurrency = selectedCurrency,
-            tokensDataState = state,
-        )
+    private fun applyInitialTokenChoice(
+        state: TokensDataStateExpress,
+        selectedCurrency: CryptoCurrencyStatus?,
+        isReverseFromTo: Boolean,
+    ) {
+        // exceptional case
         if (selectedCurrency == null) {
             analyticsEventHandler.send(SwapEvents.NoticeNoAvailableTokensToSwap)
             uiState = stateBuilder.createNoAvailableTokensToSwapState(
                 uiStateHolder = uiState,
-                fromToken = fromCurrencyStatus,
-            )
-        } else {
-            startLoadingQuotes(
-                fromToken = fromCurrencyStatus,
-                toToken = selectedCurrency,
-                amount = lastAmount.value,
-                toProvidersList = findSwapProviders(fromCurrencyStatus, selectedCurrency),
+                fromToken = initialCryptoCurrencyStatus,
             )
+            return
         }
+        isOrderReversed = isReverseFromTo
+        val (fromCurrencyStatus, toCurrencyStatus) = if (isOrderReversed) {
+            selectedCurrency to initialCryptoCurrencyStatus
+        } else {
+            initialCryptoCurrencyStatus to selectedCurrency
+        }
+        dataState = dataState.copy(
+            fromCryptoCurrency = fromCurrencyStatus,
+            toCryptoCurrency = toCurrencyStatus,
+            tokensDataState = state,
+        )
+        startLoadingQuotes(
+            fromToken = fromCurrencyStatus,
+            toToken = toCurrencyStatus,
+            amount = lastAmount.value,
+            toProvidersList = findSwapProviders(fromCurrencyStatus, toCurrencyStatus),
+        )
     }
 
     private fun updateTokensState(tokenDataState: TokensDataStateExpress) {

features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/ui/EnvironmentTogglesScreen.kt

@@ -9,7 +9,10 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
+import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
@@ -65,7 +68,6 @@ internal fun EnvironmentTogglesScreen(uiModel: EnvironmentTogglesScreenUM) {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun EnvironmentButtons(
     uiModel: EnvironmentTogglesScreenUM.ApiInfoUM,

features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/state/FeatureTogglesContentState.kt

@@ -6,14 +6,37 @@ import kotlinx.collections.immutable.ImmutableList
 /**
  * Content state of feature toggles screen
  *
+ * @property topBarState         top bar state
+ * @property appVersion          app version
  * @property featureToggles      feature toggles list
  * @property onBackClick         the lambda to be invoked when back button is pressed
  * @property onToggleValueChange the lambda to be invoked when switch button is pressed
- * @property onApplyChangesClick the lambda to be invoked when apply changes button is pressed
+ * @property onRestartAppClick   the lambda to be invoked when restart app button is pressed
  */
 internal data class FeatureTogglesContentState(
+    val topBarState: TopBarState,
+    val appVersion: String,
     val featureToggles: ImmutableList<TesterFeatureToggle>,
-    val onToggleValueChange: (String, Boolean) -> Unit,
     val onBackClick: () -> Unit,
-    val onApplyChangesClick: () -> Unit,
-)
+    val onToggleValueChange: (String, Boolean) -> Unit,
+    val onRestartAppClick: () -> Unit,
+) {
+
+    /** Top bar state */
+    sealed interface TopBarState {
+
+        /**
+         * Config setup
+         *
+         * @property onBackClick the lambda to be invoked when back button is pressed
+         */
+        data object ConfigSetup : TopBarState
+
+        /**
+         * Custom setup
+         *
+         * @property onRecoverClick the lambda to be invoked when recover button is pressed
+         */
+        data class CustomSetup(val onRecoverClick: () -> Unit) : TopBarState
+    }
+}

features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/ui/FeatureTogglesScreen.kt

@@ -6,17 +6,21 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Switch
-import androidx.compose.material.SwitchDefaults
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.components.TangemSwitch
+import com.tangem.core.ui.components.appbar.AppBarWithBackButtonAndIcon
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.components.notifications.NotificationConfig
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.feature.tester.impl.R
@@ -37,22 +41,35 @@ internal fun FeatureTogglesScreen(state: FeatureTogglesContentState) {
             .fillMaxSize()
             .background(TangemTheme.colors.background.secondary),
     ) {
-        stickyHeader {
-            AppBarWithBackButton(
-                onBackClick = state.onBackClick,
-                text = stringResource(id = R.string.feature_toggles),
-            )
+        stickyHeader { TopAppBar(state = state.topBarState, onBackClick = state.onBackClick) }
+
+        if (state.topBarState is FeatureTogglesContentState.TopBarState.CustomSetup) {
+            item(key = "warning_notification", contentType = "warning_notification") {
+                WarningNotification(
+                    appVersion = state.appVersion,
+                    modifier = Modifier
+                        .animateItem()
+                        .padding(horizontal = 16.dp)
+                        .padding(bottom = 8.dp),
+                )
+            }
         }
-        items(state.featureToggles) { featureToggle ->
+
+        items(
+            items = state.featureToggles,
+            key = TesterFeatureToggle::name,
+            contentType = { "feature_toggle_item" },
+        ) { featureToggle ->
             FeatureToggleItem(
                 toggle = featureToggle,
                 onCheckedChange = { isChange -> state.onToggleValueChange(featureToggle.name, isChange) },
             )
         }
+
         item {
             PrimaryButton(
-                text = stringResource(id = R.string.apply_changes),
-                onClick = state.onApplyChangesClick,
+                text = stringResource(id = R.string.restart_app),
+                onClick = state.onRestartAppClick,
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(TangemTheme.dimens.spacing16),
@@ -61,12 +78,48 @@ internal fun FeatureTogglesScreen(state: FeatureTogglesContentState) {
     }
 }
 
+@Composable
+private fun TopAppBar(state: FeatureTogglesContentState.TopBarState, onBackClick: () -> Unit) {
+    AppBarWithBackButtonAndIcon(
+        onBackClick = onBackClick,
+        text = stringResource(id = R.string.feature_toggles),
+        iconRes = if (state is FeatureTogglesContentState.TopBarState.CustomSetup) {
+            R.drawable.ic_refresh_24
+        } else {
+            null
+        },
+        onIconClick = if (state is FeatureTogglesContentState.TopBarState.CustomSetup) {
+            state.onRecoverClick
+        } else {
+            null
+        },
+    )
+}
+
+@Composable
+private fun WarningNotification(appVersion: String, modifier: Modifier = Modifier) {
+    Notification(
+        config = NotificationConfig(
+            subtitle = resourceReference(
+                id = R.string.feature_toggles_custom_setup_warning_description,
+                wrappedList(appVersion),
+            ),
+            iconResId = R.drawable.ic_alert_triangle_20,
+            title = resourceReference(id = R.string.feature_toggles_custom_setup_warning_title),
+        ),
+        modifier = modifier,
+    )
+}
+
 @Composable
 private fun FeatureToggleItem(toggle: TesterFeatureToggle, onCheckedChange: (Boolean) -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(horizontal = TangemTheme.dimens.spacing18),
+            .padding(
+                horizontal = TangemTheme.dimens.spacing18,
+                vertical = TangemTheme.dimens.spacing8,
+            ),
         horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically,
     ) {
@@ -78,14 +131,8 @@ private fun FeatureToggleItem(toggle: TesterFeatureToggle, onCheckedChange: (Boo
             maxLines = 1,
             style = TangemTheme.typography.body2,
         )
-        Switch(
-            checked = toggle.isEnabled,
-            onCheckedChange = onCheckedChange,
-            colors = SwitchDefaults.colors(
-                checkedThumbColor = TangemTheme.colors.control.checked,
-                uncheckedThumbColor = TangemTheme.colors.control.unchecked,
-            ),
-        )
+
+        TangemSwitch(onCheckedChange = onCheckedChange, checked = toggle.isEnabled)
     }
 }
 
@@ -94,15 +141,23 @@ private fun FeatureToggleItem(toggle: TesterFeatureToggle, onCheckedChange: (Boo
 @Composable
 private fun PreviewFeatureTogglesScreen() {
     TangemThemePreview {
+        var isCustomSetup by remember { mutableStateOf(value = true) }
+
         FeatureTogglesScreen(
             state = FeatureTogglesContentState(
+                topBarState = if (isCustomSetup) {
+                    FeatureTogglesContentState.TopBarState.CustomSetup(onRecoverClick = { isCustomSetup = false })
+                } else {
+                    FeatureTogglesContentState.TopBarState.ConfigSetup
+                },
+                appVersion = "5.15",
                 featureToggles = persistentListOf(
                     TesterFeatureToggle(name = "FEATURE_TOGGLE_1", isEnabled = true),
                     TesterFeatureToggle(name = "FEATURE_TOGGLE_2", isEnabled = false),
                 ),
-                onToggleValueChange = { _, _ -> },
                 onBackClick = {},
-                onApplyChangesClick = {},
+                onToggleValueChange = { _, _ -> isCustomSetup = true },
+                onRestartAppClick = {},
             ),
         )
     }

features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/viewmodels/FeatureTogglesViewModel.kt

@@ -11,10 +11,11 @@ import com.tangem.core.navigation.finisher.AppFinisher
 import com.tangem.feature.tester.presentation.featuretoggles.models.TesterFeatureToggle
 import com.tangem.feature.tester.presentation.featuretoggles.state.FeatureTogglesContentState
 import com.tangem.feature.tester.presentation.navigation.InnerTesterRouter
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.version.AppVersionProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -22,14 +23,14 @@ import javax.inject.Inject
  * ViewModel for screen with list of feature toggles
  *
  * @property featureTogglesManager manager for getting information about the availability of feature toggles
- * @property dispatchers           coroutine dispatchers provider
+ * @property appVersionProvider    app version provider
  *
 [REDACTED_AUTHOR]
  */
 @HiltViewModel
 internal class FeatureTogglesViewModel @Inject constructor(
     private val featureTogglesManager: FeatureTogglesManager,
-    private val dispatchers: CoroutineDispatcherProvider,
+    private val appVersionProvider: AppVersionProvider,
 ) : ViewModel() {
 
     /** Current ui state */
@@ -41,28 +42,54 @@ internal class FeatureTogglesViewModel @Inject constructor(
             "Feature toggle manager must be mutable (debug build type)"
         }
 
-    /** Setup navigation state property by router [router] and provides app restart method by [appRestarter] */
+    /** Setup navigation state property by router [router] and provides app restart method by [appFinisher] */
     fun setupInteractions(router: InnerTesterRouter, appFinisher: AppFinisher) {
         uiState = uiState.copy(
             onBackClick = router::back,
-            onApplyChangesClick = appFinisher::restart,
+            onRestartAppClick = appFinisher::restart,
         )
     }
 
     private fun initState(): FeatureTogglesContentState {
         return FeatureTogglesContentState(
+            topBarState = getConfigSetupState(),
+            appVersion = appVersionProvider.versionName,
             featureToggles = mutableFeatureTogglesManager.getTesterFeatureToggles(),
             onToggleValueChange = ::onToggleValueChange,
             onBackClick = {},
-            onApplyChangesClick = {},
+            onRestartAppClick = {},
         )
     }
 
     private fun onToggleValueChange(name: String, isEnabled: Boolean) {
-        viewModelScope.launch(dispatchers.main) {
+        viewModelScope.launch {
             mutableFeatureTogglesManager.changeToggle(name = name, isEnabled = isEnabled)
 
             uiState = uiState.copy(featureToggles = mutableFeatureTogglesManager.getTesterFeatureToggles())
+
+            // delay for smoothly update animations
+            delay(timeMillis = 300)
+
+            uiState = uiState.copy(topBarState = getConfigSetupState())
+        }
+    }
+
+    private fun getConfigSetupState(): FeatureTogglesContentState.TopBarState {
+        return if (mutableFeatureTogglesManager.isMatchLocalConfig()) {
+            FeatureTogglesContentState.TopBarState.ConfigSetup
+        } else {
+            FeatureTogglesContentState.TopBarState.CustomSetup(
+                onRecoverClick = {
+                    viewModelScope.launch {
+                        mutableFeatureTogglesManager.recoverLocalConfig()
+
+                        uiState = uiState.copy(
+                            topBarState = getConfigSetupState(),
+                            featureToggles = mutableFeatureTogglesManager.getTesterFeatureToggles(),
+                        )
+                    }
+                },
+            )
         }
     }
 

features/tester/impl/src/main/res/values/strings.xml

@@ -2,7 +2,9 @@
 <resources>
     <string name="tester_menu" translatable="false">Tester menu</string>
     <string name="feature_toggles" translatable="false">Feature toggles</string>
-    <string name="apply_changes" translatable="false">Apply changes</string>
+    <string name="feature_toggles_custom_setup_warning_title" translatable="false">Custom setup</string>
+    <string name="feature_toggles_custom_setup_warning_description" translatable="false">Feature toggles differs from v%s config</string>
+    <string name="restart_app" translatable="false">Restart app</string>
     <string name="environment_toggles" translatable="false">Environment toggles</string>
     <string name="tester_actions" translatable="false">Tester actions</string>
     <string name="hide_all_currencies" translatable="false">Hide all currencies</string>

features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/featuretoggles/TokenDetailsFeatureToggles.kt

@@ -1,6 +0,0 @@
-package com.tangem.features.tokendetails.featuretoggles
-
-interface TokenDetailsFeatureToggles {
-
-    fun isGenerateXPubEnabled(): Boolean
-}

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/di/TokenDetailsFeatureTogglesModule.kt

@@ -1,21 +0,0 @@
-package com.tangem.feature.tokendetails.di
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.feature.tokendetails.featuretoggles.DefaultTokenDetailsFeatureToggles
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object TokenDetailsFeatureTogglesModule {
-
-    @Provides
-    @Singleton
-    fun provideTokenDetailsFeatureToggles(featureTogglesManager: FeatureTogglesManager): TokenDetailsFeatureToggles {
-        return DefaultTokenDetailsFeatureToggles(featureTogglesManager)
-    }
-}

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/featuretoggles/DefaultTokenDetailsFeatureToggles.kt

@@ -1,11 +0,0 @@
-package com.tangem.feature.tokendetails.featuretoggles
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
-
-internal class DefaultTokenDetailsFeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : TokenDetailsFeatureToggles {
-
-    override fun isGenerateXPubEnabled() = featureTogglesManager.isFeatureEnabled(name = "GENERATE_XPUB_ENABLED")
-}

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt

@@ -17,7 +17,6 @@ import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.*
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
 import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
 import com.tangem.features.tokendetails.impl.R
 import com.tangem.lib.crypto.BlockchainUtils.isBitcoin
 import com.tangem.utils.converter.Converter
@@ -28,7 +27,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 internal class TokenDetailsSkeletonStateConverter(
     private val clickIntents: TokenDetailsClickIntents,
-    private val featureToggles: TokenDetailsFeatureToggles,
     private val networkHasDerivationUseCase: NetworkHasDerivationUseCase,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val userWalletId: UserWalletId,
@@ -98,12 +96,14 @@ internal class TokenDetailsSkeletonStateConverter(
         cryptoCurrency: CryptoCurrency,
     ) {
         val userWallet = getUserWalletUseCase(userWalletId).getOrNull() ?: return
-        val isGenerateXPubEnabled = featureToggles.isGenerateXPubEnabled()
-        val isBitcoin = isBitcoin(cryptoCurrency.network.id.value)
-        val hasDerivations =
-            networkHasDerivationUseCase(userWallet.scanResponse, cryptoCurrency.network).getOrElse { false }
 
-        if (isGenerateXPubEnabled && isBitcoin && hasDerivations) {
+        val isBitcoin = isBitcoin(cryptoCurrency.network.id.value)
+        val hasDerivations = networkHasDerivationUseCase(
+            scanResponse = userWallet.scanResponse,
+            network = cryptoCurrency.network,
+        ).getOrElse { false }
+
+        if (isBitcoin && hasDerivations) {
             add(
                 TokenDetailsAppBarMenuConfig.MenuItem(
                     title = resourceReference(R.string.token_details_generate_xpub),

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt

@@ -39,7 +39,6 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.t
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.exchange.ExchangeStatusBottomSheetConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents
 import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
 import com.tangem.features.tokendetails.impl.R
 import com.tangem.utils.Provider
 import kotlinx.collections.immutable.toImmutableList
@@ -53,7 +52,6 @@ internal class TokenDetailsStateFactory(
     private val stakingEntryInfoProvider: Provider<StakingEntryInfo?>,
     private val cryptoCurrencyStatusProvider: Provider<CryptoCurrencyStatus?>,
     private val clickIntents: TokenDetailsClickIntents,
-    private val featureToggles: TokenDetailsFeatureToggles,
     private val networkHasDerivationUseCase: NetworkHasDerivationUseCase,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val userWalletId: UserWalletId,
@@ -65,7 +63,6 @@ internal class TokenDetailsStateFactory(
     private val skeletonStateConverter by lazy {
         TokenDetailsSkeletonStateConverter(
             clickIntents = clickIntents,
-            featureToggles = featureToggles,
             networkHasDerivationUseCase = networkHasDerivationUseCase,
             getUserWalletUseCase = getUserWalletUseCase,
             userWalletId = userWalletId,
@@ -390,10 +387,9 @@ internal class TokenDetailsStateFactory(
         isSupported: Boolean,
     ): TokenDetailsAppBarMenuConfig? {
         if (cardTypesResolver.isSingleWalletWithToken()) return null
-        val showGenerateExtendedKey = featureToggles.isGenerateXPubEnabled() && isSupported
         return copy(
             items = buildList {
-                if (showGenerateExtendedKey && hasDerivations) {
+                if (isSupported && hasDerivations) {
                     TokenDetailsAppBarMenuConfig.MenuItem(
                         title = resourceReference(R.string.token_details_generate_xpub),
                         textColorProvider = { TangemTheme.colors.text.primary1 },

features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/viewmodels/TokenDetailsViewModel.kt

@@ -71,7 +71,6 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDeta
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.TokenDetailsStateFactory
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.exchange.ExchangeStatusBottomSheetConfig
 import com.tangem.features.staking.api.featuretoggles.StakingFeatureToggles
-import com.tangem.features.tokendetails.featuretoggles.TokenDetailsFeatureToggles
 import com.tangem.features.tokendetails.impl.R
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.*
@@ -124,7 +123,6 @@ internal class TokenDetailsViewModel @Inject constructor(
     private val vibratorHapticManager: VibratorHapticManager,
     private val clipboardManager: ClipboardManager,
     getUserWalletUseCase: GetUserWalletUseCase,
-    tokenDetailsFeatureToggles: TokenDetailsFeatureToggles,
     deepLinksRegistry: DeepLinksRegistry,
     savedStateHandle: SavedStateHandle,
     private val appRouter: AppRouter,
@@ -159,13 +157,12 @@ internal class TokenDetailsViewModel @Inject constructor(
         stakingEntryInfoProvider = Provider { stakingEntryInfo },
         cryptoCurrencyStatusProvider = Provider { cryptoCurrencyStatus },
         clickIntents = this,
-        symbol = cryptoCurrency.symbol,
-        decimals = cryptoCurrency.decimals,
-        featureToggles = tokenDetailsFeatureToggles,
-        stakingFeatureToggles = stakingFeatureToggles,
-        userWalletId = userWalletId,
         networkHasDerivationUseCase = networkHasDerivationUseCase,
         getUserWalletUseCase = getUserWalletUseCase,
+        userWalletId = userWalletId,
+        stakingFeatureToggles = stakingFeatureToggles,
+        symbol = cryptoCurrency.symbol,
+        decimals = cryptoCurrency.decimals,
     )
 
     private val exchangeStatusFactory by lazy(mode = LazyThreadSafetyMode.NONE) {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt

@@ -28,7 +28,6 @@ import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSend
 import com.tangem.feature.wallet.presentation.wallet.utils.ScreenLifecycleProvider
 import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntents
 import com.tangem.features.markets.MarketsFeatureToggles
-import com.tangem.features.pushnotifications.api.featuretoggles.PushNotificationsFeatureToggles
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
 import com.tangem.features.pushnotifications.api.utils.getPushPermissionOrNull
 import com.tangem.utils.Provider
@@ -67,7 +66,6 @@ internal class WalletViewModel @Inject constructor(
     private val walletNameMigrationUseCase: WalletNameMigrationUseCase,
     private val refreshMultiCurrencyWalletQuotesUseCase: RefreshMultiCurrencyWalletQuotesUseCase,
     private val shouldAskPermissionUseCase: ShouldAskPermissionUseCase,
-    private val pushNotificationsFeatureToggles: PushNotificationsFeatureToggles,
     private val marketsFeatureToggles: MarketsFeatureToggles,
     analyticsEventsHandler: AnalyticsEventHandler,
 ) : ViewModel() {
@@ -166,10 +164,9 @@ internal class WalletViewModel @Inject constructor(
 
     private fun subscribeOnPushNotificationsPermission() {
         viewModelScope.launch {
-            val isPushToggled = pushNotificationsFeatureToggles.isPushNotificationsEnabled
             val shouldRequestPush = shouldAskPermissionUseCase(PUSH_PERMISSION)
             val isPushPermissionAvailable = getPushPermissionOrNull() != null
-            if (!isPushToggled || !shouldRequestPush || !isPushPermissionAvailable) return@launch
+            if (!shouldRequestPush || !isPushPermissionAvailable) return@launch
 
             delay(timeMillis = 1_800)