diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemPay.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemPay.kt index f00122021a..0f9c777b3b 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemPay.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemPay.kt @@ -3,6 +3,7 @@ package com.tangem.datasource.api.common.config import com.tangem.datasource.BuildConfig import com.tangem.datasource.local.config.environment.EnvironmentConfig import com.tangem.utils.ProviderSuspend +import com.tangem.utils.SupportedLanguages import com.tangem.utils.info.AppInfoProvider internal sealed class TangemPay( @@ -56,6 +57,7 @@ internal sealed class TangemPay( "platform" to ProviderSuspend { "Android" }, "X-API-KEY" to ProviderSuspend { getBffStaticToken(apiEnvironment) }, "X-Device-Scale" to ProviderSuspend { appInfoProvider.deviceScale.toString() }, + "Accept-Language" to ProviderSuspend { SupportedLanguages.getCurrentSupportedLanguageCode() }, ) private fun getBffStaticToken(apiEnvironment: ApiEnvironment): String { diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt index 32badb05e6..7502cb3e25 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt @@ -194,13 +194,11 @@ interface TangemPayApi { @GET("v1/customer/cashback/promotions") suspend fun getCashbackPromotions( @Header("Authorization") authHeader: String, - @Header("Accept-Language") language: String, ): ApiResponse @GET("v1/customer/cashback/accruals/docs") suspend fun getCashbackAccrualDocs( @Header("Authorization") authHeader: String, - @Header("Accept-Language") language: String, ): ApiResponse @GET("v1/customer/cashback/history") 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 1447393d58..0c96eeb38b 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 @@ -18,6 +18,7 @@ import com.tangem.datasource.api.auth.P2PEthPoolAuthProvider import com.tangem.datasource.api.auth.StakeKitAuthProvider import com.tangem.test.core.ProvideTestModels import com.tangem.utils.ProviderSuspend +import com.tangem.utils.SupportedLanguages import com.tangem.utils.info.AppInfoProvider import io.mockk.clearMocks import io.mockk.coEvery @@ -300,6 +301,7 @@ internal class ProdApiConfigsManagerTest { "platform" to ProviderSuspend { "Android" }, "X-API-KEY" to ProviderSuspend { TANGEM_PAY_BFF_KEY_DEV }, "X-Device-Scale" to ProviderSuspend { DEVICE_SCALE.toString() }, + "Accept-Language" to ProviderSuspend { SupportedLanguages.getCurrentSupportedLanguageCode() }, ), ), ) @@ -316,6 +318,7 @@ internal class ProdApiConfigsManagerTest { "platform" to ProviderSuspend { "Android" }, "X-API-KEY" to ProviderSuspend { TANGEM_PAY_BFF_KEY_DEV }, "X-Device-Scale" to ProviderSuspend { DEVICE_SCALE.toString() }, + "Accept-Language" to ProviderSuspend { SupportedLanguages.getCurrentSupportedLanguageCode() }, ), ), ) diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepository.kt index 27e121ef41..3fd7aac46c 100644 --- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepository.kt +++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepository.kt @@ -14,7 +14,6 @@ import com.tangem.domain.pay.model.CashbackPromotions import com.tangem.domain.pay.model.CashbackSummary import com.tangem.domain.pay.repository.CashbackRepository import com.tangem.domain.visa.error.VisaApiError -import com.tangem.utils.SupportedLanguages import javax.inject.Inject internal class DefaultCashbackRepository @Inject constructor( @@ -31,10 +30,7 @@ internal class DefaultCashbackRepository @Inject constructor( override suspend fun getCashbackPromotions(userWalletId: UserWalletId): Either { return requestHelper.performRequest(userWalletId) { authHeader -> - tangemPayApi.getCashbackPromotions( - authHeader = authHeader, - language = SupportedLanguages.getCurrentSupportedLanguageCode(), - ) + tangemPayApi.getCashbackPromotions(authHeader = authHeader) }.map(CashbackPromotionsConverter::convert) } @@ -42,10 +38,7 @@ internal class DefaultCashbackRepository @Inject constructor( userWalletId: UserWalletId, ): Either> { return requestHelper.performRequest(userWalletId) { authHeader -> - tangemPayApi.getCashbackAccrualDocs( - authHeader = authHeader, - language = SupportedLanguages.getCurrentSupportedLanguageCode(), - ) + tangemPayApi.getCashbackAccrualDocs(authHeader = authHeader) }.map(CashbackAccrualDocsConverter::convert) } diff --git a/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepositoryTest.kt b/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepositoryTest.kt index 9d50b6eec1..28a46086c5 100644 --- a/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepositoryTest.kt +++ b/data/visa/src/test/kotlin/com/tangem/data/pay/repository/DefaultCashbackRepositoryTest.kt @@ -44,7 +44,7 @@ internal class DefaultCashbackRepositoryTest { fun `GIVEN promotions response WHEN getCashbackPromotions THEN converter result is returned`() = runTest { // Arrange val response = CashbackPromotionsResponse(cashbackOnCards = null, additionalCashback = null) - coEvery { tangemPayApi.getCashbackPromotions(any(), any()) } returns ApiResponse.Success(response) + coEvery { tangemPayApi.getCashbackPromotions(any()) } returns ApiResponse.Success(response) // Act val actual = createRepository().getCashbackPromotions(userWalletId) @@ -56,7 +56,7 @@ internal class DefaultCashbackRepositoryTest { @Test fun `GIVEN backend error WHEN getCashbackPromotions THEN error is propagated`() = runTest { // Arrange - coEvery { tangemPayApi.getCashbackPromotions(any(), any()) } returns + coEvery { tangemPayApi.getCashbackPromotions(any()) } returns ApiResponse.Error(ApiResponseError.NetworkException()) as ApiResponse // Act @@ -72,7 +72,7 @@ internal class DefaultCashbackRepositoryTest { val response = CashbackAccrualDocsResponse( docs = listOf(CashbackAccrualDocsResponse.Doc(id = "1", title = "Terms", url = "https://a")), ) - coEvery { tangemPayApi.getCashbackAccrualDocs(any(), any()) } returns ApiResponse.Success(response) + coEvery { tangemPayApi.getCashbackAccrualDocs(any()) } returns ApiResponse.Success(response) // Act val actual = createRepository().getCashbackAccrualDocs(userWalletId) @@ -84,7 +84,7 @@ internal class DefaultCashbackRepositoryTest { @Test fun `GIVEN backend error WHEN getCashbackAccrualDocs THEN error is propagated`() = runTest { // Arrange - coEvery { tangemPayApi.getCashbackAccrualDocs(any(), any()) } returns + coEvery { tangemPayApi.getCashbackAccrualDocs(any()) } returns ApiResponse.Error(ApiResponseError.NetworkException()) as ApiResponse // Act