From 930e6ffc7212a152dabed11db3711f9af1cb59a6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 8 Jan 2026 17:55:28 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- .../tap/network/auth/DefaultAuthProvider.kt | 9 ++------- .../api/common/config/GaslessTxService.kt | 2 +- .../config/environment/EnvironmentConfig.kt | 2 ++ .../converter/EnvironmentConfigConverter.kt | 2 ++ .../environment/models/EnvironmentConfigModel.kt | 2 ++ .../config/managers/ProdApiConfigsManagerTest.kt | 2 +- .../data/transaction/di/TransactionDataModule.kt | 16 +++++++++------- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 78be297b0f..5ba0959d72 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 78be297b0f09bc2be1e9b0fbab9384f17bf94c37 +Subproject commit 5ba0959d72f41e49a22f792e9a3d53e5e24e7713 diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt index abc3d9f69b..79a50c1403 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt @@ -63,13 +63,8 @@ internal class DefaultAuthProvider( return ProviderSuspend { when (apiEnvironment.invoke()) { ApiEnvironment.DEV, - ApiEnvironment.DEV_2, - ApiEnvironment.DEV_3, - -> environmentConfigStorage.getConfigSync().tangemApiKeyDev // TODO add gaslessTxApiKeyDev - ApiEnvironment.STAGE, - ApiEnvironment.STAGE_2, - -> environmentConfigStorage.getConfigSync().tangemApiKeyStage // TODO add gaslessTxApiKeyStage - ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().tangemApiKey // TODO add gaslessTxApiKey + -> environmentConfigStorage.getConfigSync().gaslessTxApiKeyDev + ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().gaslessTxApiKey else -> error("No gasless tx api config provided for ${apiEnvironment.invoke()}") } ?: error("No gasless tx api config provided") } diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/GaslessTxService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/GaslessTxService.kt index ce201f58bb..35935f0c9d 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/GaslessTxService.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/GaslessTxService.kt @@ -60,7 +60,7 @@ internal class GaslessTxService( } private companion object { - private const val PROD_BASE_URL = "https://api.tangem.org/" + private const val PROD_BASE_URL = "https://gasless.tangem.org/" private const val DEV_BASE_URL = "[REDACTED_ENV_URL]" } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt index cce8979a7c..c77d5ede0c 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt @@ -25,4 +25,6 @@ data class EnvironmentConfig( val yieldModuleApiKey: String? = null, val yieldModuleApiKeyDev: String? = null, val bffStaticToken: String? = null, + val gaslessTxApiKeyDev: String? = null, + val gaslessTxApiKey: String? = null, ) \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt index d8ec470eff..8e19d3682e 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt @@ -33,6 +33,8 @@ internal object EnvironmentConfigConverter : Converter ApiEnvironment.PROD to "https://tangem.com/" + -> ApiEnvironment.PROD to "https://gasless.tangem.org/" else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]") } return TestModel( diff --git a/data/transaction/src/main/java/com/tangem/data/transaction/di/TransactionDataModule.kt b/data/transaction/src/main/java/com/tangem/data/transaction/di/TransactionDataModule.kt index d21fc04dce..731006b04d 100644 --- a/data/transaction/src/main/java/com/tangem/data/transaction/di/TransactionDataModule.kt +++ b/data/transaction/src/main/java/com/tangem/data/transaction/di/TransactionDataModule.kt @@ -2,10 +2,11 @@ package com.tangem.data.transaction.di import com.tangem.data.common.currency.ResponseCryptoCurrenciesFactory import com.tangem.data.transaction.DefaultFeeRepository +import com.tangem.data.transaction.DefaultGaslessTransactionRepository import com.tangem.data.transaction.DefaultTransactionRepository import com.tangem.data.transaction.DefaultWalletAddressServiceRepository -import com.tangem.data.transaction.MockedGaslessTransactionRepository import com.tangem.data.transaction.error.DefaultFeeErrorResolver +import com.tangem.datasource.api.gasless.GaslessTxServiceApi import com.tangem.datasource.api.tangemTech.TangemTechApi import com.tangem.datasource.local.walletmanager.WalletManagersStore import com.tangem.domain.demo.models.DemoConfig @@ -73,12 +74,13 @@ internal object TransactionDataModule { @Singleton fun provideGaslessTransactionRepository( responseCryptoCurrenciesFactory: ResponseCryptoCurrenciesFactory, + gaslessTxServiceApi: GaslessTxServiceApi, + coroutineDispatcherProvider: CoroutineDispatcherProvider, ): GaslessTransactionRepository { - return MockedGaslessTransactionRepository(responseCryptoCurrenciesFactory) - // return DefaultGaslessTransactionRepository( - // gaslessTxServiceApi, - // coroutineDispatcherProvider, - // responseCryptoCurrenciesFactory, - // ) + return DefaultGaslessTransactionRepository( + gaslessTxServiceApi, + coroutineDispatcherProvider, + responseCryptoCurrenciesFactory, + ) } } \ No newline at end of file