Updated on 2026-08-14

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

@@ -19,7 +19,7 @@ import com.tangem.core.ui.clipboard.ClipboardManager
 import com.tangem.data.card.TransactionSignerFactory
 import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
 import com.tangem.datasource.connection.NetworkConnectionManager
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.datasource.local.config.issuers.IssuersConfigStorage
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.preferences.AppPreferencesStore
@@ -57,12 +57,12 @@ import dagger.hilt.components.SingletonComponent
 @Suppress("TooManyFunctions")
 interface ApplicationEntryPoint {
 
-    fun getEnvironmentConfigStorage(): EnvironmentConfigStorage
-
     fun getAppStateHolder(): AppStateHolder
 
     fun getIssuersConfigStorage(): IssuersConfigStorage
 
+    fun getEnvironmentConfig(): EnvironmentConfig
+
     fun getFeatureTogglesManager(): FeatureTogglesManager
 
     fun getExcludedBlockchainsManager(): ExcludedBlockchainsManager

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

@@ -36,7 +36,6 @@ import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
 import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
 import com.tangem.datasource.connection.NetworkConnectionManager
 import com.tangem.datasource.local.config.environment.EnvironmentConfig
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.datasource.local.config.issuers.IssuersConfigStorage
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.preferences.AppPreferencesStore
@@ -80,7 +79,6 @@ import dagger.hilt.EntryPoints
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.rekotlin.Store
 import timber.log.Timber
 
@@ -97,12 +95,12 @@ open class TangemApplication : Application(), ImageLoaderFactory, Configuration.
     private val appStateHolder: AppStateHolder
         get() = entryPoint.getAppStateHolder()
 
-    private val environmentConfigStorage: EnvironmentConfigStorage
-        get() = entryPoint.getEnvironmentConfigStorage()
-
     private val issuersConfigStorage: IssuersConfigStorage
         get() = entryPoint.getIssuersConfigStorage()
 
+    private val environmentConfig: EnvironmentConfig
+        get() = entryPoint.getEnvironmentConfig()
+
     private val featureTogglesManager: FeatureTogglesManager
         get() = entryPoint.getFeatureTogglesManager()
 
@@ -306,9 +304,7 @@ open class TangemApplication : Application(), ImageLoaderFactory, Configuration.
             Timber.i(excludedBlockchainsManager.toString())
         }
 
-        runBlocking {
-            initWithConfigDependency(environmentConfig = environmentConfigStorage.initialize())
-        }
+        initWithConfigDependency(environmentConfig = environmentConfig)
 
         abTestsManager.init()
 
@@ -345,7 +341,7 @@ open class TangemApplication : Application(), ImageLoaderFactory, Configuration.
         appStateHolder.mainStore = store
 
         wcInitializeUseCase.init(
-            projectId = environmentConfigStorage.getConfigSync().walletConnectProjectId,
+            projectId = environmentConfig.walletConnectProjectId,
         )
     }
 
@@ -376,7 +372,6 @@ open class TangemApplication : Application(), ImageLoaderFactory, Configuration.
                     shareManager = shareManager,
                     appRouter = appRouter,
                     transactionSignerFactory = transactionSignerFactory,
-                    environmentConfigStorage = environmentConfigStorage,
                     onboardingV2FeatureToggles = onboardingV2FeatureToggles,
                     onboardingRepository = onboardingRepository,
                     excludedBlockchains = excludedBlockchains,

app/src/main/java/com/tangem/tap/di/ActivityModule.kt

