diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index 15fe23fdca..559c09d33c 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -50,7 +50,6 @@
   <string name="send_total_subtitle_format">%s wird gesendet</string>
   <string name="send_transaction_success">Die Transaktion wurde erfolgreich signiert und an den Blockchain-Knoten gesendet. Die Walletbilanz wird aktualisiert</string>
   <string name="send_validation_invalid_address">Ungültige Adresse</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
   <string name="twins_recreate_toolbar">Tangem Twin</string>
   <string name="wallet_connect_title">WalletConnect</string>
   <string name="wallet_notification_address_copied">Die Adresse wurde erfolgreich kopiert</string>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 0901cc1225..e7454edeb7 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -50,7 +50,6 @@
   <string name="send_total_subtitle_format">Sera envoyé %s</string>
   <string name="send_transaction_success">La transaction a été signée avec succès et envoyée au nœud de blockchain. Le solde du portefeuille sera mis à jour après un certain temps</string>
   <string name="send_validation_invalid_address">Adresse incorrecte</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
   <string name="twins_recreate_toolbar">Tangem Twin</string>
   <string name="wallet_connect_title">WalletConnect</string>
   <string name="wallet_notification_address_copied">L\'adresse a été copiée avec succès</string>
diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml
index 2c944c1c4a..e7caa7829e 100644
--- a/core/res/src/main/res/values-it/strings.xml
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -50,7 +50,6 @@
   <string name="send_total_subtitle_format">Sarà inviato %s</string>
   <string name="send_transaction_success">La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo</string>
   <string name="send_validation_invalid_address">Indirizzo non valido</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
   <string name="twins_recreate_toolbar">Tangem Twin</string>
   <string name="wallet_connect_title">WalletConnect</string>
   <string name="wallet_notification_address_copied">L\'indirizzo è stato copiato con successo</string>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 8474f7f533..92eb872a29 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -15,6 +15,7 @@
   <string name="alert_manage_tokens_unsupported_message">Токены в сети %1$s не поддерживаются этой картой из-за ограничений прошивки.</string>
   <string name="alert_troubleshooting_scan_card_title">У вас возникли трудности со сканированием карты?</string>
   <string name="alert_unsupported_card">Эта карта не предназначена для работы с этим приложением</string>
+  <string name="app_settings_default_fee_footer">Подключите функцию комиссии по умолчанию и при формировании транзакции на отправку средств комиссия будет выставлена автоматически, а экран комиссии пропущен. Вы всегда сможете на него вернуться.</string>
   <string name="app_settings_enable_biometrics_description">Перейдите в настройки, чтобы включить биометрическую аутентификацию в приложении Tangem</string>
   <string name="app_settings_enable_biometrics_title">Включите биометрическую аутентификацию</string>
   <string name="app_settings_off_saved_access_code_alert_message">Все сохраненные коды доступа будут удалены. Вам потребуется вводить код доступа при работе с кошельком.</string>
@@ -139,6 +140,7 @@
   <string name="custom_token_creation_error_invalid_contract_address">Адрес контракта некорректен</string>
   <string name="custom_token_creation_error_invalid_derivation_path">Путь деривации некорректен</string>
   <string name="custom_token_creation_error_network_not_selected">Пожалуйста, выберите сеть</string>
+  <string name="custom_token_creation_error_wrong_decimals">Десятичное число должно быть действительным целым числом, до %li</string>
   <string name="custom_token_custom_derivation">Своя деривация</string>
   <string name="custom_token_custom_derivation_placeholder">Например m/00\'/0000\'/0\'/0/0</string>
   <string name="custom_token_custom_derivation_title">Введите свою деривацию</string>
@@ -185,7 +187,6 @@
   <string name="exchange_tokens_empty_tokens">У вас нет добавленных токенов. Добавьте токены для обмена</string>
   <string name="exchange_tokens_unavailable_tokens_header">Недоступен для обмена с %s</string>
   <string name="express_by_provider">Предоставлено</string>
-  <string name="express_by_provider_placeholder">Предоставлено %s</string>
   <string name="express_cex_status_button_title">Статус</string>
   <string name="express_choose_providers_subtitle">Tangem предоставляет доступ к обмену через сторонних поставщиков в соответствии с их правилами</string>
   <string name="express_choose_providers_title">Выберите провайдера</string>
@@ -262,6 +263,7 @@
   <string name="main_tokens">Токены</string>
   <string name="manage_tokens_add">Добавить</string>
   <string name="manage_tokens_edit">Изменить</string>
