From 74a5e9e0e9c20ddb99312876e01ffcf8d7ec67c4 Mon Sep 17 00:00:00 2001
From: iMaks99 <45900939+iMaks99@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:18:07 +0500
Subject: [PATCH 1/9] AND-9467 Fixed Onramp: no error when providers in
 /onramp-pairs are empty

---
 .../java/com/tangem/data/onramp/DefaultOnrampRepository.kt     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
index 3e64c44edd..195fa95a25 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
@@ -385,6 +385,9 @@ internal class DefaultOnrampRepository(
                     },
                 )
             }
+
+            if (onrampProviders.isEmpty()) throw OnrampPairsError.PairsNotFound
+
             OnrampPair(onrampProviders)
         }
         pairsStore.store(PAIRS_KEY, onrampPairs)

From d04c6d2ace9c2b20a2bc726ca42728e01c46daed Mon Sep 17 00:00:00 2001
From: iMaks99 <45900939+iMaks99@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:18:34 +0500
Subject: [PATCH 2/9] AND-9468 Fixed Onramp: No available provider error does
 not dissapear after change currency

---
 .../factory/amount/OnrampAmountStateFactory.kt | 18 ++++++++++++++++++
 .../main/model/OnrampMainComponentModel.kt     |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
index 9b9a6955cf..f9d3a8473e 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
@@ -1,6 +1,7 @@
 package com.tangem.features.onramp.main.entity.factory.amount
 
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
@@ -144,6 +145,23 @@ internal class OnrampAmountStateFactory(
         )
     }
 
