Updated on 2026-08-14

2023-08-17 18:17:52 +03:00 · 2023-08-17 18:17:52 +03:00 · ff33484b28
commit ff33484b28
parent 23a113a1eb
8 changed files with 55 additions and 25 deletions
--- a/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/StateDialog.kt
@ -17,6 +17,7 @@ sealed class AppDialog : StateDialog {
    data class SimpleOkDialogRes(
        val headerId: Int,
        val messageId: Int,
+        val args: List<String> = emptyList(),
        val onOk: VoidCallback? = null,
    ) : AppDialog()

--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt
@ -1,5 +1,6 @@
 package com.tangem.tap.features.tokens.impl.presentation.router

+import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.tap.common.extensions.dispatchDialogShow
@ -49,12 +50,21 @@ internal class DefaultTokensListRouter(
        )
    }

-    override fun openUnsupportedSoltanaNetworkAlert() {
-        store.dispatchDialogShow(
-            AppDialog.SimpleOkDialogRes(
+    override fun openUnsupportedNetworkAlert(blockchain: Blockchain) {
+        val alert = when (blockchain) {
+            Blockchain.Solana -> AppDialog.SimpleOkDialogRes(
                headerId = R.string.common_warning,
                messageId = R.string.alert_manage_tokens_unsupported_message,
-            ),
-        )
+            )
+            Blockchain.Chia, Blockchain.ChiaTestnet -> AppDialog.SimpleOkDialogRes(
+                headerId = R.string.common_warning,
+                messageId = R.string.alert_manage_tokens_unsupported_curve_message,
+                args = listOf(blockchain.fullName),
+            )
+            else -> null // there's no alerts for other blockchains yer
+        }
+        if (alert != null) {
+            store.dispatchDialogShow(alert)
+        }
    }
 }
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt
@ -1,5 +1,7 @@
 package com.tangem.tap.features.tokens.impl.presentation.router

+import com.tangem.blockchain.common.Blockchain
+
 /** Tokens list feature router */
 internal interface TokensListRouter {

@ -28,6 +30,9 @@ internal interface TokensListRouter {
     */
    fun openRemoveWalletAlert(tokenName: String, onOkClick: () -> Unit)

-    /** Open alert if solana network is unsupported */
-    fun openUnsupportedSoltanaNetworkAlert()
+    /** Open alert if solana network is unsupported
+     *
+     * @param blockchain blockchain to show alert
+     */
+    fun openUnsupportedNetworkAlert(blockchain: Blockchain)
 }
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt
@ -309,9 +309,13 @@ internal class TokensListViewModel @Inject constructor(
                    toggledNetwork.changeToggleState()
                }
            } else {
-                analyticsSender.sendWhenBlockchainAdded(blockchain)
-                changedBlockchainList.add(blockchain)
-                toggledNetwork.changeToggleState()
+                if (isUnsupportedToken(blockchain)) {
+                    router.openUnsupportedNetworkAlert(blockchain)
+                } else {
+                    analyticsSender.sendWhenBlockchainAdded(blockchain)
+                    changedBlockchainList.add(blockchain)
+                    toggledNetwork.changeToggleState()
+                }
            }
        }