@@ -1,7 +1,7 @@
 package com.tangem.tap.di
 
 import com.tangem.datasource.api.moonpay.MoonPayApi
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.exchange.RampStateManager
@@ -69,14 +69,14 @@ internal object ActivityModule {
     @Provides
     @Singleton
     fun provideExchangeService(
-        environmentConfigStorage: EnvironmentConfigStorage,
         getSelectedWalletUseCase: GetSelectedWalletUseCase,
         moonPayApi: MoonPayApi,
+        environmentConfig: EnvironmentConfig,
     ): SellService {
         return MoonPayService(
             api = moonPayApi,
-            apiKeyProvider = Provider { environmentConfigStorage.getConfigSync().moonPayApiKey },
-            secretKeyProvider = Provider { environmentConfigStorage.getConfigSync().moonPayApiSecretKey },
+            apiKey = environmentConfig.moonPayApiKey,
+            secretKey = environmentConfig.moonPayApiSecretKey,
             userWalletProvider = { getSelectedWalletUseCase.sync().getOrNull() },
         )
     }

app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt

@@ -3,7 +3,7 @@ package com.tangem.tap.network.auth
 import com.tangem.common.extensions.toHexString
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.api.common.config.ApiEnvironment
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.utils.Provider
@@ -11,7 +11,7 @@ import com.tangem.utils.ProviderSuspend
 
 internal class DefaultAuthProvider(
     private val userWalletsListRepository: UserWalletsListRepository,
-    private val environmentConfigStorage: EnvironmentConfigStorage,
+    private val environmentConfig: EnvironmentConfig,
 ) : AuthProvider {
 
     override suspend fun getCardPublicKey(): String {
@@ -47,11 +47,11 @@ internal class DefaultAuthProvider(
                 ApiEnvironment.DEV,
                 ApiEnvironment.DEV_2,
                 ApiEnvironment.DEV_3,
-                -> environmentConfigStorage.getConfigSync().tangemApiKeyDev
+                -> environmentConfig.tangemApiKeyDev
                 ApiEnvironment.STAGE_2,
                 ApiEnvironment.STAGE,
-                -> environmentConfigStorage.getConfigSync().tangemApiKeyStage
-                ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().tangemApiKey
+                -> environmentConfig.tangemApiKeyStage
+                ApiEnvironment.PROD -> environmentConfig.tangemApiKey
             } ?: error("No tangem tech api config provided")
         }
     }
@@ -60,8 +60,8 @@ internal class DefaultAuthProvider(
         return ProviderSuspend {
             when (apiEnvironment.invoke()) {
                 ApiEnvironment.DEV,
-                -> environmentConfigStorage.getConfigSync().gaslessTxApiKeyDev
-                ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().gaslessTxApiKey
+                -> environmentConfig.gaslessTxApiKeyDev
+                ApiEnvironment.PROD -> environmentConfig.gaslessTxApiKey
                 else -> error("No gasless tx api config provided for ${apiEnvironment.invoke()}")
             } ?: error("No gasless tx api config provided")
         }

app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt

@@ -1,15 +1,15 @@
 package com.tangem.tap.network.auth
 
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.staking.model.ethpool.P2PEthPoolStakingConfig
 import com.tangem.lib.auth.P2PEthPoolAuthProvider
 
 internal class DefaultP2PEthPoolAuthProvider(
-    private val environmentConfigStorage: EnvironmentConfigStorage,
+    private val environmentConfig: EnvironmentConfig,
 ) : P2PEthPoolAuthProvider {
 
     override fun getApiKey(): String {
-        val keys = environmentConfigStorage.getConfigSync().p2pApiKey
+        val keys = environmentConfig.p2pApiKey
             ?: error("No P2P api keys provided")
 
         return if (P2PEthPoolStakingConfig.USE_TESTNET) keys.hoodi else keys.mainnet

app/src/main/java/com/tangem/tap/network/auth/DefaultStakeKitAuthProvider.kt

@@ -1,13 +1,13 @@
 package com.tangem.tap.network.auth
 
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.lib.auth.StakeKitAuthProvider
 
 internal class DefaultStakeKitAuthProvider(
-    private val environmentConfigStorage: EnvironmentConfigStorage,
+    private val environmentConfig: EnvironmentConfig,
 ) : StakeKitAuthProvider {
 
     override fun getApiKey(): String {
-        return environmentConfigStorage.getConfigSync().stakeKitApiKey ?: error("No StakeKit api key provided")
+        return environmentConfig.stakeKitApiKey ?: error("No StakeKit api key provided")
     }
 }

app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt

@@ -1,7 +1,7 @@
 package com.tangem.tap.network.auth.di
 
 import com.tangem.datasource.api.common.AuthProvider
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.local.config.environment.EnvironmentConfig
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.lib.auth.ExpressAuthProvider
 import com.tangem.lib.auth.P2PEthPoolAuthProvider
@@ -22,11 +22,11 @@ internal class AuthModule {
     @Singleton
     fun provideAuthProvider(
         userWalletsListRepository: UserWalletsListRepository,
-        environmentConfigStorage: EnvironmentConfigStorage,
+        environmentConfig: EnvironmentConfig,
     ): AuthProvider {
         return DefaultAuthProvider(
             userWalletsListRepository = userWalletsListRepository,
-            environmentConfigStorage = environmentConfigStorage,
+            environmentConfig = environmentConfig,
         )
     }
 
@@ -38,14 +38,14 @@ internal class AuthModule {
 
     @Provides
     @Singleton
-    fun provideStakeKitAuthProvider(environmentConfigStorage: EnvironmentConfigStorage): StakeKitAuthProvider {
-        return DefaultStakeKitAuthProvider(environmentConfigStorage)
+    fun provideStakeKitAuthProvider(environmentConfig: EnvironmentConfig): StakeKitAuthProvider {
+        return DefaultStakeKitAuthProvider(environmentConfig)
     }
 
     @Provides
     @Singleton
-    fun provideP2PEthPoolAuthProvider(environmentConfigStorage: EnvironmentConfigStorage): P2PEthPoolAuthProvider {
-        return DefaultP2PEthPoolAuthProvider(environmentConfigStorage)
+    fun provideP2PEthPoolAuthProvider(environmentConfig: EnvironmentConfig): P2PEthPoolAuthProvider {
+        return DefaultP2PEthPoolAuthProvider(environmentConfig)
     }
 
     @Provides

app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt

@@ -19,7 +19,6 @@ import com.tangem.tap.domain.model.Currency
 import com.tangem.tap.network.exchangeServices.SellService
 import com.tangem.tap.network.exchangeServices.SellServiceInitializationStatus
 import com.tangem.tap.network.exchangeServices.moonpay.models.MoonPayAvailableCurrency
-import com.tangem.utils.Provider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import timber.log.Timber
@@ -28,8 +27,8 @@ import javax.crypto.spec.SecretKeySpec
 
 class MoonPayService(
     private val api: MoonPayApi,
-    private val apiKeyProvider: Provider<String>,
-    private val secretKeyProvider: Provider<String>,
+    private val apiKey: String,
+    private val secretKey: String,
     private val userWalletProvider: () -> UserWallet?,
 ) : SellService {
 
@@ -47,18 +46,18 @@ class MoonPayService(
             _initializationStatus.value = lceLoading()
 
             performRequest {
-                val userStatus = when (val result = performRequest { api.getUserStatus(apiKeyProvider()) }) {
+                val userStatus = when (val result = performRequest { api.getUserStatus(apiKey) }) {
                     is Result.Failure -> {
-                        Timber.e("Failed to load user status", result.error)
+                        Timber.e(result.error, "Failed to load user status")
                         _initializationStatus.value = result.error.lceError()
                         return@performRequest
                     }
                     is Result.Success -> result.data
                 }
 
-                val currencies = when (val result = performRequest { api.getCurrencies(apiKeyProvider()) }) {
+                val currencies = when (val result = performRequest { api.getCurrencies(apiKey) }) {
                     is Result.Failure -> {
-                        Timber.e("Failed to load currencies", result.error)
+                        Timber.e(result.error, "Failed to load currencies")
                         _initializationStatus.value = result.error.lceError()
                         return@performRequest
                     }
@@ -163,7 +162,7 @@ class MoonPayService(
         val uri = Uri.Builder()
             .scheme(SCHEME)
             .authority(URL_SELL)
-            .appendQueryParameter("apiKey", apiKeyProvider())
+            .appendQueryParameter("apiKey", apiKey)
             .appendQueryParameter("baseCurrencyCode", moonpayCurrency.currencyCode.uppercase())
             .appendQueryParameter("refundWalletAddress", walletAddress)
             .appendQueryParameter("redirectURL", "tangem://redirect_sell?currency_id=${cryptoCurrency.id.value}")
@@ -179,7 +178,7 @@ class MoonPayService(
 
     private fun createSignature(data: String): String {
         val sha256Hmac = Mac.getInstance("HmacSHA256")
-        val secretKey = SecretKeySpec(secretKeyProvider().toByteArray(), "HmacSHA256")
+        val secretKey = SecretKeySpec(secretKey.toByteArray(), "HmacSHA256")
         sha256Hmac.init(secretKey)
         val sha256encoded = sha256Hmac.doFinal("?$data".toByteArray())
         return Base64.encodeToString(sha256encoded, Base64.NO_WRAP)

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

@@ -11,7 +11,6 @@ import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.clipboard.ClipboardManager
 import com.tangem.data.card.TransactionSignerFactory
 import com.tangem.datasource.connection.NetworkConnectionManager
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.datasource.local.config.issuers.IssuersConfigStorage
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.token.UserTokensResponseStore
@@ -63,7 +62,6 @@ data class DaggerGraphState(
     val shareManager: ShareManager? = null,
     val appRouter: AppRouter? = null,
     val transactionSignerFactory: TransactionSignerFactory? = null,
-    val environmentConfigStorage: EnvironmentConfigStorage? = null,
     val onboardingV2FeatureToggles: OnboardingV2FeatureToggles? = null,
     val onboardingRepository: OnboardingRepository? = null,
     val excludedBlockchains: ExcludedBlockchains? = null,