+    fun getAmountSecondaryResetState(): OnrampMainComponentUM {
+        val currentState = currentStateProvider()
+        if (currentState !is OnrampMainComponentUM.Content) return currentState
+
+        val amountState = currentState.amountBlockState
+
+        if (amountState.secondaryFieldModel is OnrampAmountSecondaryFieldUM.Content) return currentState
+
+        return currentState.copy(
+            amountBlockState = amountState.copy(
+                secondaryFieldModel = OnrampAmountSecondaryFieldUM.Content(
+                    amount = TextReference.EMPTY,
+                ),
+            ),
+        )
+    }
+
     private fun OnrampQuote.toProviderBlockState(isBestRate: Boolean): OnrampProviderBlockUM {
         return OnrampProviderBlockUM.Content(
             paymentMethod = paymentMethod,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
index c3610c16d1..43915a8e50 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
@@ -157,7 +157,11 @@ internal class OnrampMainComponentModel @Inject constructor(
     }
 
     private suspend fun updatePairsAndQuotes() {
-        fetchPairsUseCase.invoke(params.cryptoCurrency).onLeft(::handleOnrampError)
+        _state.update { amountStateFactory.getAmountSecondaryLoadingState() }
+        fetchPairsUseCase.invoke(params.cryptoCurrency).fold(
+            ifLeft = ::handleOnrampError,
+            ifRight = { _state.update { amountStateFactory.getAmountSecondaryResetState() } },
+        )
         startLoadingQuotes()
     }
 

From c8535819c5ccb8d6fa729e91eafc8af22913befd Mon Sep 17 00:00:00 2001
From: iMaks99 <45900939+iMaks99@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:18:41 +0500
Subject: [PATCH 3/9] AND-9469 Fixed Onramp: infinite loader when there is
 error on all quotes

---
 .../main/entity/factory/OnrampStateFactory.kt |  3 +-
 .../main/model/OnrampMainComponentModel.kt    | 74 ++++++++++---------
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
index 3af6368c14..015923aafc 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
@@ -74,7 +74,7 @@ internal class OnrampStateFactory(
         )
     }
 
-    private fun getErrorState(errorCode: String? = null): OnrampMainComponentUM {
+    fun getErrorState(errorCode: String? = null): OnrampMainComponentUM {
         val state = currentStateProvider()
         val endButton = state.topBarConfig.endButtonUM.copy(enabled = true)
 
@@ -84,6 +84,7 @@ internal class OnrampStateFactory(
                 buyButtonConfig = state.buyButtonConfig.copy(enabled = false),
                 amountBlockState = state.amountBlockState.copy(
                     amountFieldModel = state.amountBlockState.amountFieldModel.copy(isError = true),
+                    secondaryFieldModel = OnrampAmountSecondaryFieldUM.Content(TextReference.EMPTY),
                 ),
                 providerBlockState = OnrampProviderBlockUM.Empty,
                 errorNotification = NotificationUM.Warning.OnrampErrorNotification(
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
index 43915a8e50..70508d247c 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt
@@ -199,39 +199,7 @@ internal class OnrampMainComponentModel @Inject constructor(
             .onEach { maybeQuotes ->
                 maybeQuotes.fold(
                     ifLeft = ::handleOnrampError,
-                    ifRight = { quotes ->
-                        quotes.filterIsInstance<OnrampQuote.Error>().forEach { errorState ->
-                            sendOnrampErrorAnalytic(errorState.error)
-                        }
-                        val quote = quotes.firstOrNull() ?: return@onEach
-
-                        val bestProvider = quote as? OnrampQuote.Data
-                        val isMultipleQuotes = !quotes.isSingleItem()
-                        val isOtherQuotesHasData = quotes
-                            .filter { it.paymentMethod == quote.paymentMethod }
-                            .filterNot { it == bestProvider }
-                            .any { it is OnrampQuote.Data }
-                        val hasBestProvider = isMultipleQuotes && isOtherQuotesHasData
-
-                        val isBestProvider = quote == bestProvider && hasBestProvider
-
-                        if (quote is OnrampQuote.Data && lastAmount.value != quote.fromAmount.value) {
-                            lastAmount.value = quote.fromAmount.value
-                            analyticsEventHandler.send(
-                                OnrampAnalyticsEvent.ProviderCalculated(
-                                    providerName = quote.provider.info.name,
-                                    tokenSymbol = params.cryptoCurrency.symbol,
-                                    paymentMethod = quote.paymentMethod.name,
-                                ),
-                            )
-                        }
-                        _state.update {
-                            amountStateFactory.getAmountSecondaryUpdatedState(
-                                quote = quote,
-                                isBestRate = isBestProvider,
-                            )
-                        }
-                    },
+                    ifRight = ::handleQuoteResult,
                 )
             }
             .launchIn(modelScope)
@@ -300,6 +268,46 @@ internal class OnrampMainComponentModel @Inject constructor(
         super.onDestroy()
     }
 
+    private fun handleQuoteResult(quotes: List<OnrampQuote>) {
+        quotes.filterIsInstance<OnrampQuote.Error>().forEach { errorState ->
+            sendOnrampErrorAnalytic(errorState.error)
+        }
+
+        val quote = quotes.firstOrNull()
+
+        if (quote == null) {
+            _state.update { stateFactory.getErrorState() }
+            return
+        }
+
+        val bestProvider = quote as? OnrampQuote.Data
+        val isMultipleQuotes = !quotes.isSingleItem()
+        val isOtherQuotesHasData = quotes
+            .filter { it.paymentMethod == quote.paymentMethod }
+            .filterNot { it == bestProvider }
+            .any { it is OnrampQuote.Data }
+        val hasBestProvider = isMultipleQuotes && isOtherQuotesHasData
+
+        val isBestProvider = quote == bestProvider && hasBestProvider
+
+        if (quote is OnrampQuote.Data && lastAmount.value != quote.fromAmount.value) {
+            lastAmount.value = quote.fromAmount.value
+            analyticsEventHandler.send(
+                OnrampAnalyticsEvent.ProviderCalculated(
+                    providerName = quote.provider.info.name,
+                    tokenSymbol = params.cryptoCurrency.symbol,
+                    paymentMethod = quote.paymentMethod.name,
+                ),
+            )
+        }
+        _state.update {
+            amountStateFactory.getAmountSecondaryUpdatedState(
+                quote = quote,
+                isBestRate = isBestProvider,
+            )
+        }
+    }
+
     private fun showDemoWarning() {
         val alertUM = AlertDemoModeUM(onConfirmClick = {})
 

From effb76fcac29c431511b4db56fc1a0684a7a63b7 Mon Sep 17 00:00:00 2001
From: iMaks99 <45900939+iMaks99@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:18:47 +0500
Subject: [PATCH 4/9] AND-9474 Fixed Onramp: no quote requests if enter number
 with a dot

---
 .../entity/factory/amount/OnrampAmountFieldChangeConverter.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountFieldChangeConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountFieldChangeConverter.kt
index 72a1c7a608..de2bf21fd3 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountFieldChangeConverter.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountFieldChangeConverter.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.utils.parseBigDecimalOrNull
 import com.tangem.features.onramp.main.entity.OnrampAmountSecondaryFieldUM
 import com.tangem.features.onramp.main.entity.OnrampMainComponentUM
 import com.tangem.features.onramp.main.entity.OnrampProviderBlockUM
@@ -24,7 +25,7 @@ internal class OnrampAmountFieldChangeConverter(
 
         val amountState = state.amountBlockState
         val amountTextField = amountState.amountFieldModel
-        val fiatDecimal = value.toBigDecimalOrNull() ?: BigDecimal.ZERO
+        val fiatDecimal = value.parseBigDecimalOrNull() ?: BigDecimal.ZERO
         val isDoneActionEnabled = !fiatDecimal.isNullOrZero()
         val amountFieldModel = amountState.amountFieldModel.copy(
             fiatValue = value,

From 7d93987bdd88f2c893511eb51bbb4198496ad9a3 Mon Sep 17 00:00:00 2001
From: Anton Tkachev <iiiburnyiii@gmail.com>
Date: Fri, 13 Dec 2024 14:18:12 +0400
Subject: [PATCH 5/9] AND-9455 [Custom Token] Removed derivation path selector
 display when HD wallet is not supported

---
 .../com/tangem/domain/tokens/model/Network.kt |  2 +-
 .../PreviewCustomTokenFormComponent.kt        |  2 +-
 .../entity/customtoken/CustomTokenFormUM.kt   |  2 +-
 .../model/CustomTokenFormModel.kt             | 28 ++++++++++++-------
 .../managetokens/ui/CustomTokenFormContent.kt | 16 ++++++++---
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
index ecec15cb33..d9f986af09 100644
--- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/Network.kt
@@ -82,7 +82,7 @@ data class Network(
         data class Custom(override val value: String) : DerivationPath()
 
         /**
-         * Represents a lack of derivation path.
+         * Represents a lack of derivation path, which means the wallet does not support the HD wallet feature.
          */
         @Serializable
         data object None : DerivationPath() {
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewCustomTokenFormComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewCustomTokenFormComponent.kt
index 599776031c..312678a0c2 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewCustomTokenFormComponent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewCustomTokenFormComponent.kt
@@ -18,7 +18,7 @@ import kotlinx.collections.immutable.toPersistentMap
 
 internal class PreviewCustomTokenFormComponent(
     networkName: ClickableFieldUM = PreviewCustomTokenFormComponent.networkName,
-    derivationPath: ClickableFieldUM = PreviewCustomTokenFormComponent.derivationPath,
+    derivationPath: ClickableFieldUM? = PreviewCustomTokenFormComponent.derivationPath,
     canAddToken: Boolean = false,
     tokenForm: CustomTokenFormUM.TokenFormUM? = PreviewCustomTokenFormComponent.tokenForm,
     notifications: PersistentList<CustomTokenFormUM.NotificationUM> = PreviewCustomTokenFormComponent.notifications,
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/entity/customtoken/CustomTokenFormUM.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/entity/customtoken/CustomTokenFormUM.kt
index 085d721b82..e85644cbe4 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/entity/customtoken/CustomTokenFormUM.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/entity/customtoken/CustomTokenFormUM.kt
@@ -10,7 +10,7 @@ import kotlinx.collections.immutable.persistentMapOf
 
 internal data class CustomTokenFormUM(
     val networkName: ClickableFieldUM,
-    val derivationPath: ClickableFieldUM,
+    val derivationPath: ClickableFieldUM?,
     val tokenForm: TokenFormUM?,
     val notifications: PersistentList<NotificationUM> = persistentListOf(),
     val canAddToken: Boolean = false,
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/CustomTokenFormModel.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/CustomTokenFormModel.kt
index 61220167cc..0e0198c571 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/CustomTokenFormModel.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/model/CustomTokenFormModel.kt
@@ -37,7 +37,8 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
-@Suppress("LongParameterList")
+// TODO: Divide to sub-components: https://tangem.atlassian.net/browse/AND-9479
+@Suppress("LongParameterList", "LargeClass")
 @ComponentScoped
 internal class CustomTokenFormModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
@@ -83,19 +84,26 @@ internal class CustomTokenFormModel @Inject constructor(
             } else {
                 null
             },
-            derivationPath = ClickableFieldUM(
-                label = resourceReference(R.string.custom_token_derivation_path),
-                value = if (params.derivationPath == null || params.derivationPath.isDefault) {
-                    resourceReference(R.string.custom_token_derivation_path_default)
-                } else {
-                    stringReference(params.derivationPath.name)
-                },
-                onClick = ::selectDerivationPath,
-            ),
+            derivationPath = getDerivationPathFormIfSupported(),
             saveToken = ::addCurrency,
         )
     }
 
+    private fun getDerivationPathFormIfSupported(): ClickableFieldUM? {
+        // If network doesn't support derivation path, return null
+        if (params.network.derivationPath is Network.DerivationPath.None) return null
+
+        return ClickableFieldUM(
+            label = resourceReference(R.string.custom_token_derivation_path),
+            value = if (params.derivationPath == null || params.derivationPath.isDefault) {
+                resourceReference(R.string.custom_token_derivation_path_default)
+            } else {
+                stringReference(params.derivationPath.name)
+            },
+            onClick = ::selectDerivationPath,
+        )
+    }
+
     @OptIn(FlowPreview::class)
     private fun observeTokenFormUpdates() {
         state
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenFormContent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenFormContent.kt
index 5880c3f679..b175af525f 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenFormContent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenFormContent.kt
@@ -117,12 +117,13 @@ private fun FormContent(model: CustomTokenFormUM, modifier: Modifier = Modifier)
 
         val tokenForm = model.tokenForm
         if (tokenForm != null) {
-            TokenForm(tokenForm)
+            TokenForm(tokenForm = tokenForm)
         }
 
-        ClickableField(
-            model = model.derivationPath,
-        )
+        val derivationPath = model.derivationPath
+        if (derivationPath != null) {
+            ClickableField(model = derivationPath)
+        }
 
         model.notifications.fastForEach { notification ->
             Notification(
@@ -278,6 +279,13 @@ private class PreviewCustomTokenFormComponentProvider :
             PreviewCustomTokenFormComponent(
                 tokenForm = null,
             ),
+            PreviewCustomTokenFormComponent(
+                derivationPath = null,
+            ),
+            PreviewCustomTokenFormComponent(
+                tokenForm = null,
+                derivationPath = null,
+            ),
         )
 }
 // endregion Preview

From 39e67b9d2eba5206691028e92be2c2004295260e Mon Sep 17 00:00:00 2001
From: iMaks99 <45900939+iMaks99@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:14:46 +0500
Subject: [PATCH 6/9] AND-9480 Fixed Onramp: update texts on Choose provider
 screen

---
 core/res/src/main/res/values-de/strings.xml   |  5 +--
 core/res/src/main/res/values-es/strings.xml   |  9 ++++++
 core/res/src/main/res/values-fr/strings.xml   | 20 +++++++++++-
 core/res/src/main/res/values-ja/strings.xml   |  3 +-
 core/res/src/main/res/values-ru/strings.xml   |  8 ++---
 .../src/main/res/values-uk-rUA/strings.xml    | 32 ++++++++++++++++++-
 core/res/src/main/res/values/strings.xml      |  2 +-
 .../src/main/res/drawable/ic_lightning_16.xml |  0
 .../providers/ui/SelectProviderBottomSheet.kt | 26 +++++++++++++++
 9 files changed, 95 insertions(+), 10 deletions(-)
 rename {features/swap/presentation => core/ui}/src/main/res/drawable/ic_lightning_16.xml (100%)

diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 1055b86c5d..3cc2368a82 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -258,7 +258,7 @@
   <string name="express_by_provider">Bereitgestellt von</string>
   <string name="express_cex_status_button_title">Status</string>
   <string name="express_choose_providers_subtitle">Tangem bietet Token-Swaps über Drittanbieter gemäß den jeweiligen Bedingungen des jeweiligen Anbieters an.</string>
-  <string name="express_choose_providers_title">Anbieter wählen</string>
+  <string name="express_choose_providers_title">Anbieter</string>
   <string name="express_error_code">Es ist ein Fehler aufgetreten. Code: %s</string>
   <string name="express_error_provider_amount_roundup">Fehler %1$s. Der ausgewählte Anbieter kann die angegebene Transaktion nicht verarbeiten. Bitte runde den Wert auf %2$s auf oder änder diesen.</string>
   <string name="express_error_swap_pair_unavailable">Der gewählte Anbieter ist im Moment nicht verfügbar. Bitte versuche es später noch einmal. (Code: %s)</string>
@@ -584,6 +584,7 @@
   <string name="onramp_country_search">Suche nach Land</string>
   <string name="onramp_country_unavailable">Nicht verfügbar</string>
   <string name="onramp_currency_search">Suche nach Währung</string>
+  <string name="onramp_legal">Durch die Nutzung der Onramp-Funktionalität stimmst Du den %1$s und %2$s des Anbieters zu.</string>
   <string name="onramp_max_amount_restriction">Der Kaufbetrag sollte nicht höher sein als %s</string>
   <string name="onramp_min_amount_restriction">Der zu kaufende Betrag muss mindestens %s betragen</string>
   <string name="onramp_no_available_providers">Keine verfügbaren Anbieter für diese Währung</string>
@@ -665,7 +666,7 @@
   <string name="scan_card_settings_message">Scanne die Karte oder Ring, um ihre Einstellungen zu ändern. Die Änderungen wirken sich nur auf die von dir gescannte Karte oder Ring aus und haben keine Auswirkungen auf andere mit deiner Wallet verknüpften Geräte.</string>
   <string name="scan_card_settings_title">Halte deine Karte oder Ring bereit!</string>
   <string name="security_alert_title">Sicherheitswarnung</string>
-  <string name="selling_insufficient_balance_alert_message">Dein Konto verfügt nicht über genügend Guthaben, um diese Kryptowährung zu verkaufen. Bitte zahle den gewünschten Vermögenswert ein, um fortzufahren.</string>
+  <string name="selling_insufficient_balance_alert_message">Dein Konto verfügt nicht über ausreichend Guthaben, um Kryptowährungen zu verkaufen. Bitte zahle den gewünschten Vermögenswert ein, um fortzufahren.</string>
   <string name="selling_insufficient_balance_alert_title">Unzureichendes Guthaben</string>
   <string name="selling_regional_restriction_alert_message">Der Verkauf von Kryptowährung ist in Deiner Region derzeit nicht möglich. Wir arbeiten aktiv daran, Ihnen diese Option bald anzubieten – bleib dran!</string>
   <string name="selling_regional_restriction_alert_title">Regionale Einschränkung</string>
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index 8ecdd2c7e7..683983950c 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -3,6 +3,9 @@
   <string name="action_buttons_buy_empty_search_message">¿No encuentra el token en su billetera? Consulte los mercados para encontrarlo y añadirlo a la compra</string>
   <string name="action_buttons_sell_empty_search_message">¿No encuentra el token en su billetera? Consulte los mercados para encontrarlo y añadirlo a la venta</string>
   <string name="action_buttons_sell_navigation_bar_title">Vender</string>
+  <string name="action_buttons_service_loading_alert_message">Esto puede tardar unos segundos. Inténtelo de nuevo más tarde.</string>
+  <string name="action_buttons_service_loading_alert_title">Los datos aún no se han cargado.</string>
+  <string name="action_buttons_something_wrong_alert_message">La acción no está disponible actualmente. Inténtalo de nuevo más tarde o actualiza los datos deslizando el dedo hacia abajo en la pantalla.</string>
   <string name="action_buttons_swap_choose_token">Elige el token</string>
   <string name="action_buttons_swap_empty_search_message">¿No encuentras el token en tu billetera? Consulte los mercados para encontrarlo y agregarlo al intercambio</string>
   <string name="action_buttons_swap_no_available_pair_notification_message">No hay tokens disponibles para intercambiar con el token seleccionado. Por favor elige otro.</string>
@@ -308,6 +311,7 @@
   <string name="feedback_preface_scan_failed">Por favor, díganos qué tarjeta tiene</string>
   <string name="feedback_preface_support">Hola equipo de soporte,</string>
   <string name="feedback_preface_tx_failed">Por favor, cuéntenos más sobre tu problema. Cada pequeño detalle puede ayudar.</string>
+  <string name="feedback_subject_pre_activated_wallet">Billetera previamente activada</string>
   <string name="feedback_subject_rate_negative">Mis recomendaciones</string>
   <string name="feedback_subject_scan_failed">No se puede escanear una tarjeta</string>
   <string name="feedback_subject_support">Comentarios</string>
@@ -571,6 +575,7 @@
   <string name="onramp_country_search">Buscar por país</string>
   <string name="onramp_country_unavailable">Indisponible</string>
   <string name="onramp_currency_search">Buscar por moneda</string>
+  <string name="onramp_legal">Al utilizar la funcionalidad onramp, acepta %1$s y %2$s del proveedor.</string>
   <string name="onramp_max_amount_restriction">El monto de la compra no debe ser mayor a %s</string>
   <string name="onramp_min_amount_restriction">La cantidad a comprar debe ser como mínimo %s</string>
   <string name="onramp_no_available_providers">No hay proveedores disponibles para esta moneda</string>
@@ -650,6 +655,7 @@
   <string name="scan_card_settings_button">Escanee su tarjeta</string>
   <string name="scan_card_settings_message">Escanee la tarjeta para cambiar sus ajustes. Los cambios afectarán solo a la tarjeta que has escaneado y no afectarán a otras tarjetas vinculadas a su billetera.</string>
   <string name="scan_card_settings_title">¡Prepare su tarjeta!</string>
+  <string name="security_alert_title">Alerta de seguridad</string>
   <string name="selling_insufficient_balance_alert_message">No tiene fondos suficientes en su saldo para vender esta criptomoneda. Deposite el activo deseado para continuar.</string>
   <string name="selling_insufficient_balance_alert_title">Saldo insuficiente</string>
   <string name="selling_regional_restriction_alert_message">La venta de criptomonedas no está disponible en su región en este momento. Estamos trabajando activamente para ofrecerle esta opción pronto. ¡Manténgase conectado!</string>
@@ -694,6 +700,7 @@
   <string name="send_notification_fee_too_high_title">Los aranceles aduaneros son altos</string>
   <string name="send_notification_high_fee_text">Debido a las peculiaridades de la red %1$s, la tarifa por transferir el saldo completo es más alta. Para reducir la comisión, puedes dejar %2$s.</string>
   <string name="send_notification_high_fee_title">La tarifa es más alta</string>
+  <string name="send_notification_invalid_amount_rent_fee">Su saldo no puede ser inferior al monto del alquiler. Mantenga al menos %1$s en su cuenta o retire todos los fondos.</string>
   <string name="send_notification_invalid_amount_text">La comisión incluida excede el monto de la transferencia, lo que resulta en un valor negativo</string>
   <string name="send_notification_invalid_amount_title">Cantidad no válida</string>
   <string name="send_notification_invalid_minimum_amount_text">La cantidad mínima de envío es %1$s. Asegúrate de que el saldo restante después del envío no sea menor que %2$s.</string>
@@ -866,6 +873,7 @@
   <string name="swapping_to_title">Usted recibe</string>
   <string name="swapping_token_list_title">Elige token</string>
   <string name="swapping_token_not_available">no disponible</string>
+  <string name="this_is_my_wallet_title">Esta es mi billetera</string>
   <string name="toast_balances_hidden">Saldos ocultos</string>
   <string name="toast_balances_shown">Saldos mostrados</string>
   <string name="toast_undo">Cancelar</string>
@@ -935,6 +943,7 @@
   <string name="user_wallet_list_unlock_all_with">Desbloquear todo con %s</string>
   <string name="wallet_balance_blockchain_unreachable_try_later">La blockchain está Inaccesible. Inténtelo más tarde</string>
   <string name="wallet_balance_missing_derivation">Escanee la tarjeta o el anillo</string>
+  <string name="wallet_been_activated_message">Esta billetera ya ha sido activada anteriormente.\nSi no fue usted quien lo hizo, comuníquese con el servicio de asistencia.\nTangem nunca vende billeteras junto con el código de acceso generado previamente.</string>
   <string name="wallet_connect_alert_sign_message">Solicitud para firmar un mensaje.\n\n%s</string>
   <string name="wallet_connect_bnb_sign_message">Dapp %1$s, solicitando\nfirmar transacción BNB.\n\n%2$s</string>
   <string name="wallet_connect_bnb_trade_order_message">Orden de intercambio por %1$s\nPrecio: %2$s\nCantidad a recibir: %3$s\nCantidad a pagar: %4$s</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 4e3fe4704b..55d428f3d3 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -3,10 +3,18 @@
   <string name="action_buttons_buy_empty_search_message">Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à l\'achat</string>
   <string name="action_buttons_sell_empty_search_message">Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à la vente</string>
   <string name="action_buttons_sell_navigation_bar_title">Vendre</string>
+  <string name="action_buttons_service_loading_alert_message">Cela peut prendre quelques secondes. Veuillez réessayer plus tard.</string>
+  <string name="action_buttons_service_loading_alert_title">Les données n\'ont pas encore été chargées.</string>
+  <string name="action_buttons_something_wrong_alert_message">Cette action n\'est pas disponible actuellement. Veuillez réessayer plus tard ou actualiser les données en faisant glisser votre doigt vers le bas sur l\'écran.</string>
+  <string name="action_buttons_something_wrong_alert_title">Le bouton n\'est pas disponible</string>
   <string name="action_buttons_swap_choose_token">Choisissez le jeton</string>
   <string name="action_buttons_swap_empty_search_message">Jeton non trouvé dans votre portefeuille ? Consultez les marchés pour le trouver et l\'ajouter à l\'échange</string>
   <string name="action_buttons_swap_no_available_pair_notification_message">Il n\'y a pas de token disponible pour échanger avec le token sélectionné. Veuillez en choisir un autre.</string>
   <string name="action_buttons_swap_no_available_pair_notification_title">Aucune paire disponible</string>
+  <string name="action_buttons_swap_no_tokens_added_alert_message">Pour utiliser la fonction d\'échange, votre portefeuille doit contenir au moins 2 jetons.</string>
+  <string name="action_buttons_swap_no_tokens_added_alert_title">Ajouter des jetons</string>
+  <string name="action_buttons_swap_not_enough_tokens_alert_message">Vous n\'avez qu\'un seul token ajouté à votre portefeuille. Pour utiliser la fonction d\'échange, vous devez ajouter au moins 2 tokens.</string>
+  <string name="action_buttons_swap_not_enough_tokens_alert_title">Ajouter des jetons</string>
   <string name="action_buttons_you_want_to_receive">Sélectionnez le jeton que vous souhaitez recevoir</string>
   <string name="action_buttons_you_want_to_swap">Sélectionnez le jeton que vous souhaitez échanger</string>
   <string name="add_custom_token_choose_network">Choisissez le réseau</string>
@@ -250,7 +258,7 @@
   <string name="express_by_provider">Fourni par</string>
   <string name="express_cex_status_button_title">Statut</string>
   <string name="express_choose_providers_subtitle">Tangem propose des échanges de jetons via des fournisseurs tiers selon les conditions de chaque fournisseur</string>
-  <string name="express_choose_providers_title">Choisissez un fournisseur</string>
+  <string name="express_choose_providers_title">Fournisseur</string>
   <string name="express_error_code">Une erreur s\'est produite. Code : %s</string>
   <string name="express_error_provider_amount_roundup">Erreur %1$s. Le fournisseur sélectionné ne peut pas traiter la transaction spécifiée. Veuillez arrondir la valeur à %2$s ou la modifier</string>
   <string name="express_error_swap_pair_unavailable">Le fournisseur sélectionné n\'est pas disponible pour le moment. Veuillez réessayer plus tard. (Code : %s)</string>
@@ -263,6 +271,9 @@
   <string name="express_exchange_notification_refund_title">Le montant a été remboursé en %1$s (réseau %2$s)</string>
   <string name="express_exchange_notification_verification_text">Visitez le site Web du fournisseur pour la vérification</string>
   <string name="express_exchange_notification_verification_title">Vérification KYC requise par le fournisseur</string>
+  <string name="express_exchange_status_bought">Acheté</string>
+  <string name="express_exchange_status_buying">Achat</string>
+  <string name="express_exchange_status_buying_active">En cours d\'achat</string>
   <string name="express_exchange_status_canceled">Annulé</string>
   <string name="express_exchange_status_confirmed">Confirmé</string>
   <string name="express_exchange_status_confirming">En attente de confirmation</string>
@@ -308,6 +319,7 @@
   <string name="feedback_preface_scan_failed">Veuillez nous dire quelle carte vous avez</string>
   <string name="feedback_preface_support">Chère équipe de support,</string>
   <string name="feedback_preface_tx_failed">Veuillez nous en dire plus sur votre problème. Chaque petit détail peut nous aider.</string>
+  <string name="feedback_subject_pre_activated_wallet">Portefeuille précédemment activé</string>
   <string name="feedback_subject_rate_negative">Mes suggestions</string>
   <string name="feedback_subject_scan_failed">Impossible de scanner une carte</string>
   <string name="feedback_subject_support">Commentaires</string>
@@ -571,6 +583,7 @@
   <string name="onramp_country_search">Recherche par pays</string>
   <string name="onramp_country_unavailable">Indisponible</string>
   <string name="onramp_currency_search">Recherche par devise</string>
+  <string name="onramp_legal">En utilisant la fonctionnalité onramp, vous acceptez %1$s et %2$s du fournisseur</string>
   <string name="onramp_max_amount_restriction">Le montant de l\'achat ne doit pas dépasser %s</string>
   <string name="onramp_min_amount_restriction">Le montant à acheter doit être au moins %s</string>
   <string name="onramp_no_available_providers">Aucun fournisseur disponible pour cette devise</string>
@@ -599,6 +612,7 @@
   <string name="receive_bottom_sheet_warning_message">%1$s (%2$s) sur le réseau %3$s</string>
   <string name="receive_bottom_sheet_warning_message_description">L’envoi de toute autre devise entraînera sa perte irréversible.</string>
   <string name="receive_bottom_sheet_warning_message_full">Envoyez uniquement %s à cette adresse. L\'envoi de toute autre devise entraînera sa perte irréversible.</string>
+  <string name="receive_bottom_sheet_warning_title">Envoyez uniquement %1$s sur le réseau %2$s</string>
   <string name="receive_token_description">Transférez des fonds depuis un autre portefeuille ou une autre bourse</string>
   <string name="referral_button_participate">Participer</string>
   <string name="referral_error_failed_to_load_info">Échec du chargement des informations sur le programme de parrainage. Veuillez réessayer plus tard.</string>
@@ -650,6 +664,7 @@
   <string name="scan_card_settings_button">Scannez votre carte</string>
   <string name="scan_card_settings_message">Scannez la carte pour modifier ses paramètres. Les modifications n\'affecteront que la carte que vous avez scannée et n\'affecteront pas les autres cartes liées à votre portefeuille.</string>
   <string name="scan_card_settings_title">Préparez votre carte !</string>
+  <string name="security_alert_title">Alerte de sécurité</string>
   <string name="selling_insufficient_balance_alert_message">Vous n\'avez pas assez de fonds sur votre solde pour vendre cette cryptomonnaie. Veuillez déposer l\'actif souhaité pour continuer.</string>
   <string name="selling_insufficient_balance_alert_title">Solde insuffisant</string>
   <string name="selling_regional_restriction_alert_message">La vente de cryptomonnaies n\'est pas disponible dans votre région pour le moment. Nous travaillons activement pour vous proposer cette option prochainement. Restez connecté !</string>
@@ -694,6 +709,7 @@
   <string name="send_notification_fee_too_high_title">Les frais de douane sont élevés</string>
   <string name="send_notification_high_fee_text">En raison des particularités du réseau %1$s, les frais de transfert de la totalité du solde sont plus élevés. Pour réduire la commission, vous pouvez en laisser %2$s.</string>
   <string name="send_notification_high_fee_title">Les frais sont plus élevés</string>
+  <string name="send_notification_invalid_amount_rent_fee">Le solde de votre compte ne peut pas être inférieur au montant du loyer. Veuillez conserver au moins %1$s sur votre compte ou retirer tous les fonds.</string>
   <string name="send_notification_invalid_amount_text">La commission incluse dépasse le montant du transfert, ce qui entraîne une valeur négative</string>
   <string name="send_notification_invalid_amount_title">Montant invalide</string>
   <string name="send_notification_invalid_minimum_amount_text">Le montant minimum d\'envoi est de %1$s. Veuillez vous assurer que le solde restant après l\'envoi ne sera pas inférieur à %2$s.</string>
@@ -866,6 +882,7 @@
   <string name="swapping_to_title">Vous recevez</string>
   <string name="swapping_token_list_title">Choisir le jeton</string>
   <string name="swapping_token_not_available">non disponible</string>
+  <string name="this_is_my_wallet_title">C\'est mon portefeuille</string>
   <string name="toast_balances_hidden">Soldes masqués</string>
   <string name="toast_balances_shown">Soldes affichés</string>
   <string name="toast_undo">Annuler</string>
@@ -935,6 +952,7 @@
   <string name="user_wallet_list_unlock_all_with">Tout déverrouiller avec %s</string>
   <string name="wallet_balance_blockchain_unreachable_try_later">La blockchain n\'est pas accessible. Réessayez plus tard</string>
   <string name="wallet_balance_missing_derivation">Scanner la carte ou la bague</string>
+  <string name="wallet_been_activated_message">Ce portefeuille a déjà été activé auparavant.\nSi cela n\'a pas été fait par vous, veuillez contacter le support.\nTangem ne vend jamais de portefeuilles avec le code d\'accès pré-généré.</string>
   <string name="wallet_connect_alert_sign_message">Demande de signature d\'un message.\n\n%s</string>
   <string name="wallet_connect_bnb_sign_message">Dapp %1$s, demandant de\nsigner la transaction BNB.\n\n%2$s</string>
   <string name="wallet_connect_bnb_trade_order_message">Ordre de trade pour %1$s\nPrix : %2$s\nMontant à recevoir : %3$s\nMontant à payer : %4$s</string>
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index 7b931f0406..bd018bcf92 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -255,7 +255,7 @@
   <string name="express_by_provider">提供元</string>
   <string name="express_cex_status_button_title">ステータス</string>
   <string name="express_choose_providers_subtitle">Tangemは、各プロバイダーの条件に従って、サードパーティプロバイダーを介してトークンスワップを提供します。</string>
-  <string name="express_choose_providers_title">プロバイダーを選択</string>
+  <string name="express_choose_providers_title">プロバイダー</string>
   <string name="express_error_code">エラーが発生しました。コード: %s</string>
   <string name="express_error_provider_amount_roundup">エラー%1$s 。選択したプロバイダーは指定された取引を処理できません。値を%2$sに切り上げるか、変更してください。</string>
   <string name="express_error_swap_pair_unavailable">選択したプロバイダーは現在利用できません。しばらくしてからもう一度お試しください。(コード: %s )</string>
@@ -576,6 +576,7 @@
   <string name="onramp_country_search">国で検索</string>
   <string name="onramp_country_unavailable">利用不可</string>
   <string name="onramp_currency_search">通貨で検索</string>
+  <string name="onramp_legal">オンランプ機能を使用することにより、プロバイダの%1$sおよび%2$sに同意するものとします</string>
   <string name="onramp_max_amount_restriction">買付金額は%s以下にしてください</string>
   <string name="onramp_min_amount_restriction">買付金額は少なくとも%sである必要があります</string>
   <string name="onramp_no_available_providers">この通貨で利用可能なプロバイダーはありません</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 5424eee393..dce01434b7 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -5,7 +5,7 @@
   <string name="action_buttons_sell_navigation_bar_title">Продать</string>
   <string name="action_buttons_service_loading_alert_message">Это может занять несколько секунд. Пожалуйста, попробуйте позже.</string>
   <string name="action_buttons_service_loading_alert_title">Данные ещё не загрузились</string>
-  <string name="action_buttons_something_wrong_alert_message">Действие в данный момент недоступно, пожалуйста попробуйте позже или обновить данные, сделав свайп экрана вниз.</string>
+  <string name="action_buttons_something_wrong_alert_message">Это действие в данный момент недоступно, пожалуйста попробуйте позже или обновите данные, сделав свайп экрана вниз.</string>
   <string name="action_buttons_something_wrong_alert_title">Кнопка недоступна</string>
   <string name="action_buttons_swap_choose_token">Выберите токен</string>
   <string name="action_buttons_swap_empty_search_message">Не нашли свой токен? Перейдите в раздел «Рынок» на главной странице и добавьте его в свой портфель для обмена.</string>
@@ -264,7 +264,7 @@
   <string name="express_by_provider">Предоставлено</string>
   <string name="express_cex_status_button_title">Статус</string>
   <string name="express_choose_providers_subtitle">Tangem предоставляет доступ к обмену через сторонних поставщиков в соответствии с их правилами</string>
-  <string name="express_choose_providers_title">Выберите провайдера</string>
+  <string name="express_choose_providers_title">Провайдер</string>
   <string name="express_error_code">Произошла ошибка. Код: %s</string>
   <string name="express_error_provider_amount_roundup">Ошибка %1$s. Выбранный провайдер не может обработать указанную транзакцию. Округлите значение до %2$s или измените его.</string>
   <string name="express_error_swap_pair_unavailable">Выбранный провайдер недоступен для обмена. Попробуйте позже. (Код: %s)</string>
@@ -602,11 +602,11 @@
   <string name="onramp_no_available_providers">Нет доступных провайдеров для выбранной валюты</string>
   <string name="onramp_pay_with">Оплата с</string>
   <string name="onramp_provider_max_amount">Доступно до %s</string>
-  <string name="onramp_provider_min_amount">Доступно с %s</string>
+  <string name="onramp_provider_min_amount">Доступно от %s</string>
   <string name="onramp_redirecting_to_provider_subtitle">Вы сможете продолжить транзакцию через сервис стороннего провайдера, %s</string>
   <string name="onramp_redirecting_to_provider_title">Переход к %s...</string>
   <string name="onramp_residency_bottomsheet_country_not_supported">Наши сервисы недоступны в данной стране</string>
-  <string name="onramp_residency_bottomsheet_title">Ваше местоположение определено как</string>
+  <string name="onramp_residency_bottomsheet_title">Ваше место жительства определено как</string>
   <string name="onramp_settings_residence">Страна проживания</string>
   <string name="onramp_settings_residence_description">Пожалуйста, укажите правильную страну, чтобы обеспечить точность доступных способов оплаты и услуг.</string>
   <string name="onramp_settings_title">Настройки</string>
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 80f21fbd9b..7a2ba44136 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -2,10 +2,20 @@
 <resources>
   <string name="action_buttons_buy_empty_search_message">Токен не знайдено у вашому портфелі? Перевірте Ринки, щоб знайти та додати його для покупки</string>
   <string name="action_buttons_sell_empty_search_message">Токен не знайдено у вашому портфелі? Перевірте Ринки, щоб знайти та додати його для продажу</string>
+  <string name="action_buttons_sell_navigation_bar_title">Продати</string>
+  <string name="action_buttons_service_loading_alert_message">Це може зайняти кілька секунд. Будь ласка, спробуйте пізніше.</string>
+  <string name="action_buttons_service_loading_alert_title">Дані ще не завантажилися</string>
+  <string name="action_buttons_something_wrong_alert_message">Наразі ця дія недоступна, будь ласка спробуйте пізніше або оновіть дані, зробивши свайп екрану до низу.</string>
+  <string name="action_buttons_something_wrong_alert_title">Кнопка недоступна</string>
   <string name="action_buttons_swap_choose_token">Оберіть токен</string>
   <string name="action_buttons_swap_empty_search_message">Токен не знайдено у вашому портфелі? Перевірте ринки, щоб знайти та додати його для обміну</string>
   <string name="action_buttons_swap_no_available_pair_notification_message">Немає доступних токенів для обміну з обраним токеном. Будь ласка, оберіть інший.</string>
   <string name="action_buttons_swap_no_available_pair_notification_title">Немає вільної пари</string>
+  <string name="action_buttons_swap_no_tokens_added_alert_message">Щоб скористатися функцією обміну, у вашому портфелі має бути щонайменше 2 токени.</string>
+  <string name="action_buttons_swap_not_enough_tokens_alert_message">У вас додано лише 1 токен. Щоб скористатися функцією обміну, потрібно додати мінімум 2 токени.</string>
+  <string name="action_buttons_swap_not_enough_tokens_alert_title">Додайте токени</string>
+  <string name="action_buttons_you_want_to_receive">Оберіть токен для отримання</string>
+  <string name="action_buttons_you_want_to_swap">Оберіть токен для обміну</string>
   <string name="add_custom_token_choose_network">Оберіть мережу</string>
   <string name="add_custom_token_title">Додати токен</string>
   <string name="add_tokens_title">Токени</string>
@@ -253,8 +263,9 @@
   <string name="express_by_provider">Послугу надає</string>
   <string name="express_cex_status_button_title">Статус</string>
   <string name="express_choose_providers_subtitle">Tangem пропонує обмін токенів через сторонніх провайдерів відповідно до умов кожного провайдера</string>
-  <string name="express_choose_providers_title">Оберіть провайдера</string>
+  <string name="express_choose_providers_title">Провайдер</string>
   <string name="express_error_code">Виникла помилка. Код: %s</string>
+  <string name="express_error_provider_amount_roundup">Помилка %1$s. Обраний провайдер не може обробити зазначену транзакцію. Округліть значення до %2$s або змініть його.</string>
   <string name="express_error_swap_pair_unavailable">Наразі обраний провайдер недоступний для обміну. Спробуй пізніше. (Код: %s)</string>
   <string name="express_error_swap_unavailable">Наразі обмін неможливий. Спробуй пізніше. (Код: %s)</string>
   <string name="express_estimated_amount">Курс обміну</string>
@@ -265,6 +276,9 @@
   <string name="express_exchange_notification_refund_title">Сума була повернута в %1$s (%2$s мережі)</string>
   <string name="express_exchange_notification_verification_text">Відвідайте сайт провайдера для перевірки</string>
   <string name="express_exchange_notification_verification_title">Провайдер вимагає проходження KYC верифікації</string>
+  <string name="express_exchange_status_bought">Куплено</string>
+  <string name="express_exchange_status_buying">Купівля</string>
+  <string name="express_exchange_status_buying_active">Купівля...</string>
   <string name="express_exchange_status_canceled">Скасовано</string>
   <string name="express_exchange_status_confirmed">Підтверджено</string>
   <string name="express_exchange_status_confirming">Підтвердження</string>
@@ -579,6 +593,8 @@
   <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_avaiable_with_payment_methods">Доступно з %s</string>
+  <string name="onramp_choose_provider_title_hint">Tangem забезпечує доступ к покупці через сторонніх провайдерів згідно з їхніми умовами</string>
   <string name="onramp_country_search">Пошук за країною</string>
   <string name="onramp_country_unavailable">Недоступно</string>
   <string name="onramp_currency_search">Пошук по валюті</string>
@@ -592,8 +608,10 @@
   <string name="onramp_redirecting_to_provider_title">Перенаправлення на %s...</string>
   <string name="onramp_residency_bottomsheet_country_not_supported">Наші сервіси недоступні в цій країні</string>
   <string name="onramp_residency_bottomsheet_title">Ваше місце проживання визначено як</string>
+  <string name="onramp_settings_residence">Країна проживання</string>
   <string name="onramp_settings_residence_description">Будь ласка, виберіть правильну країну, щоб забезпечити точні способи оплати та послуги.</string>
   <string name="onramp_settings_title">Параметри</string>
+  <string name="onramp_statuses_view_footer">Ви можете закрити цей екран і перевірити статус транзакції на екрані деталей токена.</string>
   <string name="onramp_transaction_status_footer_text">Ви можете перевірити статус транзакції на сторінці токена</string>
   <string name="onramp_via">Через</string>
   <string name="organize_tokens_group">Групами</string>
@@ -604,8 +622,11 @@
   <string name="qr_scanner_camera_denied_settings_button">Налаштування</string>
   <string name="qr_scanner_camera_denied_text">Ви не надали доступ до своєї камери</string>
   <string name="qr_scanner_camera_denied_title">Доступ до камери заборонено</string>
+  <string name="receive_bottom_sheet_no_memo_required_message">Memo не вимагається</string>
   <string name="receive_bottom_sheet_warning_message">%1$s (%2$s) у мережі %3$s</string>
+  <string name="receive_bottom_sheet_warning_message_description">Використання іншої мережі може призвести до втрати коштів.</string>
   <string name="receive_bottom_sheet_warning_message_full">Надсилайте лише %s на цю адресу. Надсилання будь-якої іншої валюти призведе до її незворотної втрати.</string>
+  <string name="receive_bottom_sheet_warning_title">Надсилайте лише %1$s у мережі %2$s</string>
   <string name="receive_token_description">Переказуйте кошти з будь-якого гаманця або біржі</string>
   <string name="referral_button_participate">Взяти участь</string>
   <string name="referral_error_failed_to_load_info">Не вдалося завантажити інформацію по реферальній програмі. Будь ласка, спробуйте пізніше.</string>
@@ -661,6 +682,11 @@
   <string name="scan_card_settings_button">Сканувати</string>
   <string name="scan_card_settings_message">Відскануйте картку або кільце, щоб змінити її налаштування. Зміни торкнуться лише тої картки або кільця, які ви відсканували, і не вплинуть на інші пристрої, прив\'язані до вашого гаманця.</string>
   <string name="scan_card_settings_title">Підготуйте свій Tangem!</string>
+  <string name="security_alert_title">Оповіщення безпеки</string>
+  <string name="selling_insufficient_balance_alert_message">На вашому балансі недостатньо коштів для продажу криптовалюти. Будь ласка, внесіть бажаний актив, щоб продовжити.</string>
+  <string name="selling_insufficient_balance_alert_title">Недостатній баланс</string>
+  <string name="selling_regional_restriction_alert_message">Продаж криптовалюти у вашому регіоні тимчасово недоступний. Ми активно працюємо над тим, щоб додати цю можливість. Слідкуйте за нашими новинами!</string>
+  <string name="selling_regional_restriction_alert_title">Регіональні обмеження</string>
   <string name="send_additional_field_already_included">Вже включено до введеної адреси</string>
   <string name="send_alert_fee_too_high_text">Сума комісії у %s разів перевищує рекомендовану. Переконайтеся, що вказана комісія вірна.</string>
   <string name="send_alert_fee_too_low_text">Ви вказали комісію нижче рекомендованої, це може спричинити затримку вашої транзакції. Продовжити?</string>
@@ -701,6 +727,7 @@
   <string name="send_notification_fee_too_high_title">Встановлена комісія завелика</string>
   <string name="send_notification_high_fee_text">Через особливості мережі %1$s комісія за переказ всього балансу вища. Щоб зменшити комісію, Ви можете залишити %2$s.</string>
   <string name="send_notification_high_fee_title">Підвищена комісія</string>
+  <string name="send_notification_invalid_amount_rent_fee">Баланс вашого рахунку не може бути меншим за орендну плату. Будь ласка, залиште на рахунку не менше %1$s або виведіть всі кошти.</string>
   <string name="send_notification_invalid_amount_text">Включена комісія перевищує суму переказу, що призводить до від’ємного значення</string>
   <string name="send_notification_invalid_amount_title">Недопустима сума</string>
   <string name="send_notification_invalid_minimum_amount_text">Мінімальна сума переказу - %1$s. Будь ласка, переконайтеся, що залишок після переказу не буде меншим ніж %2$s.</string>
@@ -873,6 +900,7 @@
   <string name="swapping_to_title">Ви отримаєте</string>
   <string name="swapping_token_list_title">Оберіть токен</string>
   <string name="swapping_token_not_available">недоступно</string>
+  <string name="this_is_my_wallet_title">Це мій гаманець</string>
   <string name="toast_balances_hidden">Баланси приховано</string>
   <string name="toast_balances_shown">Баланси показано</string>
   <string name="toast_undo">Скасувати</string>
@@ -902,6 +930,7 @@
   <string name="tokens_list_unavailable_to_purchase_header">Недоступно для покупки</string>
   <string name="tokens_list_unavailable_to_sell_header">Недоступно для продажу</string>
   <string name="tokens_list_unavailable_to_swap_header">Недоступно для обміну з %s</string>
+  <string name="tokens_list_unavailable_to_swap_source_header">Недоступно для обміну</string>
   <string name="transaction_history_contract_address">контракт: %s</string>
   <string name="transaction_history_empty_transactions">У вас ще немає транзакцій</string>
   <string name="transaction_history_error_failed_to_load">Не вдалося завантажити історію транзакцій.\nНатисніть кнопку нижче, щоб оновити інформацію</string>
@@ -941,6 +970,7 @@
   <string name="user_wallet_list_unlock_all_with">Розблокувати все з %s</string>
   <string name="wallet_balance_blockchain_unreachable_try_later">Блокчейн недоступний. Спробуйте пізніше</string>
   <string name="wallet_balance_missing_derivation">Відскануйте картку або кільце</string>
+  <string name="wallet_been_activated_message">Цей гаманець вже був активований раніше.\nЯкщо це було зроблено не вами, зверніться до служби підтримки.\nTangem ніколи не продає гаманці разом з попередньо згенерованим кодом доступу.</string>
   <string name="wallet_connect_alert_sign_message">Запит на підпис повідомлення.\n\n%s</string>
   <string name="wallet_connect_bnb_sign_message">Dapp %1$s, запит на\nпідпис транзакції BNB.\n\n%2$s</string>
   <string name="wallet_connect_bnb_trade_order_message">Торговий ордер на %1$s\nЦіна: %2$s\nСума до отримання: %3$s\nСума до сплати: %4$s</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index ffccaa511b..12d15e5487 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -258,7 +258,7 @@
   <string name="express_by_provider">Provided by</string>
   <string name="express_cex_status_button_title">Status</string>
   <string name="express_choose_providers_subtitle">Tangem offers token swaps via 3rd-party providers according to each provider\'s terms</string>
-  <string name="express_choose_providers_title">Choose provider</string>
+  <string name="express_choose_providers_title">Provider</string>
   <string name="express_error_code">An error occurred. Code: %s</string>
   <string name="express_error_provider_amount_roundup">Error %1$s. The selected provider cannot process the specified transaction. Please round the value up to %2$s or change it</string>
   <string name="express_error_swap_pair_unavailable">Selected provider is unavailable at the moment. Please try again later. (Code: %s)</string>
diff --git a/features/swap/presentation/src/main/res/drawable/ic_lightning_16.xml b/core/ui/src/main/res/drawable/ic_lightning_16.xml
similarity index 100%
rename from features/swap/presentation/src/main/res/drawable/ic_lightning_16.xml
rename to core/ui/src/main/res/drawable/ic_lightning_16.xml
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/ui/SelectProviderBottomSheet.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/ui/SelectProviderBottomSheet.kt
index 7d6e9ced4f..f8cc232b66 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/ui/SelectProviderBottomSheet.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/ui/SelectProviderBottomSheet.kt
@@ -12,9 +12,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -72,6 +75,7 @@ internal fun SelectProviderBottomSheetContent(state: SelectPaymentAndProviderUM,
         state.selectedPaymentMethod.providers.fastForEach { provider ->
             key(provider.providerId) { ProviderItem(state = provider) }
         }
+        OnrampMoreProviders()
     }
 }
 
@@ -251,6 +255,28 @@ private fun UnavailableProviderItem(
     }
 }
 
+@Composable
+private fun OnrampMoreProviders() {
+    Icon(
+        painter = rememberVectorPainter(
+            ImageVector.vectorResource(R.drawable.ic_lightning_16),
+        ),
+        contentDescription = null,
+        tint = TangemTheme.colors.icon.informative,
+        modifier = Modifier
+            .padding(top = 16.dp),
+    )
+    Text(
+        text = stringResource(R.string.express_more_providers_soon),
+        style = TangemTheme.typography.caption2,
+        color = TangemTheme.colors.icon.informative,
+        modifier = Modifier
+            .padding(top = 4.dp, bottom = 24.dp)
+            .padding(horizontal = TangemTheme.dimens.spacing56),
+        textAlign = TextAlign.Center,
+    )
+}
+
 // region Preview
 @Preview(showBackground = true, widthDp = 360)
 @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)

From 64ca541aece177485ed9864833076e60df56b58e Mon Sep 17 00:00:00 2001
From: Vlad Kozarez <vladks32@gmail.com>
Date: Mon, 16 Dec 2024 13:30:29 +0300
Subject: [PATCH 7/9] AND-9486 fixed custom fee for eip1559

---
 .../data/staking/DefaultStakingRepository.kt     |  6 +++---
 .../repository/DefaultCurrenciesRepository.kt    | 16 +++++++++++-----
 .../fee/custom/EthereumEIPCustomFeeConverter.kt  | 10 ++++++++--
 .../com/tangem/blockchainsdk/utils/Blockchain.kt |  9 ++++++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
index 7c7242509b..03d4dda03f 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
@@ -10,7 +10,7 @@ import com.tangem.blockchain.common.TransactionStatus
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.blockchainsdk.utils.toCoinId
-import com.tangem.blockchainsdk.utils.toMigratedCointId
+import com.tangem.blockchainsdk.utils.toMigratedCoinId
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toCompressedPublicKey
 import com.tangem.data.common.api.safeApiCall
@@ -555,7 +555,7 @@ internal class DefaultStakingRepository(
     override fun getStakingApproval(cryptoCurrency: CryptoCurrency): StakingApproval {
         return when (getIntegrationKey(cryptoCurrency.id)) {
             Blockchain.Ethereum.id + Blockchain.Polygon.toCoinId(),
-            Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCointId(),
+            Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCoinId(),
             -> StakingApproval.Needed(ETHEREUM_POLYGON_APPROVE_SPENDER)
             else -> StakingApproval.Empty
         }
@@ -644,7 +644,7 @@ internal class DefaultStakingRepository(
             Blockchain.Solana.run { id + toCoinId() } to SOLANA_INTEGRATION_ID,
             Blockchain.Cosmos.run { id + toCoinId() } to COSMOS_INTEGRATION_ID,
             Blockchain.Tron.run { id + toCoinId() } to TRON_INTEGRATION_ID,
-            Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCointId() to ETHEREUM_POLYGON_INTEGRATION_ID,
+            Blockchain.Ethereum.id + Blockchain.Polygon.toMigratedCoinId() to ETHEREUM_POLYGON_INTEGRATION_ID,
             // Blockchain.Ethereum.id + Blockchain.Polygon.toCoinId() to ETHEREUM_POLYGON_INTEGRATION_ID,
             Blockchain.BSC.run { id + toCoinId() } to BINANCE_INTEGRATION_ID,
             // Blockchain.Polkadot.run { id + toCoinId() } to POLKADOT_INTEGRATION_ID,
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
index c64af39a71..7b6b5e6223 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultCurrenciesRepository.kt
@@ -2,10 +2,7 @@ package com.tangem.data.tokens.repository
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.compatibility.getL2CompatibilityTokenComparison
-import com.tangem.blockchainsdk.utils.ExcludedBlockchains
-import com.tangem.blockchainsdk.utils.fromNetworkId
-import com.tangem.blockchainsdk.utils.toCoinId
-import com.tangem.blockchainsdk.utils.toNetworkId
+import com.tangem.blockchainsdk.utils.*
 import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.common.cache.CacheRegistry
 import com.tangem.data.common.currency.*
@@ -360,7 +357,9 @@ internal class DefaultCurrenciesRepository(
 
             val storedCoin = storedTokens.tokens
                 .find {
-                    it.networkId == blockchainNetworkId && it.id == coinId && it.derivationPath == derivationPath.value
+                    it.networkId == blockchainNetworkId &&
+                        compareIdWithMigrations(it, coinId) &&
+                        it.derivationPath == derivationPath.value
                 } ?: error("Coin in this network $networkId not found")
 
             val coin = responseCurrenciesFactory.createCurrency(storedCoin, userWallet.scanResponse)
@@ -548,6 +547,13 @@ internal class DefaultCurrenciesRepository(
         )
     }
 
+    private fun compareIdWithMigrations(token: UserTokensResponse.Token, coinId: String): Boolean {
+        return when {
+            token.id == OLD_POLYGON_NAME -> NEW_POLYGON_NAME == coinId
+            else -> token.id == coinId
+        }
+    }
+
     private suspend fun fetchTokens(userWallet: UserWallet) {
         val userWalletId = userWallet.walletId
 
diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/EthereumEIPCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/EthereumEIPCustomFeeConverter.kt
index 081ba60665..88495f81e6 100644
--- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/EthereumEIPCustomFeeConverter.kt
+++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/state/fee/custom/EthereumEIPCustomFeeConverter.kt
@@ -61,8 +61,14 @@ internal class EthereumEIPCustomFeeConverter(
         value: ImmutableList<SendTextField.CustomFee>,
     ): Fee.Ethereum.EIP1559 {
         val feeAmount = value[FEE_AMOUNT].value.parseToBigDecimal(value[FEE_AMOUNT].decimals)
-        val maxFee = value[MAX_FEE].value.parseToBigDecimal(GAS_DECIMALS).toBigInteger()
-        val priorityFee = value[PRIORITY_FEE].value.parseToBigDecimal(GAS_DECIMALS).toBigInteger()
+        val maxFeeDecimals = value[MAX_FEE].decimals
+        val maxFee = value[MAX_FEE].value.parseToBigDecimal(maxFeeDecimals)
+            .movePointRight(maxFeeDecimals)
+            .toBigInteger()
+        val priorityFeeDecimals = value[PRIORITY_FEE].decimals
+        val priorityFee = value[PRIORITY_FEE].value.parseToBigDecimal(priorityFeeDecimals)
+            .movePointRight(priorityFeeDecimals)
+            .toBigInteger()
         val gasLimit = value[GAS_LIMIT].value.parseToBigDecimal(GAS_DECIMALS).toBigInteger()
 
         return normalFee.copy(
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
index 4152ec301f..562255b087 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
@@ -303,7 +303,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.EthereumClassic, Blockchain.EthereumClassicTestnet -> "ethereum-classic"
         Blockchain.Stellar, Blockchain.StellarTestnet -> "stellar"
         Blockchain.Cardano -> "cardano"
-        Blockchain.Polygon, Blockchain.PolygonTestnet -> "polygon-ecosystem-token"
+        Blockchain.Polygon, Blockchain.PolygonTestnet -> NEW_POLYGON_NAME
         Blockchain.Arbitrum, Blockchain.ArbitrumTestnet -> "arbitrum-one"
         Blockchain.Avalanche, Blockchain.AvalancheTestnet -> "avalanche-2"
         Blockchain.Solana, Blockchain.SolanaTestnet -> "solana"
@@ -387,8 +387,8 @@ fun Blockchain.toCoinId(): String {
  * New CoinId to existing coin "id" field.
  * To support both old and new coin id.
  */
-fun Blockchain.toMigratedCointId(): String = when (this) {
-    Blockchain.Polygon, Blockchain.PolygonTestnet -> "polygon-ecosystem-token"
+fun Blockchain.toMigratedCoinId(): String = when (this) {
+    Blockchain.Polygon, Blockchain.PolygonTestnet -> NEW_POLYGON_NAME
     else -> toCoinId()
 }
 
@@ -422,5 +422,8 @@ fun Blockchain.minimalAmount(): BigDecimal {
     return BigDecimal.ONE.movePointLeft(decimals())
 }
 
+const val OLD_POLYGON_NAME = "matic-network"
+const val NEW_POLYGON_NAME = "polygon-ecosystem-token"
+
 private const val NODL = "NODL"
 private const val NODL_AMOUNT_TO_CREATE_ACCOUNT = 1.5

From df5782340aa47585efbbdf603715c5d95d52209d Mon Sep 17 00:00:00 2001
From: Vlad Kozarez <vladks32@gmail.com>
Date: Mon, 16 Dec 2024 13:47:37 +0300
Subject: [PATCH 8/9] [Lokalize] sync strings

---
 core/res/src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index dce01434b7..92629c43f6 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -325,6 +325,7 @@
   <string name="feedback_preface_scan_failed">Скажите, пожалуйста, какая у вас карта или кольцо?</string>
   <string name="feedback_preface_support">Привет, команда поддержки,</string>
   <string name="feedback_preface_tx_failed">Пожалуйста, расскажите нам больше о вашей проблеме. Каждая маленькая деталь может помочь.</string>
+  <string name="feedback_subject_pre_activated_wallet">Ранее активированный кошелек</string>
   <string name="feedback_subject_rate_negative">Мои предложения</string>
   <string name="feedback_subject_scan_failed">Не могу отсканировать карту/кольцо</string>
   <string name="feedback_subject_support">Обращение в поддержку</string>
@@ -597,6 +598,7 @@
   <string name="onramp_country_search">Поиск по стране</string>
   <string name="onramp_country_unavailable">Недоступно</string>
   <string name="onramp_currency_search">Поиск по валюте</string>
+  <string name="onramp_legal">Пользуясь сервисом покупки, вы соглашаетесь с %1$s и %2$s</string>
   <string name="onramp_max_amount_restriction">Сумма покупки не может быть больше, чем %s</string>
   <string name="onramp_min_amount_restriction">Сумма покупки должна составлять минимум %s</string>
   <string name="onramp_no_available_providers">Нет доступных провайдеров для выбранной валюты</string>

From c5918d1d4914dd815f6dc91cba34cd80d0593851 Mon Sep 17 00:00:00 2001
From: Mama1emon <andrew.khokhlove@gmail.com>
Date: Mon, 16 Dec 2024 12:58:33 +0400
Subject: [PATCH 9/9] AND-9287 Action buttons (main screen): there is no
 message about demo for sell

Signed-off-by: Mama1emon <andrew.khokhlove@gmail.com>
---
 .../tap/network/exchangeServices/CurrencyExchangeManager.kt  | 5 ++++-
 .../onramp/selecttoken/model/OnrampOperationModel.kt         | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
index 94185a495a..9e0154ad1b 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
@@ -43,7 +43,10 @@ class CurrencyExchangeManager(
     override suspend fun update() {
         _initializationStatus.value = lceLoading()
 
-        buyService.update()
+        if (!store.inject(DaggerGraphState::onrampFeatureToggles).isFeatureEnabled) {
+            buyService.update()
+        }
+
         sellService.update()
 
         _initializationStatus.value = lceContent()
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selecttoken/model/OnrampOperationModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selecttoken/model/OnrampOperationModel.kt
index 35b84b1490..59673147bb 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selecttoken/model/OnrampOperationModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selecttoken/model/OnrampOperationModel.kt
@@ -23,6 +23,7 @@ import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
 import com.tangem.domain.tokens.model.CryptoCurrencyStatus
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
+import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.features.onramp.impl.R
 import com.tangem.features.onramp.selecttoken.OnrampOperationComponent.Params
 import com.tangem.features.onramp.selecttoken.entity.OnrampOperationUM
@@ -44,6 +45,7 @@ internal class OnrampOperationModel @Inject constructor(
     private val reduxStateHolder: ReduxStateHolder,
     private val isDemoCardUseCase: IsDemoCardUseCase,
     private val messageSender: UiMessageSender,
+    private val onrampFeatureToggles: OnrampFeatureToggles,
 ) : Model() {
 
     val state: StateFlow<OnrampOperationUM> get() = _state
@@ -72,7 +74,7 @@ internal class OnrampOperationModel @Inject constructor(
             },
         )
 
-        if (params is Params.Sell) {
+        if (params is Params.Sell || !onrampFeatureToggles.isFeatureEnabled) {
             showErrorIfDemoModeOrElse { selectToken(status) }
         } else {
             selectToken(status)