From 2824ffd838c1ea0c1118c6ecd54160a29e1a6802 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 30 Sep 2025 17:44:07 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- .../sign/WcSignUseCaseDelegate.kt | 4 +- .../usecase/SendTransactionUseCase.kt | 2 +- .../walletconnect/model/WcRequestError.kt | 40 +++++++++---------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/sign/WcSignUseCaseDelegate.kt b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/sign/WcSignUseCaseDelegate.kt index b2ea1d5c4a..c360f8af34 100644 --- a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/sign/WcSignUseCaseDelegate.kt +++ b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/sign/WcSignUseCaseDelegate.kt @@ -65,11 +65,11 @@ internal class WcSignUseCaseDelegate( .onEach { state -> val step = state.domainStep as? WcSignStep.Result ?: return@onEach step.result.leftOrNull()?.let { error -> - val errorMessage = error.message() ?: "" + val errorMessage = error.message() val event = WcAnalyticEvents.SignatureRequestFailed( rawRequest = context.rawSdkRequest, network = context.network, - errorCode = error.code() ?: error::class.simpleName.orEmpty(), + errorCode = error.code(), errorMessage = errorMessage, ) analytics.send(event) diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt index 3f2e7aeaf6..6c0417c870 100644 --- a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt +++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/SendTransactionUseCase.kt @@ -139,7 +139,7 @@ class SendTransactionUseCase( internal fun handleError(result: Result.Failure): SendTransactionError { if (ResultChecker.isNetworkError(result)) { return SendTransactionError.NetworkError( - code = result.error.message, + code = result.error.code.toString(), message = result.error.customMessage, ) } diff --git a/domain/wallet-connect/models/src/main/java/com/tangem/domain/walletconnect/model/WcRequestError.kt b/domain/wallet-connect/models/src/main/java/com/tangem/domain/walletconnect/model/WcRequestError.kt index 7376048de1..20cf426034 100644 --- a/domain/wallet-connect/models/src/main/java/com/tangem/domain/walletconnect/model/WcRequestError.kt +++ b/domain/wallet-connect/models/src/main/java/com/tangem/domain/walletconnect/model/WcRequestError.kt @@ -17,43 +17,41 @@ sealed class WcRequestError { companion object { - fun WcRequestError.message(): String? = when (this) { - is UnknownError -> ex?.message + fun WcRequestError.message(): String = when (this) { + is UnknownError -> ex?.message ?: "UnknownError" is WcRespondError -> message is WrappedSendError -> sendTransactionError.message() is HandleMethodError -> message } - fun WcRequestError.code(): String? = when (this) { - is HandleMethodError, - is UnknownError, - -> null + fun WcRequestError.code(): String = when (this) { + is HandleMethodError -> "HandleMethodError" + is UnknownError -> "UnknownError" is WcRespondError -> this.code.toString() is WrappedSendError -> sendTransactionError.code() } - private fun SendTransactionError.code(): String? = when (this) { + private fun SendTransactionError.code(): String = when (this) { is SendTransactionError.BlockchainSdkError -> code.toString() - is SendTransactionError.NetworkError -> code + is SendTransactionError.NetworkError -> code ?: "NetworkError" is SendTransactionError.TangemSdkError -> code.toString() - is SendTransactionError.DataError, - SendTransactionError.DemoCardError, - is SendTransactionError.UnknownError, - SendTransactionError.UserCancelledError, - is SendTransactionError.CreateAccountUnderfunded, - -> null + is SendTransactionError.DataError -> "DataError" + SendTransactionError.DemoCardError -> "DemoCardError" + is SendTransactionError.UnknownError -> "UnknownError" + SendTransactionError.UserCancelledError -> "UserCancelledError" + is SendTransactionError.CreateAccountUnderfunded -> "CreateAccountUnderfunded" } - private fun SendTransactionError.message(): String? = when (this) { - is SendTransactionError.BlockchainSdkError -> message - is SendTransactionError.NetworkError -> message - is SendTransactionError.DataError -> message - is SendTransactionError.UnknownError -> ex?.message + private fun SendTransactionError.message(): String = when (this) { + is SendTransactionError.BlockchainSdkError -> message ?: "BlockchainSdkError" + is SendTransactionError.NetworkError -> message ?: "NetworkError" + is SendTransactionError.DataError -> message ?: "DataError" + is SendTransactionError.UnknownError -> ex?.message ?: "UnknownError" is SendTransactionError.TangemSdkError -> "TangemSdkError code: ${this.code}" SendTransactionError.DemoCardError -> "DemoCardError" - SendTransactionError.UserCancelledError, + SendTransactionError.UserCancelledError -> "UserCancelledError" is SendTransactionError.CreateAccountUnderfunded, - -> null + -> "CreateAccountUnderfunded" } } } From db9c38c551bd9962ac6631b9db3714a792762425 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 30 Sep 2025 14:44:30 +0000 Subject: [PATCH 2/2] Updated on 2026-08-14 --- gradle/tangem_dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index d1e39a0355..5af837553d 100644 --- a/gradle/tangem_dependencies.toml +++ b/gradle/tangem_dependencies.toml @@ -5,9 +5,9 @@ # https://github.com/tangem/tangem-sdk-android/ # https://github.com/tangem/vico -tangemBlockchainSdk = "releases-5.29-1249" +tangemBlockchainSdk = "develop-1248" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "releases-5.29-565" +tangemCardSdk = "develop-564" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ tangemVico = "2.0.0-alpha.25-tangem12" #tangemVico = "0.0.1" # Keep it! - used for local builds ^