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 2024-04-05 15:32:12 +01:00
parent 049bb650c9
commit 23b9a7bfd1
8 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/assets/testnet_tokens.json
View file

@ -678,6 +678,16 @@
"networkId": "polygon-zkevm/test"
}
]
},
{
"id": "base-ethereum",
"name": "Base",
"symbol": "ETH",
"networks": [
{
"networkId": "base/test"
}
]
}
]
}

5
core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
View file

@ -66,6 +66,7 @@ fun getActiveIconRes(blockchainId: String): Int {
"flare", "flare/test" -> R.drawable.img_flare_22
"taraxa", "taraxa/test" -> R.drawable.img_taraxa_22
"radiant" -> R.drawable.img_radiant_22
"base" -> R.drawable.img_base_22
else -> R.drawable.ic_alert_24
}
}
@ -133,6 +134,7 @@ fun getActiveIconResByNetworkId(networkId: String): Int {
"flare-network", "flare-network/test" -> R.drawable.img_flare_22
"taraxa", "taraxa/test" -> R.drawable.img_taraxa_22
"radiant" -> R.drawable.img_radiant_22
"base" -> R.drawable.img_base_22
else -> R.drawable.ic_alert_24
}
}
@ -197,6 +199,7 @@ fun getActiveIconResByCoinId(coinId: String): Int {
"flare-networks" -> R.drawable.img_flare_22
"taraxa" -> R.drawable.img_taraxa_22
"radiant" -> R.drawable.img_radiant_22
"base" -> R.drawable.img_base_22
else -> R.drawable.ic_alert_24
}
}
@ -264,6 +267,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
"flare", "flare/test" -> R.drawable.ic_flare_22
"taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22
"radiant" -> R.drawable.ic_radiant_22
"base", "base/test" -> R.drawable.ic_base_22
else -> R.drawable.ic_alert_24
}
}
@ -331,6 +335,7 @@ fun getGreyedOutIconResByNetworkId(networkId: String): Int {
"flare-network", "flare-network/test" -> R.drawable.ic_flare_22
"taraxa", "taraxa/test" -> R.drawable.ic_taraxa_22
"radiant" -> R.drawable.ic_radiant_22
"base", "base/test" -> R.drawable.ic_base_22
else -> R.drawable.ic_alert_24
}
}

18
core/ui/src/main/res/drawable/ic_base_22.xml Normal file
View file

@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<group>
<clip-path
android:pathData="M0,0h22v22h-22z"/>
<group>
<clip-path
android:pathData="M22,11C22,4.925 17.075,0 11,0C4.925,0 0,4.925 0,11C0,17.075 4.925,22 11,22C17.075,22 22,17.075 22,11Z"/>
<path
android:pathData="M11,0C17.075,0 22,4.925 22,11C22,17.075 17.075,22 11,22C4.925,22 0,17.075 0,11C0,4.925 4.925,0 11,0ZM19,11C19,15.418 15.412,19 10.986,19C6.787,19 3.342,15.776 3,11.672H13.593V10.328H3C3.342,6.224 6.787,3 10.986,3C15.412,3 19,6.582 19,11Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
</group>
</group>
</vector>

16
core/ui/src/main/res/drawable/img_base_22.xml Normal file
View file

@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<group>
<clip-path
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: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"
android:fillColor="#0052FF"/>
<path
android:pathData="M10.986,19C15.412,19 19,15.418 19,11C19,6.582 15.412,3 10.986,3C6.787,3 3.342,6.224 3,10.328H13.593V11.672H3C3.342,15.776 6.787,19 10.986,19Z"
android:fillColor="#ffffff"/>
</group>
</vector>

1
data/tokens/src/main/kotlin/com/tangem/data/tokens/utils/QuotesUnsupportedCurrenciesIdAdapter.kt
View file

@ -55,6 +55,7 @@ internal class QuotesUnsupportedCurrenciesIdAdapter {
"manta-network-ethereum" to "ethereum",
"polygon-zkevm-ethereum" to "ethereum",
"aurora-ethereum" to "ethereum",
"base-ethereum" to "ethereum",
)
}
}

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

@ -112,6 +112,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
"flare-network/test" -> Blockchain.FlareTestnet
"taraxa" -> Blockchain.Taraxa
"taraxa/test" -> Blockchain.TaraxaTestnet
"base" -> Blockchain.Base
"base/test" -> Blockchain.BaseTestnet
else -> null
}
}
@ -225,6 +227,8 @@ fun Blockchain.toNetworkId(): String {
Blockchain.FlareTestnet -> "flare-network/test"
Blockchain.Taraxa -> "taraxa"
Blockchain.TaraxaTestnet -> "taraxa/test"
Blockchain.Base -> "base"
Blockchain.BaseTestnet -> "base/test"
}
}
@ -297,6 +301,7 @@ fun Blockchain.toCoinId(): String {
Blockchain.Mantle, Blockchain.MantleTestnet -> "mantle"
Blockchain.Flare, Blockchain.FlareTestnet -> "flare-networks"
Blockchain.Taraxa, Blockchain.TaraxaTestnet -> "taraxa"
Blockchain.Base, Blockchain.BaseTestnet -> "base"
}
}

22
domain/legacy/src/main/java/com/tangem/domain/walletmanager/DefaultWalletManagersFacade.kt
View file

@ -192,7 +192,16 @@ class DefaultWalletManagersFacade(
address = walletManager.wallet.address,
filterType = when (currency) {
is CryptoCurrency.Coin -> TransactionHistoryRequest.FilterType.Coin
is CryptoCurrency.Token -> TransactionHistoryRequest.FilterType.Contract(currency.contractAddress)
is CryptoCurrency.Token -> {
val blockchainToken = Token(
name = currency.name,
symbol = currency.symbol,
contractAddress = currency.contractAddress,
decimals = currency.decimals,
id = currency.id.rawCurrencyId,
)
TransactionHistoryRequest.FilterType.Contract(blockchainToken)
}
},
)
.let(txHistoryStateConverter::convert)
@ -221,7 +230,16 @@ class DefaultWalletManagersFacade(
pageSize = pageSize,
filterType = when (currency) {
is CryptoCurrency.Coin -> TransactionHistoryRequest.FilterType.Coin
is CryptoCurrency.Token -> TransactionHistoryRequest.FilterType.Contract(currency.contractAddress)
is CryptoCurrency.Token -> {
val blockchainToken = Token(
name = currency.name,
symbol = currency.symbol,
contractAddress = currency.contractAddress,
decimals = currency.decimals,
id = currency.id.rawCurrencyId,
)
TransactionHistoryRequest.FilterType.Contract(blockchainToken)
}
},
),
)

4
gradle/dependencies.toml
View file

@ -85,9 +85,9 @@ leakcanary = "2.13"
# endregion Other libraries
# region Tangem
tangemBlockchainSdk = "release-app_5.9-580"
tangemBlockchainSdk = "release-app_5.9-582"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "release-app_5.9-340"
tangemCardSdk = "release-app_5.9-343"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
# endregion Tangem