diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt b/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
index 8922e9b2e7..1612d89f64 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/DefaultTokensFeatureToggles.kt
@@ -9,4 +9,7 @@ internal class DefaultTokensFeatureToggles(
 
     override val isStakingLoadingRefactoringEnabled: Boolean
         get() = featureTogglesManager.isFeatureEnabled(name = "STAKING_LOADING_REFACTORING_ENABLED")
+
+    override val isWalletBalanceFetcherEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "WALLET_BALANCE_FETCHER_ENABLED")
 }
\ No newline at end of file
diff --git a/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt b/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
index 48fcf815ed..4580b669b4 100644
--- a/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
@@ -45,7 +45,7 @@ class MockCryptoCurrencyFactory(private val scanResponse: ScanResponse = default
         )
     }
 
-    fun createCoin(blockchain: Blockchain): CryptoCurrency {
+    fun createCoin(blockchain: Blockchain): CryptoCurrency.Coin {
         val derivationPath = createDerivationPath(
             blockchain = blockchain,
             extraDerivationPath = null,
diff --git a/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt b/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
index d28fe3df7e..1585424ba5 100644
--- a/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
+++ b/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
@@ -5,9 +5,9 @@ import com.google.common.truth.Truth
 
 fun <B> assertEither(actual: Either<Throwable, B>, expected: Either<Throwable, B>) {
     actual
-        .onRight { Truth.assertThat(it).isEqualTo(expected) }
+        .onRight { Truth.assertThat(actual).isEqualTo(expected) }
         .onLeft {
-            val expectedError = expected.leftOrNull() ?: error("Expected must be Either.Left")
+            val expectedError = expected.leftOrNull() ?: error("Actual is Either.Left: $it")
 
             Truth.assertThat(it::class.java).isEqualTo(expectedError::class.java)
         }
diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
index 0ab98cc318..bbc46e5650 100644
--- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
@@ -74,5 +74,9 @@
     {
         "name": "SEND_REDESIGN_ENABLED",
         "version": "undefined"
+    },
+    {
+        "name": "WALLET_BALANCE_FETCHER_ENABLED",
+        "version": "undefined"
     }
 ]
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
index f04d8d0e56..50ae6bb491 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/TokensFeatureToggles.kt
@@ -8,4 +8,6 @@ package com.tangem.domain.tokens
 interface TokensFeatureToggles {
 
     val isStakingLoadingRefactoringEnabled: Boolean
+
+    val isWalletBalanceFetcherEnabled: Boolean
 }
\ No newline at end of file