Updated on 2026-08-14

2023-11-21 12:25:28 +04:00 · 2023-11-21 12:25:28 +04:00 · 275e07cb9d
commit 275e07cb9d
parent 9db902b25c
22 changed files with 34 additions and 199 deletions
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
@ -25,7 +25,6 @@ import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.domain.tokens.GetCryptoCurrenciesUseCase
 import com.tangem.domain.tokens.model.CryptoCurrency
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
-import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.tap.features.customtoken.impl.domain.CustomTokenInteractor
 import com.tangem.tap.features.customtoken.impl.domain.models.FoundToken
 import com.tangem.tap.features.customtoken.impl.presentation.models.*
@ -68,7 +67,6 @@ internal class AddCustomTokenViewModel @Inject constructor(
    private val featureInteractor: CustomTokenInteractor,
    private val dispatchers: AppCoroutineDispatcherProvider,
    private val getSelectedWalletSyncUseCase: GetSelectedWalletSyncUseCase,
-    private val walletFeatureToggles: WalletFeatureToggles,
 ) : ViewModel(), DefaultLifecycleObserver {

    private val analyticsSender = AddCustomTokenAnalyticsSender(analyticsEventHandler)
@ -85,18 +83,16 @@ internal class AddCustomTokenViewModel @Inject constructor(
    private var foundToken: FoundToken? = null

    init {
-        if (walletFeatureToggles.isRedesignedScreenEnabled) {
-            viewModelScope.launch(dispatchers.main) {
-                currentCryptoCurrencies = getSelectedWalletSyncUseCase().fold(
-                    ifLeft = { emptyList() },
-                    ifRight = { selectedWallet ->
-                        getCurrenciesUseCase(selectedWallet.walletId).fold(
-                            ifLeft = { emptyList() },
-                            ifRight = { it },
-                        )
-                    },
-                )
-            }
+        viewModelScope.launch(dispatchers.main) {
+            currentCryptoCurrencies = getSelectedWalletSyncUseCase().fold(
+                ifLeft = { emptyList() },
+                ifRight = { selectedWallet ->
+                    getCurrenciesUseCase(selectedWallet.walletId).fold(
+                        ifLeft = { emptyList() },
+                        ifRight = { it },
+                    )
+                },
+            )
        }
    }

--- a/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt
@ -1,10 +0,0 @@
-package com.tangem.tap.features.details
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-
-class DarkThemeFeatureToggle(
-    private val featureTogglesManager: FeatureTogglesManager,
-) {
-    val isDarkThemeEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "DARK_THEME_ENABLED")
-}
--- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt
@ -1,11 +0,0 @@
-package com.tangem.tap.features.details.featuretoggles
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-
-internal class DefaultDetailsFeatureToggles(
-    private val featureTogglesManager: FeatureTogglesManager,
-) : DetailsFeatureToggles {
-
-    override val isRedesignedAppCurrencySelectorEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "REDESIGNED_APP_CURRENCY_SELECTOR_ENABLED")
-}
--- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt
@ -1,6 +0,0 @@
-package com.tangem.tap.features.details.featuretoggles
-
-interface DetailsFeatureToggles {
-
-    val isRedesignedAppCurrencySelectorEnabled: Boolean
-}
--- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt
@ -1,17 +0,0 @@
-package com.tangem.tap.features.details.featuretoggles
-
-import com.tangem.core.featuretoggle.manager.FeatureTogglesManager
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object DetailsFeatureTogglesModule {
-
-    @Provides
-    fun provideDetailsFeatureToggles(featureTogglesManager: FeatureTogglesManager): DetailsFeatureToggles {
-        return DefaultDetailsFeatureToggles(featureTogglesManager)
-    }
-}
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
@ -13,7 +13,6 @@ sealed class DetailsAction : Action {

    data class PrepareScreen(
        val scanResponse: ScanResponse,
-        val darkThemeSwitchEnabled: Boolean,
        val shouldSaveUserWallets: Boolean,
    ) : DetailsAction()

--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@ -83,7 +83,6 @@ private fun handlePrepareScreen(action: DetailsAction.PrepareScreen): DetailsSta
                store.state.daggerGraphState
                    .get { balanceHidingRepository }.getBalanceHidingSettings().isHidingEnabledInSettings
            },
-            darkThemeSwitchEnabled = action.darkThemeSwitchEnabled,
        ),
    )
 }
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
@ -64,7 +64,6 @@ data class AppSettingsState(
    val isInProgress: Boolean = false,
    val selectedFiatCurrency: FiatCurrency = FiatCurrency.Default,
    val selectedThemeMode: AppThemeMode = AppThemeMode.DEFAULT,
-    val darkThemeSwitchEnabled: Boolean = false,
 )

 enum class SecurityOption { LongTap, PassCode, AccessCode }
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
@ -7,7 +7,6 @@ import com.tangem.core.navigation.NavigationAction
 import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
