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-08-29 11:00:44 +03:00
commit c897be37cc
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
View file

@ -12,11 +12,11 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.Token
import com.tangem.blockchain.common.derivation.DerivationStyle
import com.tangem.core.analytics.api.AnalyticsEventHandler
import com.tangem.crypto.hdWallet.DerivationPath
import com.tangem.crypto.hdWallet.HDWalletError
import com.tangem.domain.AddCustomTokenError
import com.tangem.domain.common.DerivationStyleProvider
import com.tangem.domain.common.extensions.*
import com.tangem.domain.common.util.cardTypesResolver
import com.tangem.domain.common.util.derivationStyleProvider
@ -145,7 +145,7 @@ internal class AddCustomTokenViewModel @Inject constructor(
fun createDerivationPathSelectorAdditionalItem(
blockchain: Blockchain,
type: DerivationPathSelectorType = DerivationPathSelectorType.BLOCKCHAIN,
derivationStyle: DerivationStyle?,
derivationPath: String,
): SelectorItem.TitleWithSubtitle {
return when (type) {
DerivationPathSelectorType.DEFAULT -> SelectorItem.TitleWithSubtitle(
@ -161,10 +161,7 @@ internal class AddCustomTokenViewModel @Inject constructor(
type = DerivationPathSelectorType.CUSTOM,
)
DerivationPathSelectorType.BLOCKCHAIN -> SelectorItem.TitleWithSubtitle(
title = blockchain.derivationPath(
style = derivationStyle,
)?.rawPath?.let(TextReference::Str)
?: TextReference.Res(R.string.custom_token_derivation_path_default),
title = TextReference.Str(derivationPath),
subtitle = TextReference.Str(blockchain.fullName),
blockchain = blockchain,
)
@ -211,10 +208,12 @@ internal class AddCustomTokenViewModel @Inject constructor(
private fun getNetworkSelectorItems(): List<SelectorItem.Title> {
val defaultNetwork = createNetworkSelectorItem(blockchain = Blockchain.Unknown)
val scanResponse = reduxStateHolder.scanResponse
val derivationStyle = scanResponse?.derivationStyleProvider?.getDerivationStyle()
return listOf(defaultNetwork) + Blockchain.values()
.filter { blockchain ->
scanResponse?.card?.supportedBlockchains(scanResponse.cardTypesResolver)
?.contains(blockchain) == true
?.contains(blockchain) == true &&
blockchain.derivationPath(derivationStyle)?.rawPath?.isNotEmpty() == true
}
.sortedBy(Blockchain::fullName)
.map(::createNetworkSelectorItem)
@ -258,7 +257,7 @@ internal class AddCustomTokenViewModel @Inject constructor(
if (scanResponse?.card?.settings?.isHDWalletAllowed == false) return null
val selectorItems =
getDerivationPathsSelectorItems(scanResponse?.derivationStyleProvider?.getDerivationStyle())
getDerivationPathsSelectorItems(scanResponse?.derivationStyleProvider)
return AddCustomTokenSelectorField.DerivationPath(
label = TextReference.Res(R.string.custom_token_derivation_path_input_title),
selectedItem = requireNotNull(selectorItems.firstOrNull()),
@ -269,29 +268,35 @@ internal class AddCustomTokenViewModel @Inject constructor(
}
private fun getDerivationPathsSelectorItems(
derivationStyle: DerivationStyle?,
derivationStyleProvider: DerivationStyleProvider?,
): List<SelectorItem.TitleWithSubtitle> {
val derivationStyle = derivationStyleProvider?.getDerivationStyle()
return listOf(
createDerivationPathSelectorAdditionalItem(
blockchain = Blockchain.Unknown,
type = DerivationPathSelectorType.DEFAULT,
derivationStyle = derivationStyle,
derivationPath = "",
),
createDerivationPathSelectorAdditionalItem(
blockchain = Blockchain.Unknown,
type = DerivationPathSelectorType.CUSTOM,
derivationStyle = derivationStyle,
derivationPath = "",
),
) + Blockchain.values()
.filter { blockchain ->
blockchain.isSupportedInApp() && !blockchain.isTestnet()
}
.sortedBy(Blockchain::fullName)
.map {
createDerivationPathSelectorAdditionalItem(
blockchain = it,
derivationStyle = derivationStyle,
)
.mapNotNull {
val derivationPath = it.derivationPath(derivationStyle)?.rawPath
if (derivationPath?.isNotEmpty() == true) {
createDerivationPathSelectorAdditionalItem(
blockchain = it,
derivationPath = derivationPath,
)
} else {
null
}
}
}
@ -828,7 +833,7 @@ internal class AddCustomTokenViewModel @Inject constructor(
selectedItem = formStateBuilder.createDerivationPathSelectorAdditionalItem(
blockchain = Blockchain.Unknown,
type = DerivationPathSelectorType.DEFAULT,
derivationStyle = scanResponse?.derivationStyleProvider?.getDerivationStyle(),
derivationPath = "",
),
),
),

2
gradle/dependencies.toml
View file

@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0"
# endregion Other libraries
# region Tangem
tangemBlockchainSdk = "release-app_4.10-335"
tangemBlockchainSdk = "release-app_4.10-336"
#tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
tangemCardSdk = "release-app_4.10-292"
#tangemCardSdk = "0.0.1" # Keep it! - used for local builds