diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 16c0de5855..27ddebaece 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 16c0de5855d0a75e285a9c84e616dd020f7da4d1 +Subproject commit 27ddebaece01b8e13a9bbafd51f5ff1d64efc2a6 diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt index d26fdea229..5839903010 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultP2PEthPoolAuthProvider.kt @@ -8,13 +8,9 @@ internal class DefaultP2PEthPoolAuthProvider( ) : P2PEthPoolAuthProvider { override fun getApiKey(): String { - // val keys = environmentConfigStorage.getConfigSync().p2pApiKey - // ?: error("No P2P api keys provided") - // - // return keys.mainnet + val keys = environmentConfigStorage.getConfigSync().p2pApiKey + ?: error("No P2P api keys provided") - environmentConfigStorage - - return "TODO restore p2p config call after release 5.30" + return keys.mainnet } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolVaultsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolVaultsResponse.kt index 6aee62ed0e..5c825c6346 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolVaultsResponse.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/ethpool/models/response/P2PEthPoolVaultsResponse.kt @@ -2,7 +2,6 @@ package com.tangem.datasource.api.ethpool.models.response import com.squareup.moshi.Json import com.squareup.moshi.JsonClass -import org.joda.time.DateTime /** * Response for GET /api/v1/staking/pool/{network}/vaults @@ -56,5 +55,5 @@ data class P2PEthPoolVaultDTO( @Json(name = "tokenSymbol") val tokenSymbol: String?, @Json(name = "createdAt") - val createdAt: DateTime, + val createdAt: Long, ) \ 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 ec74644f39..1d4c3967de 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 @@ -2,6 +2,7 @@ package com.tangem.datasource.local.config.environment import com.tangem.blockchain.common.BlockchainSdkConfig import com.tangem.datasource.local.config.environment.models.ExpressModel +import com.tangem.datasource.local.config.environment.models.P2PKeys data class EnvironmentConfig( val moonPayApiKey: String = "", @@ -16,7 +17,7 @@ data class EnvironmentConfig( val express: ExpressModel? = null, val devExpress: ExpressModel? = null, val stakeKitApiKey: String? = null, - // val p2pApiKey: P2PKeys? = null, TODO p2p after release 5.30 + val p2pApiKey: P2PKeys? = null, val blockAidApiKey: String? = null, val tangemApiKey: String? = null, val tangemApiKeyDev: String? = null, 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 834ee30126..e75bd8c8a3 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 @@ -25,7 +25,7 @@ internal object EnvironmentConfigConverter : Converter