-import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
@ -21,14 +20,11 @@ internal class AppSettingsFragment : ComposeFragment(), StoreSubscriber<DetailsS
    @Inject
    override lateinit var appThemeModeHolder: AppThemeModeHolder

-    @Inject
-    lateinit var detailsFeatureToggles: DetailsFeatureToggles
-
    @Inject
    lateinit var appCurrencyRepository: AppCurrencyRepository

    private val viewModel by lazy(mode = LazyThreadSafetyMode.NONE) {
-        AppSettingsViewModel(store, detailsFeatureToggles, appCurrencyRepository)
+        AppSettingsViewModel(store, appCurrencyRepository)
    }

    @Composable
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
@ -15,7 +15,6 @@ import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.AppState
-import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles
 import com.tangem.tap.features.details.redux.AppSetting
 import com.tangem.tap.features.details.redux.AppSettingsState
 import com.tangem.tap.features.details.redux.DetailsAction
@ -31,7 +30,6 @@ import org.rekotlin.Store

 internal class AppSettingsViewModel(
    private val store: Store<AppState>,
-    private val detailsFeatureToggles: DetailsFeatureToggles,
    private val appCurrencyRepository: AppCurrencyRepository,
 ) {

@ -44,9 +42,7 @@ internal class AppSettingsViewModel(
        private set

    init {
-        if (detailsFeatureToggles.isRedesignedAppCurrencySelectorEnabled) {
-            bootstrapAppCurrencyUpdates()
-        }
+        bootstrapAppCurrencyUpdates()
    }

    fun updateState(state: DetailsState) {
@ -93,11 +89,9 @@ internal class AppSettingsViewModel(
                onCheckedChange = ::onFlipToHideBalanceToggled,
            ).let(::add)

-            if (state.darkThemeSwitchEnabled) {
-                itemsFactory.createSelectThemeModeButton(state.selectedThemeMode) {
-                    showThemeModeSelector(state.selectedThemeMode)
-                }.let(::add)
-            }
+            itemsFactory.createSelectThemeModeButton(state.selectedThemeMode) {
+                showThemeModeSelector(state.selectedThemeMode)
+            }.let(::add)
        }

        return items.toImmutableList()
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
@ -9,7 +9,6 @@ import com.tangem.core.ui.screen.ComposeFragment
 import com.tangem.core.ui.theme.AppThemeModeHolder
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.tap.common.analytics.events.Settings
-import com.tangem.tap.features.details.DarkThemeFeatureToggle
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
 import dagger.hilt.android.AndroidEntryPoint
@ -22,9 +21,6 @@ internal class DetailsFragment : ComposeFragment(), StoreSubscriber<DetailsState
    @Inject
    override lateinit var appThemeModeHolder: AppThemeModeHolder

-    @Inject
-    lateinit var darkThemeFeatureToggle: DarkThemeFeatureToggle
-
    @Inject
    lateinit var walletsRepository: WalletsRepository

@ -32,7 +28,7 @@ internal class DetailsFragment : ComposeFragment(), StoreSubscriber<DetailsState

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        detailsViewModel = DetailsViewModel(store, darkThemeFeatureToggle, walletsRepository)
+        detailsViewModel = DetailsViewModel(store, walletsRepository)
        Analytics.send(Settings.ScreenOpened())
    }

--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
@ -20,7 +20,6 @@ import com.tangem.tap.common.feedback.FeedbackEmail
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.features.details.DarkThemeFeatureToggle
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
@ -43,7 +42,6 @@ import timber.log.Timber
 // TODO: change to Android ViewModel [REDACTED_JIRA]
 internal class DetailsViewModel(
    private val store: Store<AppState>,
-    private val darkThemeFeatureToggle: DarkThemeFeatureToggle,
    private val walletsRepository: WalletsRepository,
 ) {

@ -202,7 +200,6 @@ internal class DetailsViewModel(
                store.dispatchWithMain(
                    DetailsAction.PrepareScreen(
                        scanResponse = selectedUserWallet.scanResponse,
-                        darkThemeSwitchEnabled = darkThemeFeatureToggle.isDarkThemeEnabled,
                        shouldSaveUserWallets = walletsRepository.shouldSaveUserWalletsSync(),
                    ),
                )