@ -350,17 +354,8 @@ internal class TokensListViewModel @Inject constructor(
                    toggledNetwork.changeToggleState()
                }
            } else {
-                val scanResponse = reduxStateHolder.scanResponse
-                val isUnsupportedToken =
-                    !(
-                        scanResponse?.card?.canHandleToken(
-                            blockchain = token.blockchain,
-                            cardTypesResolver = scanResponse.cardTypesResolver,
-                        ) ?: false
-                        )
-
-                if (isUnsupportedToken) {
-                    router.openUnsupportedSoltanaNetworkAlert()
+                if (isUnsupportedToken(token.blockchain)) {
+                    router.openUnsupportedNetworkAlert(token.blockchain)
                } else {
                    analyticsSender.sendWhenTokenAdded(token.token)
                    changedTokensList.add(token)
@ -370,6 +365,15 @@ internal class TokensListViewModel @Inject constructor(
        }
    }

+    private fun isUnsupportedToken(blockchain: Blockchain): Boolean {
+        val scanResponse = reduxStateHolder.scanResponse
+        val canHandleToken = scanResponse?.card?.canHandleToken(
+            blockchain = blockchain,
+            cardTypesResolver = scanResponse.cardTypesResolver,
+        ) ?: false
+        return !canHandleToken
+    }
+
    private companion object {
        const val MAIN_NETWORK_LABEL = "MAIN"
    }
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SimpleOkDialog.kt
@ -25,9 +25,14 @@ object SimpleOkDialog {
    }

    fun create(dialog: AppDialog.SimpleOkDialogRes, context: Context): AlertDialog {
+        val message = if (dialog.args.isEmpty()) {
+            context.getString(dialog.messageId)
+        } else {
+            context.getString(dialog.messageId, *dialog.args.toTypedArray())
+        }
        return AlertDialog.Builder(context).apply {
            setTitle(context.getString(dialog.headerId))
-            setMessage(dialog.messageId)
+            setMessage(message)
            setPositiveButton(R.string.common_ok) { _, _ -> }
            setOnDismissListener {
                store.dispatchDialogHide()
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@ -15,6 +15,7 @@
    <string name="alert_failed_to_send_transaction_message">Причина: %s</string>
    <string name="alert_failed_to_send_transaction_title">Не могу отправить транзакцию</string>
    <string name="alert_manage_tokens_addresses_message">Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства.</string>
+    <string name="alert_manage_tokens_unsupported_curve_message">Для активации криптографии сети %1$s необходимо сбросить кошелек до заводских настроек. Пожалуйста, выведите свои средства, чтобы не потерять их, после сброса доступ к текущему кошельку будет невозможен.</string>
    <string name="alert_manage_tokens_unsupported_message">Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки.</string>
    <string name="alert_signed_hashes_message">Эта карта не является платежным средством. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец удерживает подписанную транзакцию от публикации, что является поводом для беспокойства.\nНе принимайте эту карту в качестве физического платежа от кого-то, кому вы не доверяете.\nВо всех остальных отношениях эта карта совершенно безопасна.\nTangem — единственный аппаратный кошелек, предлагающий защиту методом подсчета подписей.</string>
    <string name="alert_troubleshooting_scan_card_title">У вас возникли трудности со сканированием карты?</string>
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@ -15,6 +15,7 @@
    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
+    <string name="alert_manage_tokens_unsupported_curve_message">To activate the %1$s blockchain\'s cryptographic encryption, you\'ll need to reset the wallet to factory settings. Please withdraw your funds before doing so to ensure that you don\'t lose them, and then complete the reset process. Access to the current wallet will not be possible after the reset.</string>
    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
    <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
@ -15,10 +15,13 @@ val FirmwareVersion.Companion.SolanaTokensAvailable

 fun CardDTO.supportedBlockchains(cardTypesResolver: CardTypesResolver): List<Blockchain> {
    val supportedBlockchains = if (firmwareVersion < FirmwareVersion.MultiWalletAvailable) {
-        Blockchain.fromCurve(EllipticCurve.Secp256k1)
+        Blockchain.fromCurve(EllipticCurve.Secp256k1).toMutableList()
+    } else if (!cardTypesResolver.isWallet2() && !cardTypesResolver.isTangemWallet()) {
+        // need for old multiwallet that supports only secp256k1
+        wallets.flatMap { Blockchain.fromCurve(it.curve) }.distinct().toMutableList()
    } else {
-        wallets.flatMap { Blockchain.fromCurve(it.curve) }.distinct()
-    }.toMutableList()
+        Blockchain.values().toMutableList()
+    }
    // disabled Cardano for wallet 2 for now, should be enabled after key processed
    // ([REDACTED_JIRA])
    if (cardTypesResolver.isWallet2()) {