diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt index 68aca58758..4d081cc2e6 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt @@ -45,6 +45,7 @@ fun Blockchain.getGreyedOutIconRes(): Int { Blockchain.Cronos -> R.drawable.ic_cronos_no_color Blockchain.Telos, Blockchain.TelosTestnet -> R.drawable.ic_telos_no_color Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> R.drawable.ic_azero_no_color + Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> R.drawable.ic_octaspace_no_color else -> R.drawable.ic_tangem_logo } } diff --git a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt index 7c3e6f8b1e..57afd33a26 100644 --- a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt +++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt @@ -10,7 +10,7 @@ import com.tangem.blockchain.common.transaction.Fee import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.blockchain.extensions.Result import com.tangem.blockchain.extensions.SimpleResult -import com.tangem.blockchain.extensions.isNetworkError +import com.tangem.blockchain.network.ResultChecker import com.tangem.common.core.TangemSdkError import com.tangem.common.extensions.hexToBytes import com.tangem.core.analytics.api.AnalyticsEventHandler @@ -361,7 +361,7 @@ class TransactionManagerImpl( return SendTxResult.Success } is SimpleResult.Failure -> { - if (result.isNetworkError()) return SendTxResult.NetworkError(result.error) + if (ResultChecker.isNetworkError(result)) return SendTxResult.NetworkError(result.error) val error = result.error as? BlockchainSdkError ?: return SendTxResult.UnknownError() when (error) { is BlockchainSdkError.WrappedTangemError -> { diff --git a/app/src/main/res/drawable/ic_octaspace_no_color.xml b/app/src/main/res/drawable/ic_octaspace_no_color.xml new file mode 100644 index 0000000000..36751027a3 --- /dev/null +++ b/app/src/main/res/drawable/ic_octaspace_no_color.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index 9bd2291a93..da1221c137 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -64,6 +64,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { "telos/test" -> Blockchain.TelosTestnet "aleph-zero" -> Blockchain.AlephZero "aleph-zero/test" -> Blockchain.AlephZeroTestnet + "octaspace" -> Blockchain.OctaSpace + "octaspace/test" -> Blockchain.OctaSpaceTestnet else -> null } } @@ -132,6 +134,8 @@ fun Blockchain.toNetworkId(): String { Blockchain.TelosTestnet -> "telos/test" Blockchain.AlephZero -> "aleph-zero" Blockchain.AlephZeroTestnet -> "aleph-zero/test" + Blockchain.OctaSpace -> "octaspace" + Blockchain.OctaSpaceTestnet -> "octaspace/test" } } @@ -175,6 +179,7 @@ fun Blockchain.toCoinId(): String { Blockchain.Cronos -> "crypto-com-chain" Blockchain.Telos, Blockchain.TelosTestnet -> "telos" Blockchain.AlephZero, Blockchain.AlephZeroTestnet -> "aleph-zero" + Blockchain.OctaSpace, Blockchain.OctaSpaceTestnet -> "octaspace" } } diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index edf13f07ee..701091b1d4 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-288" +tangemBlockchainSdk = "develop-289" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "develop-278" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds