diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index faddf299c6..dea8c07645 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -896,6 +896,8 @@
   <string name="reset_card_without_backup_to_factory_message">La réinitialisation aux paramètres d\'usine supprimera complètement le portefeuille de la carte sélectionnée et le supprimera de l\'application. Vous ne pourrez pas restaurer le portefeuille actuel.</string>
   <string name="ring_promo_text">Les propriétaires du Tangem Ring ont droit à 3 swap gratis sur Changelly jusqu\'au 15/11 !</string>
   <string name="ring_promo_title">Échangez avec 0 % de frais !</string>
+  <string name="root_detected_warning_description">Les appareils disposant d\'un accès root sont considérés comme moins sécurisés. Vos données peuvent être exposées à des risques supplémentaires.</string>
+  <string name="root_detected_warning_title">Accès root détecté</string>
   <string name="save_user_wallet_agreement_access_description">Connectez-vous à l\'application et vérifiez votre solde sans scanner la carte</string>
   <string name="save_user_wallet_agreement_access_title">Accéder à l\'application</string>
   <string name="save_user_wallet_agreement_allow_biometrics">Autoriser l\'utilisation de la biométrie</string>
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index bce005b585..70f1b95349 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -103,10 +103,10 @@
   <string name="app_settings_enable_biometrics_description">設定に移動して、Tangemアプリで生体認証を有効にします。</string>
   <string name="app_settings_enable_biometrics_title">生体認証を有効にする</string>
   <string name="app_settings_off_biometrics_alert_message">%1$sが無効になると、アプリのロックを解除してウォレットを操作するために、パスコードを入力する必要があります。</string>
-  <string name="app_settings_off_require_access_code_alert_message">後でウォレットのアクセスコードを入力してもらいます。それを安全に保存し、今後の利用に備えるためです。</string>
-  <string name="app_settings_off_saved_access_code_alert_message">これにより、保存されているウォレットアクセスコードがすべて削除されます。ウォレットでの今後の操作には、アクセスコードの送信が必要になります。</string>
+  <string name="app_settings_off_require_access_code_alert_message">安全に保管するため、後ほどアクセスコードの入力を求められます。</string>
+  <string name="app_settings_off_saved_access_code_alert_message">保存されているすべてのウォレットのアクセスコードが削除されます。ウォレットを使用するには、再度アクセスコードを入力する必要があります。</string>
   <string name="app_settings_off_saved_wallet_alert_message">保存したデバイスを削除すると、保存されているすべてのウォレットとそのアクセスコードがアプリから削除されます。</string>
-  <string name="app_settings_on_require_access_code_alert_message">これにより、保存されているウォレットアクセスコードがすべて削除されます。今後ウォレットを操作するには、アクセスコードの送信が必要になります。</string>
+  <string name="app_settings_on_require_access_code_alert_message">保存されているすべてのウォレットのアクセスコードが削除されます。ウォレットを使用するには、再度アクセスコードを入力する必要があります。</string>
   <string name="app_settings_require_access_code">アクセスコードを要求する</string>
   <string name="app_settings_require_access_code_footer">このオプションを選択すると、機密性の高い操作における生体認証が無効になります。取引に署名するたびにアクセスコードを入力する必要があります。</string>
   <string name="app_settings_saved_access_codes">アクセスコードを保存</string>
@@ -144,10 +144,10 @@
   <string name="balance_hidden_title">残高は非表示</string>
   <string name="beta_mode_warning_message">ブロックチェーン開発者によると、Kaspaトークンは現在ベータ版です。アップデートをお楽しみに！</string>
   <string name="beta_mode_warning_title">ベータモード</string>
-  <string name="biometric_disabled_warning_description">デバイスで生体認証がオフになっているため、ウォレットのロック解除に使用できません。生体認証を再度利用するには、デバイスの設定で有効にしてください。</string>
+  <string name="biometric_disabled_warning_description">この端末では生体認証がオフになっているため、ウォレットの解除に使用できません。再度この方法を使用するには、端末の設定で生体認証を有効にしてください。</string>
   <string name="biometric_disabled_warning_title">生体認証が無効になっています</string>
   <string name="biometric_lockout_permanent_warning_description">カードまたはリングをスキャンしてください</string>
-  <string name="biometric_lockout_permanent_warning_description_2">生体認証の試行回数が上限に達しました。端末タップまたはアクセスコードでウォレットを解除してください。</string>
+  <string name="biometric_lockout_permanent_warning_description_2">生体認証の試行回数の上限に達しました。カード／リングでウォレットを解除するか、アクセスコードを入力してください。</string>
   <string name="biometric_lockout_permanent_warning_title">生体認証がロックされています</string>
   <string name="biometric_lockout_warning_description">30秒後に再試行するか、カードまたはリングをスキャンしてください</string>
   <string name="biometric_lockout_warning_description_2">生体認証ログインは一時的にロックされています。30秒後にもう一度お試しいただくか、端末タップまたはアクセスコードでウォレットを解除してください。</string>
@@ -179,7 +179,7 @@
   <string name="card_reset_alert_finish_ok_button">もう一度アップグレードしてください</string>
   <string name="card_reset_alert_finish_title">リセット完了</string>
   <string name="card_reset_alert_incomplete_message">このウォレット内のすべてのTangemデバイスで、リセット処理を完了することを推奨します。</string>
-  <string name="card_reset_alert_incomplete_title">すべてのTangemデバイスをリセットしていません</string>
+  <string name="card_reset_alert_incomplete_title">リセットが必要なTangemデバイスがあります。</string>
   <string name="card_settings_access_code_recovery_disabled_description">このカードを使用して、このウォレット内の他のカードまたはリングのアクセスコードをリセットしたくない場合は、このオプションを無効にしてください。これにより、このカードのアクセスコードもリセットできなくなりますのでご注意ください。</string>
   <string name="card_settings_access_code_recovery_enabled_description">このカードを使用して、このウォレット内の他のカードのアクセスコードをリセットできます。</string>
   <string name="card_settings_access_code_recovery_title">アクセスコードの復元</string>
@@ -378,6 +378,7 @@
   <string name="common_transfer">送金</string>
   <string name="common_unable_to_load">データを読み込めません…</string>
   <string name="common_understand">わかりました</string>
+  <string name="common_understand_continue">理解して続行</string>
   <string name="common_unknown_error">エラーが発生しました。もう一度お試しください。</string>
   <string name="common_unreachable">アクセスできません</string>
   <string name="common_unstake">ステーキング解除</string>
@@ -567,7 +568,7 @@
   <string name="home_button_create_new_wallet">新しいウォレットを作成する</string>
   <string name="home_button_order">Tangemを注文</string>
   <string name="home_button_scan">Tangemをスキャン</string>
-  <string name="hot_access_code_set_biometric_ask">「Tangem」に生体認証の使用を許可しますか？\n本人確認とアプリの起動のために使用されます。</string>
+  <string name="hot_access_code_set_biometric_ask">「Tangem」が生体認証を使用して本人確認を行い、アプリを開くことを許可しますか？</string>
   <string name="hot_crypto_add_token_subtitle">%sへ</string>
   <string name="hot_crypto_token_network">%sネットワーク</string>
   <string name="hw_access_code_create_alert_title">アクセスコードの設定をキャンセルしてもよろしいですか？</string>
@@ -1059,6 +1060,7 @@
   <string name="reset_card_to_factory_button_title">カードをリセットする</string>
   <string name="reset_card_to_factory_condition_1">この操作を実行すると、現在のウォレットにアクセスできなくなることを理解しています。</string>
   <string name="reset_card_to_factory_condition_2">このカードを使用して、現在のウォレットの他のカードのアクセスコードを回復させられないことを認識しています。</string>
+  <string name="reset_card_to_factory_condition_3">復元は不可能であり、Tangem Payカードおよびカード上のすべての資金へのアクセスを完全に失うことを理解しました</string>
   <string name="reset_card_with_backup_to_factory_message">工場出荷時設定にリセットすると、選択したカードやリングからウォレットが完全に削除されます。現在のウォレットを復元したり、カードやリングを使用してアクセスコードを復元することはできません。</string>
   <string name="reset_card_without_backup_to_factory_message">工場出荷時の状態にリセットすると、選択したカードやリングからウォレットが完全に削除され、アプリから削除されます。現在のウォレットを復元することはできません。</string>
   <string name="reset_cards_dialog_complete_description">すべてのTangemデバイスがリセットされました。</string>
@@ -1067,6 +1069,8 @@
   <string name="reset_cards_dialog_next_device_description">続行するには次のデバイスをリセットしてください</string>
   <string name="ring_promo_text">Tangem Ringユーザーは、11/15日までChangelly経由でスワップを3回手数料ゼロで行えます！</string>
   <string name="ring_promo_title">今すぐ手数料0% でスワップしましょう！</string>
+  <string name="root_detected_warning_description">Rootアクセスが有効な端末は、セキュリティが低いと判断されます。データが追加のリスクにさらされる可能性があります。</string>
+  <string name="root_detected_warning_title">Rootアクセスが検出されました</string>
   <string name="save_user_wallet_agreement_access_description">アプリにログインして、カードまたはリングをスキャンせずに残高を確認できます</string>
   <string name="save_user_wallet_agreement_access_title">アプリにアクセスする</string>
   <string name="save_user_wallet_agreement_allow_biometrics">生体認証の使用を許可する</string>
@@ -1402,6 +1406,7 @@
   <string name="tangem_pay_freeze_card_success">カードが凍結されています</string>
   <string name="tangem_pay_get_help">サポートを受ける</string>
   <string name="tangem_pay_other">その他</string>
+  <string name="tangem_pay_rooted_device_subtitle">Root化された端末では使用できません</string>
   <string name="tangem_pay_status_completed">完了</string>
   <string name="tangem_pay_status_declined">拒否</string>
   <string name="tangem_pay_status_pending">保留中</string>
@@ -1414,6 +1419,8 @@
   <string name="tangem_pay_unfreeze_card_failed">カードの凍結解除に失敗しました。しばらくしてからもう一度お試しください。</string>
   <string name="tangem_pay_unfreeze_card_success">カードの凍結が解除されました</string>
   <string name="tangem_pay_withdrawal">出金</string>
+  <string name="tangempay_account_unable_to_use_rooted">Root化された端末では使用できません</string>
+  <string name="tangempay_cancel_kyc">KYCをキャンセル</string>
   <string name="tangempay_card_details_add_funds">資金を追加</string>
   <string name="tangempay_card_details_add_funds_subtitle">入金オプション</string>
   <string name="tangempay_card_details_card_number">カード番号</string>
@@ -1441,6 +1448,7 @@
   <string name="tangempay_card_details_open_wallet_step_5">準備完了！カードはすぐに使用できます。</string>
   <string name="tangempay_card_details_open_wallet_title">Google Payにカードを追加する</string>
   <string name="tangempay_card_details_open_wallet_title_apple">Apple Payにカードを追加する</string>
+  <string name="tangempay_card_details_pin_code">PINコード</string>
   <string name="tangempay_card_details_receive_description">アドレスを共有するか、QRコードを表示してください。</string>
   <string name="tangempay_card_details_receive_error_description">技術的な問題が検出されました。しばらくしてからもう一度お試しいただくか、サポートにお問い合わせください。</string>
   <string name="tangempay_card_details_receive_error_title">現在、受け取りは利用できません</string>
@@ -1449,12 +1457,15 @@
   <string name="tangempay_card_details_swap_description">ポートフォリオ内のあらゆる資産をカードと交換</string>
   <string name="tangempay_card_details_title">カードの詳細</string>
   <string name="tangempay_card_details_unfreeze_card">カードの一時停止を解除</string>
+  <string name="tangempay_card_details_view_pin_code_description">忘れた場合は、アプリに戻ってください。</string>
+  <string name="tangempay_card_details_view_pin_code_title">PINコード</string>
   <string name="tangempay_card_details_withdraw">出金</string>
   <string name="tangempay_card_details_withdraw_error_title">現在、出金ができません</string>
   <string name="tangempay_card_details_withdraw_in_progress_description">現在の処理が完了するまでは、スワップや新しい出金を開始することはできません。</string>
   <string name="tangempay_card_details_withdraw_in_progress_title">出金処理中です</string>
   <string name="tangempay_change_pin_code">PINコードを変更</string>
   <string name="tangempay_come_back_if_forget_pin">忘れた場合はアプリに戻って確認できます。</string>
+  <string name="tangempay_factory_settings_warning_title">復元は不可能であり、Tangem Payカードおよびカード上のすべての資金へのアクセスを完全に失うことを理解しました</string>
   <string name="tangempay_failed_to_issue_card">カードの発行に失敗しました</string>
   <string name="tangempay_failed_to_issue_card_retry_description">技術的なエラーが発生しました。下のボタンをクリックして、もう一度お試しください。</string>
   <string name="tangempay_failed_to_issue_card_support_description">技術的なエラーが発生しました。サポートへお問い合わせください。</string>
@@ -1471,6 +1482,7 @@
   <string name="tangempay_kyc_in_progress">KYC進行中</string>
   <string name="tangempay_kyc_in_progress_notification_button">ステータスを表示</string>
   <string name="tangempay_kyc_in_progress_notification_title">Tangem PayのKYC手続き進行中</string>
+  <string name="tangempay_kyc_in_progress_popup_description">以下のボタンから、現在のKYCステータスを確認するか、KYCをキャンセルできます。</string>
   <string name="tangempay_onboarding_banner_description">暗号資産を、リアルな支払いに。\n他とはまったく違う、新しいタイプの決済カード。</string>
   <string name="tangempay_onboarding_banner_title">Tangem Visaカード</string>
   <string name="tangempay_onboarding_get_card_button_text">カードをGET</string>
@@ -1488,7 +1500,7 @@
   <string name="tangempay_service_unreachable_try_later">現在、データを表示できませんが、カードでのお支払いは引き続きご利用いただけます。</string>
   <string name="tangempay_sync_needed">同期が必要です</string>
   <string name="tangempay_tangem_visa_card">Tangem Visaカード</string>
-  <string name="tangempay_temporarily_unavailable">Tangem Payは一時的に利用できません</string>
+  <string name="tangempay_temporarily_unavailable">Tangem Payは現在一時的に利用できません。</string>
   <string name="tangempay_title">Tangem Pay</string>
   <string name="tangempay_use_tangem_device_to_restore_payment_account">カードまたはリングを使用して、支払いアカウントへのアクセスを復元してください。</string>
   <string name="tangempay_your_pin_code">PINコード</string>
@@ -1572,7 +1584,7 @@
   <string name="user_push_notification_agreement_header">プッシュ通知を使用しますか?</string>
   <string name="user_push_notification_banner_subtitle">プッシュ通知を有効にすると、ウォレットに着金したときにアラートを受信できます。</string>
   <string name="user_push_notification_banner_title">取引を見逃さない</string>
-  <string name="user_wallet_list_add_button">新しいウォレットを追加</string>
+  <string name="user_wallet_list_add_button">ウォレットを追加</string>
   <string name="user_wallet_list_delete_hw_prompt">バックアップせずにこのウォレットを削除すると、資金に永久にアクセスできなくなります。</string>
   <string name="user_wallet_list_delete_prompt">このウォレットを忘れてもよろしいですか？</string>
   <string name="user_wallet_list_error_unable_to_unlock">エラーが発生しました。カードまたはリングをスキャンしてログインしてください。</string>
@@ -1879,7 +1891,7 @@
   <string name="wc_warning_transaction">不審な取引</string>
   <string name="welcome_create_wallet_already_have">すでにTangemウォレットをお持ちですか？</string>
   <string name="welcome_create_wallet_feature_assets">数千種類の資産</string>
-  <string name="welcome_create_wallet_feature_class">業界最高水準のハードウェアウォレット</string>
+  <string name="welcome_create_wallet_feature_class">最高水準のハードウェアウォレット</string>
   <string name="welcome_create_wallet_feature_delivery">迅速な配送</string>
   <string name="welcome_create_wallet_feature_one_tap">ワンタップで開始</string>
   <string name="welcome_create_wallet_feature_seamless">シームレスで安全</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 0d5eaa197f..036b504b45 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -394,6 +394,7 @@
   <string name="common_transfer">Перевод</string>
   <string name="common_unable_to_load">Невозможно загрузить данные…</string>
   <string name="common_understand">Я понял</string>
+  <string name="common_understand_continue">Я понимаю, продолжить</string>
   <string name="common_unknown_error">Произошла ошибка. Пожалуйста, попробуйте снова.</string>
   <string name="common_unreachable">Недоступно</string>
   <string name="common_unstake">Завершить стейкинг</string>
@@ -733,6 +734,7 @@
   <string name="markets_sort_by_top_gainers_title">Лидеры роста</string>
   <string name="markets_sort_by_top_losers_title">Лидеры падения</string>
   <string name="markets_sort_by_trending_title">В тренде</string>
+  <string name="markets_sort_by_yield_mode_title">Режим доходности</string>
   <string name="markets_staking_banner_description_placeholder">Стейкинг — простой способ получать доход с вашей криптовалюты. %s</string>
   <string name="markets_staking_banner_title">Получайте до %s APY</string>
   <string name="markets_token_added">Токен добавлен</string>
@@ -994,6 +996,7 @@
   <string name="onramp_currency_other">Другие валюты</string>
   <string name="onramp_currency_popular">Популярные фиаты</string>
   <string name="onramp_currency_search">Поиск по валюте</string>
+  <string name="onramp_error_transaction_already_processed">Эта транзакция уже была обработана. Дополнительных действий не требуется.</string>
   <string name="onramp_fetching_best_rates">Получение лучших курсов...</string>
   <string name="onramp_instant_status">Моментально</string>
   <string name="onramp_legal">Пользуясь сервисом покупки, вы соглашаетесь с %1$s и %2$s</string>
@@ -1104,6 +1107,8 @@
   <string name="reset_cards_dialog_next_device_description">Сбросьте следующее устройство для продолжения.</string>
   <string name="ring_promo_text">Владельцам колец — 3 обмена без комиссии на Changelly до 15.11!</string>
   <string name="ring_promo_title">Обмен с 0% комиссией!</string>
+  <string name="root_detected_warning_description">Устройства с root-доступом считаются менее безопасными. Ваши данные могут быть подвержены дополнительным рискам.</string>
+  <string name="root_detected_warning_title">Обнаружен root-доступ</string>
   <string name="save_user_wallet_agreement_access_description">Войдите в приложение и следите за своим балансом без сканирования карты или кольца</string>
   <string name="save_user_wallet_agreement_access_title">Доступ в приложение</string>
   <string name="save_user_wallet_agreement_allow_biometrics">Использовать биометрию</string>
@@ -1493,6 +1498,7 @@
   <string name="tangempay_card_details_withdraw_in_progress_title">Вывод выполняется</string>
   <string name="tangempay_change_pin_code">Изменить PIN-код</string>
   <string name="tangempay_come_back_if_forget_pin">Можно посмотреть здесь, если забудете его.</string>
+  <string name="tangempay_factory_settings_warning_title">Я понимаю, что полностью потеряю доступ к своей карте Tangem Pay и ко всем средствам на ней без возможности восстановления.</string>
   <string name="tangempay_failed_to_issue_card">Не удалось выпустить карту</string>
   <string name="tangempay_failed_to_issue_card_retry_description">Техническая ошибка, попробуйте ещё раз, нажав кнопку ниже</string>
   <string name="tangempay_failed_to_issue_card_support_description">Техническая ошибка, свяжитесь с поддержкой</string>
@@ -1964,6 +1970,7 @@
   <string name="yield_module_fee_policy_sheet_title">Политика комиссий за пополнение</string>
   <string name="yield_module_fee_policy_tangem_service_fee_title">Tangem взимает комиссию за обслуживание в размере 15% от полученного дохода.</string>
   <string name="yield_module_high_fee_error">Ваши средства будут автоматически переведены в Aave, как только комиссия сети снизится или баланс достигнет минимально необходимой суммы.</string>
+  <string name="yield_module_high_network_fees_notification_description">Комиссии сейчас выше обычного из-за высокой активности на рынке. Вы можете продолжить сейчас или вернуться позже, когда комиссии снизятся.</string>
   <string name="yield_module_high_network_fees_notification_title">Высокая сетевая комиссия</string>
   <string name="yield_module_historical_returns">Историческая доходность</string>
   <string name="yield_module_main_screen_promo_banner_message">Получай до %1$s APY на свой баланс</string>
@@ -2017,7 +2024,7 @@
   <string name="yield_module_transaction_exit_subtitle">%1$s выведено из Aave</string>
   <string name="yield_module_transaction_initialize">Режим доходности инициализирован</string>
   <string name="yield_module_transaction_reactivate">Режим доходности реактивирован</string>
-  <string name="yield_module_transaction_topup">Перевод средств в Aave</string>
+  <string name="yield_module_transaction_topup">Перевод в Aave</string>
   <string name="yield_module_transaction_topup_subtitle">%1$s отправлено в Aave</string>
   <string name="yield_module_transaction_withdraw">Вывод из Aave</string>
   <string name="yield_module_transfer_mode_automatic">Автоматически</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index d365c6e247..eaddf5b46e 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -103,10 +103,10 @@
   <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
   <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
   <string name="app_settings_off_biometrics_alert_message">Disabling %1$s will require you to enter your passcode to unlock the app and to interact with your wallet.</string>
-  <string name="app_settings_off_require_access_code_alert_message">You’ll be asked for your wallet’s access code later so we can securely store it for future use</string>
-  <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
+  <string name="app_settings_off_require_access_code_alert_message">You\'ll be asked for your access code later for secure storage.</string>
+  <string name="app_settings_off_saved_access_code_alert_message">This will delete all saved wallet access codes. You\'ll need to enter the access code again to use the wallet.</string>
   <string name="app_settings_off_saved_wallet_alert_message">Removing the saved devices deletes all the saved wallets and their access codes from the app.</string>
-  <string name="app_settings_on_require_access_code_alert_message">This will delete all the saved wallet access codes. Any further interaction with the wallet will require submitting the access code.</string>
+  <string name="app_settings_on_require_access_code_alert_message">This will delete all saved wallet access codes. You’ll need to enter the access code again to use the wallet.</string>
   <string name="app_settings_require_access_code">Require Access Code</string>
   <string name="app_settings_require_access_code_footer">This option turns off biometrics for sensitive actions. You’ll need to enter your access code each time you sign a transaction.</string>
   <string name="app_settings_saved_access_codes">Save Access Code</string>
@@ -145,10 +145,10 @@
   <string name="balance_hidden_title">Balances are hidden</string>
   <string name="beta_mode_warning_message">According to the blockchain developers, Kaspa tokens are currently in beta. Stay tuned for updates!</string>
   <string name="beta_mode_warning_title">Beta Mode</string>
-  <string name="biometric_disabled_warning_description">Biometrics are turned off on your device, so you can’t use them to unlock your wallets. Enable biometrics in your device settings to use this method again.</string>
+  <string name="biometric_disabled_warning_description">Biometrics are turned off on your device, so you can\'t use them to unlock your wallets. Enable biometrics in your device settings to use this method again.</string>
   <string name="biometric_disabled_warning_title">Biometric authentication disabled</string>
   <string name="biometric_lockout_permanent_warning_description">Please scan the card or ring</string>
-  <string name="biometric_lockout_permanent_warning_description_2">You’ve reached the limit of biometric attempts. Please unlock your wallet with a device tap or enter your access code.</string>
+  <string name="biometric_lockout_permanent_warning_description_2">You\'ve reached the limit of biometric attempts. Please unlock your wallet with a card/ring or enter your access code.</string>
   <string name="biometric_lockout_permanent_warning_title">Biometric authentication locked</string>
   <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card or ring</string>
   <string name="biometric_lockout_warning_description_2">Biometric login is temporarily locked. Please try again in 30 seconds, or unlock your wallet with a device tap or access code.</string>
@@ -182,7 +182,7 @@
   <string name="card_reset_alert_finish_ok_button">Upgrade again</string>
   <string name="card_reset_alert_finish_title">Reset complete</string>
   <string name="card_reset_alert_incomplete_message">We recommend completing the reset process for all Tangem devices in this wallet.</string>
-  <string name="card_reset_alert_incomplete_title">You haven’t reset all your Tangem devices</string>
+  <string name="card_reset_alert_incomplete_title">Some Tangem devices still need to be reset.</string>
   <string name="card_settings_access_code_recovery_disabled_description">Disable this option if you don\'t want this card to be used to reset access codes on other cards or rings in this wallet. Please note that this will also prevent you from resetting the access code on this card.</string>
   <string name="card_settings_access_code_recovery_enabled_description">Allows you to use this card to reset access code on other cards in this wallet</string>
   <string name="card_settings_access_code_recovery_title">Access code recovery</string>
@@ -384,8 +384,9 @@
   <string name="common_transaction_status">Transaction status</string>
   <string name="common_transactions">Transactions</string>
   <string name="common_transfer">Transfer</string>
-  <string name="common_unable_to_load">Unable to load the data…</string>
+  <string name="common_unable_to_load">Unable to load data…</string>
   <string name="common_understand">I understand</string>
+  <string name="common_understand_continue">I understand, continue</string>
   <string name="common_unknown_error">There was an error. Please try again.</string>
   <string name="common_unreachable">Unreachable</string>
   <string name="common_unstake">Unstake</string>
@@ -575,7 +576,7 @@
   <string name="home_button_create_new_wallet">Create New Wallet</string>
   <string name="home_button_order">Order Tangem</string>
   <string name="home_button_scan">Scan Tangem</string>
-  <string name="hot_access_code_set_biometric_ask">Do you want to allow “Tangem” to use biometric authentication? To confirm your identity and open the app</string>
+  <string name="hot_access_code_set_biometric_ask">Do you want to allow \"Tangem\" to use biometric authentication to confirm your identity and open the app?</string>
   <string name="hot_crypto_add_token_subtitle">to %s</string>
   <string name="hot_crypto_token_network">On %s network</string>
   <string name="hw_access_code_create_alert_title">Are you sure you want to cancel access code setup?</string>
@@ -799,7 +800,7 @@
   <string name="markets_tooltip_title">Add tokens</string>
   <string name="markets_yield_supply_banner_description">Power up your assets while supplying them with instant access. %s</string>
   <string name="markets_yield_supply_banner_title">Activate Yield Mode</string>
-  <string name="mobile_wallet_requires_min_os_warning_body">You must update to %1$s in order to create mobile wallet</string>
+  <string name="mobile_wallet_requires_min_os_warning_body">You must update to %1$s  before creating a mobile wallet</string>
   <string name="mobile_wallet_requires_min_os_warning_title">Mobile Wallet requires %1$s or later</string>
   <string name="news_all_news">All news</string>
   <plurals name="news_published_hours_ago">
@@ -1082,6 +1083,7 @@
   <string name="reset_card_to_factory_button_title">Reset the card</string>
   <string name="reset_card_to_factory_condition_1">I understand that after performing this action, I will no longer have access to the current wallet</string>
   <string name="reset_card_to_factory_condition_2">I realize that I can\'t use this card to recover my access code on the other cards of the current wallet</string>
+  <string name="reset_card_to_factory_condition_3">I understand that I will completely lose access to my Tangem Pay Card and all funds on it without the possibility of recovery</string>
   <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card or ring. You will not be able to restore the current wallet or use the card or ring to recover the access code.</string>
   <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card or ring and remove it from the app. You will not be able to restore the current wallet.</string>
   <string name="reset_cards_dialog_complete_description">All Tangem devices have been reset.</string>