+  <string name="manage_tokens_list_header_title">Рыночная капитализация</string>
   <string name="manage_tokens_network_selector_native_title">Основная сеть</string>
   <string name="manage_tokens_network_selector_non_native_subtitle">Не основной или основной блокчейн, на котором размещен токен</string>
   <string name="manage_tokens_network_selector_non_native_title">Не основные сети</string>
@@ -275,7 +277,6 @@
     <item quantity="other">%1$d из %2$d кошельков</item>
   </plurals>
   <string name="manage_tokens_search_placeholder">например Bitcoin</string>
-  <string name="manage_tokens_title">Рыночная капитализация</string>
   <string name="manage_tokens_unavailable_description">Выбранный токен не доступен в кошельке на данный момент. Но не переживайте, вы можете выразить свой интерес проголосовав за его добавление.</string>
   <string name="manage_tokens_unavailable_vote">Голосовать</string>
   <string name="manage_tokens_wallet_selector_title">Выберите кошелек</string>
@@ -320,7 +321,19 @@
   <string name="onboarding_navbar_title_creating_backup">Резервная копия</string>
   <string name="onboarding_seed_button_read_more">Прочитать о seed-фразе</string>
   <string name="onboarding_seed_generate_message">Запишите эти 12 слов в порядке, указанном ниже, и сохраните их в надежном месте.</string>
+  <plurals name="onboarding_seed_generate_message_words_count">
+    <item quantity="one"></item>
+    <item quantity="few">Запишите эти %d слова в порядке, указанном ниже, и сохраните их в надежном месте.</item>
+    <item quantity="many">Запишите эти %d слов в порядке, указанном ниже, и сохраните их в надежном месте.</item>
+    <item quantity="other">Запишите эти %d слов в порядке, указанном ниже, и сохраните их в надежном месте.</item>
+  </plurals>
   <string name="onboarding_seed_generate_title">Ваша seed-фраза</string>
+  <plurals name="onboarding_seed_generate_words_count">
+    <item quantity="one"></item>
+    <item quantity="few">%d слова</item>
+    <item quantity="many">%d слов</item>
+    <item quantity="other">%d слов</item>
+  </plurals>
   <string name="onboarding_seed_import_message">Чтобы импортировать кошелек, введите seed-фразу в поле ниже</string>
   <string name="onboarding_seed_intro_button_generate">Создать seed-фразу</string>
   <string name="onboarding_seed_intro_button_import">Импорт кошелька</string>
@@ -484,10 +497,6 @@
   <string name="send_total_subtitle_format">%s будет отправлено</string>
   <string name="send_transaction_success">Транзакция успешно подписана и отправлена в блокчейн. Баланс будет обновлен через некоторое время</string>
   <string name="send_validation_invalid_address">Неверный адрес</string>
-  <string name="shop_buy_now">Купить сейчас</string>
-  <string name="shop_i_have_a_promo_code">У меня есть промо-код…</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
-  <string name="shop_other_payment_methods">Другие способы оплаты</string>
   <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
   <string name="story_awe_title">Революционный аппаратный кошелек</string>
   <string name="story_backup_description">До трех карт с одним кошельком</string>
@@ -509,14 +518,11 @@
   <string name="swapping_alert_title">Комиссии</string>
   <string name="swapping_approve_information_text">Подтверждения считаются отраслевым стандартом для всех децентрализованных бирж и защищают ваш кошелек от доступа со стороны смарт-контракта без вашего разрешения. По замыслу смарт-контракты не могут получить доступ к вашим токенам, если вы не одобрите доступ со своей стороны. «Разблокируя» свои токены, вы даете смарт-контракту 1inch разрешение тратить ваши активы. Майнеры сети получают компенсацию за газ (оплачиваемый вами) за запись этого действия в блокчейне. Как только разрешение будет предоставлено, вы сможете обменять свой токен.</string>
   <string name="swapping_approve_information_title">Подтвердить</string>
-  <string name="swapping_error_wrapper">Ошибка: %s</string>
   <string name="swapping_from_title">Вы отправляете</string>
   <string name="swapping_give_permission">Дать разрешение</string>
   <string name="swapping_high_price_impact_description">Обмен этой суммы выбранных токенов может вызвать значительные колебания цены и уменьшить получаемую сумму.</string>
   <string name="swapping_insufficient_funds">Недостаточно средств</string>
   <string name="swapping_network_fee_warning_content">Сумма отправки будет уменьшена для покрытия выбранного уровня комиссии</string>
