Updated on 2026-08-14

2025-10-10 12:28:38 +05:00 · 2025-10-10 12:28:38 +05:00 · cfd8ae2957
commit cfd8ae2957
parent d30713a914
13 changed files with 209 additions and 140 deletions
--- a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
@ -7,7 +7,9 @@ import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
 import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
@ -15,6 +17,8 @@ import com.tangem.core.ui.format.bigdecimal.percent
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.StatusSource
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.yieldSupplyKey
 import com.tangem.domain.models.staking.YieldBalance
 import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
 import com.tangem.utils.StringsSigns.DASH_SIGN
@ -35,10 +39,13 @@ import java.math.BigDecimal
 */
 class TokenItemStateConverter(
    private val appCurrency: AppCurrency,
+    private val apyMap: Map<String, String> = emptyMap(),
    private val iconStateProvider: (CryptoCurrencyStatus) -> CurrencyIconState = {
        CryptoCurrencyToIconStateConverter().convert(it)
    },
-    private val titleStateProvider: (CryptoCurrencyStatus) -> TokenItemState.TitleState = Companion::createTitleState,
+    private val titleStateProvider: (CryptoCurrencyStatus) -> TokenItemState.TitleState = {
+        createTitleState(it, apyMap)
+    },
    private val subtitleStateProvider: (CryptoCurrencyStatus) -> TokenItemState.SubtitleState? = {
        createSubtitleState(it, appCurrency)
    },
@ -144,7 +151,10 @@ class TokenItemStateConverter(
        private fun CryptoCurrencyStatus.getStakedBalance() = (value.yieldBalance as? YieldBalance.Data)
            ?.getTotalWithRewardsStakingBalance(blockchainId = currency.network.rawId).orZero()

-        private fun createTitleState(currencyStatus: CryptoCurrencyStatus): TokenItemState.TitleState {
+        private fun createTitleState(
+            currencyStatus: CryptoCurrencyStatus,
+            apyMap: Map<String, String>,
+        ): TokenItemState.TitleState {
            return when (val value = currencyStatus.value) {
                is CryptoCurrencyStatus.Loading,
                is CryptoCurrencyStatus.MissedDerivation,
@ -158,14 +168,33 @@ class TokenItemStateConverter(
                is CryptoCurrencyStatus.NoQuote,
                is CryptoCurrencyStatus.NoAccount,
                -> {
+                    val earnApyText = resolveEarnApy(currencyStatus, apyMap)?.let { apy ->
+                        resourceReference(
+                            R.string.yield_module_earn_badge,
+                            wrappedList(apy),
+                        )
+                    }
                    TokenItemState.TitleState.Content(
                        text = stringReference(currencyStatus.currency.name),
                        hasPending = value.hasCurrentNetworkTransactions,
+                        earnApy = earnApyText,
                    )
                }
            }
        }

+        private fun resolveEarnApy(cryptoCurrencyStatus: CryptoCurrencyStatus, apyMap: Map<String, String>): String? {
+            if (apyMap.isEmpty()) return null
+
+            val isYieldSupplyActive = (cryptoCurrencyStatus.value as? CryptoCurrencyStatus.Loaded)
+                ?.yieldSupplyStatus?.isActive == true
+            if (isYieldSupplyActive) return null
+
+            val token = cryptoCurrencyStatus.currency as? CryptoCurrency.Token ?: return null
+
+            return apyMap[token.yieldSupplyKey()]
+        }
+
        private fun createSubtitleState(
            currencyStatus: CryptoCurrencyStatus,
            appCurrency: AppCurrency,
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@ -1362,7 +1362,7 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">Frühzeitiger Zugriff auf neue Funktionen und exklusive Angebote.</string>
  <string name="user_push_notification_agreement_argument_two_title">Updates zu Funktionen und Neuigkeiten</string>
  <string name="user_push_notification_agreement_header">Möchtest du Push-Benachrichtigungen verwenden?</string>
-  <string name="user_push_notification_banner_subtitle">Aktiviere Push-Benachrichtigungen und wir benachrichtigen Dich sofort, wenn Gelder eintreffen \n</string>
+  <string name="user_push_notification_banner_subtitle">Aktiviere Push-Benachrichtigungen und wir benachrichtigen Dich sofort, wenn Gelder eintreffen</string>
  <string name="user_push_notification_banner_title">Verpasse keine Transaktion</string>
  <string name="user_wallet_list_add_button">Neues Wallet hinzufügen</string>
  <string name="user_wallet_list_delete_prompt">Möchtest Du diese Wallet wirklich entfernen?</string>
--- a/core/res/src/main/res/values-es/strings.xml
+++ b/core/res/src/main/res/values-es/strings.xml
@ -1212,6 +1212,8 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">Acceso anticipado a nuevas funciones y ofertas exclusivas.</string>
  <string name="user_push_notification_agreement_argument_two_title">Actualizaciones de características y noticias</string>
  <string name="user_push_notification_agreement_header">¿Quiere utilizar\nnotificaciones push?</string>
+  <string name="user_push_notification_banner_subtitle">Active las notificaciones push y le avisaremos al instante cuando le lleguen fondos.</string>
+  <string name="user_push_notification_banner_title">No se pierda ninguna transacción</string>
  <string name="user_wallet_list_add_button">Agregar una nueva billetera</string>
  <string name="user_wallet_list_delete_prompt">¿Estás seguro de que deseas olvidar esta billetera?</string>
  <string name="user_wallet_list_error_unable_to_unlock">Ha ocurrido un error, por favor escanee su tarjeta o anillo para iniciar sesión</string>
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@ -1185,6 +1185,8 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">Accès anticipé à de nouvelles fonctionnalités et à des offres exclusives.</string>
  <string name="user_push_notification_agreement_argument_two_title">Actualités et mises à jour</string>
  <string name="user_push_notification_agreement_header">Souhaitez-vous utiliser les\nnotifications push?</string>
+  <string name="user_push_notification_banner_subtitle">Activez les notifications pour recevoir des alertes lorsque des fonds arrivent dans votre portefeuille.</string>
+  <string name="user_push_notification_banner_title">Ne manquez aucune transaction</string>
  <string name="user_wallet_list_add_button">Ajouter un nouveau portefeuille</string>
  <string name="user_wallet_list_delete_prompt">Êtes-vous sûr de vouloir supprimer ce portefeuille ?</string>
  <string name="user_wallet_list_error_unable_to_unlock">Une erreur s\'est produite, veuillez scanner votre carte ou bague pour vous connecter</string>
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@ -291,6 +291,7 @@
  <string name="common_range_with_space">%1$s — %2$s</string>
  <string name="common_read_more">続きを読む</string>
  <string name="common_receive">受け取る</string>
+  <string name="common_recommended">おすすめ</string>
  <string name="common_reject">拒否</string>
  <string name="common_reload">リロード</string>
  <string name="common_rename">名前を変更</string>
@ -347,6 +348,8 @@
  <string name="common_yes">はい</string>
  <string name="contract_address_copied_message">コントラクトアドレスをコピーしました!</string>
  <string name="currency_subtitle_expanded">利用可能なネットワーク</string>
+  <string name="custom_token_another_account_dialog_description">このトークンの導出パスが%1$sの導出パスと一致しています。トークンはこのアカウントに追加されます。</string>
+  <string name="custom_token_another_account_dialog_title">導出パスは別のアカウントに属します。</string>
  <string name="custom_token_contract_address_input_title">コントラクトアドレス</string>
  <string name="custom_token_creation_error_invalid_contract_address">コントラクトアドレスが無効です</string>
  <string name="custom_token_creation_error_network_not_selected">ネットワークを選択してください</string>
@ -464,6 +467,7 @@
  <string name="express_provider">プロバイダー</string>
  <string name="express_provider_best_rate">ベストレート</string>
  <string name="express_provider_fca_warning_list">FCA警告リスト</string>
+  <string name="express_provider_great_rate">お得なレート</string>
  <string name="express_provider_in_fca_warning_list">FCA警告リストに掲載されたプロバイダー</string>
  <string name="express_provider_max_amount">最大 %s まで使用可能</string>
  <string name="express_provider_min_amount">%s 以上で利用可能</string>
@ -1361,9 +1365,10 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">新しい機能や限定オファーへの早期アクセス。</string>
  <string name="user_push_notification_agreement_argument_two_title">機能およびニュースのアップデート</string>
  <string name="user_push_notification_agreement_header">プッシュ通知を使用しますか?</string>
-  <string name="user_push_notification_banner_subtitle">プッシュ通知を有効にすると、資金が到着するとすぐに通知されます</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_delete_hw_prompt">バックアップせずにこのウォレットを削除すると、資金に永久にアクセスできなくなります。</string>
  <string name="user_wallet_list_delete_prompt">このウォレットを忘れてもよろしいですか？</string>
  <string name="user_wallet_list_error_unable_to_unlock">エラーが発生しました。カードまたはリングをスキャンしてログインしてください。</string>
  <string name="user_wallet_list_error_wallet_already_saved">このウォレットはすでに保存されています。別のウォレットを追加できます。</string>
@ -1393,6 +1398,13 @@
  <string name="visa_unlock_notification_button">ロック解除</string>
  <string name="visa_unlock_notification_subtitle">カードをスキャンしてアクセスロックを解除する</string>
  <string name="visa_unlock_notification_title">ロック解除が必要</string>
+  <string name="wallet_add_common_title">ウォレットの追加方法を選択してください</string>
+  <string name="wallet_add_hardware_description">Tangemカードまたはリングをスキャンして復元するか、別のウォレットからインポートしてください。</string>
+  <string name="wallet_add_hardware_info_create">ハードウェアウォレットを作成</string>
+  <string name="wallet_add_hardware_purchase">Tangemウォレットを購入しますか？</string>
+  <string name="wallet_add_import_seed_phrase">シードフレーズをインポート</string>
+  <string name="wallet_add_mobile_description">スマートフォン上でウォレットを復元するか、他のアプリからインポートできますが、Tangemカードと比べるとセキュリティは劣ります。</string>
+  <string name="wallet_add_support_title">お選びください</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>
@ -1657,13 +1669,20 @@
  <string name="wc_uri_already_used_title">URIはすでに使用されています</string>
  <string name="wc_wallet_connect">WalletConnect</string>
  <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_delivery">迅速な配送</string>
+  <string name="welcome_create_wallet_feature_one_tap">ワンタップで開始</string>
+  <string name="welcome_create_wallet_feature_seamless">シームレスで安全</string>
  <string name="welcome_create_wallet_feature_use">シンプルな操作</string>
  <string name="welcome_create_wallet_hardware_description">Tangemでハードウェアウォレットを作成しましょう。銀行のカードのようにスリムで、金庫のように安全です。</string>
  <string name="welcome_create_wallet_mobile_description">ソフトウェアウォレットを作成またはインポート</string>
+  <string name="welcome_create_wallet_mobile_description_full">スマートフォン上にソフトウェアウォレットを作成するか、インポートしてください。</string>
  <string name="welcome_create_wallet_mobile_title">モバイルウォレットから始める</string>
  <string name="welcome_create_wallet_other_method">その他の方法</string>
+  <string name="welcome_create_wallet_use_hardware_description">Tangemハードウェアウォレットを使用する</string>
+  <string name="welcome_create_wallet_use_hardware_title">詳細を見る・購入する</string>
  <string name="welcome_interrupted_backup_alert_discard">破棄</string>
  <string name="welcome_interrupted_backup_alert_message">バックアップが中断されました。再開しますか?</string>
  <string name="welcome_interrupted_backup_alert_resume">はい、再開します</string>
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@ -80,7 +80,7 @@
  <string name="biometric_unavailable_warning">Вы отключили биометрическую аутентификацию на вашем телефоне и не сможете сохранять кошельки в приложении. Для сохранения кошельков, пожалуйста, включите функцию биометрической аутентификации в настройках телефона.</string>
  <string name="bitcoin_promo_activation_error">При обработке промокода произошла ошибка. Пожалуйста, попробуйте позже.</string>
  <string name="bitcoin_promo_activation_error_title">Ошибка активации</string>
-  <string name="bitcoin_promo_activation_success">Ваш промокод успешно активирован. Бонус 10 USDT в Bitcoin будет зачислен через 14 дней.</string>
+  <string name="bitcoin_promo_activation_success">Ваш промокод был успешно активирован. Награда будет зачислена на ваш счёт в течение 14 дней.</string>
  <string name="bitcoin_promo_activation_success_title">Промокод активирован</string>
  <string name="bitcoin_promo_already_activated">Этот промокод уже был использован и не может быть активирован повторно.</string>
  <string name="bitcoin_promo_already_activated_title">Код недоступен</string>
@ -132,7 +132,7 @@
  <string name="common_analytics">Аналитика</string>
  <string name="common_apply">Применить</string>
  <string name="common_approval">Одобрение</string>
-  <string name="common_approve">Подтвердить</string>
+  <string name="common_approve">Разрешить</string>
  <string name="common_attention">Внимание</string>
  <string name="common_available_networks">Доступные сети</string>
  <string name="common_balance">Баланс: %s</string>
@ -1202,7 +1202,7 @@
  <string name="swapping_alert_dex_description_with_slippage">В сумму включена комиссия провайдера сервиса. \n\nПроскальзывание провайдера составляет до %s</string>
  <string name="swapping_alert_title">Информация</string>
  <string name="swapping_approve_information_text">Подтверждения считаются отраслевым стандартом для всех децентрализованных бирж и защищают ваш кошелек от доступа со стороны смарт-контракта без вашего разрешения. По замыслу смарт-контракты не могут получить доступ к вашим токенам, если вы не одобрите доступ со своей стороны. «Разблокируя» свои токены, вы даете смарт-контракту 1inch разрешение тратить ваши активы. Майнеры сети получают компенсацию за газ (оплачиваемый вами) за запись этого действия в блокчейне. Как только разрешение будет предоставлено, вы сможете обменять свой токен.</string>
-  <string name="swapping_approve_information_title">Подтвердить</string>
+  <string name="swapping_approve_information_title">Разрешение</string>
  <string name="swapping_fee_estimation_error_text">Ошибка расчета комиссии. Пожалуйста, отправьте информацию в поддержку.</string>
  <string name="swapping_from_title">Вы отправляете</string>
  <string name="swapping_high_price_impact_description">Обмен этой суммы выбранных токенов может вызвать значительные колебания цены и уменьшить получаемую сумму.</string>
@ -1288,6 +1288,8 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">Ранний доступ к новым функциям и эксклюзивным предложениям.</string>
  <string name="user_push_notification_agreement_argument_two_title">Новые функции и важные новости</string>
  <string name="user_push_notification_agreement_header">Хотите использовать Push-уведомления?</string>
+  <string name="user_push_notification_banner_subtitle">Включите push-уведомления, и мы мгновенно сообщим вам, когда поступят средства.</string>
+  <string name="user_push_notification_banner_title">Не пропустите транзакцию</string>
  <string name="user_wallet_list_add_button">Добавить новый кошелек</string>
  <string name="user_wallet_list_delete_prompt">Вы уверены, что хотите забыть этот кошелек?</string>
  <string name="user_wallet_list_error_unable_to_unlock">Произошла ошибка, пожалуйста, отсканируйте свою карту или кольцо для входа</string>
@ -1559,6 +1561,7 @@
  <string name="xtz_withdrawal_message_ignore">Нет, отправить все</string>
  <string name="xtz_withdrawal_message_reduce">Уменьшить на %s XTZ</string>
  <string name="xtz_withdrawal_message_warning">Чтобы не платить повышенную комиссию при следующем пополнении кошелька, уменьшите сумму на %s XTZ</string>
+  <string name="yield_module_approve_needed_notification_cta">Выдать разрешение</string>
  <string name="yield_module_chart_loading_error">Невозможно загрузить график</string>
  <string name="yield_module_deposit_error_notification_title">Полученная сумма, %1$s %2$s, не была зачислена на Aave.</string>
  <string name="yield_module_high_fee_error">Сетевая комиссия сейчас слишком высокая. Ожидаем, пока она упадёт ниже вашего лимита.</string>
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@ -135,7 +135,7 @@
  <string name="biometric_unavailable_warning">You have disabled biometric authentication on your phone and will not be able to save wallets in the app. To save wallets, please enable the biometric authentication function in your phone settings.</string>
  <string name="bitcoin_promo_activation_error">An error occurred while processing your promo code. Please try again later.</string>
  <string name="bitcoin_promo_activation_error_title">Activation error</string>
-  <string name="bitcoin_promo_activation_success">Your promo code was successfully activated. A bonus of 10 USDT in Bitcoin will be credited to your account within 14 days.</string>
+  <string name="bitcoin_promo_activation_success">Your promo code was successfully activated. A reward will be credited to your account within 14 days.</string>
  <string name="bitcoin_promo_activation_success_title">Promo Code Activated</string>
  <string name="bitcoin_promo_already_activated">This promo code has already been used and cannot be activated again.</string>
  <string name="bitcoin_promo_already_activated_title">Code unavailable</string>
@ -297,6 +297,7 @@
  <string name="common_range_with_space">%1$s — %2$s</string>
  <string name="common_read_more">Read more</string>
  <string name="common_receive">Receive</string>
+  <string name="common_recommended">Recommended</string>
  <string name="common_reject">Reject</string>
  <string name="common_reload">Reload</string>
  <string name="common_rename">Rename</string>
@ -474,6 +475,7 @@
  <string name="express_provider">Provider</string>
  <string name="express_provider_best_rate">Best rate</string>
  <string name="express_provider_fca_warning_list">FCA Warning List</string>
+  <string name="express_provider_great_rate">Great rate</string>
  <string name="express_provider_in_fca_warning_list">Provider in FCA warning list</string>
  <string name="express_provider_max_amount">Available up to %s</string>
  <string name="express_provider_min_amount">Available from %s</string>
@ -1117,8 +1119,8 @@
  <string name="settings_forget_wallet_footer">This will remove the wallet from the application. The wallet itself can be added again.</string>
  <string name="settings_wallet_name_title">Name</string>
  <string name="stake_token_description">Put your token to work</string>
-  <string name="staking_account_initialization_footer">A network fee is a small payment to process and confirm your transaction on the blockchain.</string>
-  <string name="staking_account_initialization_message">To start staking, your TON account must be activated with a self-transaction of 1 TON. The funds stay in your wallet — this step only enables your account for staking.</string>
+  <string name="staking_account_initialization_footer">A network fee is a small payment required to process and confirm your transaction on the blockchain.</string>
+  <string name="staking_account_initialization_message">To start staking, your TON account must be activated with a self-transaction of 1 TON. The funds stay in your wallet — this step only enables your account for staking.</string>
  <string name="staking_account_initialization_title">Account activation</string>
  <string name="staking_amount_requirement_error">The amount to stake must be at least %s</string>
  <string name="staking_amount_tron_integer_error">Staking amount will be rounded to %1$s TRX due to network rules.</string>
@ -1386,9 +1388,10 @@
  <string name="user_push_notification_agreement_argument_two_subtitle">Early access to fresh features and exclusive offers.</string>
  <string name="user_push_notification_agreement_argument_two_title">Feature and News Updates</string>
  <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 and we’ll notify you instantly when funds arrive\n</string>
-  <string name="user_push_notification_banner_title">Don’t Miss a Transaction</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_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>
  <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
@ -1465,6 +1468,13 @@
  <string name="visa_unlock_notification_button">Unlock</string>
  <string name="visa_unlock_notification_subtitle">Scan your card to unlock access</string>
  <string name="visa_unlock_notification_title">Needed unlock</string>
+  <string name="wallet_add_common_title">Choose how to add your wallet</string>
+  <string name="wallet_add_hardware_description">Scan your Tangem card or ring to restore it or import from another wallet.</string>
+  <string name="wallet_add_hardware_info_create">Create Hardware Wallet</string>
+  <string name="wallet_add_hardware_purchase">Want to purchase a Tangem Wallet?</string>
+  <string name="wallet_add_import_seed_phrase">Import seed phrase</string>
+  <string name="wallet_add_mobile_description">Restore your wallet on your phone or import from another app — convenient, but less secure than a Tangem card.</string>
+  <string name="wallet_add_support_title">What to choose?</string>
  <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
  <string name="wallet_balance_missing_derivation">Scan card or ring</string>
  <string name="wallet_been_activated_message">This wallet has already been activated earlier.\nIf it was not done by you, please contact support.\nTangem never sells wallets along with pre-generated access codes.</string>
@ -1504,6 +1514,7 @@
  <string name="wallet_connect_subtitle">Connect to dApps</string>
  <string name="wallet_connect_title">WalletConnect</string>
  <string name="wallet_connect_toast_awaiting_session_proposal">Connecting may take a few seconds</string>
+  <string name="wallet_create_common_title">Create Tangem Wallet</string>
  <string name="wallet_create_hardware_badge">From %s</string>
  <string name="wallet_create_hardware_description">Buy Tangem Wallet—a physical device that securely stores your private key offline.</string>
  <string name="wallet_create_hardware_title">Hardware Wallet</string>
@ -1731,13 +1742,20 @@
  <string name="wc_uri_already_used_title">URI already used</string>
  <string name="wc_wallet_connect">WalletConnect</string>
  <string name="wc_warning_transaction">Suspicious transaction</string>
+  <string name="welcome_create_wallet_already_have">Already have Tangem?</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_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>
  <string name="welcome_create_wallet_feature_use">Simple to use</string>
  <string name="welcome_create_wallet_hardware_description">Create a hardware wallet with Tangem. Slim as a bank card, secure as a bank vault.</string>
  <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_use_hardware_description">Use 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>
  <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
  <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
@ -1814,7 +1832,8 @@
  <string name="yield_module_supply_apr">Supply APR</string>
  <string name="yield_module_token_details_earn_notification_apy">APY</string>
  <string name="yield_module_token_details_earn_notification_description">Make your money work — earn interest on your balance.</string>
-  <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">Earning on your balance</string>
+  <string name="yield_module_token_details_earn_notification_earning_on_your_balance_subtitle">Interest accrues automatically</string>
+  <string name="yield_module_token_details_earn_notification_earning_on_your_balance_title">Aave lending</string>
  <string name="yield_module_token_details_earn_notification_processing">Processing your deposit</string>
  <string name="yield_module_token_details_earn_notification_title">Earn %1$s%% per year</string>
  <string name="yield_module_transfer_mode_automatic">Automatic</string>
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
@ -2,7 +2,6 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert

 import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter
 import com.tangem.common.ui.tokens.TokenItemStateConverter
-import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.components.tokenlist.state.PortfolioTokensListItemUM
 import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
 import com.tangem.core.ui.extensions.resourceReference
@ -14,9 +13,7 @@ import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.account.AccountId
 import com.tangem.domain.models.account.AccountStatus
-import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.currency.yieldSupplyKey
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.tokenlist.TokenList.GroupedByNetwork.NetworkGroup
 import com.tangem.domain.models.wallet.UserWallet
@ -37,7 +34,7 @@ internal class TokenListStateConverter(
    private val params: TokenConverterParams,
    private val selectedWallet: UserWallet,
    private val clickIntents: WalletClickIntents,
-    private val apyMap: Map<String, String> = emptyMap(),
+    private val apyMap: Map<String, String>,
 ) : Converter<WalletTokensListState, WalletTokensListState> {

    private val onTokenClick: (accountId: AccountId?, currencyStatus: CryptoCurrencyStatus) -> Unit =
@ -52,6 +49,7 @@ internal class TokenListStateConverter(

    private fun tokenStatusConverter(accountId: AccountId? = null) = TokenItemStateConverter(
        appCurrency = appCurrency,
+        apyMap = apyMap,
        onItemClick = { _, status -> onTokenClick(accountId, status) },
        onItemLongClick = { _, status -> onTokenLongClick(accountId, status) },
    )
@ -168,52 +166,13 @@ internal class TokenListStateConverter(
        tokenConverter: TokenItemStateConverter,
        token: CryptoCurrencyStatus,
    ): List<TokensListItemUM> {
-        val tokenItemState = tokenConverter.convert(token).withEarnApyBadge(token)
+        val tokenItemState = tokenConverter.convert(token)

        add(TokensListItemUM.Token(tokenItemState))

        return this
    }

-    private fun TokenItemState.withEarnApyBadge(cryptoCurrencyStatus: CryptoCurrencyStatus): TokenItemState {
-        val apy: String? = resolveEarnApy(cryptoCurrencyStatus)
-
-        val shouldApply = apy != null && this.titleState is TokenItemState.TitleState.Content
-
-        return if (!shouldApply) {
-            this
-        } else {
-            val contentTitle = this.titleState as TokenItemState.TitleState.Content
-            val newTitle = contentTitle.copy(
-                earnApy = resourceReference(
-                    R.string.yield_module_earn_badge,
-                    wrappedList(apy),
-                ),
-            )
-
-            when (this) {
-                is TokenItemState.Content -> this.copy(titleState = newTitle)
-                is TokenItemState.Unreachable -> this.copy(titleState = newTitle)
-                is TokenItemState.NoAddress -> this.copy(titleState = newTitle)
-                is TokenItemState.Loading -> this.copy(titleState = newTitle)
-                is TokenItemState.Draggable -> this.copy(titleState = newTitle)
-                is TokenItemState.Locked -> this
-            }
-        }
-    }
-
-    private fun resolveEarnApy(cryptoCurrencyStatus: CryptoCurrencyStatus): String? {
-        if (apyMap.isEmpty()) return null
-
-        val isYieldSupplyActive = (cryptoCurrencyStatus.value as? CryptoCurrencyStatus.Loaded)
-            ?.yieldSupplyStatus?.isActive == true
-        if (isYieldSupplyActive) return null
-
-        val token = cryptoCurrencyStatus.currency as? CryptoCurrency.Token ?: return null
-
-        return apyMap[token.yieldSupplyKey()]
-    }
-
    private fun getOrganizeTokensButtonState(tokenList: TokenList): WalletOrganizeTokensButtonConfig? {
        val currenciesSize = when (tokenList) {
            TokenList.Empty -> return null
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/DefaultYieldSupplyComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/DefaultYieldSupplyComponent.kt
@ -38,9 +38,8 @@ internal class DefaultYieldSupplyComponent @AssistedInject constructor(
    override fun Content(modifier: Modifier) {
        val yieldSupplyUM by model.uiState.collectAsStateWithLifecycle()
        val bottomSheet by bottomSheetSlot.subscribeAsState()
-        val isBalanceHidden by model.isBalanceHiddenFlow.collectAsStateWithLifecycle()

-        YieldSupplyBlockContent(yieldSupplyUM = yieldSupplyUM, isBalanceHidden = isBalanceHidden, modifier = modifier)
+        YieldSupplyBlockContent(yieldSupplyUM = yieldSupplyUM, modifier = modifier)

        bottomSheet.child?.instance?.BottomSheet()
    }
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt
@ -18,7 +18,8 @@ internal sealed class YieldSupplyUM {
    data object Unavailable : YieldSupplyUM()

    data class Content(
-        val rewardsBalance: TextReference,
+        val title: TextReference,
+        val subtitle: TextReference,
        val rewardsApy: TextReference,
        val onClick: () -> Unit,
        val isAllowedToSpend: Boolean,
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt
@ -7,12 +7,15 @@ import com.tangem.common.routing.AppRouter
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
-import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.network.TxInfo
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.yield.supply.YieldSupplyStatus
 import com.tangem.domain.tokens.FetchCurrencyStatusUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
@ -20,6 +23,7 @@ import com.tangem.domain.yield.supply.usecase.YieldSupplyActivateUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyDeactivateUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyGetTokenStatusUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyIsAvailableUseCase
+import com.tangem.features.yield.supply.impl.R
 import com.tangem.features.yield.supply.api.YieldSupplyComponent
 import com.tangem.features.yield.supply.impl.main.entity.YieldSupplyUM
 import com.tangem.features.yield.supply.impl.main.model.transformers.YieldSupplyTokenStatusSuccessTransformer
@ -72,6 +76,8 @@ internal class YieldSupplyModel @Inject constructor(
    val isBalanceHiddenFlow: StateFlow<Boolean>
        field = MutableStateFlow(false)

+    private var lastYieldSupplyStatus: YieldSupplyStatus? = null
+
    init {
        checkIfYieldSupplyIsAvailable()
    }
@ -100,7 +106,7 @@ internal class YieldSupplyModel @Inject constructor(
                        maybeCryptoCurrency.fold(
                            ifRight = { cryptoCurrencyStatus ->
                                cryptoCurrencyStatusFlow.update { cryptoCurrencyStatus }
-                                onDataLoaded(cryptoCurrencyStatus)
+                                onCryptoCurrencyStatusUpdated(cryptoCurrencyStatus)
                            },
                            ifLeft = {
                                Timber.w(it.toString())
@ -128,6 +134,7 @@ internal class YieldSupplyModel @Inject constructor(
                        ),
                    )
                }.onLeft {
+                    Timber.e(it)
                    uiState.update { YieldSupplyUM.Unavailable }
                }
        }
@ -157,50 +164,76 @@ internal class YieldSupplyModel @Inject constructor(
            .launchIn(modelScope)
    }

-    private fun onDataLoaded(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    @Suppress("MaximumLineLength")
+    private fun onCryptoCurrencyStatusUpdated(cryptoCurrencyStatus: CryptoCurrencyStatus) {
        val yieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
        val hasActiveTransaction = cryptoCurrencyStatus.value.hasCurrentNetworkTransactions
        val yieldTransaction = cryptoCurrencyStatus.value.pendingTransactions.firstOrNull {
            it.type is TxInfo.TransactionType.YieldSupply
        }?.type as? TxInfo.TransactionType.YieldSupply
-        sendInfoAboutProtocolStatus(yieldSupplyStatus?.isActive == true)
+        sendInfoAboutProtocolStatus(cryptoCurrencyStatus)

-        val yieldSupplyUM = when {
+        when {
            hasActiveTransaction && yieldTransaction != null -> {
                coroutineScope.launch(dispatchers.io) {
                    delay(PROCESSING_UPDATE_DELAY)
                    fetchCurrencyStatusUseCase(userWalletId = userWallet.walletId, cryptoCurrency.id)
                }
-                when (yieldTransaction) {
-                    TxInfo.TransactionType.YieldSupply.Enter -> YieldSupplyUM.Processing.Enter
-                    TxInfo.TransactionType.YieldSupply.Exit -> YieldSupplyUM.Processing.Exit
+                uiState.update {
+                    when (yieldTransaction) {
+                        TxInfo.TransactionType.YieldSupply.Enter -> YieldSupplyUM.Processing.Enter
+                        TxInfo.TransactionType.YieldSupply.Exit -> YieldSupplyUM.Processing.Exit
+                    }
+                }
+            }
+            yieldSupplyStatus?.isActive == true -> {
+                val cryptoCurrencyToken = cryptoCurrency as? CryptoCurrency.Token ?: return
+                modelScope.launch(dispatchers.default) {
+                    yieldSupplyGetTokenStatusUseCase(cryptoCurrencyToken)
+                        .onRight { tokenStatus ->
+                            uiState.update {
+                                YieldSupplyUM.Content(
+                                    title = resourceReference(
+                                        R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
+                                    ),
+                                    subtitle = resourceReference(
+                                        R.string.yield_module_token_details_earn_notification_earning_on_your_balance_subtitle,
+                                    ),
+                                    rewardsApy = combinedReference(
+                                        resourceReference(
+                                            R.string.yield_module_token_details_earn_notification_apy,
+                                        ),
+                                        stringReference(tokenStatus.apy.toString() + "%"),
+                                    ),
+                                    onClick = ::onActiveClick,
+                                    isAllowedToSpend = yieldSupplyStatus.isAllowedToSpend,
+                                )
+                            }
+                        }.onLeft {
+                            Timber.e(it)
+                            uiState.update { YieldSupplyUM.Loading }
+                        }
                }
            }
-            yieldSupplyStatus?.isActive == true ->
-                YieldSupplyUM.Content(
-                    rewardsBalance = TextReference.EMPTY,
-                    rewardsApy = TextReference.EMPTY,
-                    onClick = ::onActiveClick,
-                    isAllowedToSpend = yieldSupplyStatus.isAllowedToSpend,
-                )
-            else -> YieldSupplyUM.Initial
-        }

-        uiState.update { yieldSupplyUM }
-
-        when (yieldSupplyUM) {
-            is YieldSupplyUM.Initial -> loadTokenStatus()
-            else -> Unit
+            else -> {
+                loadTokenStatus()
+            }
        }
    }

-    private fun sendInfoAboutProtocolStatus(isActivated: Boolean) {
+    private fun sendInfoAboutProtocolStatus(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        if (lastYieldSupplyStatus == cryptoCurrencyStatus.value.yieldSupplyStatus) return
        val token = cryptoCurrency as? CryptoCurrency.Token ?: return
        modelScope.launch(dispatchers.default) {
-            if (isActivated) {
-                yieldSupplyActivateUseCase(token)
+            if (cryptoCurrencyStatus.value.yieldSupplyStatus?.isActive == true) {
+                yieldSupplyActivateUseCase(token).onRight {
+                    lastYieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
+                }
            } else {
-                yieldSupplyDeactivateUseCase(token)
+                yieldSupplyDeactivateUseCase(token).onRight {
+                    lastYieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
+                }
            }
        }
    }
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
@ -3,6 +3,7 @@ package com.tangem.features.yield.supply.impl.main.ui
 import android.content.res.Configuration
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@ -17,12 +18,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.SecondaryButton
+import com.tangem.core.ui.components.SpacerW12
 import com.tangem.core.ui.components.SpacerW8
 import com.tangem.core.ui.components.TextShimmer
 import com.tangem.core.ui.components.buttons.common.TangemButtonSize
@ -34,11 +37,7 @@ import com.tangem.features.yield.supply.impl.main.entity.YieldSupplyUM
 import com.tangem.utils.StringsSigns

@Composable
-internal fun YieldSupplyBlockContent(
-    yieldSupplyUM: YieldSupplyUM,
-    isBalanceHidden: Boolean,
-    modifier: Modifier = Modifier,
-) {
+internal fun YieldSupplyBlockContent(yieldSupplyUM: YieldSupplyUM, modifier: Modifier = Modifier) {
    AnimatedContent(
        targetState = yieldSupplyUM,
        modifier = modifier,
@ -46,7 +45,7 @@ internal fun YieldSupplyBlockContent(
        when (supplyUM) {
            is YieldSupplyUM.Available -> SupplyAvailable(supplyUM)
            YieldSupplyUM.Loading -> SupplyLoading()
-            is YieldSupplyUM.Content -> SupplyContent(supplyUM, isBalanceHidden)
+            is YieldSupplyUM.Content -> SupplyContent(supplyUM)
            YieldSupplyUM.Processing.Enter -> SupplyProcessing(
                resourceReference(R.string.yield_module_token_details_earn_notification_processing),
            )
@ -87,7 +86,7 @@ private fun SupplyUnavailable() {
 }

@Composable
-private fun SupplyContent(supplyUM: YieldSupplyUM.Content, isBalanceHidden: Boolean) {
+private fun SupplyContent(supplyUM: YieldSupplyUM.Content) {
    Row(
        verticalAlignment = Alignment.CenterVertically,
        modifier = Modifier
@ -96,22 +95,21 @@ private fun SupplyContent(supplyUM: YieldSupplyUM.Content, isBalanceHidden: Bool
            .clickable(onClick = supplyUM.onClick)
            .padding(12.dp),
    ) {
+        Image(
+            painter = painterResource(R.drawable.img_aave_22),
+            modifier = Modifier.size(36.dp),
+            contentDescription = null,
+        )
+        SpacerW12()
        Column(
            verticalArrangement = Arrangement.spacedBy(4.dp),
            modifier = Modifier.weight(1f),
        ) {
-            Text(
-                text = stringResourceSafe(
-                    R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
-                ),
-                style = TangemTheme.typography.subtitle2,
-                color = TangemTheme.colors.text.tertiary,
-            )
            Row(
                horizontalArrangement = Arrangement.spacedBy(4.dp),
            ) {
                Text(
-                    text = supplyUM.rewardsBalance.orMaskWithStars(isBalanceHidden).resolveReference(),
+                    text = supplyUM.title.resolveReference(),
                    style = TangemTheme.typography.subtitle1,
                    color = TangemTheme.colors.text.primary1,
                )
@ -123,9 +121,15 @@ private fun SupplyContent(supplyUM: YieldSupplyUM.Content, isBalanceHidden: Bool
                Text(
                    text = supplyUM.rewardsApy.resolveReference(),
                    style = TangemTheme.typography.subtitle1,
-                    color = TangemTheme.colors.text.tertiary,
+                    maxLines = 1,
+                    color = TangemTheme.colors.text.accent,
                )
            }
+            Text(
+                text = supplyUM.subtitle.resolveReference(),
+                style = TangemTheme.typography.caption2,
+                color = TangemTheme.colors.text.primary1,
+            )
        }
        SpacerW8()
        AnimatedVisibility(supplyUM.isAllowedToSpend.not()) {
@ -146,36 +150,42 @@ private fun SupplyContent(supplyUM: YieldSupplyUM.Content, isBalanceHidden: Bool

@Composable
 private fun SupplyProcessing(text: TextReference) {
-    Column(
-        verticalArrangement = Arrangement.spacedBy(4.dp),
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
        modifier = Modifier
-            .fillMaxWidth()
            .clip(RoundedCornerShape(16.dp))
            .background(TangemTheme.colors.background.primary)
            .padding(12.dp),
    ) {
-        Text(
-            text = stringResourceSafe(
-                R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
-            ),
-            style = TangemTheme.typography.subtitle2,
-            color = TangemTheme.colors.text.tertiary,
+        Image(
+            painter = painterResource(R.drawable.img_aave_22),
+            modifier = Modifier.size(36.dp),
+            contentDescription = null,
        )
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(4.dp),
+        SpacerW12()
+        Column(
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            modifier = Modifier.weight(1f),
        ) {
            Text(
-                text = text.resolveReference(),
-                style = TangemTheme.typography.body1,
+                text = stringResourceSafe(
+                    R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
+                ),
+                style = TangemTheme.typography.subtitle2,
                color = TangemTheme.colors.text.tertiary,
            )
-            CircularProgressIndicator(
-                modifier = Modifier.size(16.dp),
-                color = TangemTheme.colors.icon.accent,
-                strokeWidth = 2.dp,
+            Text(
+                text = text.resolveReference(),
+                style = TangemTheme.typography.caption2,
+                color = TangemTheme.colors.text.primary1,
            )
        }
+        SpacerW8()
+        CircularProgressIndicator(
+            modifier = Modifier.size(20.dp),
+            color = TangemTheme.colors.icon.accent,
+            strokeWidth = 2.dp,
+        )
    }
 }

@ -286,7 +296,7 @@ private fun SupplyInfo(
@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
 private fun YieldSupplyBlockContent_Preview(@PreviewParameter(PreviewProvider::class) params: YieldSupplyUM) {
    TangemThemePreview {
-        YieldSupplyBlockContent(params, true)
+        YieldSupplyBlockContent(yieldSupplyUM = params, modifier = Modifier)
    }
 }

@ -301,13 +311,15 @@ private class PreviewProvider : PreviewParameterProvider<YieldSupplyUM> {
                onClick = {},
            ),
            YieldSupplyUM.Content(
-                rewardsBalance = stringReference("1 USDT"),
+                title = stringReference("Aave lending is active"),
+                subtitle = stringReference("Interest accrues automatically"),
                rewardsApy = stringReference("5.1 % APY"),
                onClick = {},
                isAllowedToSpend = false,
            ),
            YieldSupplyUM.Content(
-                rewardsBalance = stringReference("1 USDT"),
+                title = stringReference("Aave lending is active"),
+                subtitle = stringReference("Interest accrues automatically"),
                rewardsApy = stringReference("5.1 % APY"),
                onClick = {},
                isAllowedToSpend = true,
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
@ -56,17 +56,6 @@ internal fun YieldSupplyActiveContent(
                .fillMaxWidth()
                .padding(12.dp),
        ) {
-            Text(
-                text = stringResourceSafe(R.string.yield_module_earn_sheet_total_earnings_title),
-                style = TangemTheme.typography.subtitle2,
-                color = TangemTheme.colors.text.tertiary,
-            )
-            ResizableText(
-                text = state.totalEarnings.orMaskWithStars(isBalanceHidden).resolveReference(),
-                style = TangemTheme.typography.h2,
-                color = TangemTheme.colors.text.primary1,
-            )
-
            CurrentApy(state.apy)
            chartComponent.Content(Modifier.padding(bottom = 12.dp))
        }
@ -85,22 +74,23 @@ internal fun YieldSupplyActiveContent(

@Composable
 private fun CurrentApy(apy: TextReference?, modifier: Modifier = Modifier) {
-    Row(modifier = modifier.padding(vertical = 12.dp), verticalAlignment = Alignment.CenterVertically) {
+    Column(modifier = modifier.padding(vertical = 12.dp)) {
        Text(
-            modifier = modifier.weight(1.0f),
+            modifier = Modifier,
            text = stringResourceSafe(R.string.yield_module_earn_sheet_current_apy_title),
-            style = TangemTheme.typography.body1,
+            style = TangemTheme.typography.subtitle2,
            color = TangemTheme.colors.text.tertiary,
        )
        AnimatedContent(
+            modifier = Modifier.height(32.dp),
            targetState = apy?.resolveReference(),
            label = "CurrentApy",
        ) { apyText ->
            if (apyText == null) {
                TextShimmer(
-                    modifier = modifier.width(56.dp),
+                    modifier = modifier.width(94.dp),
                    text = "",
-                    style = TangemTheme.typography.body1,
+                    style = TangemTheme.typography.head,
                )
            } else {
                Row(verticalAlignment = Alignment.CenterVertically) {
@ -108,7 +98,7 @@ private fun CurrentApy(apy: TextReference?, modifier: Modifier = Modifier) {
                        painterResource(R.drawable.ic_arrow_up_8),
                        tint = TangemTheme.colors.text.accent,
                        contentDescription = null,
-                        modifier = Modifier.padding(end = 8.dp),
+                        modifier = Modifier.padding(end = 6.dp).size(12.dp),
                    )
                    Text(
                        modifier = modifier,
@ -260,6 +250,7 @@ private class YieldSupplyActiveBottomSheetPreviewProvider : PreviewParameterProv
                ),
                subtitleLink = resourceReference(R.string.common_read_more),
                notificationUM = NotificationUM.Error.InvalidAmount,
+                apy = stringReference("5,14%"),
            ),
        )
 }