From 772ec7b53a1f3104bb7ff5b2522332ae36ac0a0c Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 2 Jul 2025 17:46:22 +0400 Subject: [PATCH] Updated on 2026-08-14 --- core/res/src/main/res/values/strings.xml | 5 +++++ .../message/MessageBottomSheetUMV2.kt | 2 +- .../message/MessageBottomSheetV2.kt | 4 ++++ .../connections/utils/WcAlertsFactory.kt | 17 ++++++----------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 886d47ca48..cbdeae4e30 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -413,6 +413,10 @@ Scan Tangem to %s On %s network + Backup Now + To complete setup, back up your wallet and secure app access with a Access Code. + Finish Now + Finish Wallet Activation Recover an existing wallet stored in your iCloud backup iCloud backup Go to backup @@ -1424,6 +1428,7 @@ Enable Trustline A Trustline must be enabled to receive this token. The network requires a %1$s %2$s reserve. Trustline Required + Malicious domain Unknown domain Connect anyway Timeout error. Please, try again later. diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUMV2.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUMV2.kt index 0f6901011f..0fc219bba4 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUMV2.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUMV2.kt @@ -37,7 +37,7 @@ data class MessageBottomSheetUMV2( } enum class BackgroundType { - Unspecified, SameAsTint + Unspecified, SameAsTint, Accent, Informative, Attention, Warning, } } diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt index 57f8d0f0d5..bdb7f5f705 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt @@ -138,6 +138,10 @@ private fun BottomSheetIcon(icon: MessageBottomSheetUMV2.Icon, modifier: Modifie val backgroundColor = when (icon.backgroundType) { MessageBottomSheetUMV2.Icon.BackgroundType.Unspecified -> TangemTheme.colors.icon.informative MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint -> tint + MessageBottomSheetUMV2.Icon.BackgroundType.Accent -> TangemTheme.colors.icon.accent + MessageBottomSheetUMV2.Icon.BackgroundType.Informative -> TangemTheme.colors.icon.informative + MessageBottomSheetUMV2.Icon.BackgroundType.Attention -> TangemTheme.colors.icon.attention + MessageBottomSheetUMV2.Icon.BackgroundType.Warning -> TangemTheme.colors.icon.warning } Box( diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcAlertsFactory.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcAlertsFactory.kt index 75e7d6143e..21c8ac3960 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcAlertsFactory.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/utils/WcAlertsFactory.kt @@ -26,8 +26,7 @@ internal object WcAlertsFactory { return messageBottomSheetUM { infoBlock { icon(R.drawable.img_knight_shield_32) { - type = MessageBottomSheetUMV2.Icon.Type.Attention - backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint + backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Attention } title = resourceReference(R.string.security_alert_title) body = resourceReference(R.string.wc_alert_domain_issues_description) @@ -52,12 +51,11 @@ internal object WcAlertsFactory { return messageBottomSheetUM { infoBlock { icon(R.drawable.img_knight_shield_32) { - type = MessageBottomSheetUMV2.Icon.Type.Warning - backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint + backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Warning } title = resourceReference(R.string.security_alert_title) body = resourceReference(R.string.wc_alert_domain_issues_description) - chip(resourceReference(R.string.wc_alert_audit_unknown_domain)) { + chip(resourceReference(R.string.wc_alert_audit_malicious_domain)) { type = MessageBottomSheetUMV2.Chip.Type.Warning } } @@ -78,8 +76,7 @@ internal object WcAlertsFactory { return messageBottomSheetUM { infoBlock { icon(R.drawable.img_attention_20) { - type = MessageBottomSheetUMV2.Icon.Type.Warning - backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint + backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Attention } title = resourceReference(R.string.wc_alert_unknown_error_title) body = if (errorMessage.isNullOrEmpty()) { @@ -105,8 +102,7 @@ internal object WcAlertsFactory { return messageBottomSheetUM { infoBlock { icon(R.drawable.img_knight_shield_32) { - type = MessageBottomSheetUMV2.Icon.Type.Warning - backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint + backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Attention } title = resourceReference(R.string.security_alert_title) if (!description.isNullOrEmpty()) { @@ -128,8 +124,7 @@ internal object WcAlertsFactory { return messageBottomSheetUM { infoBlock { icon(R.drawable.img_approvale2_20) { - type = MessageBottomSheetUMV2.Icon.Type.Accent - backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Unspecified + backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.Accent } title = resourceReference(R.string.wc_alert_verified_domain_title) body = resourceReference(R.string.wc_alert_verified_domain_description, wrappedList(appName))