Updated on 2026-08-14

app/src/main/java/com/tangem/tap/TapApplication.kt

@@ -23,6 +23,7 @@ import com.tangem.datasource.config.FeaturesLocalLoader
 import com.tangem.datasource.config.models.Config
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.domain.DomainLayer
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.wallets.legacy.WalletManagersRepository
@@ -161,6 +162,9 @@ class TapApplication : Application(), ImageLoaderFactory {
     @Inject
     lateinit var blockchainExceptionHandler: BlockchainExceptionHandler
 
+    @Inject
+    lateinit var appCurrencyRepository: AppCurrencyRepository
+
     override fun onCreate() {
         super.onCreate()
 
@@ -179,6 +183,7 @@ class TapApplication : Application(), ImageLoaderFactory {
                     walletConnectSessionsRepository = walletConnectSessionsRepository,
                     tokenDetailsFeatureToggles = tokenDetailsFeatureToggles,
                     scanCardProcessor = scanCardProcessor,
+                    appCurrencyRepository = appCurrencyRepository,
                 ),
             ),
         )

app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt

@@ -8,10 +8,12 @@ import com.tangem.domain.common.LogConfig
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.tap.*
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
@@ -24,17 +26,13 @@ import com.tangem.tap.network.exchangeServices.ExchangeService
 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.preferencesStorage
-import com.tangem.tap.scope
-import com.tangem.tap.store
-import com.tangem.tap.tangemSdkManager
-import com.tangem.tap.userTokensRepository
-import com.tangem.tap.walletCurrenciesManager
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
-import java.util.*
+import java.util.Locale
 
 object GlobalMiddleware {
     val handler = globalMiddlewareHandler
@@ -68,13 +66,11 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             }
         }
         is GlobalAction.RestoreAppCurrency -> {
-            store.dispatch(
-                GlobalAction.RestoreAppCurrency.Success(
-                    preferencesStorage.fiatCurrenciesPrefStorage.getAppCurrency()
-                        ?.run { FiatCurrency(code, name, symbol) }
-                        ?: FiatCurrency.Default,
-                ),
-            )
+            if (store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles).isRedesignedScreenEnabled) {
+                restoreAppCurrencyNew()
+            } else {
+                restoreAppCurrencyLegacy()
+            }
         }
         is GlobalAction.HideWarningMessage -> {
             store.state.globalState.warningManager?.let {
@@ -193,6 +189,28 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
     }
 }
 
