Updated on 2026-08-14

2024-10-31 12:27:23 +05:00 · 2024-10-31 12:27:23 +05:00 · 58e6110121
commit 58e6110121
parent 78cb4a712f
13 changed files with 43 additions and 14 deletions
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeProvider.kt
@ -26,6 +26,9 @@ data class ExchangeProvider(

    @Json(name = "recommended")
    val isRecommended: Boolean = false,
+
+    @Json(name = "slippage")
+    val slippage: Int?,
 )

 enum class ExchangeProviderType {
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@ -551,9 +551,11 @@
  <string name="onboarding_wallet_info_title_fourth">Zugangscode wiederherstellen</string>
  <string name="onboarding_wallet_info_title_second">Identische Karten oder Ring</string>
  <string name="onboarding_wallet_info_title_third">Zugangscode</string>
+  <string name="onramp_pay_with">Bezahlen mit</string>
  <string name="onramp_residency_bottomsheet_country_not_supported">Unsere Dienstleistungen sind in diesem Land nicht verfügbar</string>
  <string name="onramp_residency_bottomsheet_country_subtitle">Änder oder bestätige bitte</string>
  <string name="onramp_residency_bottomsheet_title">Dein Wohnsitz wurde identifiziert als</string>
+  <string name="onramp_via">Über</string>
  <string name="organize_tokens_group">Gruppe erstellen</string>
  <string name="organize_tokens_sort_by_balance">Nach Guthaben</string>
  <string name="organize_tokens_title">Token organisieren</string>
@ -742,6 +744,7 @@
  <string name="staking_notification_new_validator_funds_transfer">Beim Staking im %1$s -Netzwerk mit einem neuen Validator werden alle zuvor eingesetzten Kryptos automatisch an diesen Validator übertragen</string>
  <string name="staking_notification_restake_rewards_text">Reinvestiert Deine verdienten Prämien in Deinen Einsatzbetrag und erhöht so den potenziellen Gewinn.</string>
  <string name="staking_notification_restake_text">Mit Restake kannst Du Dein Guthaben von einem Validator zu einem anderen verschieben, ohne dass Du den Stake aufheben musst.</string>
+  <string name="staking_notification_stake_entire_balance_text">Du bist dabei, Dein gesamtes Guthaben zu staken. Wir empfehlen, einen kleinen Betrag übrig zu lassen, um die Netzwerkgebühren für die Aufhebung des Stakes oder das Einfordern von Prämien abzudecken.</string>
  <string name="staking_notification_unlock_text">Entsperre dein Geld, um es aus dem Staking-Prozess abzuheben. Das Freischalten nimmt %s.</string>
  <string name="staking_notification_unstake_cosmos_text">Nach Ablauf der 21-tägigen Bindungsfrist kannst Du über Dein Guthaben verfügen. Die Prämie wird zusammen mit dem ungestaketen Guthaben abgehoben.</string>
  <string name="staking_notification_unstake_text">Deine Assets steht Dir nach Ablauf der Frist für die Aufhebung der Bindung %s zur Verfügung.</string>
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@ -742,6 +742,7 @@
  <string name="staking_notification_new_validator_funds_transfer">El staking en la red %1$s con un nuevo validador transferirá automáticamente todos los fondos previamente en staking a este validador.</string>
  <string name="staking_notification_restake_rewards_text">Reinvierta las recompensas obtenidas en el monto apostado, aumentando las ganancias potenciales.</string>
  <string name="staking_notification_restake_text">La opción de volver a staking le permite mover sus fondos de un validador a otro sin necesidad de retirarlos.</string>
+  <string name="staking_notification_stake_entire_balance_text">Está a punto de hacer staking con todo su saldo. Recomendamos dejar una cantidad para cubrir las tarifas de la red por unstaking o reclamo de recompensas.</string>
  <string name="staking_notification_unlock_text">Desbloquee su dinero para retirarlo del proceso de staking. El desbloqueo demora %s minuto.</string>
  <string name="staking_notification_unstake_cosmos_text">Sus fondos estarán disponibles para su uso después del período de desvinculación de 21 días. La recompensa se retirará junto con los fondos de desvinculación.</string>
  <string name="staking_notification_unstake_text">Sus fondos estarán disponibles para su uso después del período de desvinculación de %s.</string>
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@ -742,6 +742,7 @@
  <string name="staking_notification_new_validator_funds_transfer">Le staking dans le réseau %1$s avec un nouveau validateur transférera automatiquement tous les fonds précédemment stakés vers ce validateur</string>
  <string name="staking_notification_restake_rewards_text">Réinvestissez vos récompenses gagnées dans le montant que vous avez staké, augmentant ainsi vos gains potentiels.</string>
  <string name="staking_notification_restake_text">L\'option de restaker vous permet de déplacer vos fonds d\'un validateur à un autre sans avoir besoin de les déstaker.</string>
+  <string name="staking_notification_stake_entire_balance_text">Vous êtes sur le point de staker l\'intégralité de votre solde. Nous vous recommandons de laisser un petit montant pour couvrir les frais de réseau pour unstaking ou la réclamation des récompenses.</string>
  <string name="staking_notification_unlock_text">Débloquez votre argent pour le retirer du processus de staking. Le déverrouillage prend %s.</string>
  <string name="staking_notification_unstake_cosmos_text">Vos fonds seront disponibles à l\'utilisation après la période de déblocage de 21 jours. La récompense sera retirée en même temps que vos fonds de déblocage.</string>
  <string name="staking_notification_unstake_text">Vos fonds seront disponibles pour utilisation après la période de désengagement %s.</string>
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@ -543,9 +543,11 @@
  <string name="onboarding_wallet_info_title_fourth">アクセスコードの復元</string>
  <string name="onboarding_wallet_info_title_second">同一のカード</string>
  <string name="onboarding_wallet_info_title_third">アクセスコード</string>
+  <string name="onramp_pay_with">支払う</string>
  <string name="onramp_residency_bottomsheet_country_not_supported">この国では当社のサービスはご利用いただけません</string>
  <string name="onramp_residency_bottomsheet_country_subtitle">変更または確認</string>
  <string name="onramp_residency_bottomsheet_title">あなたの住居は次のように識別されています</string>
+  <string name="onramp_via">経由</string>
  <string name="organize_tokens_group">グループ</string>
  <string name="organize_tokens_sort_by_balance">残高順</string>
  <string name="organize_tokens_title">トークンを整理する</string>
@ -732,6 +734,7 @@
  <string name="staking_notification_new_validator_funds_transfer">新しいバリデーターで%1$sネットワークにステーキングすると、以前にステーキングされた資金はすべてこのバリデーターに自動的に転送されます。</string>
  <string name="staking_notification_restake_rewards_text">獲得した報酬をステーキングに再投資し、潜在的な収益を増やします。</string>
  <string name="staking_notification_restake_text">再ステーキングを使うと、ステーキングを解除することなく、あるバリデータから別のバリデータに資金を移動できます。</string>
+  <string name="staking_notification_stake_entire_balance_text">残高のすべてをステーキングしようとしています。ステーキング解除や報酬請求にかかるネットワーク手数料をカバーするために、少額を残しておくことをお勧めします。</string>
  <string name="staking_notification_unlock_text">資金をステーキングから引き出すには、ロックを解除してください。ロック解除には%sかかります。</string>
  <string name="staking_notification_unstake_cosmos_text">資金は、21日間のロック解除期間後に使用可能になります。報酬は、ロック解除後の資金とともに引き出されます。</string>
  <string name="staking_notification_unstake_text">%sのステーキング解除期間後、資金はすぐ利用可能となります。</string>
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@ -825,7 +825,8 @@
  <string name="swap_promo_title">Новый провайдер обмена!</string>
  <string name="swapping_alert_cex_description">В сумму включено: \n• комиссия провайдера сервиса\n• комиссия сети за отправку %s от биржи обратно на адрес пользователя.</string>
  <string name="swapping_alert_dex_description">В сумму включена комиссия провайдера сервиса.</string>
-  <string name="swapping_alert_title">Комиссии</string>
+  <string name="swapping_alert_slippage_description">Проскальзывание провайдера составляет до %s.</string>
+  <string name="swapping_alert_title">Информация</string>
  <string name="swapping_approve_information_text">Подтверждения считаются отраслевым стандартом для всех децентрализованных бирж и защищают ваш кошелек от доступа со стороны смарт-контракта без вашего разрешения. По замыслу смарт-контракты не могут получить доступ к вашим токенам, если вы не одобрите доступ со своей стороны. «Разблокируя» свои токены, вы даете смарт-контракту 1inch разрешение тратить ваши активы. Майнеры сети получают компенсацию за газ (оплачиваемый вами) за запись этого действия в блокчейне. Как только разрешение будет предоставлено, вы сможете обменять свой токен.</string>
  <string name="swapping_approve_information_title">Подтвердить</string>
  <string name="swapping_fee_estimation_error_text">Ошибка расчета комиссии. Пожалуйста, отправьте информацию в поддержку.</string>
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@ -810,7 +810,8 @@
  <string name="swap_promo_title">New Swap Provider Available!</string>
  <string name="swapping_alert_cex_description">The amount includes:\n• service provider\'s fee\n• network fee for sending %s from the exchange back to the user\'s address.</string>
  <string name="swapping_alert_dex_description">The amount includes the service provider\'s fee.</string>
-  <string name="swapping_alert_title">Fees</string>
+  <string name="swapping_alert_slippage_description">Provider slippage is up to %s.</string>
+  <string name="swapping_alert_title">Information</string>
  <string name="swapping_approve_information_text">All decentralized exchanges require approvals to prevent smart contracts from accessing your wallet without your permission. By design, smart contracts can\'t access your tokens unless you approve. By \"unlocking\" your tokens, you authorize the 1-inch smart contract to spend them. The network\'s miners receive a gas fee (paid by you) to record this action on the blockchain. You can swap your token after giving approval.</string>
  <string name="swapping_approve_information_title">Approve</string>
  <string name="swapping_fee_estimation_error_text">Fee estimation error. Please send feedback to support.</string>
--- a/core/utils/src/main/java/com/tangem/utils/StringsSigns.kt
+++ b/core/utils/src/main/java/com/tangem/utils/StringsSigns.kt
@ -10,4 +10,5 @@ object StringsSigns {
    const val TILDE_SIGN = "~"
    const val INFINITY_SIGN = "∞"
    const val NON_BREAKING_SPACE = '\u00A0'
+    const val PERCENT = "%"
 }
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapPairInfoConverter.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapPairInfoConverter.kt
@ -46,6 +46,7 @@ class SwapPairInfoConverter : Converter<SwapPairsWithProviders, PairsWithProvide
            termsOfUse = exchangeProvider.termsOfUse,
            privacyPolicy = exchangeProvider.privacyPolicy,
            isRecommended = exchangeProvider.isRecommended,
+            slippage = exchangeProvider.slippage,
        )
    }

