GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2025-08-20 14:20:25 +07:00
parent ac0302d452
commit be07bf138c
9 changed files with 79 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/res/src/main/res/values-de/strings.xml
View file

@ -116,6 +116,7 @@
<string name="cardano_max_amount_has_token_title">Nicht genug ADA</string>
<string name="common_accept">Akzeptieren</string>
<string name="common_access_denied">Zugang verweigert</string>
<string name="common_add">Hinzufügen</string>
<string name="common_add_to_portfolio">Zum Portfolio hinzufügen</string>
<string name="common_add_token">Token hinzufügen</string>
<string name="common_address">Vertragsadresse</string>

1
core/res/src/main/res/values-es/strings.xml
View file

@ -113,6 +113,7 @@
<string name="cardano_max_amount_has_token_title">ADA insuficiente</string>
<string name="common_accept">Aceptar</string>
<string name="common_access_denied">Acceso denegado</string>
<string name="common_add">Agregar</string>
<string name="common_add_to_portfolio">Añadir al portafolio</string>
<string name="common_add_token">Agregar token</string>
<string name="common_address">Dirección</string>

1
core/res/src/main/res/values-fr/strings.xml
View file

@ -95,6 +95,7 @@
<string name="cardano_max_amount_has_token_title">ADA insuffisant</string>
<string name="common_accept">Accepter</string>
<string name="common_access_denied">Accès refusé</string>
<string name="common_add">Ajouter</string>
<string name="common_add_to_portfolio">Ajouter au portfolio</string>
<string name="common_add_token">Ajouter un jeton</string>
<string name="common_address">Adresse</string>

1
core/res/src/main/res/values-ja/strings.xml
View file

@ -149,6 +149,7 @@
<string name="cardano_max_amount_has_token_title">ADAが不足しています。</string>
<string name="common_accept">受け入れる</string>
<string name="common_access_denied">アクセスが拒否されました</string>
<string name="common_add">追加</string>
<string name="common_add_to_portfolio">ポートフォリオに追加</string>
<string name="common_add_token">トークンを追加</string>
<string name="common_address">アドレス</string>

1
core/res/src/main/res/values-ru/strings.xml
View file

@ -92,6 +92,7 @@
<string name="cardano_max_amount_has_token_title">Недостаточно ADA</string>
<string name="common_accept">Принять</string>
<string name="common_access_denied">Доступ запрещен</string>
<string name="common_add">Добавить</string>
<string name="common_add_to_portfolio">Добавить в портфель</string>
<string name="common_add_token">Добавить токен</string>
<string name="common_address">Адрес</string>

1
core/res/src/main/res/values-uk-rUA/strings.xml
View file

@ -92,6 +92,7 @@
<string name="cardano_max_amount_has_token_title">Недостатньо ADA</string>
<string name="common_accept">Прийняти</string>
<string name="common_access_denied">Доступ заборонено</string>
<string name="common_add">Додати</string>
<string name="common_add_to_portfolio">Додати у портфель</string>
<string name="common_add_token">Додати токен</string>
<string name="common_address">Адреса</string>

1
core/res/src/main/res/values/strings.xml
View file

@ -152,6 +152,7 @@
<string name="cardano_max_amount_has_token_title">Not enough ADA</string>
<string name="common_accept">Accept</string>
<string name="common_access_denied">Access denied</string>
<string name="common_add">Add</string>
<string name="common_add_to_portfolio">Add to portfolio</string>
<string name="common_add_token">Add token</string>
<string name="common_address">Address</string>

7
features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/chain/WcAddEthereumChainModalBottomSheetContent.kt
View file

@ -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,
)
},
)

96
features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcTransactionRequestButtons.kt
View file

@ -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()
}
}