diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiEnvironment.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiEnvironment.kt index c6e72a8a75..755887fd7f 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiEnvironment.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiEnvironment.kt @@ -16,6 +16,9 @@ enum class ApiEnvironment { @Json(name = "DEV_2") DEV_2, + @Json(name = "DEV_3") + DEV_3, + @Json(name = "STAGE") STAGE, diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt index 23b46cf40b..6d4b9a1e5a 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt @@ -28,6 +28,7 @@ internal class Express( override val environmentConfigs: List = listOf( createDevEnvironment(), createDev2Environment(), + createDev3Environment(), createStageEnvironment(), createMockedEnvironment(), createProdEnvironment(), @@ -60,6 +61,12 @@ internal class Express( headers = createHeaders(isProd = false), ) + private fun createDev3Environment(): ApiEnvironmentConfig = ApiEnvironmentConfig( + environment = ApiEnvironment.DEV_3, + baseUrl = "[REDACTED_ENV_URL]", + headers = createHeaders(isProd = false), + ) + private fun createStageEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig( environment = ApiEnvironment.STAGE, baseUrl = "[REDACTED_ENV_URL]", diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt index 4a8e1db349..8d44291374 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt @@ -73,6 +73,7 @@ internal class TangemTech( ApiEnvironment.MOCK, ApiEnvironment.DEV, ApiEnvironment.DEV_2, + ApiEnvironment.DEV_3, -> environmentConfigStorage.getConfigSync().tangemApiKeyDev ApiEnvironment.STAGE -> environmentConfigStorage.getConfigSync().tangemApiKeyStage ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().tangemApiKey diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt index 97b84bd4e9..2875b51a63 100644 --- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt +++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt @@ -74,6 +74,7 @@ internal class DefaultCardDetailsRepository @Inject constructor( return when (env) { ApiEnvironment.DEV, ApiEnvironment.DEV_2, + ApiEnvironment.DEV_3, ApiEnvironment.STAGE, ApiEnvironment.MOCK, -> visaLibLoader.getOrCreateConfig().rainRSAPublicKey.dev diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaActivationRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaActivationRepository.kt index 939794afce..a227353e33 100644 --- a/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaActivationRepository.kt +++ b/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaActivationRepository.kt @@ -169,6 +169,7 @@ internal class DefaultVisaActivationRepository @AssistedInject constructor( return when (env) { ApiEnvironment.DEV, ApiEnvironment.DEV_2, + ApiEnvironment.DEV_3, ApiEnvironment.STAGE, ApiEnvironment.MOCK, -> rsaPublicKey.dev diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/ui/EnvironmentTogglesScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/ui/EnvironmentTogglesScreen.kt index 21a0d5aad5..02d68f4f73 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/ui/EnvironmentTogglesScreen.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/ui/EnvironmentTogglesScreen.kt @@ -177,6 +177,7 @@ private fun PreviewFeatureTogglesScreen() { environments = persistentSetOf( ApiEnvironment.DEV.name, ApiEnvironment.DEV_2.name, + ApiEnvironment.DEV_3.name, ApiEnvironment.STAGE.name, ApiEnvironment.MOCK.name, ApiEnvironment.PROD.name, diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/utils/ApiEnvironmentComparator.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/utils/ApiEnvironmentComparator.kt index cdf172d0c4..ac81103c06 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/utils/ApiEnvironmentComparator.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/environments/utils/ApiEnvironmentComparator.kt @@ -14,9 +14,10 @@ internal object ApiEnvironmentComparator : Comparator { when (it) { ApiEnvironment.DEV -> 0 ApiEnvironment.DEV_2 -> 1 - ApiEnvironment.STAGE -> 2 - ApiEnvironment.MOCK -> 3 - ApiEnvironment.PROD -> 4 + ApiEnvironment.DEV_3 -> 2 + ApiEnvironment.STAGE -> 3 + ApiEnvironment.MOCK -> 4 + ApiEnvironment.PROD -> 5 } }