@ -63,6 +64,7 @@ class SwapPairInfoConverter : Converter<SwapPairsWithProviders, PairsWithProvide
            termsOfUse = additionalProvider.termsOfUse,
            privacyPolicy = additionalProvider.privacyPolicy,
            isRecommended = additionalProvider.isRecommended,
+            slippage = additionalProvider.slippage,
        )
    }

--- a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/SwapPairLeast.kt
+++ b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/SwapPairLeast.kt
@ -39,6 +39,7 @@ data class SwapProvider(
    val termsOfUse: String?,
    val privacyPolicy: String?,
    val isRecommended: Boolean = false,
+    val slippage: Int?,
 )

 enum class ExchangeProviderType(val providerName: String) {
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapAlertUM.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapAlertUM.kt
@ -25,12 +25,12 @@ sealed class SwapAlertUM : AlertUM {
            resourceReference(id = R.string.common_support)
    }

-    data class FeesAlert(
+    data class InformationAlert(
        override val message: TextReference,
        override val onConfirmClick: (() -> Unit),
    ) : SwapAlertUM() {
        override val title: TextReference = resourceReference(
-            com.tangem.feature.swap.presentation.R.string.swapping_alert_title,
+            R.string.swapping_alert_title,
        )
        override val confirmButtonText: TextReference =
            resourceReference(id = R.string.common_ok)
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@ -34,6 +34,7 @@ import com.tangem.feature.swap.utils.getExpressErrorTitle
 import com.tangem.feature.swap.viewmodels.SwapProcessDataState
 import com.tangem.utils.Provider
 import com.tangem.utils.StringsSigns.DASH_SIGN
+import com.tangem.utils.StringsSigns.PERCENT
 import com.tangem.utils.StringsSigns.TILDE_SIGN
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@ -1089,28 +1090,39 @@ internal class StateBuilder(
        uiState: SwapStateHolder,
        isPriceImpact: Boolean,
        token: String,
-        providerType: ExchangeProviderType,
+        provider: SwapProvider,
        onDismiss: () -> Unit,
    ): SwapStateHolder {
-        val message = when (providerType) {
-            ExchangeProviderType.CEX -> resourceReference(R.string.swapping_alert_cex_description, wrappedList(token))
-            ExchangeProviderType.DEX, ExchangeProviderType.DEX_BRIDGE -> {
-                val refs = buildList {
+        val combinedMessage = buildList {
+            when (provider.type) {
+                ExchangeProviderType.CEX -> {
+                    add(resourceReference(R.string.swapping_alert_cex_description, wrappedList(token)))
+                }
+                ExchangeProviderType.DEX,
+                ExchangeProviderType.DEX_BRIDGE,
+                -> {
                    if (isPriceImpact) {
                        add(resourceReference(R.string.swapping_high_price_impact_description))
                        add(stringReference("\n\n"))
                    }
                    add(resourceReference(R.string.swapping_alert_dex_description))
                }
-
-                combinedReference(refs.toWrappedList())
+            }
+            provider.slippage?.let { slippage ->
+                add(stringReference("\n\n"))
+                add(
+                    resourceReference(
+                        R.string.swapping_alert_slippage_description,
+                        wrappedList("$slippage$PERCENT"),
+                    ),
+                )
            }
        }
        return uiState.copy(
            event = triggeredEvent(
                SwapEvent.ShowAlert(
-                    SwapAlertUM.FeesAlert(
-                        message = message,
+                    SwapAlertUM.InformationAlert(
+                        message = combinedReference(combinedMessage.toWrappedList()),
                        onConfirmClick = onDismiss,
                    ),
                ),
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@ -1067,7 +1067,7 @@ internal class SwapViewModel @Inject constructor(
                    uiState = uiState,
                    isPriceImpact = isPriceImpact,
                    token = currencySymbol,
-                    providerType = selectedProvider.type,
+                    provider = selectedProvider,
                ) {
                    uiState = stateBuilder.clearAlert(uiState)
                }