From ce9cfb001d25dd1ccd87a625d074befc4790a972 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 6 May 2024 16:37:44 +0200 Subject: [PATCH] Updated on 2026-08-14 --- core/res/src/main/res/values-ru/strings.xml | 9 ++++----- core/res/src/main/res/values/strings.xml | 11 +++++------ .../tokens/model/warnings/CryptoCurrencyWarning.kt | 4 +--- .../domain/tokens/GetCryptoCurrencyActionsUseCase.kt | 2 +- .../domain/tokens/GetCurrencyWarningsUseCase.kt | 3 --- .../tokens/model/ScenarioUnavailabilityReason.kt | 2 +- .../TokenDetailsNotificationsAnalyticsSender.kt | 1 - .../state/components/TokenDetailsNotification.kt | 12 ++---------- .../factory/TokenDetailsNotificationConverter.kt | 3 --- .../state/factory/TokenDetailsStateFactory.kt | 6 +++--- .../intents/WalletCurrencyActionsClickIntents.kt | 6 +++--- 11 files changed, 20 insertions(+), 39 deletions(-) diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 6e9e7bf51e..b8a5d12fe9 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -58,9 +58,9 @@ Тип безопасности Настройки карты Ввиду особенностей сети Cardano при транзакции токена %1$s помимо комиссии сети будет списано %2$s - Для совершения транзакции %1$s, вам необходимо внести немного %2$s (%3$s), чтобы покрыть комиссию сети и минимальное значение ADA для отправки. + Чтобы совершить транзакцию %1$s, вы должны внести некоторую сумму ADA для покрытия сетевой комиссии и минимального значения ADA. (рекомендуется баланс в размере 5 ADA) Недостаточно ADA для отправки токена - Вывод всего баланса ADA невозможен при наличии средств на токенах сети Cardano. Сначала выведите средства на ваших токенах. + Сеть Cardano не позволяет вам оставлять на своем балансе сумму ниже минимального значения %1$s, если у вас есть токены. Пожалуйста, убедитесь, что у вас осталось немного ADA. Принять Доступ запрещен Применить @@ -557,7 +557,8 @@ У вас нет средств для продажи. Пополните счет, чтобы иметь возможность продать с него средства. У вас нет средств для отправки. Пополните счет, чтобы иметь возможность отправить с него средства. В данный момент обмен монеты %s недоступен. Следите за нашими обновлениями. - Продажа средств станет доступной после завершения транзакции %s + Продажа средств станет доступной после завершения транзакции(-ий) в сети %s + Отправка средств станет доступной после завершения транзакции(-ий) в сети %s В данный момент продажа %s недоступна. Следите за нашими обновлениями. Выберите адрес Сгенерировать XPUB @@ -697,8 +698,6 @@ Необходима плата за аренду сети %1$s - это монета в сети %2$s. Для совершения транзакции %3$s, вам необходимо внести немного %4$s (%5$s), чтобы покрыть комиссию сети. Недостаточно %1$s для оплаты комиссии сети - Отправка средств станет доступной после завершения транзакции(-ий) в сети %s - Отправка средств станет доступной после завершения транзакции %s Транзакция в обработке Сеть Солана испытывает высокую нагрузку. Если Ваша транзакция не прошла в течение 2 минут, повторите её отправку. Оповещение сети Солана diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 2fb4ea6a93..ef843270c8 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -56,10 +56,10 @@ Reset to Factory Settings Security Mode Card Settings - Due to the peculiarities of the Cardano network, when transacting the %1$s token, in addition to the network commission, %2$s will be charged - To make a %1$s transaction, you must deposit some %2$s (%3$s) to cover the network fee and minimum ADA value + Due to the peculiarities of the Cardano network, when transacting the %1$s token, in addition to the network commission, %2$s will be charged + To make a %1$s transaction, you must deposit some ADA to cover the network fee and minimum ADA value. (5 ADA balance recommended) Insufficient ADA to token transfer - Withdrawal of the entire ADA balance is not possible if funds are available in Cardano network tokens. First, withdraw funds on your tokens. + The Cardano network does not allow you to leave an amount on your balance below the minimum value %1$s if you have tokens. Please ensure that you have some ADA remaining. Accept Access denied Apply @@ -557,7 +557,8 @@ You do not have funds to sell. Top up your account to be able to sell funds from it. You do not have funds to send. Top up your account to be able to send funds from it. Swapping %s is not available at the moment. Please check our updates. - Selling funds will be available once the %s transaction is complete + Selling funds will be available once the pending transaction(s) in network %s is complete + Sending funds will be available once the pending transaction(s) in network %s is complete Selling %s is not available at the moment. Please check our updates. Choose address Generate XPUB @@ -695,8 +696,6 @@ Network rent fee required %1$s is an asset in the %2$s network. To make a %3$s transaction, you must deposit some %4$s (%5$s) to cover the network fee. Insufficient %1$s to cover network fee - Sending funds will be available once the pending transaction(s) in network %s is complete - Sending funds will be available once the %s transaction is complete Transaction pending The Solana network is congested. If your transaction is not processed within 2 minutes, please repeat the transaction. Solana Network Alert diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt index 6e477d8a10..5c1cad5f44 100644 --- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt +++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/warnings/CryptoCurrencyWarning.kt @@ -31,7 +31,7 @@ sealed class CryptoCurrencyWarning { val amountCurrency: CryptoCurrency, ) : CryptoCurrencyWarning() - object TopUpWithoutReserve : CryptoCurrencyWarning() + data object TopUpWithoutReserve : CryptoCurrencyWarning() /** * Represents wallet blockchain rent @@ -41,8 +41,6 @@ sealed class CryptoCurrencyWarning { */ data class Rent(val rent: BigDecimal, val exemptionAmount: BigDecimal) : CryptoCurrencyWarning() - data class HasPendingTransactions(val blockchainSymbol: String) : CryptoCurrencyWarning() - data class SwapPromo( val startDateTime: DateTime, val endDateTime: DateTime, diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt index 74e89db52c..d0155c6c62 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCryptoCurrencyActionsUseCase.kt @@ -232,7 +232,7 @@ class GetCryptoCurrencyActionsUseCase( ) -> { ScenarioUnavailabilityReason.PendingTransaction( withdrawalScenario = ScenarioUnavailabilityReason.WithdrawalScenario.SEND, - cryptoCurrencySymbol = coinStatus?.currency?.symbol.orEmpty(), + networkName = coinStatus?.currency?.network?.name.orEmpty(), ) } else -> { diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt index 91430442e1..43a7a2fda8 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetCurrencyWarningsUseCase.kt @@ -167,9 +167,6 @@ class GetCurrencyWarningsUseCase( when { tokenStatus != null && coinStatus != null -> { buildList { - if (currenciesRepository.hasPendingTransactions(tokenStatus, coinStatus)) { - add(CryptoCurrencyWarning.HasPendingTransactions(coinStatus.currency.symbol)) - } getFeeWarning( userWalletId = userWalletId, coinStatus = coinStatus, diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/ScenarioUnavailabilityReason.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/ScenarioUnavailabilityReason.kt index 27315e15a7..e241178026 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/ScenarioUnavailabilityReason.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/model/ScenarioUnavailabilityReason.kt @@ -6,7 +6,7 @@ sealed class ScenarioUnavailabilityReason { // send&sell-specific data class PendingTransaction( val withdrawalScenario: WithdrawalScenario, - val cryptoCurrencySymbol: String, + val networkName: String, ) : ScenarioUnavailabilityReason() data class EmptyBalance(val withdrawalScenario: WithdrawalScenario) : ScenarioUnavailabilityReason() diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/analytics/TokenDetailsNotificationsAnalyticsSender.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/analytics/TokenDetailsNotificationsAnalyticsSender.kt index 3a470f1a30..9236e01d5e 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/analytics/TokenDetailsNotificationsAnalyticsSender.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/analytics/TokenDetailsNotificationsAnalyticsSender.kt @@ -37,7 +37,6 @@ internal class TokenDetailsNotificationsAnalyticsSender( ) is TokenDetailsNotification.NetworksUnreachable, is TokenDetailsNotification.ExistentialDeposit, - is TokenDetailsNotification.HasPendingTransactions, is TokenDetailsNotification.NetworksNoAccount, is TokenDetailsNotification.TopUpWithoutReserve, is TokenDetailsNotification.RentInfo, diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt index a33cc576e3..bed8a2a0e2 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsNotification.kt @@ -66,7 +66,7 @@ internal sealed class TokenDetailsNotification(val config: NotificationConfig) { ), ) - object NetworksUnreachable : Warning( + data object NetworksUnreachable : Warning( title = resourceReference(R.string.warning_network_unreachable_title), subtitle = resourceReference(R.string.warning_network_unreachable_message), ) @@ -163,16 +163,8 @@ internal sealed class TokenDetailsNotification(val config: NotificationConfig) { ), ) - object TopUpWithoutReserve : Informational( + data object TopUpWithoutReserve : Informational( title = resourceReference(id = R.string.warning_no_account_title), subtitle = resourceReference(id = R.string.no_account_send_to_create), ) - - class HasPendingTransactions(val coinSymbol: String) : Informational( - title = resourceReference(R.string.warning_send_blocked_pending_transactions_title), - subtitle = resourceReference( - id = R.string.warning_send_blocked_pending_transactions_message, - formatArgs = wrappedList(coinSymbol), - ), - ) } \ No newline at end of file diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt index 048afdb96e..01535ea1b4 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsNotificationConverter.kt @@ -74,9 +74,6 @@ internal class TokenDetailsNotificationConverter( symbol = warning.amountCurrency.symbol, ) is CryptoCurrencyWarning.TopUpWithoutReserve -> TopUpWithoutReserve - is CryptoCurrencyWarning.HasPendingTransactions -> HasPendingTransactions( - coinSymbol = warning.blockchainSymbol, - ) is CryptoCurrencyWarning.SwapPromo -> SwapPromo( startDateTime = warning.startDateTime, endDateTime = warning.endDateTime, diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt index 0109f66fa5..82d586ce66 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt @@ -337,12 +337,12 @@ internal class TokenDetailsStateFactory( is ScenarioUnavailabilityReason.PendingTransaction -> { when (unavailabilityReason.withdrawalScenario) { ScenarioUnavailabilityReason.WithdrawalScenario.SEND -> resourceReference( - id = R.string.warning_send_blocked_pending_transactions_message, - formatArgs = wrappedList(unavailabilityReason.cryptoCurrencySymbol), + id = R.string.token_button_unavailability_reason_pending_transaction_send, + formatArgs = wrappedList(unavailabilityReason.networkName), ) ScenarioUnavailabilityReason.WithdrawalScenario.SELL -> resourceReference( id = R.string.token_button_unavailability_reason_pending_transaction_sell, - formatArgs = wrappedList(unavailabilityReason.cryptoCurrencySymbol), + formatArgs = wrappedList(unavailabilityReason.networkName), ) } } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCurrencyActionsClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCurrencyActionsClickIntents.kt index 3294411975..d45b21bf9c 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCurrencyActionsClickIntents.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/intents/WalletCurrencyActionsClickIntents.kt @@ -449,12 +449,12 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor( is ScenarioUnavailabilityReason.PendingTransaction -> { when (unavailabilityReason.withdrawalScenario) { ScenarioUnavailabilityReason.WithdrawalScenario.SEND -> resourceReference( - id = R.string.warning_send_blocked_pending_transactions_message, - formatArgs = wrappedList(unavailabilityReason.cryptoCurrencySymbol), + id = R.string.token_button_unavailability_reason_pending_transaction_send, + formatArgs = wrappedList(unavailabilityReason.networkName), ) ScenarioUnavailabilityReason.WithdrawalScenario.SELL -> resourceReference( id = R.string.token_button_unavailability_reason_pending_transaction_sell, - formatArgs = wrappedList(unavailabilityReason.cryptoCurrencySymbol), + formatArgs = wrappedList(unavailabilityReason.networkName), ) } }