GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2023-07-22 19:34:34 +04:00
parent 11f4759544
commit 57e6f0ebb9
5 changed files with 67 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
View file

@ -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
}
}

4
app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
View file

@ -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 -> {

58
app/src/main/res/drawable/ic_octaspace_no_color.xml Normal file
View file

@ -0,0 +1,58 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:autoMirrored="true"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:fillColor="#EBEBEB"
android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z" />
<path
android:fillColor="#B0B0B0"
android:pathData="M3.385,7.404L4.654,6.558V15.442L3.385,14.596V7.404Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M5.923,7.404L4.654,6.558V15.442L5.923,14.596V7.404Z"
android:strokeAlpha="0.4" />
<path
android:fillColor="#B0B0B0"
android:pathData="M16.077,7.404L17.346,6.558V15.442L16.077,14.596V7.404Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M18.615,7.404L17.346,6.558V15.442L18.615,14.596V7.404Z"
android:strokeAlpha="0.4" />
<path
android:fillColor="#B0B0B0"
android:pathData="M5.923,5.288L7.192,4.442V17.558L5.923,16.712V5.288Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M8.462,5.288L7.192,4.442V17.558L8.462,16.712V5.288Z"
android:strokeAlpha="0.4" />
<path
android:fillColor="#B0B0B0"
android:pathData="M13.538,5.288L14.808,4.442V17.558L13.538,16.712V5.288Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M16.077,5.288L14.808,4.442V17.558L16.077,16.712V5.288Z"
android:strokeAlpha="0.4" />
<path
android:fillColor="#B0B0B0"
android:pathData="M8.462,3.596L9.731,2.75V19.25L8.462,18.404V3.596Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M11,3.596L9.731,2.75V19.25L11,18.404V3.596Z"
android:strokeAlpha="0.4" />
<path
android:fillColor="#B0B0B0"
android:pathData="M11,3.596L12.269,2.75V19.25L11,18.404V3.596Z" />
<path
android:fillAlpha="0.4"
android:fillColor="#B0B0B0"
android:pathData="M13.538,3.596L12.269,2.75V19.25L13.538,18.404V3.596Z"
android:strokeAlpha="0.4" />
</vector>

5
domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
View file

@ -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"
}
}

2
gradle/dependencies.toml
View file

@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0"
# endregion Other libraries
# region Tangem
tangemBlockchainSdk = "develop-283"
tangemBlockchainSdk = "develop-289"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "develop-273"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds