diff --git 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
index a674196d0d..54cca1b8dc 100644
--- 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
@@ -56,15 +56,12 @@ internal class DefaultTokensListRouter(
headerId = R.string.common_warning,
messageId = R.string.alert_manage_tokens_unsupported_message,
)
- Blockchain.Chia, Blockchain.ChiaTestnet -> AppDialog.SimpleOkDialogRes(
+ else -> 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)
}
+ store.dispatchDialogShow(alert)
}
}
\ No newline at end of file
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index fb0916e031..91773de93c 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -342,7 +342,7 @@
Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку
Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать данную карту для восстановления кода доступа.
Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек.
- У вас есть карта банка другой страны или платежной системы UnionPay?
+ У вас есть карта банка другой страны, а также вид на жительство или регистрация вне РФ?
Карты банков РФ в данный момент не принимаются
Войдите в приложение и следите за своим балансом без сканирования карты
Доступ в приложение
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index a4bc3c019a..0542ac7dc4 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -335,8 +335,8 @@
I understand that after performing this action, I will no longer have access to the current wallet
Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.
Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.
- Do you have a bank card of another country or a UnionPay card?
- Russian bank cards are not accepted at the moment
+ Do you have a bank card from another country and a residence permit or registration outside the Russian Federation?
+ Russian bank cards are not currently accepted
Log into the app and check your balance without scanning the card
Access the app
Allow to use biometrics
diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
index 9085357e7e..0970e85d77 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt
@@ -214,6 +214,4 @@ private val excludedBlockchains = listOf(
Blockchain.Ducatus,
Blockchain.Telos, // disable in 4.9
Blockchain.TelosTestnet, // disable in 4.9
- Blockchain.OctaSpace,
- Blockchain.OctaSpaceTestnet,
)
\ No newline at end of file
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 2509479732..8420054345 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,18 +53,26 @@ fun CardDTO.supportedTokens(cardTypesResolver: CardTypesResolver): List