@@ -1090,6 +1092,8 @@
   <string name="reset_cards_dialog_next_device_description">Please reset the next device to continue</string>
   <string name="ring_promo_text">Ring owners get 3 commission-free swaps on Changelly until 15.11!</string>
   <string name="ring_promo_title">Swap With 0% Fees Now!</string>
+  <string name="root_detected_warning_description">Devices with root access are considered less secure. Your data may be exposed to additional risks.</string>
+  <string name="root_detected_warning_title">Root access detected</string>
   <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card or ring</string>
   <string name="save_user_wallet_agreement_access_title">Access the app</string>
   <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
@@ -1426,6 +1430,7 @@
   <string name="tangem_pay_freeze_card_success">Your card is frozen.</string>
   <string name="tangem_pay_get_help">Get Help</string>
   <string name="tangem_pay_other">Other</string>
+  <string name="tangem_pay_rooted_device_subtitle">Unable to use on rooted devices</string>
   <string name="tangem_pay_status_completed">Completed</string>
   <string name="tangem_pay_status_declined">Declined</string>
   <string name="tangem_pay_status_pending">Pending</string>
@@ -1439,6 +1444,7 @@
   <string name="tangem_pay_unfreeze_card_success">Your card is unfrozen.</string>
   <string name="tangem_pay_withdrawal">Withdrawal</string>
   <string name="tangempay_account_unable_to_use_rooted">Unable to use on rooted device</string>
+  <string name="tangempay_cancel_kyc">Cancel KYC</string>
   <string name="tangempay_card_details_add_funds">Add funds</string>
   <string name="tangempay_card_details_add_funds_subtitle">Top-up options</string>
   <string name="tangempay_card_details_card_number">Card Number</string>
@@ -1466,6 +1472,7 @@
   <string name="tangempay_card_details_open_wallet_step_5">All set! Your card is ready to use.</string>
   <string name="tangempay_card_details_open_wallet_title">Add card to Google Pay</string>
   <string name="tangempay_card_details_open_wallet_title_apple">Add card to Apple Pay</string>
+  <string name="tangempay_card_details_pin_code">PIN code</string>
   <string name="tangempay_card_details_receive_description">Share your address or show QR-code</string>
   <string name="tangempay_card_details_receive_error_description">Technical issues detected. Please try again later or contact support.</string>
   <string name="tangempay_card_details_receive_error_title">Receive unavailable now</string>
@@ -1474,6 +1481,8 @@
   <string name="tangempay_card_details_swap_description">Swap any asset in your portfolio for card</string>
   <string name="tangempay_card_details_title">Card details</string>
   <string name="tangempay_card_details_unfreeze_card">Unfreeze Card</string>
+  <string name="tangempay_card_details_view_pin_code_description">Come back to the app if you forget it.</string>
+  <string name="tangempay_card_details_view_pin_code_title">Your PIN code</string>
   <string name="tangempay_card_details_withdraw">Withdraw</string>
   <string name="tangempay_card_details_withdraw_error_title">Withdraw unavailable now</string>
   <string name="tangempay_card_details_withdraw_in_progress_description">You can\'t initiate swap or new withdrawal till the current one is finished</string>
@@ -1497,6 +1506,7 @@
   <string name="tangempay_kyc_in_progress">KYC in progress</string>
   <string name="tangempay_kyc_in_progress_notification_button">View Status</string>
   <string name="tangempay_kyc_in_progress_notification_title">KYC in progress for Tangem Pay</string>
+  <string name="tangempay_kyc_in_progress_popup_description">Use the buttons below to view your current KYC status or cancel it.</string>
   <string name="tangempay_onboarding_banner_description">Use your crypto for real world spending. \nIt’s a payment card unlike any other.</string>
   <string name="tangempay_onboarding_banner_title">Tangem Visa Card</string>
   <string name="tangempay_onboarding_get_card_button_text">Get card</string>
@@ -1598,7 +1608,7 @@
   <string name="user_push_notification_agreement_header">Would you like to use\nPush-notifications?</string>
   <string name="user_push_notification_banner_subtitle">Enable push notifications to receive alerts when funds arrive in your wallet.</string>
   <string name="user_push_notification_banner_title">Don\'t Miss a Transaction</string>
-  <string name="user_wallet_list_add_button">Add new wallet</string>
+  <string name="user_wallet_list_add_button">Add Wallet</string>
   <string name="user_wallet_list_delete_hw_prompt">If you delete this wallet without a backup, you will permanently lose access to your funds.</string>
   <string name="user_wallet_list_delete_prompt">Are you sure you want to forget this wallet?</string>
   <string name="user_wallet_list_error_unable_to_unlock">An error has occurred, please scan your card or ring to log in</string>
@@ -1759,7 +1769,7 @@
   <string name="wallet_settings_change_access_code_title">Change access code</string>
   <string name="wallet_settings_push_notifications_description">Stay notified on wallet incoming transactions and Tangem updates.</string>
   <string name="wallet_settings_push_notifications_huawei_warning">Push notifications may currently not work on Huawei devices. We\'re actively working on a solution and will release a fix in an upcoming update. Thank you for your understanding!</string>
-  <string name="wallet_settings_push_notifications_title">Transaction Notifications</string>
+  <string name="wallet_settings_push_notifications_title">Transaction notifications</string>
   <string name="wallet_settings_set_access_code_title">Set access code</string>
   <string name="wallet_settings_title">Wallet settings</string>
   <string name="wallet_title">Tangem</string>
@@ -1952,7 +1962,7 @@
   <string name="wc_warning_transaction">Suspicious transaction</string>
   <string name="welcome_create_wallet_already_have">Already have Tangem Wallet?</string>
   <string name="welcome_create_wallet_feature_assets">Thousands of assets</string>
-  <string name="welcome_create_wallet_feature_class">Best in class hardware wallet</string>
+  <string name="welcome_create_wallet_feature_class">Top-tier hardware wallet</string>
   <string name="welcome_create_wallet_feature_delivery">Fast delivery</string>
   <string name="welcome_create_wallet_feature_one_tap">Start in one tap</string>
   <string name="welcome_create_wallet_feature_seamless">Seamless and secure</string>
@@ -1961,7 +1971,7 @@
   <string name="welcome_create_wallet_mobile_description">Create or import a software wallet</string>
   <string name="welcome_create_wallet_mobile_description_full">Create or import a software wallet on your phone.</string>
   <string name="welcome_create_wallet_mobile_title">Start with Mobile Wallet</string>
