diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index b1faa6cfad..80e947429f 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -247,20 +247,15 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac private fun createAppThemeModeFlow(): SharedFlow { val tapApplication = application as TapApplication - val featureToggle = tapApplication.darkThemeFeatureToggle - return if (featureToggle.isDarkThemeEnabled) { - tapApplication.getAppThemeModeUseCase() - .map { maybeMode -> - maybeMode.getOrElse { AppThemeMode.DEFAULT } - } - .shareIn( - scope = lifecycleScope + Dispatchers.IO, - started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5_000), - ) - } else { - MutableStateFlow(AppThemeMode.FORCE_LIGHT) - } + return tapApplication.getAppThemeModeUseCase() + .map { maybeMode -> + maybeMode.getOrElse { AppThemeMode.DEFAULT } + } + .shareIn( + scope = lifecycleScope + Dispatchers.IO, + started = SharingStarted.WhileSubscribed(stopTimeoutMillis = 5_000), + ) } override fun onStart() { diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt index 9ce22e7a27..087d548ae0 100644 --- a/app/src/main/java/com/tangem/tap/TapApplication.kt +++ b/app/src/main/java/com/tangem/tap/TapApplication.kt @@ -36,7 +36,6 @@ import com.tangem.domain.wallets.legacy.UserWalletsListManager import com.tangem.domain.wallets.repository.WalletsRepository import com.tangem.features.managetokens.featuretoggles.ManageTokensFeatureToggles import com.tangem.features.send.api.featuretoggles.SendFeatureToggles -import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles import com.tangem.tap.common.analytics.AnalyticsFactory import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder import com.tangem.tap.common.analytics.handlers.BlockchainExceptionHandler @@ -62,8 +61,6 @@ import com.tangem.tap.domain.userWalletList.di.provideRuntimeImplementation import com.tangem.tap.domain.walletconnect.WalletConnectRepository import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles -import com.tangem.tap.features.details.DarkThemeFeatureToggle -import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles import com.tangem.tap.proxy.AppStateHolder import com.tangem.tap.proxy.redux.DaggerGraphState import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider @@ -110,9 +107,6 @@ internal class TapApplication : Application(), ImageLoaderFactory { @Inject lateinit var preferencesDataSource: PreferencesDataSource - @Inject - lateinit var walletFeatureToggles: WalletFeatureToggles - @Inject lateinit var walletConnect2Repository: WalletConnect2Repository @@ -149,12 +143,6 @@ internal class TapApplication : Application(), ImageLoaderFactory { @Inject lateinit var balanceHidingRepository: BalanceHidingRepository - @Inject - lateinit var detailsFeatureToggles: DetailsFeatureToggles - - @Inject - lateinit var darkThemeFeatureToggle: DarkThemeFeatureToggle - @Inject lateinit var userTokensStore: UserTokensStore @@ -222,9 +210,7 @@ internal class TapApplication : Application(), ImageLoaderFactory { storageService = userTokensStorageService, ) derivationsFinder = DerivationsFinder( - legacyTokensStore = userTokensStorageService, newTokensStore = userTokensStore, - walletFeatureToggles = walletFeatureToggles, dispatchers = AppCoroutineDispatcherProvider(), ) appStateHolder.mainStore = store @@ -242,7 +228,6 @@ internal class TapApplication : Application(), ImageLoaderFactory { assetReader = assetReader, networkConnectionManager = networkConnectionManager, customTokenFeatureToggles = customTokenFeatureToggles, - walletFeatureToggles = walletFeatureToggles, walletConnectRepository = walletConnect2Repository, walletConnectSessionsRepository = walletConnectSessionsRepository, manageTokensFeatureToggles = manageTokensFeatureToggles, @@ -254,7 +239,6 @@ internal class TapApplication : Application(), ImageLoaderFactory { currenciesRepository = currenciesRepository, appThemeModeRepository = appThemeModeRepository, balanceHidingRepository = balanceHidingRepository, - detailsFeatureToggles = detailsFeatureToggles, walletsRepository = walletsRepository, sendFeatureToggles = sendFeatureToggles, ), diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt index add3c5f204..88b5bac5ae 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt @@ -9,7 +9,6 @@ import com.tangem.datasource.config.models.Config import com.tangem.domain.common.LogConfig import com.tangem.domain.models.scan.CardDTO import com.tangem.domain.models.scan.ScanResponse -import com.tangem.tap.* import com.tangem.tap.common.analytics.events.Basic import com.tangem.tap.common.entities.FiatCurrency import com.tangem.tap.common.extensions.dispatchDebugErrorNotification @@ -18,6 +17,7 @@ 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.send.redux.SendAction +import com.tangem.tap.mainScope import com.tangem.tap.network.exchangeServices.BuyExchangeService import com.tangem.tap.network.exchangeServices.CardExchangeRules import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager @@ -26,6 +26,9 @@ import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoEnvironment import com.tangem.tap.network.exchangeServices.mercuryo.MercuryoService import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService import com.tangem.tap.proxy.redux.DaggerGraphState +import com.tangem.tap.scope +import com.tangem.tap.store +import com.tangem.tap.userWalletsListManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch @@ -66,17 +69,7 @@ private fun handleAction(action: Action, appState: () -> AppState?) { } } is GlobalAction.RestoreAppCurrency -> { - val daggerGraphState = store.state.daggerGraphState - val walletFeatureToggles = daggerGraphState.get(DaggerGraphState::walletFeatureToggles) - val detailsFeatureToggles = daggerGraphState.get(DaggerGraphState::detailsFeatureToggles) - - if (walletFeatureToggles.isRedesignedScreenEnabled || - detailsFeatureToggles.isRedesignedAppCurrencySelectorEnabled - ) { - restoreAppCurrencyNew() - } else { - restoreAppCurrencyLegacy() - } + restoreAppCurrency() } is GlobalAction.HideWarningMessage -> { store.state.globalState.warningManager?.let { @@ -193,17 +186,7 @@ private fun handleAction(action: Action, appState: () -> AppState?) { } } -private fun restoreAppCurrencyLegacy() { - store.dispatch( - GlobalAction.RestoreAppCurrency.Success( - preferencesStorage.fiatCurrenciesPrefStorage.getAppCurrency() - ?.run { FiatCurrency(code, name, symbol) } - ?: FiatCurrency.Default, - ), - ) -} - -private fun restoreAppCurrencyNew() { +private fun restoreAppCurrency() { scope.launch { val currency = store.state.daggerGraphState.get(DaggerGraphState::appCurrencyRepository) .getSelectedAppCurrency() diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt index f1345d6989..fad75db2f6 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt @@ -8,8 +8,8 @@ import java.util.concurrent.CopyOnWriteArrayList /** [REDACTED_AUTHOR] */ -// TODO: Delete with WalletFeatureToggles -@Deprecated(message = "Used only in old wallet screen") +// TODO: Delete with SendFeatureToggles +@Deprecated(message = "Used only in old send screen") class WarningMessagesManager { private val warningsList = CopyOnWriteArrayList() diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt index 38a23139b6..d229d8f05d 100644 --- a/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt +++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt @@ -11,10 +11,7 @@ import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.domain.models.scan.CardDTO import com.tangem.domain.userwallets.UserWalletIdBuilder import com.tangem.domain.wallets.models.UserWalletId -import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles -import com.tangem.tap.domain.tokens.UserTokensStorageService import com.tangem.tap.features.demo.DemoHelper -import com.tangem.tap.features.wallet.models.Currency import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.withContext @@ -25,9 +22,7 @@ internal data class BlockchainToDerive( // FIXME: May be move to DI, currently unnecessary internal class DerivationsFinder( - private val legacyTokensStore: UserTokensStorageService, private val newTokensStore: UserTokensStore, - private val walletFeatureToggles: WalletFeatureToggles, private val dispatchers: CoroutineDispatcherProvider, ) { @@ -40,11 +35,7 @@ internal class DerivationsFinder( val derivationStyle = derivationStyleProvider.getDerivationStyle() var blockchains = withContext(dispatchers.io) { - if (walletFeatureToggles.isRedesignedScreenEnabled) { - getBlockchainsNew(userWalletId) - } else { - getBlockchainsLegacy(userWalletId) - } + getBlockchains(userWalletId) } if (blockchains.isEmpty()) { @@ -72,7 +63,7 @@ internal class DerivationsFinder( return blockchains } - private suspend fun getBlockchainsNew(userWalletId: UserWalletId): MutableSet { + private suspend fun getBlockchains(userWalletId: UserWalletId): MutableSet { val responseTokens = newTokensStore.getSyncOrNull(userWalletId) ?.tokens ?: return hashSetOf() @@ -88,22 +79,6 @@ internal class DerivationsFinder( .toMutableSet() } - private fun getBlockchainsLegacy(userWalletId: UserWalletId): MutableSet { - val currencies = legacyTokensStore.getUserTokens(userWalletId.stringValue) - ?.takeIf { it.isNotEmpty() } - ?: return hashSetOf() - - return currencies.asSequence() - .filterIsInstance() - .map { coin -> - val blockchain = coin.blockchain - val derivationPath = coin.derivationPath?.let(::DerivationPath) - - BlockchainToDerive(blockchain, derivationPath) - } - .toMutableSet() - } - // TODO: Move to user wallet config private fun getDemoBlockchains(derivationStyle: DerivationStyle?): MutableSet { return DemoHelper.config.demoBlockchains.mapToBlockchainsWithDerivations(derivationStyle) diff --git 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 index f7b4c3e9b0..fdc6fa6287 100644 --- 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 }, + ) + }, + ) } } diff --git a/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt b/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt deleted file mode 100644 index afb3010ad3..0000000000 --- a/app/src/main/java/com/tangem/tap/features/details/DarkThemeFeatureToggle.kt +++ /dev/null @@ -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") -} \ No newline at end of file diff --git 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 deleted file mode 100644 index 2ed04a4c94..0000000000 --- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DefaultDetailsFeatureToggles.kt +++ /dev/null @@ -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") -} \ No newline at end of file diff --git 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 deleted file mode 100644 index dd1cd3bbdd..0000000000 --- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureToggles.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.tangem.tap.features.details.featuretoggles - -interface DetailsFeatureToggles { - - val isRedesignedAppCurrencySelectorEnabled: Boolean -} \ No newline at end of file diff --git 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 deleted file mode 100644 index 2e6fd9874a..0000000000 --- a/app/src/main/java/com/tangem/tap/features/details/featuretoggles/DetailsFeatureTogglesModule.kt +++ /dev/null @@ -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) - } -} \ No newline at end of file diff --git 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 index 338e8f255c..fe5e31ca84 100644 --- 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() diff --git 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 index 5c5815107f..3b77867e00 100644 --- 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, ), ) } diff --git 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 index c17950e504..89ae6adef9 100644 --- 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 } diff --git 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 index 122e9437d1..8afcd15101 100644 --- 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, - 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() diff --git 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 index d3d215551c..57376f6c70 100644 --- 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, - 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(), ), ) diff --git a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt index 32b8f47384..cd189f36c4 100644 --- a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt +++ b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt @@ -2,7 +2,6 @@ package com.tangem.tap.proxy.di import com.tangem.common.Provider import com.tangem.core.analytics.api.AnalyticsEventHandler -import com.tangem.core.featuretoggle.manager.FeatureTogglesManager import com.tangem.domain.card.repository.CardSdkConfigRepository import com.tangem.domain.common.CardTypesResolver import com.tangem.domain.common.util.cardTypesResolver @@ -13,7 +12,6 @@ import com.tangem.feature.learn2earn.domain.api.Learn2earnDependencyProvider import com.tangem.lib.crypto.DerivationManager import com.tangem.lib.crypto.TransactionManager import com.tangem.lib.crypto.UserWalletManager -import com.tangem.tap.features.details.DarkThemeFeatureToggle import com.tangem.tap.proxy.* import dagger.Module import dagger.Provides @@ -75,12 +73,6 @@ class ProxyModule { ) } - @Provides - @Singleton - fun provideDarkThemeFeatureToggle(featureTogglesManager: FeatureTogglesManager): DarkThemeFeatureToggle { - return DarkThemeFeatureToggle(featureTogglesManager) - } - // regions FeatureConsumers @Provides @Singleton diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt index e7a479dfa0..0a28f3831c 100644 --- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt +++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt @@ -18,13 +18,11 @@ import com.tangem.features.send.api.featuretoggles.SendFeatureToggles import com.tangem.features.send.api.navigation.SendRouter import com.tangem.features.tester.api.TesterRouter import com.tangem.features.tokendetails.navigation.TokenDetailsRouter -import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles import com.tangem.features.wallet.navigation.WalletRouter import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor import com.tangem.tap.domain.walletconnect2.domain.WalletConnectRepository import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles -import com.tangem.tap.features.details.featuretoggles.DetailsFeatureToggles import com.tangem.tap.proxy.AppStateHolder import org.rekotlin.StateType @@ -34,7 +32,6 @@ data class DaggerGraphState( val networkConnectionManager: NetworkConnectionManager? = null, val customTokenFeatureToggles: CustomTokenFeatureToggles? = null, val scanCardUseCase: ScanCardUseCase? = null, - val walletFeatureToggles: WalletFeatureToggles? = null, val walletRouter: WalletRouter? = null, val walletConnectRepository: WalletConnectRepository? = null, val walletConnectSessionsRepository: WalletConnectSessionsRepository? = null, @@ -49,7 +46,6 @@ data class DaggerGraphState( val appStateHolder: AppStateHolder? = null, val appThemeModeRepository: AppThemeModeRepository? = null, val balanceHidingRepository: BalanceHidingRepository? = null, - val detailsFeatureToggles: DetailsFeatureToggles? = null, val walletsRepository: WalletsRepository? = null, val networksRepository: NetworksRepository? = null, val sendFeatureToggles: SendFeatureToggles? = null, diff --git a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json index 2b5c465b78..ac5e3560a7 100644 --- a/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/featuretoggles/src/main/assets/configs/feature_toggles_config.json @@ -1,16 +1,8 @@ [ - { - "name": "OPTIMISM_SWAP_FEATURE_ENABLED", - "version": "4.3.1" - }, { "name": "NEW_CARD_SCANNING_ENABLED", "version": "undefined" }, - { - "name": "REDESIGNED_WALLET_SCREEN_ENABLED", - "version": "5.0.0" - }, { "name": "1INCH_LEARN_2_EARN_ENABLED", "version": "undefined" @@ -19,14 +11,6 @@ "name": "SHOPIFY_DYNAMIC_ENABLED", "version": "undefined" }, - { - "name": "REDESIGNED_APP_CURRENCY_SELECTOR_ENABLED", - "version": "5.0.0" - }, - { - "name": "DARK_THEME_ENABLED", - "version": "5.0.0" - }, { "name": "REDESIGNED_MANAGE_TOKENS_SCREEN_ENABLED", "version": "undefined" diff --git a/features/wallet/api/src/main/kotlin/com/tangem/features/wallet/featuretoggles/WalletFeatureToggles.kt b/features/wallet/api/src/main/kotlin/com/tangem/features/wallet/featuretoggles/WalletFeatureToggles.kt index 9485b4d30c..f2bd26a6ba 100644 --- a/features/wallet/api/src/main/kotlin/com/tangem/features/wallet/featuretoggles/WalletFeatureToggles.kt +++ b/features/wallet/api/src/main/kotlin/com/tangem/features/wallet/featuretoggles/WalletFeatureToggles.kt @@ -7,8 +7,5 @@ package com.tangem.features.wallet.featuretoggles */ interface WalletFeatureToggles { - /** Availability of redesigned screen */ - val isRedesignedScreenEnabled: Boolean - val isWalletsScrollingPreviewEnabled: Boolean } \ No newline at end of file diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt index 09655bdd61..b87f2678ff 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt @@ -14,9 +14,6 @@ internal class DefaultWalletFeatureToggles( private val featureTogglesManager: FeatureTogglesManager, ) : WalletFeatureToggles { - override val isRedesignedScreenEnabled: Boolean - get() = featureTogglesManager.isFeatureEnabled(name = "REDESIGNED_WALLET_SCREEN_ENABLED") - override val isWalletsScrollingPreviewEnabled: Boolean get() = featureTogglesManager.isFeatureEnabled(name = "WALLETS_SCROLLING_PREVIEW_ENABLED") } \ No newline at end of file