diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 97a76b6ac8..2ef3c24014 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -313,6 +313,16 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="join.tangem.com"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:scheme="https"
                     android:host="tangem.com"
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 9903332ae6..4cc165f633 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -1431,6 +1431,8 @@
   <string name="swap_give_permission_fee_footer">Das Netzwerk erhebt eine Token-Genehmigungsgebühr, um zu überprüfen, ob Sie die Verwendung Ihres Tokens für den Swap genehmigen.</string>
   <string name="swap_promo_text">Tausche mehr Token zu besseren Kursen direkt in deiner Brieftasche.</string>
   <string name="swap_promo_title">Neuer Swap-Anbieter verfügbar!</string>
+  <string name="swap_search_tooltip_description">Suchen Sie nach einem beliebigen Token, auch wenn es noch nicht in Ihrer Liste ist.</string>
+  <string name="swap_search_tooltip_title">Nutzen Sie die Suche, um zu finden, was Sie benötigen.</string>
   <string name="swap_story_fifth_subtitle">Vertraue auf den rund um die Uhr verfügbaren Support bei allen Problemen</string>
   <string name="swap_story_fifth_title">Immer für Dich da</string>
   <string name="swap_story_first_subtitle">Mehrere vertrauenswürdige Anbieter an einem Ort – tausche mühelos alle Vermögenswerte in Deiner Wallet</string>
@@ -1888,6 +1890,8 @@
   <string name="warning_express_refresh_required_title">Service vorübergehend nicht verfügbar</string>
   <string name="warning_express_too_maximum_amount_title">Die Menge der zu tauschenden Token darf folgende Werte nicht überschreiten %s</string>
   <string name="warning_express_too_minimal_amount_title">Der zu tauschende Betrag muss mindestens %s betragen</string>
+  <string name="warning_express_unsupported_pair_description">Der Tausch ist für dieses Paar nicht verfügbar. Bitte wählen Sie ein anderes Token und versuchen Sie es erneut.</string>
+  <string name="warning_express_unsupported_pair_title">Nicht unterstütztes Swap-Paar.</string>
   <string name="warning_express_wrong_amount_description">Bitte änder den zu tauschenden Betrag</string>
   <string name="warning_failed_to_verify_card_message">Bei dieser Karte oder Ring kann es sich um ein Produktionsmuster oder eine Fälschung handeln</string>
   <string name="warning_failed_to_verify_card_title">Echtheitsprüfung fehlgeschlagen</string>
diff --git a/core/res/src/main/res/values-es/strings.xml b/core/res/src/main/res/values-es/strings.xml
index 462fd75c00..0ec38e3506 100644
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@@ -1896,6 +1896,8 @@
   <string name="warning_express_refresh_required_title">Servicio no disponible temporalmente</string>
   <string name="warning_express_too_maximum_amount_title">La cantidad de tokens a intercambiar no debe exceder %s</string>
   <string name="warning_express_too_minimal_amount_title">El monto a cambiar debe ser de al menos %s</string>
+  <string name="warning_express_unsupported_pair_description">El intercambio no está disponible para este par. Por favor, seleccione otro token e inténtelo de nuevo.</string>
+  <string name="warning_express_unsupported_pair_title">Par de intercambio no compatible.</string>
   <string name="warning_express_wrong_amount_description">Por favor cambie la cantidad a cambiar</string>
   <string name="warning_failed_to_verify_card_message">Esta tarjeta podría ser una muestra de producción o una falsificación</string>
   <string name="warning_failed_to_verify_card_title">La verificación de autenticidad falló</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index fcdf84f726..41913d6515 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -1434,6 +1434,8 @@
   <string name="swap_give_permission_fee_footer">Le réseau facturera des frais d\'approbation de jeton pour vérifier que vous autorisez l\'utilisation de votre jeton pour l\'échange.</string>
   <string name="swap_promo_text">Échangez plus de jetons à de meilleurs taux directement dans votre portefeuille.</string>
   <string name="swap_promo_title">Nouveau fournisseur d\'échange disponible !</string>
+  <string name="swap_search_tooltip_description">Recherchez n’importe quel token, même s’il ne figure pas encore dans votre liste.</string>
+  <string name="swap_search_tooltip_title">Utilisez la recherche pour trouver ce dont vous avez besoin.</string>
   <string name="swap_story_fifth_subtitle">Ayez confiance en notre assistance 24 heures sur 24 pour vous aider à résoudre tous vos problèmes</string>
   <string name="swap_story_fifth_title">Assistance 24 heures sur 24</string>
   <string name="swap_story_first_subtitle">Plusieurs fournisseurs de confiance en un seul endroit : échangez n\'importe quel actif facilement</string>
@@ -1891,6 +1893,8 @@
   <string name="warning_express_refresh_required_title">Service temporairement indisponible</string>
   <string name="warning_express_too_maximum_amount_title">Le nombre de jetons à échanger ne doit pas dépasser %s</string>
   <string name="warning_express_too_minimal_amount_title">Le montant à échanger doit être d\'au moins %s</string>