-  <string name="welcome_create_wallet_other_method">Other method</string>
+  <string name="welcome_create_wallet_other_method">Other methods</string>
   <string name="welcome_create_wallet_use_hardware_description">Use a Tangem hardware wallet</string>
   <string name="welcome_create_wallet_use_hardware_title">Learn more &amp; buy</string>
   <string name="welcome_interrupted_backup_alert_discard">Discard</string>
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
index 5b0f50b11d..00caf4f9d7 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
@@ -276,8 +276,10 @@ internal class DefaultWalletManagersFacade @Inject constructor(
             is Result.Success -> PaginationWrapper(
                 currentPage = sdkPageConverter.convert(page),
                 nextPage = sdkPageConverter.convert(itemsResult.data.nextPage),
-                items = SdkTransactionHistoryItemConverter(smartContractMethods = readSmartContractMethods())
-                    .convertList(itemsResult.data.items),
+                items = SdkTransactionHistoryItemConverter(
+                    smartContractMethods = readSmartContractMethods(),
+                    yieldSupplyAddresses = YIELD_SUPPLY_ADDRESSES,
+                ).convertList(itemsResult.data.items),
             )
             is Result.Failure -> error(itemsResult.error.message ?: itemsResult.error.customMessage)
         }
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
index 1a677b9cdb..51d7e2fd6e 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionHistoryItemConverter.kt
@@ -8,9 +8,13 @@ import com.tangem.blockchain.transactionhistory.models.TransactionHistoryItem as
 
 internal class SdkTransactionHistoryItemConverter(
     smartContractMethods: Map<String, SmartContractMethod>,
+    yieldSupplyAddresses: Set<String>,
 ) : Converter<SdkTransactionHistoryItem, TxInfo> {
 
-    private val typeConverter by lazy { SdkTransactionTypeConverter(smartContractMethods) }
+    private val typeConverter by lazy { SdkTransactionTypeConverter(
+        smartContractMethods = smartContractMethods,
+        yieldSupplyAddresses = yieldSupplyAddresses,
+    ) }
 
     override fun convert(value: SdkTransactionHistoryItem): TxInfo = TxInfo(
         txHash = value.txHash,
@@ -24,7 +28,7 @@ internal class SdkTransactionHistoryItemConverter(
             SdkTransactionHistoryItem.TransactionStatus.Failed -> TxInfo.TransactionStatus.Failed
             SdkTransactionHistoryItem.TransactionStatus.Unconfirmed -> TxInfo.TransactionStatus.Unconfirmed
         },
-        type = typeConverter.convert(value.type to value.destinationType.toDomain()),
+        type = typeConverter.convert(value),
         amount = requireNotNull(value.amount.value) { "Transaction amount value must not be null" },
     )
 
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
index 5e9fe1dc0b..639350d503 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/SdkTransactionTypeConverter.kt
@@ -1,5 +1,6 @@
 package com.tangem.data.walletmanager.utils
 
+import com.tangem.blockchain.transactionhistory.models.TransactionHistoryItem
 import com.tangem.blockchain.transactionhistory.models.TransactionHistoryItem.TransactionType
 import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplyEnterCallData
 import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplyExitCallData
@@ -11,17 +12,29 @@ import com.tangem.utils.converter.Converter
 
 internal class SdkTransactionTypeConverter(
     private val smartContractMethods: Map<String, SmartContractMethod>,
-) : Converter<Pair<TransactionType, TxInfo.DestinationType>, TxInfo.TransactionType> {
+    private val yieldSupplyAddresses: Set<String>,
+) : Converter<TransactionHistoryItem, TxInfo.TransactionType> {
 
-    override fun convert(value: Pair<TransactionType, TxInfo.DestinationType>): TxInfo.TransactionType {
-        val (type, destination) = value
+    override fun convert(value: TransactionHistoryItem): TxInfo.TransactionType {
+        val (type, destination) = value.type to value.destinationType
+        val source = value.sourceType
 
         return when (type) {
             is TransactionType.ContractMethod -> {
-                getTransactionType(methodName = smartContractMethods[type.id]?.name, type.callData, destination)
+                getTransactionType(
+                    methodName = smartContractMethods[type.id]?.name,
+                    callData = type.callData,
+                    destination = destination,
+                    source = source,
+                )
             }
             is TransactionType.ContractMethodName -> {
-                getTransactionType(methodName = type.name, type.callData, destination)
+                getTransactionType(
+                    methodName = type.name,
+                    callData = type.callData,
+                    destination = destination,
+                    source = source,
+                )
             }
             is TransactionType.Transfer -> {
                 TxInfo.TransactionType.Transfer
@@ -48,7 +61,8 @@ internal class SdkTransactionTypeConverter(
     private fun getTransactionType(
         methodName: String?,
         callData: String?,
-        destination: TxInfo.DestinationType,
+        destination: TransactionHistoryItem.DestinationType,
+        source: TransactionHistoryItem.SourceType,
     ): TxInfo.TransactionType {
         return when (methodName) {
             "transfer" -> TxInfo.TransactionType.Transfer
@@ -70,7 +84,21 @@ internal class SdkTransactionTypeConverter(
             "withdrawRewardsPOL",
             -> TxInfo.TransactionType.Staking.ClaimRewards
             "redelegate" -> TxInfo.TransactionType.Staking.Restake
-            "yieldSend" -> TxInfo.TransactionType.YieldSupply.Send
+            "yieldSend" -> {
+                val sourceAddresses = when (source) {
+                    is TransactionHistoryItem.SourceType.Multiple -> source.addresses
+                    is TransactionHistoryItem.SourceType.Single -> listOf(source.address)
+                }.map {
+                    it.lowercase()
+                }.toSet()
+
+                val isYieldSupplyWithdraw =
+                    yieldSupplyAddresses.intersect(sourceAddresses).isNotEmpty()
+
+                TxInfo.TransactionType.YieldSupply.Send(
+                    isYieldSupplyWithdraw = isYieldSupplyWithdraw,
+                )
+            }
             "enterProtocolByOwner" -> callData?.let { data ->
                 TxInfo.TransactionType.YieldSupply.Enter(
                     EthereumYieldSupplyEnterCallData.decode(data)?.tokenContractAddress.orEmpty(),
@@ -82,7 +110,7 @@ internal class SdkTransactionTypeConverter(
                 )
             }
             "deployYieldModule" -> TxInfo.TransactionType.YieldSupply.DeployContract(
-                (destination as? TxInfo.DestinationType.Single)?.addressType?.address.orEmpty(),
+                (destination as? TransactionHistoryItem.DestinationType.Single)?.addressType?.address.orEmpty(),
             )
             "initYieldToken" -> callData?.let { data ->
                 TxInfo.TransactionType.YieldSupply.InitializeToken(
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/YieldSupplyAddresses.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/YieldSupplyAddresses.kt
new file mode 100644
index 0000000000..22e28e3eb6
--- /dev/null
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/YieldSupplyAddresses.kt
@@ -0,0 +1,113 @@
+package com.tangem.data.walletmanager.utils
+
+// Remove after moving this data to BE
+internal val YIELD_SUPPLY_ADDRESSES: Set<String> = setOf(
+    "0x00901a076785e0906d1028c7d6372d247bec7d61",
+    "0x00907f9921424583e7ffbfedf84f92b7b2be4977",
+    "0x018008bfb33d285247a21d44e50697654f754e63",
+    "0x067ae75628177fd257c2b1e500993e1a0babcbd1",
+    "0x078f358208685046a11c85e8ad32895ded33a249",
+    "0x0a1d576f3efef75b330424287a95a366e8281d54",
+    "0x0b925ed163218f6662a35e0f0371ac234f9e9371",
+    "0x0c0d01abf3e6adfca0989ebba9d6e85dd58eab1e",
+    "0x10ac93971cdb1f5c778144084242374473c350da",
+    "0x191c10aa4af7c30e871e70c95db0e4eb77237530",
+    "0x1ba9843bd4327c6c77011406de5fa8749f7e3479",
+    "0x1c0e06a0b1a4c160c17545ff2a951bfca57c0002",
+    "0x23878914efe38d27c4d67ab83ed1b93a74d4086a",
+    "0x24ab03a9a5bc2c49e5523e8d915a3536ac38b91d",
+    "0x2516e7b3f76294e03c42aa4c5b5b4dce9c436fb8",
+    "0x285866acb0d60105b4ed350a463361c2d9afa0e2",
+    "0x2d62109243b87c4ba3ee7ba1d91b0dd0a074d7b1",
+    "0x2e94171493fabe316b6205f1585779c887771e2f",
+    "0x2edff5af94334fbd7c38ae318edf1c40e072b73b",
+    "0x312ffc57778cefa11989733e6e08143e7e229c1c",
+    "0x32a6268f9ba3642dda7892add74f1d34469a4259",
+    "0x38a5357ce55c81add62abc84fb32981e2626adef",
+    "0x38c503a438185cde29b5cf4dc1442fd6f074f1cc",
+    "0x38d693ce1df5aadf7bc62595a37d667ad57922e5",
+    "0x3fe6a295459fae07df8a0cecc36f37160fe86aa9",
+    "0x40b4baecc69b882e8804f9286b12228c27f8c9bf",
+    "0x4199cc1f5ed0d796563d7ccb2e036253e2c18281",
+    "0x44705f578135cc5d703b4c9c122528c73eb87145",
+    "0x4579a27af00a62c0eb156349f31b345c08386419",
+    "0x481a2acf3a72ffdc602a9541896ca1db87f86cf7",
+    "0x4b0821e768ed9039a70ed1e80e15e76a5be5df5f",
+    "0x4c612e3b15b96ff9a6faed838f8d07d479a8dd4c",
+    "0x4d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e8",
+    "0x4e2a4d9b3df7aae73b418bd39f3af9e148e3f479",
+    "0x4e65fe4dba92790696d040ac24aa414708f5c0ab",
+    "0x4f5923fc5fd4a93352581b38b7cd26943012decf",
+    "0x513c7e3a9c69ca3e22550ef58ac1c0088e918fff",
+    "0x545bd6c032efdde65a377a6719def2796c8e0f2e",
+    "0x56a7ddc4e848ebf43845854205ad71d5d5f72d3d",
+    "0x5b502e3796385e1e9755d7043b9c945c3accec9c",
+    "0x5c647ce0ae10658ec44fa4e11a51c96e94efd1dd",
+    "0x5e8c8a7243651db1384c0ddfdbe39761e8e7e51a",
+    "0x5ee5bf7ae06d1be5997a1a72006fe6c607ec6de8",
+    "0x5f4a0873a3a02f7c0cb0e13a1d4362a1ad90e751",
+    "0x5f9190496e0dfc831c3bd307978de4a245e2f5cd",
+    "0x5fefd7069a7d91d01f269dade14526ccf3487810",
+    "0x625e7708f30ca75bfd92586e17077590c60eb4cd",
+    "0x62fc96b27a510cf4977b59ff952dc32378cc221d",
+    "0x6533afac2e7bccb20dca161449a13a32d391fb00",
+    "0x65906988adee75306021c417a1a3458040239602",
+    "0x67eaf2bee4384a2f84da9eb8105c661c123736ba",
+    "0x6ab707aca953edaefbc4fd23ba73294241490620",
+    "0x6b030ff3fb9956b1b69f475b77ae0d3cf2cc5afa",
+    "0x6d80113e533a2c0fe82eabd35f1875dcea89ea97",
+    "0x71aef7b30728b9bb371578f36c5a1f1502a5723e",
+    "0x724dc807b04555b71ed48a6896b6f41593b8c637",
+    "0x75bd1a659bdc62e4c313950d44a2416fab43e785",
+    "0x7b95ec873268a6bfc6427e7a28e396db9d0ebc65",
+    "0x7c307e128efa31f540f2e2d976c995e0b65f51f6",
+    "0x80a94c36747cf51b2fbabdff045f6d22c1930ed1",
+    "0x80ca0d8c38d2e2bcbab66aa1648bd1c7160500fe",
+    "0x82e64f49ed5ec1bc6e43dad4fc8af9bb3a2312ee",
+    "0x82f9c5ad306bba1ad0de49bb5fa6f01bf61085ef",
+    "0x8437d7c167dfb82ed4cb79cd44b7a32a1dd95c77",
+    "0x8a2b6f94ff3a89a03e8c02ee92b55af90c9454a2",
+    "0x8a458a9dc9048e005d22849f470891b840296619",
+    "0x8a9fde6925a839f6b1932d16b36ac026f8d3fbdb",
+    "0x8eb270e296023e9d92081fdf967ddd7878724424",
+    "0x8ffdf2de812095b1d19cb146e4c004587c0a0692",
+    "0x90072a4aa69b5eb74984ab823efc5f91e90b3a72",
+    "0x90da57e0a6c0d166bf15764e03b83745dc90025b",
+    "0x927709711794f3de5ddbf1d176bee2d55ba13c21",
+    "0x977b6fc5de62598b08c85ac8cf2b745874e8b78c",
+    "0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c",
+    "0x99cbc45ea5bb7ef3a5bc08fb1b7e56bb2442ef0d",
+    "0x9a44fd41566876a39655f74971a3a6ea0a17a454",
+    "0x9b00a09492a626678e5a3009982191586c444df9",
+    "0xa4d94019934d8333ef880abffbf2fdd611c762bd",
+    "0xa700b4eb416be35b2911fd5dee80678ff64ff6c9",
+    "0xa9251ca9de909cb71783723713b21e4233fbf1b1",
+    "0xaa0200d169ff3ba9385c12e073c5d1d30434ae7b",
+    "0xaa6e91c82942aeae040303bf96c15a6dbcb82ca0",
+    "0xb76cf92076adbf1d9c39294fa8e7a67579fde357",
+    "0xb82fa9f31612989525992fcfbb09ab22eff5c85a",
+    "0xbcffb4b3beadc989bd1458740952af6ec8fbe431",
+    "0xbdb9300b7cde636d9cd4aff00f6f009ffbbc8ee6",
+    "0xbdfa7b7893081b35fb54027489e2bc7a38275129",
+    "0xbdfd4e51d3c14a232135f04988a42576efb31519",
+    "0xbe54767735fb7acca2aa7e2d209a6f705073536d",
+    "0xc45a479877e1e9dfe9fcd4056c699575a1045daa",
+    "0xc7b4c17861357b8abb91f25581e7263e08dcb59c",
+    "0xcc9ee9483f662091a1de4795249e24ac0ac2630f",
+    "0xcca43cef272c30415866914351fdfc3e881bb7c2",
+    "0xcf3d55c10db69f28fd1a75bd73f3d8a2d9c595ad",
+    "0xd4a0e0b9149bcee3c920d2e00b5de09138fd8bb7",
+    "0xd4e245848d6e1220dbe62e155d89fa327e43cb06",
+    "0xdd5745756c2de109183c6b5bb886f9207bef114d",
+    "0xde6ef6cb4abd3a473ffc2942eef5d84536f8e864",
+    "0xe50fa9b3c56ffb159cb0fca61f5c9d750e8128c8",
+    "0xe728577e9a1fe7032bc309b4541f58f45443866e",
+    "0xea1132120ddcdda2f119e99fa7a27a0d036f7ac9",
+    "0xebe517846d0f36eced99c735cbf6131e1feb775d",
+    "0xec4ef66d4fceeba34abb4de69db391bc5476ccc8",
+    "0xf329e36c7bf6e5e86ce2150875a84ce77f477375",
+    "0xf59036caebea7dc4b86638dfa2e3c97da9fccd40",
+    "0xf611aeb5013fd2c0511c9cd55c7dc5c1140741a6",
+    "0xf6d2224916ddfbbab6e6bd0d1b7034f4ae0cab18",
+    "0xfa82580c16a31d0c1bc632a36f82e83efef3eec0",
+)
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
index d8fd074625..aae35a95f1 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
@@ -124,9 +124,10 @@ data class TxInfo(
             }
 
             @Serializable
-            data object Send : YieldSupply {
-                override val address: String? = null
-            }
+            data class Send(
+                override val address: String? = null,
+                val isYieldSupplyWithdraw: Boolean,
+            ) : YieldSupply
 
             @Serializable
             data class DeployContract(override val address: String) : YieldSupply
diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
index bc5f160b47..21045da86e 100644
--- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
+++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
@@ -61,7 +61,7 @@ internal class TxHistoryItemToTransactionStateConverter(
             is TransactionType.Swap,
             is TransactionType.Transfer,
             is TransactionType.UnknownOperation,
-            TransactionType.YieldSupply.Send,
+            is TransactionType.YieldSupply.Send,
             TransactionType.YieldSupply.Topup,
             -> if (isOutgoing) R.drawable.ic_arrow_up_24 else R.drawable.ic_arrow_down_24
         }
@@ -83,10 +83,12 @@ internal class TxHistoryItemToTransactionStateConverter(
             is TransactionType.YieldSupply.Enter -> resourceReference(R.string.yield_module_transaction_enter)
             is TransactionType.YieldSupply.Exit -> resourceReference(R.string.yield_module_transaction_exit)
             TransactionType.YieldSupply.Topup -> resourceReference(R.string.yield_module_transaction_topup)
-            TransactionType.YieldSupply.Send -> if (isOutgoing) {
-                resourceReference(R.string.common_transfer)
-            } else {
-                resourceReference(R.string.yield_module_transaction_withdraw)
+            is TransactionType.YieldSupply.Send -> {
+                if (type.isYieldSupplyWithdraw || isOutgoing) {
+                    resourceReference(R.string.yield_module_transaction_withdraw)
+                } else {
+                    resourceReference(R.string.common_transfer)
+                }
             }
             is TransactionType.YieldSupply.DeployContract -> resourceReference(
                 R.string
@@ -107,7 +109,7 @@ internal class TxHistoryItemToTransactionStateConverter(
     private fun TxInfo.extractSubtitle(): TextReference {
         return when (val type = this.type) {
             is TransactionType.YieldSupply -> if (currency is CryptoCurrency.Coin) {
-                if (type == TransactionType.YieldSupply.Send) {
+                if (type is TransactionType.YieldSupply.Send) {
                     extractSubtitleByAddressType()
                 } else {
                     resourceReference(
@@ -129,8 +131,8 @@ internal class TxHistoryItemToTransactionStateConverter(
                         val amount = amount.format { crypto(symbol = currency.symbol, decimals = currency.decimals) }
                         resourceReference(R.string.yield_module_transaction_exit_subtitle, wrappedList(amount))
                     }
-                    TransactionType.YieldSupply.Send -> {
-                        if (isOutgoing) {
+                    is TransactionType.YieldSupply.Send -> {
+                        if (isOutgoing || !type.isYieldSupplyWithdraw) {
                             extractSubtitleByAddressType()
                         } else {
                             val amount =
@@ -190,12 +192,9 @@ internal class TxHistoryItemToTransactionStateConverter(
             TransactionType.Staking.Withdraw,
             -> return ""
 
-            is TransactionType.YieldSupply -> if (currency is CryptoCurrency.Token) {
-                when (type) {
-                    TransactionType.YieldSupply.Send -> if (!isOutgoing) {
-                        return ""
-                    }
-                    else -> return ""
+            is TransactionType.YieldSupply -> {
+                if (currency is CryptoCurrency.Token && type == TransactionType.YieldSupply.Send && !isOutgoing) {
+                    return ""
                 }
             }
             else -> Unit
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
index a30612c67e..b04f228e55 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
@@ -71,7 +71,7 @@ internal class TxHistoryItemStateConverter(
             is TransactionType.Swap,
             is TransactionType.Transfer,
             is TransactionType.UnknownOperation,
-            TransactionType.YieldSupply.Send,
+            is TransactionType.YieldSupply.Send,
             TransactionType.YieldSupply.Topup,
             -> if (isOutgoing) R.drawable.ic_arrow_up_24 else R.drawable.ic_arrow_down_24
         }
@@ -93,10 +93,12 @@ internal class TxHistoryItemStateConverter(
             is TransactionType.YieldSupply.Enter -> resourceReference(R.string.yield_module_transaction_enter)
             is TransactionType.YieldSupply.Exit -> resourceReference(R.string.yield_module_transaction_exit)
             TransactionType.YieldSupply.Topup -> resourceReference(R.string.yield_module_transaction_topup)
-            TransactionType.YieldSupply.Send -> if (isOutgoing) {
-                resourceReference(R.string.common_transfer)
-            } else {
-                resourceReference(R.string.yield_module_transaction_withdraw)
+            is TransactionType.YieldSupply.Send -> {
+                if (type.isYieldSupplyWithdraw || isOutgoing) {
+                    resourceReference(R.string.yield_module_transaction_withdraw)
+                } else {
+                    resourceReference(R.string.common_transfer)
+                }
             }
             is TransactionType.YieldSupply.DeployContract -> resourceReference(
                 R.string
@@ -137,8 +139,8 @@ internal class TxHistoryItemStateConverter(
                             wrappedList(amount),
                         )
                     }
-                    TransactionType.YieldSupply.Send -> {
-                        if (isOutgoing) {
+                    is TransactionType.YieldSupply.Send -> {
+                        if (isOutgoing || !type.isYieldSupplyWithdraw) {
                             extractSubtitleByAddressType()
                         } else {
                             val amount =