diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayWalletSelectorModel.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayWalletSelectorModel.kt
index 27a15aeeeb..5846a5ad8f 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayWalletSelectorModel.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayWalletSelectorModel.kt
@@ -37,13 +37,13 @@ internal class TangemPayWalletSelectorModel @Inject constructor(
         onWalletClick = { params.listener.onWalletSelected(it) },
     )
 
+    val uiState: StateFlow<WalletSelectorBSContentUM>
+        field = MutableStateFlow(getInitialState())
+
     init {
         fetchUserWalletsUM()
     }
 
-    val uiState: StateFlow<WalletSelectorBSContentUM>
-        field = MutableStateFlow(getInitialState())
-
     private fun getInitialState(): WalletSelectorBSContentUM {
         return WalletSelectorBSContentUM(
             userWallets = persistentListOf(),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
index 16187090af..dc74a050f9 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
@@ -210,6 +210,7 @@ internal object WalletScreenPreviewData {
         isHidingMode = false,
         showMarketsOnboarding = false,
         onDismissMarketsTooltip = {},
+        isRedesignEnabled = true,
     )
 
     val defaultAccountState = defaultState.copy(
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewDataLegacy.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewDataLegacy.kt
index 5485587450..5f2c522e24 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewDataLegacy.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewDataLegacy.kt
@@ -245,6 +245,7 @@ internal object WalletScreenPreviewDataLegacy {
         isHidingMode = false,
         showMarketsOnboarding = false,
         onDismissMarketsTooltip = {},
+        isRedesignEnabled = false,
     )
 
     internal val accountScreenState =
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletStateController.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletStateController.kt
index 89bff8d53b..76ab2122d0 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletStateController.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletStateController.kt
@@ -139,6 +139,7 @@ internal class WalletStateController @Inject constructor(
             isHidingMode = false,
             showMarketsOnboarding = false,
             onDismissMarketsTooltip = {},
+            isRedesignEnabled = designFeatureToggles.isRedesignEnabled,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
index fe7cb111e8..9a0e1d8822 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
@@ -15,4 +15,5 @@ internal data class WalletScreenState(
     val isHidingMode: Boolean,
     val showMarketsOnboarding: Boolean,
     val onDismissMarketsTooltip: () -> Unit,
+    val isRedesignEnabled: Boolean,
 )
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/WalletStateTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/WalletStateTransformer.kt
index 5aa3c34900..2790e44084 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/WalletStateTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/WalletStateTransformer.kt
@@ -15,17 +15,22 @@ internal abstract class WalletStateTransformer(
     abstract fun transform(walletUM: WalletUM): WalletUM
 
     final override fun transform(prevState: WalletScreenState): WalletScreenState {
-        return prevState.copy(
-            wallets = prevState.wallets
-                .map { state ->
-                    if (state.walletCardState.id == userWalletId) transform(state) else state
-                }
-                .toImmutableList(),
-            wallets2 = prevState.wallets2
-                .map { walletUM ->
-                    if (walletUM.walletsBalanceUM.id == userWalletId) transform(walletUM) else walletUM
-                }
-                .toImmutableList(),
-        )
+        return if (prevState.isRedesignEnabled) {
+            prevState.copy(
+                wallets2 = prevState.wallets2
+                    .map { walletUM ->
+                        if (walletUM.walletsBalanceUM.id == userWalletId) transform(walletUM) else walletUM
+                    }
+                    .toImmutableList(),
+            )
+        } else {
+            prevState.copy(
+                wallets = prevState.wallets
+                    .map { state ->
+                        if (state.walletCardState.id == userWalletId) transform(state) else state
+                    }
+                    .toImmutableList(),
+            )
+        }
     }
 }
\ No newline at end of file