+  <string name="warning_express_unsupported_pair_description">L’échange n’est pas disponible pour cette paire. Veuillez sélectionner un autre token et réessayer.</string>
+  <string name="warning_express_unsupported_pair_title">Paire d’échange non prise en charge.</string>
   <string name="warning_express_wrong_amount_description">Veuillez modifier le montant à échanger</string>
   <string name="warning_failed_to_verify_card_message">Cette carte pourrait être un échantillon de production ou une contrefaçon</string>
   <string name="warning_failed_to_verify_card_title">Échec de la vérification d\'authenticité</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 5a0683d679..350f3c2c43 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -1864,6 +1864,8 @@
   <string name="warning_express_refresh_required_title">Сервис временно недоступен</string>
   <string name="warning_express_too_maximum_amount_title">Сумма для обмена должна быть не более %s</string>
   <string name="warning_express_too_minimal_amount_title">Сумма для обмена должна быть не менее %s</string>
+  <string name="warning_express_unsupported_pair_description">Обмен для этой пары недоступен. Пожалуйста, выберите другой токен и попробуйте снова.</string>
+  <string name="warning_express_unsupported_pair_title">Неподдерживаемая для обмена пара</string>
   <string name="warning_express_wrong_amount_description">Пожалуйста, измените сумму для обмена</string>
   <string name="warning_failed_to_verify_card_message">Возможно, данная карта является образцом или подделкой</string>
   <string name="warning_failed_to_verify_card_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 94cc71f5db..297d8310dc 100644
--- a/core/res/src/main/res/values-uk-rUA/strings.xml
+++ b/core/res/src/main/res/values-uk-rUA/strings.xml
@@ -1894,6 +1894,8 @@
   <string name="warning_express_refresh_required_title">Сервіс тимчасово недоступний</string>
   <string name="warning_express_too_maximum_amount_title">Сума до обміну не повинна перевищувати %s</string>
   <string name="warning_express_too_minimal_amount_title">Сума для обміну має бути не менше %s</string>
+  <string name="warning_express_unsupported_pair_description">Обмін для цієї пари недоступний. Будь ласка, виберіть інший токен і спробуйте знову.</string>
+  <string name="warning_express_unsupported_pair_title">Непідтримувана пара для обміну.</string>
   <string name="warning_express_wrong_amount_description">Будь ласка, змініть суму для обміну</string>
   <string name="warning_failed_to_verify_card_message">Ця картка може бути виробничим зразком або підробкою</string>
   <string name="warning_failed_to_verify_card_title">Перевірка автентичності не вдалася</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index dbc8f644d4..f40c33cb35 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -1898,7 +1898,7 @@
   <string name="warning_express_too_maximum_amount_title">The amount of tokens to be swapped must not exceed %s</string>
   <string name="warning_express_too_minimal_amount_title">The amount to swap must be at least %s</string>
   <string name="warning_express_unsupported_pair_description">Swapping isn\'t available for this pair. Please select a different token and try again.</string>
-  <string name="warning_express_unsupported_pair_title">Unsupported token pair</string>
+  <string name="warning_express_unsupported_pair_title">Unsupported swap pair</string>
   <string name="warning_express_wrong_amount_description">Please change the amount to swap</string>
   <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
   <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/SendConfirmAlertFactory.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/SendConfirmAlertFactory.kt
index 9a9ee70d57..f8ad03193d 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/SendConfirmAlertFactory.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/SendConfirmAlertFactory.kt
@@ -22,10 +22,13 @@ internal class SendConfirmAlertFactory @Inject constructor(
                 title = resourceReference(id = R.string.send_alert_transaction_failed_title),
                 message = resourceReference(id = R.string.common_unknown_error),
                 onDismissRequest = popBack,
-                firstAction = EventMessageAction(
-                    title = resourceReference(R.string.common_support),
-                    onClick = onFailedTxEmailClick,
-                ),
+                firstActionBuilder = {
+                    EventMessageAction(
+                        title = resourceReference(R.string.common_support),
+                        onClick = onFailedTxEmailClick,
+                    )
+                },
+                secondActionBuilder = { cancelAction { } },
             ),
         )
     }
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
index e8a70ed5c4..f04f4d1bcb 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
@@ -2480,6 +2480,8 @@ internal class SwapModel @Inject constructor(
         }
 
         override fun onResult(newState: FeeSelectorUM) {
+            state.value = newState
+
             if (newState is FeeSelectorUM.Error) {
                 modelScope.launch {
                     forceUpdateState.emit(newState.copy(isHidden = true))
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt
index 078a18f3e9..cec6ab682a 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt
@@ -32,10 +32,13 @@ class YieldSupplyAlertFactory @Inject constructor(
                 title = resourceReference(id = R.string.send_alert_transaction_failed_title),
                 message = resourceReference(id = R.string.common_unknown_error),
                 onDismissRequest = popBack,
-                firstAction = EventMessageAction(
-                    title = resourceReference(R.string.common_support),
-                    onClick = onFailedTxEmailClick,
-                ),
+                firstActionBuilder = {
+                    EventMessageAction(
+                        title = resourceReference(R.string.common_support),
+                        onClick = onFailedTxEmailClick,
+                    )
+                },
+                secondActionBuilder = { cancelAction { } },
             ),
         )
     }