-  <string name="swapping_pending_transaction_subtitle">Транзакция в процессе…</string>
-  <string name="swapping_pending_transaction_title">Подождите</string>
   <string name="swapping_permission_buttons_approve">Подтвердить</string>
   <string name="swapping_permission_current_transaction">Текущая транзакция</string>
   <string name="swapping_permission_fee_footer">Комиссия сети за одобрение токена будет взиматься за подтверждение того, что именно вы разрешаете использовать ваш токен для обмена.</string>
diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml
index b5cdf09a4e..3b90b9b331 100644
--- a/core/res/src/main/res/values-zh-rTW/strings.xml
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -185,6 +185,9 @@
   <string name="onboarding_navbar_title_creating_backup">創建備份</string>
   <string name="onboarding_seed_button_read_more">閱讀更多關於助記詞的訊息</string>
   <string name="onboarding_seed_generate_message">按照下面給出的順序寫下這 12 個單詞，並將它們存放在安全秘密的地方。</string>
+  <plurals name="onboarding_seed_generate_message_words_count">
+    <item quantity="other">按照下面給出的順序寫下這 %d 個單詞，並將它們存放在安全秘密的地方。</item>
+  </plurals>
   <string name="onboarding_seed_intro_button_generate">生成助記詞</string>
   <string name="onboarding_seed_intro_button_import">導入錢包</string>
   <string name="onboarding_seed_intro_title">使用助記詞</string>
@@ -272,10 +275,6 @@
   <string name="send_total_subtitle_format">%s 將被發送</string>
   <string name="send_transaction_success">交易已成功簽署並發送至區塊鏈節點。錢包餘額稍後更新</string>
   <string name="send_validation_invalid_address">無效地址</string>
-  <string name="shop_buy_now">現在購買</string>
-  <string name="shop_i_have_a_promo_code">輸入折扣碼</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
-  <string name="shop_other_payment_methods">其他付款方式</string>
   <string name="story_awe_description">安全地存儲您的加密貨幣，同時將私鑰保存在您的卡中</string>
   <string name="story_awe_title">創新式的硬體錢包</string>
   <string name="story_backup_description">最多 3張實體卡片 到一個錢包</string>
@@ -292,12 +291,9 @@
   <string name="story_web3_title">兼容Web3.0</string>
   <string name="swapping_approve_information_text">批准被視為所有去中心化交易所的行業標準，並保護您的錢包在未經您許可的情況下不被智能合約訪問。按照設計，智能合約無法訪問您的代幣，除非您從您的終端批准訪問。通過“解鎖”您的代幣，您將獲得 1inch 智能合約使用您的資產的權限。網絡的礦工將獲得Gas Fee（由您支付）作為補償，以在區塊鏈上記錄此操作。一旦獲得許可，您就可以交易您的代幣。</string>
   <string name="swapping_approve_information_title">批准</string>
-  <string name="swapping_error_wrapper">錯誤： %s</string>
   <string name="swapping_give_permission">賦予權限</string>
   <string name="swapping_high_price_impact_description">在此代幣交換的數量將對價格產生重大影響，並降低您收到的數量</string>
   <string name="swapping_insufficient_funds">餘額不足</string>
-  <string name="swapping_pending_transaction_subtitle">交易進行中...</string>
-  <string name="swapping_pending_transaction_title">等待中</string>
   <string name="swapping_permission_buttons_approve">允許</string>
   <string name="swapping_permission_header">賦予權限</string>
   <string name="swapping_permission_rows_amount">數量 %s</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index d07bb17a98..53492c3a02 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
   <string name="alert_manage_tokens_unsupported_message">Tokens in %1$s network are not supported by this card due to firmware limitation.</string>
   <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
   <string name="alert_unsupported_card">This card is not designed to work with this app</string>
+  <string name="app_settings_default_fee">Default Fee</string>
+  <string name="app_settings_default_fee_footer">Enable Default Fee to set transaction fees automatically and skip the Fee page when sending funds. You can always go back to this page if necessary.</string>
   <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_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>
@@ -185,7 +187,6 @@
   <string name="exchange_tokens_empty_tokens">You haven\'t added any tokens yet. Add tokens via Market to swap</string>
   <string name="exchange_tokens_unavailable_tokens_header">Cannot be swapped for %s</string>
   <string name="express_by_provider">Provided by</string>
-  <string name="express_by_provider_placeholder">Provided by %s</string>
   <string name="express_cex_status_button_title">Status</string>
   <string name="express_choose_providers_subtitle">Tangem offers token swaps via 3rd-party providers according to each provider\'s terms</string>
   <string name="express_choose_providers_title">Choose provider</string>
@@ -263,7 +264,6 @@
   <string name="main_tokens">Tokens</string>
   <string name="manage_tokens_add">Add</string>
   <string name="manage_tokens_edit">Edit</string>
-  <string name="manage_tokens_list_header_subtitle">Couldn’t find this token, you can add it manually</string>
   <string name="manage_tokens_list_header_title">Coin market cap</string>
   <string name="manage_tokens_network_selector_native_subtitle">Blockchain the cryptocurrency was initially created</string>
   <string name="manage_tokens_network_selector_native_title">Native network</string>
@@ -278,7 +278,6 @@
     <item quantity="other">%1$d of %2$d wallets</item>
   </plurals>
   <string name="manage_tokens_search_placeholder">e.g. BTC I trust, hodl I must</string>
-  <string name="manage_tokens_title">Coin market cap</string>
   <string name="manage_tokens_unavailable_description">The selected token is currently unavailable for actions within the crypto wallet. But worry not, you can express your interest by upvoting it.</string>
   <string name="manage_tokens_unavailable_vote">Upvote</string>
   <string name="manage_tokens_wallet_selector_title">Choose wallet</string>
@@ -323,7 +322,15 @@
   <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
   <string name="onboarding_seed_button_read_more">Read more about seed phrase</string>
   <string name="onboarding_seed_generate_message">Write these 12 words down in the order given below and store them in a safe and secret place.</string>
+  <plurals name="onboarding_seed_generate_message_words_count">
+    <item quantity="one"></item>
+    <item quantity="other">Write these %d words down in the order given below and store them in a safe and secret place.</item>
+  </plurals>
   <string name="onboarding_seed_generate_title">Your seed phrase</string>
+  <plurals name="onboarding_seed_generate_words_count">
+    <item quantity="one"></item>
+    <item quantity="other">%d words</item>
+  </plurals>
   <string name="onboarding_seed_import_message">To import your wallet, enter your seed phrase in the field below</string>
   <string name="onboarding_seed_intro_button_generate">Generate seed phrase</string>
   <string name="onboarding_seed_intro_button_import">Import wallet</string>
@@ -499,10 +506,6 @@
   <string name="send_validation_invalid_address">Invalid address</string>
   <string name="send_wallet_balance_format">%1$s (%2$s)</string>
   <string name="sent_transaction_sent_title">Transaction sent</string>
-  <string name="shop_buy_now">Buy now</string>
-  <string name="shop_i_have_a_promo_code">I have a promo code…</string>
-  <string name="shop_one_wallet">Tangem Wallet</string>
-  <string name="shop_other_payment_methods">Other payment methods</string>
   <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
   <string name="story_awe_title">Revolutionary Hardware Wallet</string>
   <string name="story_backup_description">Up to 3 physical cards to one wallet</string>
@@ -524,14 +527,11 @@
   <string name="swapping_alert_title">Fees</string>
   <string name="swapping_approve_information_text">All decentralized exchanges require approvals to prevent smart contracts from accessing your wallet without your permission. By design, smart contracts can\'t access your tokens unless you approve. By \"unlocking\" your tokens, you authorize the 1-inch smart contract to spend them. The network\'s miners receive a gas fee (paid by you) to record this action on the blockchain. You can swap your token after giving approval.</string>
   <string name="swapping_approve_information_title">Approve</string>
-  <string name="swapping_error_wrapper">Error: %s</string>
   <string name="swapping_from_title">You swap</string>
   <string name="swapping_give_permission">Give Permission</string>
   <string name="swapping_high_price_impact_description">Swapping this amount of selected tokens will cause a significant price impact and reduce your outcome.</string>
   <string name="swapping_insufficient_funds">Insufficient funds</string>
   <string name="swapping_network_fee_warning_content">Sending amount will be reduced to cover the selected fee level</string>
-  <string name="swapping_pending_transaction_subtitle">Transaction in progress...</string>
-  <string name="swapping_pending_transaction_title">Waiting</string>
   <string name="swapping_permission_buttons_approve">Approve</string>
   <string name="swapping_permission_current_transaction">Current transaction</string>
   <string name="swapping_permission_fee_footer">The network will charge a token approval fee to verify that you are authorizing the use of your token for the swap.</string>
