From be07bf138cfffb3e6c52354e7da16d5f07679c5a Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 20 Aug 2025 14:20:25 +0700 Subject: [PATCH] Updated on 2026-08-14 --- core/res/src/main/res/values-de/strings.xml | 1 + core/res/src/main/res/values-es/strings.xml | 1 + core/res/src/main/res/values-fr/strings.xml | 1 + core/res/src/main/res/values-ja/strings.xml | 1 + core/res/src/main/res/values-ru/strings.xml | 1 + .../src/main/res/values-uk-rUA/strings.xml | 1 + core/res/src/main/res/values/strings.xml | 1 + ...AddEthereumChainModalBottomSheetContent.kt | 7 +- .../ui/common/WcTransactionRequestButtons.kt | 96 +++++++++++++------ 9 files changed, 79 insertions(+), 31 deletions(-) diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml index c62cee51c8..ddcad5ed92 100644 --- a/core/res/src/main/res/values-de/strings.xml +++ b/core/res/src/main/res/values-de/strings.xml @@ -116,6 +116,7 @@ Nicht genug ADA Akzeptieren Zugang verweigert + Hinzufügen Zum Portfolio hinzufügen Token hinzufügen Vertragsadresse diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml index c510d098aa..fa2411cdf5 100644 --- a/core/res/src/main/res/values-es/strings.xml +++ b/core/res/src/main/res/values-es/strings.xml @@ -113,6 +113,7 @@ ADA insuficiente Aceptar Acceso denegado + Agregar Añadir al portafolio Agregar token Dirección diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml index 1b64b43e63..e907d8df01 100644 --- a/core/res/src/main/res/values-fr/strings.xml +++ b/core/res/src/main/res/values-fr/strings.xml @@ -95,6 +95,7 @@ ADA insuffisant Accepter Accès refusé + Ajouter Ajouter au portfolio Ajouter un jeton Adresse diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml index 7f437b9d1e..5ffb365ef3 100644 --- a/core/res/src/main/res/values-ja/strings.xml +++ b/core/res/src/main/res/values-ja/strings.xml @@ -149,6 +149,7 @@ ADAが不足しています。 受け入れる アクセスが拒否されました + 追加 ポートフォリオに追加 トークンを追加 アドレス diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 8de88e16ba..befe0fd2d7 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -92,6 +92,7 @@ Недостаточно ADA Принять Доступ запрещен + Добавить Добавить в портфель Добавить токен Адрес 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 ef5cb62c26..5c7d9f4ef4 100644 --- a/core/res/src/main/res/values-uk-rUA/strings.xml +++ b/core/res/src/main/res/values-uk-rUA/strings.xml @@ -92,6 +92,7 @@ Недостатньо ADA Прийняти Доступ заборонено + Додати Додати у портфель Додати токен Адреса diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 5074ca1886..8bda8073a5 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -152,6 +152,7 @@ Not enough ADA Accept Access denied + Add Add to portfolio Add token Address diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/chain/WcAddEthereumChainModalBottomSheetContent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/chain/WcAddEthereumChainModalBottomSheetContent.kt index 3f1a55cfe8..73d7ef80e2 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/chain/WcAddEthereumChainModalBottomSheetContent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/chain/WcAddEthereumChainModalBottomSheetContent.kt @@ -30,8 +30,8 @@ import com.tangem.features.walletconnect.connections.ui.WcAppInfoItem import com.tangem.features.walletconnect.impl.R import com.tangem.features.walletconnect.transaction.entity.chain.WcAddEthereumChainItemUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionAppInfoContentUM +import com.tangem.features.walletconnect.transaction.ui.common.WcSimpleConfirmButtons import com.tangem.features.walletconnect.transaction.ui.common.WcSmallTitleItem -import com.tangem.features.walletconnect.transaction.ui.common.WcTransactionRequestButtons import com.tangem.features.walletconnect.transaction.ui.common.WcTransactionRequestItem import com.tangem.features.walletconnect.transaction.ui.common.WcWalletItem @@ -91,13 +91,12 @@ internal fun WcAddEthereumChainModalBottomSheetContent( } }, footer = { - WcTransactionRequestButtons( + WcSimpleConfirmButtons( modifier = Modifier.padding(16.dp), onDismiss = state.onDismiss, onClickActiveButton = state.onSign, - activeButtonText = resourceReference(R.string.common_sign), + activeButtonText = resourceReference(R.string.common_add), isLoading = state.isLoading, - validationResult = null, ) }, ) diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcTransactionRequestButtons.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcTransactionRequestButtons.kt index ffd23bc142..61f1cf95e7 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcTransactionRequestButtons.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcTransactionRequestButtons.kt @@ -2,6 +2,7 @@ package com.tangem.features.walletconnect.transaction.ui.common import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -24,6 +25,73 @@ internal fun WcTransactionRequestButtons( onClickActiveButton: () -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, +) { + WcCommonButtons( + onDismiss = onDismiss, + modifier = modifier, + primaryButton = { + // Before change, make sure you are align with WcSendTransactionModel::onSign + when (validationResult) { + ValidationResult.UNSAFE, + ValidationResult.WARNING, + -> PrimaryButton( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + text = stringResourceSafe(R.string.common_continue), + onClick = onClickActiveButton, + showProgress = isLoading, + enabled = enabled, + ) + ValidationResult.SAFE, + ValidationResult.FAILED_TO_VALIDATE, + null, + -> PrimaryButtonIconEnd( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + text = activeButtonText.resolveReference(), + onClick = onClickActiveButton, + iconResId = R.drawable.ic_tangem_24, + showProgress = isLoading, + enabled = enabled, + ) + } + }, + ) +} + +@Composable +internal fun WcSimpleConfirmButtons( + activeButtonText: TextReference, + isLoading: Boolean, + onDismiss: () -> Unit, + onClickActiveButton: () -> Unit, + modifier: Modifier = Modifier, + enabled: Boolean = true, +) { + WcCommonButtons( + onDismiss = onDismiss, + modifier = modifier, + primaryButton = { + PrimaryButton( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + text = activeButtonText.resolveReference(), + onClick = onClickActiveButton, + showProgress = isLoading, + enabled = enabled, + ) + }, + ) +} + +@Composable +internal fun WcCommonButtons( + onDismiss: () -> Unit, + modifier: Modifier = Modifier, + primaryButton: @Composable RowScope.() -> Unit, ) { Row(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8)) { SecondaryButton( @@ -33,32 +101,6 @@ internal fun WcTransactionRequestButtons( text = stringResourceSafe(R.string.common_cancel), onClick = onDismiss, ) - // Before change, make sure you are align with WcSendTransactionModel::onSign - when (validationResult) { - ValidationResult.UNSAFE, - ValidationResult.WARNING, - -> PrimaryButton( - modifier = Modifier - .fillMaxWidth() - .weight(1f), - text = stringResourceSafe(R.string.common_continue), - onClick = onClickActiveButton, - showProgress = isLoading, - enabled = enabled, - ) - ValidationResult.SAFE, - ValidationResult.FAILED_TO_VALIDATE, - null, - -> PrimaryButtonIconEnd( - modifier = Modifier - .fillMaxWidth() - .weight(1f), - text = activeButtonText.resolveReference(), - onClick = onClickActiveButton, - iconResId = R.drawable.ic_tangem_24, - showProgress = isLoading, - enabled = enabled, - ) - } + primaryButton() } } \ No newline at end of file