+private fun restoreAppCurrencyLegacy() {
+    store.dispatch(
+        GlobalAction.RestoreAppCurrency.Success(
+            preferencesStorage.fiatCurrenciesPrefStorage.getAppCurrency()
+                ?.run { FiatCurrency(code, name, symbol) }
+                ?: FiatCurrency.Default,
+        ),
+    )
+}
+
+private fun restoreAppCurrencyNew() {
+    scope.launch {
+        val currency = store.state.daggerGraphState.get(DaggerGraphState::appCurrencyRepository)
+            .getSelectedAppCurrency()
+            .firstOrNull()
+            ?.run { FiatCurrency(code, name, symbol) }
+            ?: FiatCurrency.Default
+
+        store.dispatchWithMain(GlobalAction.RestoreAppCurrency.Success(currency))
+    }
+}
+
 private fun makeSellExchangeService(config: Config): ExchangeService {
     return MoonPayService(
         apiKey = config.moonPayApiKey,

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt

@@ -3,12 +3,14 @@ package com.tangem.tap.features.wallet.redux.middlewares
 import com.tangem.common.extensions.guard
 import com.tangem.core.analytics.Analytics
 import com.tangem.data.source.preferences.model.DataSourceCurrency
-import com.tangem.data.source.preferences.model.DataSourceFiatCurrency
 import com.tangem.data.source.preferences.storage.FiatCurrenciesPrefStorage
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
+import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchDialogShow
+import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapWalletManager
 import com.tangem.tap.features.details.redux.DetailsAction
@@ -19,6 +21,8 @@ import com.tangem.tap.features.walletSelector.redux.WalletSelectorAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.userWalletsListManager
+import com.tangem.utils.coroutines.JobHolder
+import com.tangem.utils.coroutines.saveIn
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -26,8 +30,12 @@ class AppCurrencyMiddleware(
     private val walletRepository: WalletRepository,
     private val tapWalletManager: TapWalletManager,
     private val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage,
+    private val featureToggles: WalletFeatureToggles,
+    private val appCurrencyRepository: AppCurrencyRepository,
     private val appCurrencyProvider: () -> FiatCurrency,
 ) {
+    private val showSelectorJobHolder = JobHolder()
+
     fun handle(action: WalletAction.AppCurrencyAction) {
         when (action) {
             is WalletAction.AppCurrencyAction.ChooseAppCurrency -> showSelector()
@@ -36,6 +44,52 @@ class AppCurrencyMiddleware(
     }
 
     private fun showSelector() {
+        if (featureToggles.isRedesignedScreenEnabled) {
+            showSelectorNew()
+        } else {
+            showSelectorLegacy()
+        }
+    }
+
+    private fun selectCurrency(action: WalletAction.AppCurrencyAction.SelectAppCurrency) {
+        Analytics.send(MainScreen.MainCurrencyChanged(AnalyticsParam.CurrencyType.FiatCurrency(action.fiatCurrency)))
+
+        scope.launch {
+            appCurrencyRepository.changeAppCurrency(action.fiatCurrency.code)
+
+            store.dispatchWithMain(GlobalAction.ChangeAppCurrency(action.fiatCurrency))
+            store.dispatchWithMain(DetailsAction.ChangeAppCurrency(action.fiatCurrency))
+            store.dispatchWithMain(WalletSelectorAction.ChangeAppCurrency(action.fiatCurrency))
+
+            val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
+                Timber.e("Unable to select currency, no user wallet selected")
+                return@launch
+            }
+
+            tapWalletManager.loadData(selectedUserWallet, refresh = true)
+        }
+    }
+
+    private fun showSelectorNew() {
+        scope.launch {
+            val currencies = appCurrencyRepository.getAvailableAppCurrencies()
+
+            store.dispatchDialogShow(
+                WalletDialog.CurrencySelectionDialog(
+                    currenciesList = currencies.map { appCurrency ->
+                        FiatCurrency(
+                            code = appCurrency.code,
+                            name = appCurrency.name,
+                            symbol = appCurrency.symbol,
+                        )
+                    },
+                    currentAppCurrency = appCurrencyProvider.invoke(),
+                ),
+            )
+        }.saveIn(showSelectorJobHolder)
+    }
+
+    private fun showSelectorLegacy() {
         val storedFiatCurrencies = fiatCurrenciesPrefStorage.restore()
         if (storedFiatCurrencies.isNotEmpty()) {
             store.dispatchDialogShow(
@@ -65,23 +119,6 @@ class AppCurrencyMiddleware(
         }
     }
 
-    private fun selectCurrency(action: WalletAction.AppCurrencyAction.SelectAppCurrency) {
-        Analytics.send(MainScreen.MainCurrencyChanged(AnalyticsParam.CurrencyType.FiatCurrency(action.fiatCurrency)))
-        fiatCurrenciesPrefStorage.saveAppCurrency(
-            with(action.fiatCurrency) { DataSourceFiatCurrency(code, name, symbol) },
-        )
-        store.dispatch(GlobalAction.ChangeAppCurrency(action.fiatCurrency))
-        store.dispatch(DetailsAction.ChangeAppCurrency(action.fiatCurrency))
-        store.dispatch(WalletSelectorAction.ChangeAppCurrency(action.fiatCurrency))
-        val selectedUserWallet = userWalletsListManager.selectedUserWalletSync.guard {
-            Timber.e("Unable to select currency, no user wallet selected")
-            return
-        }
-        scope.launch {
-            tapWalletManager.loadData(selectedUserWallet, refresh = true)
-        }
-    }
-
     private fun List<DataSourceCurrency>.mapToUiModel(): List<FiatCurrency> {
         return this.map {
             FiatCurrency(

app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt

@@ -55,6 +55,8 @@ class WalletMiddleware {
             walletRepository = store.state.featureRepositoryProvider.walletRepository,
             tapWalletManager = store.state.globalState.tapWalletManager,
             fiatCurrenciesPrefStorage = preferencesStorage.fiatCurrenciesPrefStorage,
+            appCurrencyRepository = store.state.daggerGraphState.get(DaggerGraphState::appCurrencyRepository),
+            featureToggles = store.state.daggerGraphState.get(DaggerGraphState::walletFeatureToggles),
             appCurrencyProvider = { store.state.globalState.appCurrency },
         )
     }

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt

@@ -2,6 +2,7 @@ package com.tangem.tap.proxy.redux
 
 import com.tangem.datasource.asset.AssetReader
 import com.tangem.datasource.connection.NetworkConnectionManager
+import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
@@ -31,6 +32,7 @@ data class DaggerGraphState(
     val tokenDetailsRouter: TokenDetailsRouter? = null,
     val scanCardProcessor: ScanCardProcessor? = null,
     val cardSdkConfigRepository: CardSdkConfigRepository? = null,
+    val appCurrencyRepository: AppCurrencyRepository? = null,
 ) : StateType {
 
     inline fun <reified T> get(getDependency: DaggerGraphState.() -> T?): T {