From c237a4e50c78d56d7e9dba0939aa8a770ca812ac Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 18 Aug 2023 17:21:54 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../products/wallet/ui/dialogs/ResetBackupCardDialog.kt | 9 +++++---- core/res/src/main/res/values-ru/strings.xml | 2 +- core/res/src/main/res/values-zh-rTW/strings.xml | 2 +- core/res/src/main/res/values/strings.xml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt index 0632c6a120..0da9a7063a 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt @@ -10,12 +10,13 @@ import com.tangem.wallet.R object ResetBackupCardDialog { fun create(context: Context, cardId: String): AlertDialog { return AlertDialog.Builder(context).apply { - setTitle(R.string.common_warning) + setTitle(R.string.common_attention) setMessage(R.string.onboarding_linking_error_card_with_wallets) - setPositiveButton(R.string.common_continue) { _, _ -> - store.dispatch(BackupAction.ResetBackupCard(cardId)) + setPositiveButton(R.string.common_cancel) { _, _ -> + /* no-op */ } - setNegativeButton(R.string.common_cancel) { _, _ -> + setNegativeButton(R.string.common_reset) { _, _ -> + store.dispatch(BackupAction.ResetBackupCard(cardId)) } setOnDismissListener { store.dispatch(GlobalAction.HideDialog) diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 843b3f4be1..97aae433d7 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -43,7 +43,6 @@ Использовать эту карту для сброса кода доступа на других картах в этом кошельке Отключить возможность сброса кода доступа на этой карте или других картах этого кошелька Восстановление кода доступа - Сбросить Вы уверены, что хотите это сделать? Смена кода доступа Код доступа будет изменен только на данной карте @@ -96,6 +95,7 @@ Получить Отклонить Перезагрузить + Сбросить Сохранить изменения Искать Поиск токенов diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index 748251aefa..20f0e81a58 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -38,7 +38,6 @@ 允許您使用此卡重置此錢包中其他卡上的訪問密碼 禁用重置此卡或此錢包中其他卡上的訪問密碼的功能 恢復訪問密碼 - 重置 您確定要這麼做嗎？ 更改訪問密碼 訪問密碼將僅在此卡上更改 @@ -80,6 +79,7 @@ OK 主卡片 拒絕 + 重置 保存設置 搜索 搜尋代幣 diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 9d7e67dfea..8275351d0b 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -41,7 +41,6 @@ Allows you to use this card to reset access code on other cards in this wallet Disable the ability to reset the access code on this card or other cards in this wallet Access code recovery - Reset Are you sure you want to do this? Change Access Code Access code will be changed on this card only @@ -95,6 +94,7 @@ Receive Reject Reload + Reset Save changes Search Search tokens From 3e6691a1061858926335012e87878cd840ee9928 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 18 Aug 2023 17:28:15 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../presentation/viewmodels/TokensListViewModel.kt | 12 +++++++++++- .../com/tangem/domain/common/extensions/CardSdk.kt | 4 ++++ .../domain/common/extensions/WalletManagerFactory.kt | 1 + gradle/dependencies.toml | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git 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 index 1e74d442a8..ffb1de2c52 100644 --- 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 @@ -14,6 +14,7 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation +import com.tangem.domain.common.extensions.canHandleBlockchain import com.tangem.domain.common.extensions.canHandleToken import com.tangem.domain.common.extensions.fromNetworkId import com.tangem.domain.common.util.cardTypesResolver @@ -309,7 +310,7 @@ internal class TokensListViewModel @Inject constructor( toggledNetwork.changeToggleState() } } else { - if (isUnsupportedToken(blockchain)) { + if (isUnsupportedBlockchain(blockchain)) { router.openUnsupportedNetworkAlert(blockchain) } else { analyticsSender.sendWhenBlockchainAdded(blockchain) @@ -374,6 +375,15 @@ internal class TokensListViewModel @Inject constructor( return !canHandleToken } + private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean { + val scanResponse = reduxStateHolder.scanResponse + val canHandleToken = scanResponse?.card?.canHandleBlockchain( + blockchain = blockchain, + cardTypesResolver = scanResponse.cardTypesResolver, + ) ?: false + return !canHandleToken + } + private companion object { const val MAIN_NETWORK_LABEL = "MAIN" } diff --git 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 index f8e958583f..0f0c628689 100644 --- 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 @@ -53,4 +53,8 @@ fun CardDTO.supportedTokens(cardTypesResolver: CardTypesResolver): List { diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index 3d58165539..fadee9849b 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,7 +80,7 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_4.10-321" +tangemBlockchainSdk = "release-app_4.10-324" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_4.10-290" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds From d3cf5c43165280a7a3788cb6157b3233c503d8d2 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 18 Aug 2023 17:30:28 +0300 Subject: [PATCH 3/3] Updated on 2026-08-14 --- .../products/wallet/ui/OnboardingSeedPhraseStateHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt index 05eaf95d55..11f7664aa8 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt @@ -59,7 +59,7 @@ internal class OnboardingSeedPhraseStateHandler( private fun setMainScreenToolbarTitle(walletFragment: OnboardingWalletFragment, subScreen: SeedPhraseScreen) { val titleResId = when (subScreen) { - SeedPhraseScreen.Intro, + SeedPhraseScreen.Intro -> R.string.wallet_title SeedPhraseScreen.AboutSeedPhrase, SeedPhraseScreen.YourSeedPhrase, SeedPhraseScreen.CheckSeedPhrase,