diff --git a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
index 56de193f2c..987366bd71 100644
--- a/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/ActivityModule.kt
@@ -1,5 +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.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.exchange.RampStateManager
@@ -8,9 +10,12 @@ import com.tangem.domain.tokens.GetPolkadotCheckHasImmortalUseCase
 import com.tangem.domain.tokens.GetPolkadotCheckHasResetUseCase
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.PolkadotAccountHealthCheckRepository
+import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.domain.scanCard.repository.DefaultScanCardRepository
 import com.tangem.tap.network.exchangeServices.DefaultRampManager
+import com.tangem.tap.network.exchangeServices.SellService
+import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -64,6 +69,21 @@ internal object ActivityModule {
         return CoroutineScope(SupervisorJob() + Dispatchers.IO)
     }
 
+    @Provides
+    @Singleton
+    fun provideExchangeService(
+        environmentConfigStorage: EnvironmentConfigStorage,
+        getSelectedWalletUseCase: GetSelectedWalletUseCase,
+        moonPayApi: MoonPayApi,
+    ): SellService {
+        return MoonPayService(
+            api = moonPayApi,
+            apiKeyProvider = Provider { environmentConfigStorage.getConfigSync().moonPayApiKey },
+            secretKeyProvider = Provider { environmentConfigStorage.getConfigSync().moonPayApiSecretKey },
+            userWalletProvider = { getSelectedWalletUseCase.sync().getOrNull() },
+        )
+    }
+
     @Provides
     @Singleton
     fun provideGetPolkadotCheckHasResetUseCase(
diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
index 4afa4ca1bb..ddc7090242 100644
--- a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
@@ -16,14 +16,11 @@ import com.tangem.core.ui.message.BottomSheetMessage
 import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
-import com.tangem.datasource.local.config.environment.EnvironmentConfig
-import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.domain.appcurrency.FetchAppCurrenciesUseCase
 import com.tangem.domain.balancehiding.BalanceHidingSettings
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.balancehiding.ListenToFlipsUseCase
 import com.tangem.domain.balancehiding.UpdateBalanceHidingSettingsUseCase
-import com.tangem.domain.common.LogConfig
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.notifications.GetApplicationIdUseCase
 import com.tangem.domain.notifications.SendPushTokenUseCase
@@ -42,8 +39,7 @@ import com.tangem.domain.wallets.usecase.GetSelectedWalletUseCase
 import com.tangem.domain.wallets.usecase.UpdateRemoteWalletsInfoUseCase
 import com.tangem.feature.swap.analytics.StoriesEvents
 import com.tangem.tap.common.extensions.setContext
-import com.tangem.tap.network.exchangeServices.ExchangeService
-import com.tangem.tap.network.exchangeServices.moonpay.MoonPayService
+import com.tangem.tap.network.exchangeServices.SellService
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.tap.routing.configurator.AppRouterConfig
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -83,9 +79,9 @@ internal class MainViewModel @Inject constructor(
     private val apiConfigsManager: ApiConfigsManager,
     private val multiQuoteUpdater: MultiQuoteUpdater,
     private val appStateHolder: AppStateHolder,
-    private val environmentConfigStorage: EnvironmentConfigStorage,
     private val getSelectedWalletUseCase: GetSelectedWalletUseCase,
     private val appRouterConfig: AppRouterConfig,
+    private val sellService: SellService,
     getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
 ) : ViewModel() {
 
@@ -195,22 +191,12 @@ internal class MainViewModel @Inject constructor(
 
     private fun initializeOffRamp() {
         viewModelScope.launch {
-            val sellService = makeSellExchangeService(environmentConfig = environmentConfigStorage.getConfigSync())
             appStateHolder.sellService = sellService
 
             sellService.update()
         }
     }
 
-    private fun makeSellExchangeService(environmentConfig: EnvironmentConfig): ExchangeService {
-        return MoonPayService(
-            apiKey = environmentConfig.moonPayApiKey,
-            secretKey = environmentConfig.moonPayApiSecretKey,
-            isLogEnabled = LogConfig.network.moonPayService,
-            userWalletProvider = { getSelectedWalletUseCase.sync().getOrNull() },
-        )
-    }
-
     private fun observeFlips() {
         listenToFlipsUseCase().launchIn(viewModelScope)
     }
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
index 43606fbf69..9b9018f1ba 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.firstOrNull
 
 internal class DefaultRampManager(
-    private val sellService: Provider<ExchangeService>,
+    private val sellService: Provider<SellService>,
     private val expressServiceFetcher: ExpressServiceFetcher,
     private val currenciesRepository: CurrenciesRepository,
     private val dispatchers: CoroutineDispatcherProvider,
@@ -90,7 +90,7 @@ internal class DefaultRampManager(
         return availabilityState.toReason(cryptoCurrency.name)
     }
 
-    override fun getSellInitializationStatus(): Flow<ExchangeServiceInitializationStatus> {
+    override fun getSellInitializationStatus(): Flow<SellServiceInitializationStatus> {
         return sellService.invoke().initializationStatus
     }
 
@@ -100,7 +100,7 @@ internal class DefaultRampManager(
         }
     }
 
-    override fun getExpressInitializationStatus(userWalletId: UserWalletId): Flow<ExchangeServiceInitializationStatus> {
+    override fun getExpressInitializationStatus(userWalletId: UserWalletId): Flow<SellServiceInitializationStatus> {
         return expressServiceFetcher.getInitializationStatus(userWalletId)
     }
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/SellService.kt
similarity index 75%
rename from app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
rename to app/src/main/java/com/tangem/tap/network/exchangeServices/SellService.kt
index 88ba965edc..82aa59fe63 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/ExchangeService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/SellService.kt
@@ -5,11 +5,11 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.tap.domain.model.Currency
 import kotlinx.coroutines.flow.StateFlow
 
-typealias ExchangeServiceInitializationStatus = Lce<Throwable, Any>
+typealias SellServiceInitializationStatus = Lce<Throwable, Any>
 
-interface ExchangeService {
+interface SellService {
 
-    val initializationStatus: StateFlow<ExchangeServiceInitializationStatus>
+    val initializationStatus: StateFlow<SellServiceInitializationStatus>
 
     suspend fun update()
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
index 1f291b109b..0e5af5e7c0 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
@@ -5,7 +5,9 @@ import android.util.Base64
 import com.tangem.blockchainsdk.utils.toBlockchain
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.datasource.api.common.createRetrofitInstance
+import com.tangem.datasource.api.moonpay.MoonPayApi
+import com.tangem.datasource.api.moonpay.MoonPayCurrencies
+import com.tangem.datasource.api.moonpay.MoonPayUserStatus
 import com.tangem.domain.card.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.extensions.withIOContext
 import com.tangem.domain.core.utils.lceContent
@@ -14,9 +16,10 @@ import com.tangem.domain.core.utils.lceLoading
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.tap.domain.model.Currency
-import com.tangem.tap.network.exchangeServices.ExchangeService
-import com.tangem.tap.network.exchangeServices.ExchangeServiceInitializationStatus
+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
@@ -24,25 +27,18 @@ import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 
 class MoonPayService(
-    private val apiKey: String,
-    private val secretKey: String,
-    private val isLogEnabled: Boolean,
+    private val api: MoonPayApi,
+    private val apiKeyProvider: Provider<String>,
+    private val secretKeyProvider: Provider<String>,
     private val userWalletProvider: () -> UserWallet?,
-) : ExchangeService {
+) : SellService {
 
-    override val initializationStatus: StateFlow<ExchangeServiceInitializationStatus>
+    override val initializationStatus: StateFlow<SellServiceInitializationStatus>
         get() = _initializationStatus
 
-    private val _initializationStatus: MutableStateFlow<ExchangeServiceInitializationStatus> =
+    private val _initializationStatus: MutableStateFlow<SellServiceInitializationStatus> =
         MutableStateFlow(value = lceLoading())
 
-    private val api: MoonPayApi by lazy {
-        createRetrofitInstance(
-            baseUrl = MoonPayApi.MOOONPAY_BASE_URL,
-            logEnabled = isLogEnabled,
-        ).create(MoonPayApi::class.java)
-    }
-
     private var status: MoonPayStatus? = null
 
     override suspend fun update() {
@@ -51,7 +47,7 @@ class MoonPayService(
             _initializationStatus.value = lceLoading()
 
             performRequest {
-                val userStatus = when (val result = performRequest { api.getUserStatus(apiKey) }) {
+                val userStatus = when (val result = performRequest { api.getUserStatus(apiKeyProvider()) }) {
                     is Result.Failure -> {
                         Timber.e("Failed to load user status", result.error)
                         _initializationStatus.value = result.error.lceError()
@@ -60,7 +56,7 @@ class MoonPayService(
                     is Result.Success -> result.data
                 }
 
-                val currencies = when (val result = performRequest { api.getCurrencies(apiKey) }) {
+                val currencies = when (val result = performRequest { api.getCurrencies(apiKeyProvider()) }) {
                     is Result.Failure -> {
                         Timber.e("Failed to load currencies", result.error)
                         _initializationStatus.value = result.error.lceError()
@@ -78,7 +74,7 @@ class MoonPayService(
                         MoonPayAvailableCurrency(
                             currencyCode = currency.code,
                             networkCode = currency.metadata?.networkCode ?: return@mapNotNull null,
-                            contractAddress = currency.metadata.contractAddress,
+                            contractAddress = currency.metadata?.contractAddress,
                         )
                     }
 
@@ -167,7 +163,7 @@ class MoonPayService(
         val uri = Uri.Builder()
             .scheme(SCHEME)
             .authority(URL_SELL)
-            .appendQueryParameter("apiKey", apiKey)
+            .appendQueryParameter("apiKey", apiKeyProvider())
             .appendQueryParameter("baseCurrencyCode", moonpayCurrency.currencyCode.uppercase())
             .appendQueryParameter("refundWalletAddress", walletAddress)
             .appendQueryParameter("redirectURL", "tangem://redirect_sell?currency_id=${cryptoCurrency.id.value}")
@@ -191,7 +187,7 @@ class MoonPayService(
 
     private fun createSignature(data: String): String {
         val sha256Hmac = Mac.getInstance("HmacSHA256")
-        val secretKey = SecretKeySpec(secretKey.toByteArray(), "HmacSHA256")
+        val secretKey = SecretKeySpec(secretKeyProvider().toByteArray(), "HmacSHA256")
         sha256Hmac.init(secretKey)
         val sha256encoded = sha256Hmac.doFinal("?$data".toByteArray())
         return Base64.encodeToString(sha256encoded, Base64.NO_WRAP)
diff --git a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
index cee10eaf8f..c3261b1873 100644
--- a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -7,7 +7,7 @@ import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
-import com.tangem.tap.network.exchangeServices.ExchangeService
+import com.tangem.tap.network.exchangeServices.SellService
 import org.rekotlin.Action
 import org.rekotlin.Store
 import javax.inject.Inject
@@ -19,7 +19,7 @@ import javax.inject.Inject
 class AppStateHolder @Inject constructor() : ReduxStateHolder {
 
     var mainStore: Store<AppState>? = null
-    var sellService: ExchangeService? = null
+    var sellService: SellService? = null
 
     override fun dispatch(action: Action) {
         mainStore?.dispatch(action)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
index cac3e4c967..6b642716dd 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
@@ -27,6 +27,7 @@ sealed class ApiConfig {
         TangemPay,
         BlockAid,
         YieldSupply,
+        MoonPay,
     }
 
     private fun initializeId(): ID {
@@ -37,6 +38,7 @@ sealed class ApiConfig {
             is TangemPay -> ID.TangemPay
             is BlockAid -> ID.BlockAid
             is YieldSupply -> ID.YieldSupply
+            is MoonPay -> ID.MoonPay
         }
     }
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/MoonPay.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/MoonPay.kt
new file mode 100644
index 0000000000..9b33b5f7f3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/MoonPay.kt
@@ -0,0 +1,43 @@
+package com.tangem.datasource.api.common.config
+
+import com.tangem.datasource.BuildConfig
+
+/**
+ * MoonPay [ApiConfig]
+ */
+internal class MoonPay : ApiConfig() {
+
+    override val defaultEnvironment: ApiEnvironment = getInitialEnvironment()
+
+    override val environmentConfigs: List<ApiEnvironmentConfig> = listOf(
+        createProdEnvironment(),
+        createMockEnvironment(),
+    )
+
+    private fun getInitialEnvironment(): ApiEnvironment {
+        return when (BuildConfig.BUILD_TYPE) {
+            MOCKED_BUILD_TYPE,
+            -> ApiEnvironment.MOCK
+            DEBUG_BUILD_TYPE,
+            INTERNAL_BUILD_TYPE,
+            EXTERNAL_BUILD_TYPE,
+            RELEASE_BUILD_TYPE,
+            -> ApiEnvironment.PROD
+            else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]")
+        }
+    }
+
+    private fun createProdEnvironment(): ApiEnvironmentConfig {
+        return ApiEnvironmentConfig(
+            environment = ApiEnvironment.PROD,
+            baseUrl = "https://api.moonpay.com/",
+        )
+    }
+
+    private fun createMockEnvironment(): ApiEnvironmentConfig {
+        return ApiEnvironmentConfig(
+            environment = ApiEnvironment.MOCK,
+            baseUrl = "[REDACTED_ENV_URL]", // TODO [REDACTED_TASK_KEY]
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/moonpay/MoonPayApi.kt
similarity index 80%
rename from app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/moonpay/MoonPayApi.kt
index 554a0b4265..70e9556fe7 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/moonpay/MoonPayApi.kt
@@ -1,4 +1,4 @@
-package com.tangem.tap.network.exchangeServices.moonpay
+package com.tangem.datasource.api.moonpay
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
@@ -7,17 +7,11 @@ import retrofit2.http.Query
 
 interface MoonPayApi {
 
-    @GET(MOOONPAY_IP_ADDRESS_REQUEST_URL)
+    @GET("v4/ip_address/")
     suspend fun getUserStatus(@Query("apiKey") moonPayApiKey: String): MoonPayUserStatus
 
-    @GET(MOOONPAY_CURRENCIES_REQUEST_URL)
+    @GET("v3/currencies/")
     suspend fun getCurrencies(@Query("apiKey") moonPayApiKey: String): List<MoonPayCurrencies>
-
-    companion object {
-        const val MOOONPAY_BASE_URL = "https://api.moonpay.com/"
-        const val MOOONPAY_IP_ADDRESS_REQUEST_URL = "v4/ip_address/"
-        const val MOOONPAY_CURRENCIES_REQUEST_URL = "v3/currencies/"
-    }
 }
 
 @JsonClass(generateAdapter = true)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
index 57c3c53a26..b0c6d9e1d6 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
@@ -76,4 +76,10 @@ internal object ApiConfigsModule {
     fun provideBlockAidConfig(environmentConfigStorage: EnvironmentConfigStorage): ApiConfig {
         return BlockAid(environmentConfigStorage)
     }
+
+    @Provides
+    @IntoSet
+    fun provideMoonPayConfig(): ApiConfig {
+        return MoonPay()
+    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
index 9a0bed416c..22c745744a 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -5,12 +5,14 @@ import com.tangem.datasource.api.common.blockaid.BlockAidApi
 import com.tangem.datasource.api.common.config.ApiConfig
 import com.tangem.datasource.api.common.config.ApiConfig.Companion.MOCKED_BUILD_TYPE
 import com.tangem.datasource.api.common.config.ApiConfigs
+import com.tangem.datasource.api.common.config.MoonPay
 import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
 import com.tangem.datasource.api.common.config.managers.DevApiConfigsManager
 import com.tangem.datasource.api.common.config.managers.MockApiConfigsManager
 import com.tangem.datasource.api.common.config.managers.ProdApiConfigsManager
 import com.tangem.datasource.api.express.TangemExpressApi
 import com.tangem.datasource.api.markets.TangemTechMarketsApi
+import com.tangem.datasource.api.moonpay.MoonPayApi
 import com.tangem.datasource.api.onramp.OnrampApi
 import com.tangem.datasource.api.pay.TangemPayApi
 import com.tangem.datasource.api.stakekit.StakeKitApi
@@ -130,4 +132,13 @@ internal object NetworkModule {
             applyTimeoutAnnotations = false,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideMoonPayApi(retrofitApiBuilder: RetrofitApiBuilder): MoonPayApi {
+        return retrofitApiBuilder.build(
+            apiConfigId = ApiConfig.ID.MoonPay,
+            applyTimeoutAnnotations = false,
+        )
+    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt b/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
index b952dc4b5b..2c3b8604a0 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
@@ -197,6 +197,7 @@ internal class RetrofitApiBuilder @Inject constructor(
 
         val excludedApiForLogging: Set<ApiConfig.ID> = setOf(
             // ApiConfig.ID.StakeKit,
+            ApiConfig.ID.MoonPay,
         )
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
index 53392207a9..96b464a53b 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
@@ -56,6 +56,7 @@ class ApiConfigTest {
                 ApiConfig.ID.StakeKit -> StakeKit(stakeKitAuthProvider = mockk())
                 ApiConfig.ID.TangemPay -> TangemPay(appVersionProvider = mockk())
                 ApiConfig.ID.BlockAid -> BlockAid(configStorage = mockk())
+                ApiConfig.ID.MoonPay -> MoonPay()
             }
         }
     }
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
index cb64ca1ea5..276627fc34 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
@@ -103,6 +103,7 @@ internal class ProdApiConfigsManagerTest {
                 ApiConfig.ID.StakeKit -> StakeKit(stakeKitAuthProvider = stakeKitAuthProvider)
                 ApiConfig.ID.TangemPay -> TangemPay(appVersionProvider = appVersionProvider)
                 ApiConfig.ID.BlockAid -> BlockAid(configStorage = environmentConfigStorage)
+                ApiConfig.ID.MoonPay -> MoonPay()
             }
         }
     }
@@ -115,6 +116,7 @@ internal class ProdApiConfigsManagerTest {
             ApiConfig.ID.StakeKit -> createStakeKitModel()
             ApiConfig.ID.TangemPay -> createTangemPayModel()
             ApiConfig.ID.BlockAid -> createBlockAidSdkModel()
+            ApiConfig.ID.MoonPay -> createMoonPayModel()
         }
     }
 
@@ -257,6 +259,16 @@ internal class ProdApiConfigsManagerTest {
         )
     }
 
+    private fun createMoonPayModel(): TestModel {
+        return TestModel(
+            id = ApiConfig.ID.MoonPay,
+            expected = ApiEnvironmentConfig(
+                environment = ApiEnvironment.PROD,
+                baseUrl = "https://api.moonpay.com/",
+            ),
+        )
+    }
+
     private fun String.checkHeaderValueOrEmpty(): String {
         for (i in this.indices) {
             val c = this[i]
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/LogConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/LogConfig.kt
index 9ea3f6e4db..3adab018df 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/LogConfig.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/LogConfig.kt
@@ -10,11 +10,6 @@ object LogConfig {
 }
 
 object NetworkLogConfig {
-    const val mercuryoService: Boolean = false
-    const val moonPayService: Boolean = false
-    const val utorgService: Boolean = false
-    val tangemTechService: Boolean = BuildConfig.LOG_ENABLED
-    val paymentologyApiService: Boolean = BuildConfig.LOG_ENABLED
     val blockchainSdkNetwork: Boolean = BuildConfig.LOG_ENABLED
 }
 
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 6adbcc9cf1..48a0dc4f7c 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -83,7 +83,7 @@ reownCore = "1.4.11"
 reownWeb3 = "1.4.11"
 prettyLogger = "2.2.0"
 okHttp-prettyLogging = "3.1.0"
-chucker = "4.0.0"
+chucker = "4.2.0"
 mlKit-barcodeScanning = "17.3.0"
 androidXCamera = "1.4.2"
 listenableFuture = "1.0"