diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml index 851e4bc48c..d0bb34dd95 100644 --- a/core/res/src/main/res/values-de/strings.xml +++ b/core/res/src/main/res/values-de/strings.xml @@ -394,6 +394,7 @@ Standardadresse Legacy adresse Empfangen von Vermögenswerten + %s Adresse Das Senden von Vermögenswerten in anderen Netzwerken führt zu dauerhaftem Verlust. %s Netzwerk Sende Geld nur mit diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml index c70f5846b2..d665c40e7f 100644 --- a/core/res/src/main/res/values-es/strings.xml +++ b/core/res/src/main/res/values-es/strings.xml @@ -332,6 +332,7 @@ Dirección por defecto Dirección Legacy Recibir activos + %s dirección Enviar activos a otras redes resultará en una pérdida permanente. Envíe fondos utilizando solo Hola equipo de soporte, he encontrado un error con el código: %s diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml index 475f78e43a..228fa133e0 100644 --- a/core/res/src/main/res/values-fr/strings.xml +++ b/core/res/src/main/res/values-fr/strings.xml @@ -309,6 +309,7 @@ Adresse par défaut Legacy adresse Recevoir des actifs + %s adresse L’envoi d’actifs sur d’autres réseaux entraînera une perte définitive. Envoyez des fonds en utilisant uniquement Bonjour équipe de support, j’ai rencontré une erreur avec le code : %s diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 9fda11100a..a3fd7c0d13 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -308,6 +308,7 @@ Основной адрес Legacy адрес Получить активы + %s адрес Отправка средств в другой сети может повлечь потерю средств. Отправляйте средства, используя только Привет, команда поддержки, у меня возникла ошибка с кодом: %s diff --git a/core/res/src/main/res/values-uk-rUA/strings.xml b/core/res/src/main/res/values-uk-rUA/strings.xml index 14ac369e2e..8430c62ce1 100644 --- a/core/res/src/main/res/values-uk-rUA/strings.xml +++ b/core/res/src/main/res/values-uk-rUA/strings.xml @@ -305,6 +305,7 @@ Основна адреса Legacy адреса Отримати активи + %s адреса Надсилання активів в інші мережі призведе до безповоротної втрати. Надсилайте кошти, використовуючи лише Привіт, команда підтримки, я зіткнувся з помилкою з кодом: %s diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 1a6894683e..1d7c55ec0b 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -395,6 +395,7 @@ Default Address Legacy Address Receive assets + %s address Sending assets in other networks will result in permanent loss. %s network Send funds using only diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt index 48f75b359d..22a746d2f2 100644 --- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt +++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt @@ -29,8 +29,8 @@ import com.tangem.core.res.getStringSafe import com.tangem.core.ui.R import com.tangem.core.ui.components.SpacerH12 import com.tangem.core.ui.components.SpacerH8 +import com.tangem.core.ui.components.SpacerW import com.tangem.core.ui.components.SpacerW12 -import com.tangem.core.ui.components.SpacerW8 import com.tangem.core.ui.components.atoms.text.EllipsisText import com.tangem.core.ui.components.atoms.text.TextEllipsis import com.tangem.core.ui.components.buttons.small.TangemIconButton @@ -211,9 +211,9 @@ private fun AddressItem( Column(modifier = Modifier.weight(1f)) { EllipsisText( text = primaryType.displayName.resolveReference(), - ellipsis = TextEllipsis.Middle, + ellipsis = TextEllipsis.End, color = TangemTheme.colors.text.primary1, - style = TangemTheme.typography.subtitle1, + style = TangemTheme.typography.subtitle2, ) EllipsisText( @@ -227,16 +227,16 @@ private fun AddressItem( SpacerW12() TangemIconButton( - modifier = Modifier.size(TangemTheme.dimens.size28), + modifier = Modifier.size(TangemTheme.dimens.size32), innerPadding = 6.dp, iconRes = R.drawable.ic_qrcode_new_24, onClick = onOpenQrCodeClick, ) - SpacerW8() + SpacerW(12.dp) TangemIconButton( - modifier = Modifier.size(TangemTheme.dimens.size28), + modifier = Modifier.size(TangemTheme.dimens.size32), iconRes = R.drawable.ic_copy_new_24, innerPadding = 6.dp, onClick = onCopyClick, diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveQrCodeContent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveQrCodeContent.kt index d248c1b34d..084e80506b 100644 --- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveQrCodeContent.kt +++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveQrCodeContent.kt @@ -3,7 +3,9 @@ package com.tangem.features.tokenreceive.ui import android.content.res.Configuration import androidx.compose.foundation.Image import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -87,12 +89,23 @@ private fun QrCodePage(addressFullName: TextReference, addressValue: String, net SpacerH(20.dp) - Image( - painter = qrCodePainter, - contentDescription = null, - contentScale = ContentScale.Fit, - modifier = Modifier.size(248.dp), - ) + Box( + modifier = Modifier + .border( + width = 8.dp, + color = TangemTheme.colors.icon.constant, + shape = RoundedCornerShape(8.dp), + ) + .padding(8.dp), + + ) { + Image( + painter = qrCodePainter, + contentDescription = null, + contentScale = ContentScale.Fit, + modifier = Modifier.sizeIn(minWidth = 148.dp), + ) + } SpacerH24() }