diff --git a/features/manage-tokens/impl/src/main/java/com/tangem/managetokens/presentation/managetokens/ui/components/TokensList.kt b/features/manage-tokens/impl/src/main/java/com/tangem/managetokens/presentation/managetokens/ui/components/TokensList.kt
index d6c2b505ea..ca26ef0621 100644
--- a/features/manage-tokens/impl/src/main/java/com/tangem/managetokens/presentation/managetokens/ui/components/TokensList.kt
+++ b/features/manage-tokens/impl/src/main/java/com/tangem/managetokens/presentation/managetokens/ui/components/TokensList.kt
@@ -25,7 +25,7 @@ internal fun TokensList(
     LazyColumn(modifier = modifier) {
         item {
             Text(
-                text = stringResource(id = R.string.manage_tokens_title),
+                text = stringResource(id = R.string.manage_tokens_list_header_title),
                 style = TangemTheme.typography.h3,
                 color = TangemTheme.colors.text.primary1,
                 modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
index 32b1388ef6..cff24ca2a6 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/models/SwapStateHolder.kt
@@ -108,7 +108,6 @@ sealed interface SwapWarning {
         val title: TextReference? = null,
         val message: TextReference? = null,
         val type: GenericWarningType = GenericWarningType.OTHER,
-        val shouldWrapMessage: Boolean = false,
         val onClick: () -> Unit,
     ) : SwapWarning
     data class GeneralError(val notificationConfig: NotificationConfig) : SwapWarning
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index cea2fca9cc..1580582c2f 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -344,8 +344,8 @@ internal class StateBuilder(
         if (quoteModel.permissionState is PermissionDataState.PermissionLoading) {
             warnings.add(
                 SwapWarning.TransactionInProgressWarning(
-                    title = resourceReference(R.string.swapping_pending_transaction_title),
-                    description = resourceReference(R.string.swapping_pending_transaction_subtitle),
+                    title = resourceReference(R.string.warning_express_approval_in_progress_title),
+                    description = resourceReference(R.string.warning_express_approval_in_progress_message),
                 ),
             )
         } else if (quoteModel.preparedSwapConfigState.hasOutgoingTransaction) {
@@ -821,8 +821,8 @@ internal class StateBuilder(
         warnings.add(
             0,
             SwapWarning.TransactionInProgressWarning(
-                title = resourceReference(R.string.swapping_pending_transaction_title),
-                description = resourceReference(R.string.swapping_pending_transaction_subtitle),
+                title = resourceReference(R.string.warning_express_approval_in_progress_title),
+                description = resourceReference(R.string.warning_express_approval_in_progress_message),
             ),
         )
         return uiState.copy(
@@ -926,17 +926,11 @@ internal class StateBuilder(
 
     fun clearAlert(uiState: SwapStateHolder): SwapStateHolder = uiState.copy(alert = null)
 
-    fun addWarning(
-        uiState: SwapStateHolder,
-        message: TextReference?,
-        shouldWrapMessage: Boolean = false,
-        onClick: () -> Unit,
-    ): SwapStateHolder {
+    fun addWarning(uiState: SwapStateHolder, message: TextReference?, onClick: () -> Unit): SwapStateHolder {
         val renewWarnings = uiState.warnings.filterNot { it is SwapWarning.GenericWarning }.toMutableList()
         renewWarnings.add(
             SwapWarning.GenericWarning(
                 message = message,
-                shouldWrapMessage = shouldWrapMessage,
                 onClick = onClick,
             ),
         )
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
index 6c31dea226..64964aef80 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
@@ -337,13 +337,8 @@ private fun SwapWarnings(warnings: List<SwapWarning>) {
                     )
                 }
                 is SwapWarning.GenericWarning -> {
-                    val message = warning.message?.let {
-                        if (warning.shouldWrapMessage) {
-                            String.format(stringResource(id = R.string.swapping_error_wrapper), it.resolveReference())
-                        } else {
-                            it.resolveReference()
-                        }
-                    } ?: stringResource(id = R.string.common_unknown_error)
+                    val message = warning.message?.resolveReference()
+                        ?: stringResource(id = R.string.common_unknown_error)
                     RefreshableWaringCard(
                         title = stringResource(id = R.string.common_warning),
                         description = message,