From fd1f70b52650ace32620340031dfde8ea39427bd Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Feb 2023 14:14:12 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../wallet/redux/reducers/WalletReducer.kt    |  1 -
 .../wallet/ui/wallet/SaltPayWalletView.kt     |  2 +-
 core/res/src/main/res/values-de/strings.xml   | 32 ++++++++++++-------
 core/res/src/main/res/values-fr/strings.xml   | 32 ++++++++++++-------
 core/res/src/main/res/values-it/strings.xml   | 20 ++++++++----
 core/res/src/main/res/values-ru/strings.xml   | 32 ++++++++++++-------
 .../src/main/res/values-zh-rTW/strings.xml    | 32 ++++++++++++-------
 core/res/src/main/res/values/strings.xml      | 32 ++++++++++++-------
 .../res/values/strings_untranslatable.xml     |  5 +++
 .../tangem/network/common/MoshiConverter.kt   |  0
 10 files changed, 121 insertions(+), 67 deletions(-)
 create mode 100644 core/res/src/main/res/values/strings_untranslatable.xml
 delete mode 100644 network/src/main/java/com/tangem/network/common/MoshiConverter.kt

diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
index 6c0ed18bd8..1dfbfbd164 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@@ -15,7 +15,6 @@ import com.tangem.tap.common.extensions.toFormattedFiatValue
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.getArtworkUrl
-import com.tangem.tap.domain.extensions.isMultiwalletAllowed
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.WalletRent
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayWalletView.kt
index 93445da197..78170ab9c7 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPayWalletView.kt
@@ -80,7 +80,7 @@ class SaltPayWalletView : WalletView() {
             store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency)
         }
 
-        btnBuy.show(tokenData.isAvailableToBuy)
+        btnBuy.show(tokenData.isAvailableToBuy(store.state.globalState.exchangeManager))
         btnBuy.setOnClickListener {
             store.dispatch(WalletAction.TradeCryptoAction.Buy(false))
         }
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
index caeed9710d..3862000c49 100644
--- a/core/res/src/main/res/values-de/strings.xml
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
     <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
     <string name="app_settings_title">App Settings</string>
+    <string name="biometric_lockout_permanent_warning_description">Please scan the card</string>
+    <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card</string>
+    <string name="biometric_lockout_warning_title">Too many attempts</string>
+    <string name="card_settings_action_sheet_reset">Reset</string>
+    <string name="card_settings_action_sheet_title">Are you sure you want to do this?</string>
     <string name="card_settings_change_access_code">Change Access Code</string>
     <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
     <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
     <string name="card_settings_security_mode">Security Mode</string>
     <string name="card_settings_title">Card Settings</string>
     <string name="chat_bot_name">Tangem Bot</string>
+    <string name="chat_button_title">Support</string>
     <string name="common_accept">Akzeptieren</string>
     <string name="common_add">Add</string>
     <string name="common_attention">Attention</string>
@@ -134,13 +140,13 @@
     <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
     <string name="main_scan_card_warning_view_title">Scan your card</string>
     <string name="main_tokens">Tokens</string>
-    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets</string>
     <string name="onboarding_access_code_feature_1_title">Protect</string>
-    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set up an individual access code on each card later</string>
     <string name="onboarding_access_code_feature_2_title">Personalize</string>
-    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place</string>
     <string name="onboarding_access_code_feature_3_title">Restore</string>
-    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code</string>
     <string name="onboarding_access_code_intro_title">Create Access Code</string>
     <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
     <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">Scan primary card</string>
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
-    <string name="onboarding_chat_button_title">Support</string>
     <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
     <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
     <string name="onboarding_create_wallet_header">Create a wallet</string>
@@ -178,7 +183,7 @@
     <string name="onboarding_navbar_register_wallet">Connect</string>
     <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
     <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add the Tangem card as your backup</string>
     <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
     <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
     <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
@@ -191,7 +196,7 @@
     <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
     <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
     <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_pin">Set up a 4-digit code.\nIt will be used for payments.</string>
     <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
     <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
     <string name="onboarding_title">Activating card</string>
     <string name="onboarding_title_backup_card_format">Backup card #%d</string>
     <string name="onboarding_title_claim">Claim %s</string>
@@ -219,7 +223,7 @@
     <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
     <string name="onboarding_top_up_header">Top up your wallet</string>
     <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
-    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over</string>
     <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
     <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
     <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
@@ -360,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
     <string name="token_item_no_rate">No rate</string>
+    <string name="transaction_history_empty_transactions">You don\'t have any transactions yet</string>
+    <string name="transaction_history_error_failed_to_load">Failed to load transactions</string>
+    <string name="transaction_history_title">Transactions</string>
+    <string name="transaction_history_tx_in_progress">In progress...</string>
     <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
     <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
     <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
@@ -402,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
     <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_missing_blockchains">Not all tokens were added to your list. Please add them first and try again. Missing tokens:\n</string>
     <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_blockchains">Session request contains unsupported blockchains for WalletConnect connection. Unsupported blockchains:\n</string>
     <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="wallet_connect_generic_error_with_code">We\'ve encountered unknown error. Error code: %d. If the problem persists — feel free to contact our support</string>
     <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
     <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
     <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
@@ -464,7 +475,4 @@
     <string name="welcome_unlock_card">Scan card</string>
     <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
     <string name="welcome_unlock_title">Welcome back!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
index 5cc275855b..1a31505a3e 100644
--- a/core/res/src/main/res/values-fr/strings.xml
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
     <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
     <string name="app_settings_title">App Settings</string>
+    <string name="biometric_lockout_permanent_warning_description">Please scan the card</string>
+    <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card</string>
+    <string name="biometric_lockout_warning_title">Too many attempts</string>
+    <string name="card_settings_action_sheet_reset">Reset</string>
+    <string name="card_settings_action_sheet_title">Are you sure you want to do this?</string>
     <string name="card_settings_change_access_code">Change Access Code</string>
     <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
     <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
     <string name="card_settings_security_mode">Security Mode</string>
     <string name="card_settings_title">Card Settings</string>
     <string name="chat_bot_name">Tangem Bot</string>
+    <string name="chat_button_title">Support</string>
     <string name="common_accept">J\'accepte</string>
     <string name="common_add">Add</string>
     <string name="common_attention">Attention</string>
@@ -134,13 +140,13 @@
     <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
     <string name="main_scan_card_warning_view_title">Scan your card</string>
     <string name="main_tokens">Tokens</string>
-    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets</string>
     <string name="onboarding_access_code_feature_1_title">Protect</string>
-    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set up an individual access code on each card later</string>
     <string name="onboarding_access_code_feature_2_title">Personalize</string>
-    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place</string>
     <string name="onboarding_access_code_feature_3_title">Restore</string>
-    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code</string>
     <string name="onboarding_access_code_intro_title">Create Access Code</string>
     <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
     <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">Scan primary card</string>
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
-    <string name="onboarding_chat_button_title">Support</string>
     <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
     <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
     <string name="onboarding_create_wallet_header">Create a wallet</string>
@@ -178,7 +183,7 @@
     <string name="onboarding_navbar_register_wallet">Connect</string>
     <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
     <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add the Tangem card as your backup</string>
     <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
     <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
     <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
@@ -191,7 +196,7 @@
     <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
     <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
     <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_pin">Set up a 4-digit code.\nIt will be used for payments.</string>
     <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
     <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
     <string name="onboarding_title">Activating card</string>
     <string name="onboarding_title_backup_card_format">Backup card #%d</string>
     <string name="onboarding_title_claim">Claim %s</string>
@@ -219,7 +223,7 @@
     <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
     <string name="onboarding_top_up_header">Top up your wallet</string>
     <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
-    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over</string>
     <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
     <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
     <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
@@ -360,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
     <string name="token_item_no_rate">No rate</string>
+    <string name="transaction_history_empty_transactions">You don\'t have any transactions yet</string>
+    <string name="transaction_history_error_failed_to_load">Failed to load transactions</string>
+    <string name="transaction_history_title">Transactions</string>
+    <string name="transaction_history_tx_in_progress">In progress...</string>
     <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
     <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
     <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
@@ -402,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
     <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_missing_blockchains">Not all tokens were added to your list. Please add them first and try again. Missing tokens:\n</string>
     <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_blockchains">Session request contains unsupported blockchains for WalletConnect connection. Unsupported blockchains:\n</string>
     <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="wallet_connect_generic_error_with_code">We\'ve encountered unknown error. Error code: %d. If the problem persists — feel free to contact our support</string>
     <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
     <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
     <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
@@ -464,7 +475,4 @@
     <string name="welcome_unlock_card">Scan card</string>
     <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
     <string name="welcome_unlock_title">Welcome back!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml
index fd7be8b8db..21e7723360 100644
--- a/core/res/src/main/res/values-it/strings.xml
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
     <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
     <string name="app_settings_title">App Settings</string>
+    <string name="biometric_lockout_permanent_warning_description">Please scan the card</string>
+    <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card</string>
+    <string name="biometric_lockout_warning_title">Too many attempts</string>
+    <string name="card_settings_action_sheet_reset">Reset</string>
+    <string name="card_settings_action_sheet_title">Are you sure you want to do this?</string>
     <string name="card_settings_change_access_code">Change Access Code</string>
     <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
     <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
     <string name="card_settings_security_mode">Security Mode</string>
     <string name="card_settings_title">Card Settings</string>
     <string name="chat_bot_name">Tangem Bot</string>
+    <string name="chat_button_title">Support</string>
     <string name="common_accept">Accetta</string>
     <string name="common_add">Add</string>
     <string name="common_attention">Attention</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">Scan primary card</string>
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
-    <string name="onboarding_chat_button_title">Support</string>
     <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
     <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
     <string name="onboarding_create_wallet_header">Create a wallet</string>
@@ -191,7 +196,7 @@
     <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
     <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
     <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_pin">Set up a 4-digit code.\nIt will be used for payments.</string>
     <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
     <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
     <string name="onboarding_title">Activating card</string>
     <string name="onboarding_title_backup_card_format">Backup card #%d</string>
     <string name="onboarding_title_claim">Claim %s</string>
@@ -360,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
     <string name="token_item_no_rate">No rate</string>
+    <string name="transaction_history_empty_transactions">You don\'t have any transactions yet</string>
+    <string name="transaction_history_error_failed_to_load">Failed to load transactions</string>
+    <string name="transaction_history_title">Transactions</string>
+    <string name="transaction_history_tx_in_progress">In progress...</string>
     <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
     <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
     <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
@@ -402,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
     <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_missing_blockchains">Not all tokens were added to your list. Please add them first and try again. Missing tokens:\n</string>
     <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_blockchains">Session request contains unsupported blockchains for WalletConnect connection. Unsupported blockchains:\n</string>
     <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="wallet_connect_generic_error_with_code">We\'ve encountered unknown error. Error code: %d. If the problem persists — feel free to contact our support</string>
     <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
     <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
     <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
@@ -464,7 +475,4 @@
     <string name="welcome_unlock_card">Scan card</string>
     <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
     <string name="welcome_unlock_title">Welcome back!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
index 3cd68acd4e..b73c0cd578 100644
--- a/core/res/src/main/res/values-ru/strings.xml
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">Cохранение кошелька</string>
     <string name="app_settings_saved_wallet_footer">Подключите функцию привязки карты в приложении, а также возможность биометрической аутентификации. Подпись транзакции все так же потребует карту.</string>
     <string name="app_settings_title">Настройки приложения</string>
+    <string name="biometric_lockout_permanent_warning_description">Пожалуйста, отсканируйте карту</string>
+    <string name="biometric_lockout_warning_description">Пожалуйста, попробуйте снова через 30 секунд или отсканируйте карту</string>
+    <string name="biometric_lockout_warning_title">Слишком много попыток</string>
+    <string name="card_settings_action_sheet_reset">Сбросить</string>
+    <string name="card_settings_action_sheet_title">Вы уверены, что хотите это сделать?</string>
     <string name="card_settings_change_access_code">Смена кода доступа</string>
     <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
     <string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
     <string name="card_settings_security_mode">Тип безопасности</string>
     <string name="card_settings_title">Настройки карты</string>
     <string name="chat_bot_name">Tangem Bot</string>
+    <string name="chat_button_title">Чат</string>
     <string name="common_accept">Принять</string>
     <string name="common_add">Добавить</string>
     <string name="common_attention">Внимание</string>
@@ -134,13 +140,13 @@
     <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
     <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
     <string name="main_tokens">Токены</string>
-    <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт.</string>
+    <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт</string>
     <string name="onboarding_access_code_feature_1_title">Защита</string>
-    <string name="onboarding_access_code_feature_2_description">Позже вы сможете установить индивидуальный код доступа для каждой карты.</string>
+    <string name="onboarding_access_code_feature_2_description">Позже вы сможете установить индивидуальный код доступа для каждой карты</string>
     <string name="onboarding_access_code_feature_2_title">Персонализация</string>
-    <string name="onboarding_access_code_feature_3_description">Код доступа можно восстановить с помощью привязанной карты. Не храните все карты в одном месте.</string>
+    <string name="onboarding_access_code_feature_3_description">Код доступа можно восстановить с помощью привязанной карты. Не храните все карты в одном месте</string>
     <string name="onboarding_access_code_feature_3_title">Восстановление</string>
-    <string name="onboarding_access_code_hint">Выберите любое слово, фразу или число в качестве кода доступа.</string>
+    <string name="onboarding_access_code_hint">Выберите любое слово, фразу или число в качестве кода доступа</string>
     <string name="onboarding_access_code_intro_title">Создайте код доступа</string>
     <string name="onboarding_access_code_repeat_code_title">Повторно введите код доступа</string>
     <string name="onboarding_access_code_too_short">Код доступа должен состоять не менее чем из 4 символов.</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">Сканировать основную карту</string>
     <string name="onboarding_button_skip_backup">Пропустить</string>
     <string name="onboarding_button_what_does_it_mean">Как это работает?</string>
-    <string name="onboarding_chat_button_title">Чат</string>
     <string name="onboarding_create_wallet_body">Давайте сгенерируем все ключи на вашей карте и создадим безопасный кошелек</string>
     <string name="onboarding_create_wallet_button_create_wallet">Создать кошелек</string>
     <string name="onboarding_create_wallet_header">Создать кошелек</string>
@@ -184,14 +189,14 @@
     <string name="onboarding_saltpay_title_no_backup_card">Бэкап карта не добавлена</string>
     <string name="onboarding_saltpay_title_one_backup_card">Бэкап карта создана</string>
     <string name="onboarding_saltpay_title_prepare_origin">Приготовьте SaltPay карту</string>
-    <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDai на свой кошелек</string>
+    <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDAI на свой кошелек</string>
     <string name="onboarding_subtitle_claim_progress">Это займет несколько секунд</string>
     <string name="onboarding_subtitle_kyc_retry">Более подробная информация отправлена на ваш адрес электронной почты.</string>
     <string name="onboarding_subtitle_kyc_start">Для начала работы с картой вам необходимо завершить процесс подтверждения личности</string>
     <string name="onboarding_subtitle_kyc_waiting">Пожалуйста дождитесь завершения процесса подтверждения личности. Вы будете уведомлены через e-mail. Обычно это занимает не более часа. Вы можете закрыть приложение и вернуться позже.</string>
     <string name="onboarding_subtitle_no_backup_cards">Чтобы начать процесс резервного копирования, добавьте одну или две резервные карты.</string>
     <string name="onboarding_subtitle_one_backup_card">Вы можете добавить еще одну карту или завершить процесс резервного копирования</string>
-    <string name="onboarding_subtitle_pin">Установите Код доступа для вашей SaltPay карты</string>
+    <string name="onboarding_subtitle_pin">Установите 4-х значный код.\nОн будет использован для платежей.</string>
     <string name="onboarding_subtitle_register_wallet">Подключите вашу карту к децентрализованной платежной системе</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Подготовьте резервную карту с номером %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Подготовьте основную карту</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">Поздравляем! Ваша платежная крипто карта теперь активирована!</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Ваша карта настроена и готова к использованию.</string>
     <string name="onboarding_subtitle_two_backup_cards">Добавлено максимальное количество карт. Завершите процесс резервного копирования.</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Чат поддержки</string>
     <string name="onboarding_title">Активация карты</string>
     <string name="onboarding_title_backup_card_format">Резервная карта #%d</string>
     <string name="onboarding_title_claim">Запросить %s</string>
@@ -219,7 +223,7 @@
     <string name="onboarding_top_up_button_show_wallet_address">Показать адрес кошелька</string>
     <string name="onboarding_top_up_header">Пополните свой кошелек</string>
     <string name="onboarding_twin_exit_warning">Процесс связывания карт частично завершен. Вы не можете выйти из него сейчас.</string>
-    <string name="onboarding_twins_interrupt_warning">Если процесc создания кошелька каким-либо образом прервется, вам придется начинать сначала.</string>
+    <string name="onboarding_twins_interrupt_warning">Если процесc создания кошелька каким-либо образом прервется, вам придется начинать сначала</string>
     <string name="onboarding_wallet_info_subtitle_first">Вы можете сделать резервную копию своих ключей на одной или двух других пустых картах Wallet.</string>
     <string name="onboarding_wallet_info_subtitle_fourth">Код доступа можно восстановить с помощью одной из резервных карт.</string>
     <string name="onboarding_wallet_info_subtitle_second">Все резервные карты являются полнофункциональными и содержат одинаковые ключи.</string>
@@ -360,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">Токен %1$s является основной валютой в сети %2$s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
     <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
     <string name="token_item_no_rate">Нет цены</string>
+    <string name="transaction_history_empty_transactions">У вас еще нет транзакций</string>
+    <string name="transaction_history_error_failed_to_load">Не удалось загрузить транзакции</string>
+    <string name="transaction_history_title">Транзакции</string>
+    <string name="transaction_history_tx_in_progress">В процессе…</string>
     <string name="twin_error_same_card">Вы отсканировали ту же карту. Для создания twin-кошелька вам необходимо отсканировать карту с номером %d</string>
     <string name="twins_onboarding_description_format">Это карта, которую вы держите в руках. У парной карты номер %s.\n\nОбе карты можно использовать для вывода средств из этого кошелька.</string>
     <string name="twins_onboarding_subtitle">Один кошелек. Две карты.</string>
@@ -402,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %1$s\n%2$s\n\nСумма: %3$s\nКомиссия: %4$s\nВсего: %5$s\nБаланс: %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">Невозможно отправить транзакцию. Недостаточно средств.</string>
     <string name="wallet_connect_error_failed_to_connect">Не удалось установить сессию WalletConnect. Пожалуйста, повторите попытку позже.</string>
+    <string name="wallet_connect_error_missing_blockchains">Не все токены добавлены в ваш список. Пожалуйста, добавьте их в начале, а потом попробуйте снова. Недостающие токены: \n</string>
     <string name="wallet_connect_error_timeout">Не удалось установить сессию WalletConnect за отведённое время. Пожалуйста, повторите попытку позже.</string>
+    <string name="wallet_connect_error_unsupported_blockchains">Запрос на подключение через WalletConnect содержит неподдерживаемые блокчеины. Неподдерживаемые блокчеины:\n</string>
     <string name="wallet_connect_error_unsupported_dapp">Cоединение с этим Dapp сервисом не может быть установлено из-за его технической реализации.</string>
+    <string name="wallet_connect_generic_error_with_code">Произошла непредвиденная ошибка. Код ошибки: %d Попробуйте, пожалуйста, позже. Если проблема будет продолжать возникать - обратитесь в службу поддержки.</string>
     <string name="wallet_connect_network_not_found_format">Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново.</string>
     <string name="wallet_connect_no_sessions_message">Нет открытых сессий WalletConnect</string>
     <string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>
@@ -464,7 +475,4 @@
     <string name="welcome_unlock_card">Сканировать карту</string>
     <string name="welcome_unlock_description">Используйте %s или код доступа для входа в приложение</string>
     <string name="welcome_unlock_title">C возвращением!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
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 ad0a5ac18f..0ee86509c4 100644
--- a/core/res/src/main/res/values-zh-rTW/strings.xml
+++ b/core/res/src/main/res/values-zh-rTW/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">將錢包保存在應用程序中</string>
     <string name="app_settings_saved_wallet_footer">啟用以將所有錢包鏈接到 Tangem 應用程序。解鎖應用程序需要生物識別身份驗證。交易簽名需要輕觸您的 Tangem 卡片</string>
     <string name="app_settings_title">APP設置</string>
+    <string name="biometric_lockout_permanent_warning_description">請掃描卡片</string>
+    <string name="biometric_lockout_warning_description">請30秒後重試或刷卡</string>
+    <string name="biometric_lockout_warning_title">嘗試次數過多</string>
+    <string name="card_settings_action_sheet_reset">重置</string>
+    <string name="card_settings_action_sheet_title">您確定要這麼做嗎？</string>
     <string name="card_settings_change_access_code">更改訪問密碼</string>
     <string name="card_settings_change_access_code_footer">訪問密碼將僅在此卡上更改</string>
     <string name="card_settings_reset_card_to_factory">回復至原廠設置</string>
     <string name="card_settings_security_mode">安全模式</string>
     <string name="card_settings_title">卡片設置</string>
     <string name="chat_bot_name">Tangem 機器人</string>
+    <string name="chat_button_title">支援</string>
     <string name="common_accept">接受</string>
     <string name="common_add">添加</string>
     <string name="common_attention">注意</string>
@@ -134,13 +140,13 @@
     <string name="main_scan_card_warning_view_subtitle">要訪問所有的網路您需要掃描卡片</string>
     <string name="main_scan_card_warning_view_title">掃描卡片</string>
     <string name="main_tokens">代幣</string>
-    <string name="onboarding_access_code_feature_1_description">您必須設置一個單一的訪問代碼來保護您的所有錢包。</string>
+    <string name="onboarding_access_code_feature_1_description">您必須設置一個單一的訪問代碼來保護您的所有錢包</string>
     <string name="onboarding_access_code_feature_1_title">保護</string>
     <string name="onboarding_access_code_feature_2_description">您可以稍後在每張卡上設置單獨的訪問密碼</string>
     <string name="onboarding_access_code_feature_2_title">個人化</string>
-    <string name="onboarding_access_code_feature_3_description">門禁密碼可以用聯動卡恢復，不要把所有卡都放在一個地方。</string>
+    <string name="onboarding_access_code_feature_3_description">門禁密碼可以用聯動卡恢復，不要把所有卡都放在一個地方</string>
     <string name="onboarding_access_code_feature_3_title">恢復</string>
-    <string name="onboarding_access_code_hint">選擇您想要的任何單詞、短語或數字作為您的訪問代碼。</string>
+    <string name="onboarding_access_code_hint">選擇您想要的任何單詞、短語或數字作為您的訪問代碼</string>
     <string name="onboarding_access_code_intro_title">建立訪問密碼</string>
     <string name="onboarding_access_code_repeat_code_title">重新輸入訪問密碼</string>
     <string name="onboarding_access_code_too_short">訪問代碼的長度必須至少為 4 個字符</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">掃描主卡</string>
     <string name="onboarding_button_skip_backup">暫時略過</string>
     <string name="onboarding_button_what_does_it_mean">它是如何運作的？</string>
-    <string name="onboarding_chat_button_title">支援</string>
     <string name="onboarding_create_wallet_body">讓我們生成您卡上的所有密鑰並創建一個安全的錢包</string>
     <string name="onboarding_create_wallet_button_create_wallet">創建錢包</string>
     <string name="onboarding_create_wallet_header">創造錢包</string>
@@ -191,7 +196,7 @@
     <string name="onboarding_subtitle_kyc_waiting">請等待驗證完成，您將收到電子郵件通知。通常最多需要 1 小時。您可以關閉該應用程序，稍後再回來</string>
     <string name="onboarding_subtitle_no_backup_cards">要開始備份過程，最多可添加兩張備份卡。</string>
     <string name="onboarding_subtitle_one_backup_card">您可以再添加一張卡或完成備份過程</string>
-    <string name="onboarding_subtitle_pin">為您的 SaltPay 卡設置 PIN 碼</string>
+    <string name="onboarding_subtitle_pin">設置一個 4 位密碼。 \n它將用在付款時使用。</string>
     <string name="onboarding_subtitle_register_wallet">將您的卡片連接到去中心化支付系統</string>
     <string name="onboarding_subtitle_scan_backup_card_format">準備編號為 %s 的備份卡</string>
     <string name="onboarding_subtitle_scan_origin_card">準備主卡</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">恭喜！ 您的第一張支付加密卡已啟用！</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">您的錢包卡已配置完畢，可以使用了</string>
     <string name="onboarding_subtitle_two_backup_cards">已添加至最大數量。完成備份過程</string>
-    <string name="onboarding_supplement_button_kyc_waiting">聯繫客服</string>
     <string name="onboarding_title">啟用卡片</string>
     <string name="onboarding_title_backup_card_format">備份卡 #%d</string>
     <string name="onboarding_title_claim">獲取%s</string>
@@ -303,7 +307,7 @@
     <string name="shop_buy_now">現在購買</string>
     <string name="shop_free">免費</string>
     <string name="shop_i_have_a_promo_code">輸入折扣碼</string>
-    <string name="shop_one_wallet">Tangem 冷錢包</string>
+    <string name="shop_one_wallet">Tangem Wallet</string>
     <string name="shop_other_payment_methods">其他付款方式</string>
     <string name="shop_shipping">運送</string>
     <string name="shop_total">總計</string>
@@ -328,6 +332,7 @@
     <string name="story_meet_title">認識Tangem</string>
     <string name="story_web3_description">交易、購買NFT、自由穿梭於100+去中心化服務</string>
     <string name="story_web3_title">兼容DeFi</string>
+    <string name="swapping_error_wrapper">錯誤： %s</string>
     <string name="swapping_generic_error">有錯誤。請再試一遍</string>
     <string name="swapping_give_permission">賦予權限</string>
     <string name="swapping_insufficient_funds">餘額不足</string>
@@ -359,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">%1$s 代幣是 %2$s 網絡上的主要貨幣，只要列表中還有該網絡上的其他代幣，它就無法被隱藏。</string>
     <string name="token_details_unable_hide_alert_title">無法隱藏 %s</string>
     <string name="token_item_no_rate">無費用</string>
+    <string name="transaction_history_empty_transactions">您還沒有任何交易</string>
+    <string name="transaction_history_error_failed_to_load">無法加載交易</string>
+    <string name="transaction_history_title">交易</string>
+    <string name="transaction_history_tx_in_progress">進行中...</string>
     <string name="twin_error_same_card">您掃描了同一張卡片。要創建雙錢包，您需要掃描編號為 %d 的卡</string>
     <string name="twins_onboarding_description_format">這一個是你手裡拿著的，另一個是編號為 %s 的，這兩張卡都可以用來從這個錢包中提取資金</string>
     <string name="twins_onboarding_subtitle">一個錢包，兩張卡片</string>
@@ -366,9 +375,10 @@
     <string name="twins_recreate_title_creating_wallet">創建錢包</string>
     <string name="twins_recreate_title_format">掃描 #%s 雙胞胎卡</string>
     <string name="twins_recreate_title_preparing">準備卡片</string>
-    <string name="twins_recreate_toolbar">Tangem雙胞胎卡</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
     <string name="twins_recreate_warning">這個動作是不可逆的。您將無法訪問舊錢包</string>
     <string name="user_wallet_list_add_button">添加新錢包</string>
+    <string name="user_wallet_list_delete_prompt">您確定要刪除此錢包?</string>
     <string name="user_wallet_list_editing_count">已選擇 %d</string>
     <string name="user_wallet_list_error_wallet_already_saved">此錢包已保存，您可以再添加一個</string>
     <string name="user_wallet_list_multi_header">多幣種</string>
@@ -400,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">請求為 %1$s 創建交易\n%2$s\n\n數量： %3$s\n費用： %4$s\n全部的： %5$s\n餘額： %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">無法交易，無足夠資金</string>
     <string name="wallet_connect_error_failed_to_connect">未能建立 WalletConnect 連接。請稍後再試</string>
+    <string name="wallet_connect_error_missing_blockchains">並非所有代幣都已添加到您的列表中。請先添加它們，然後重試。缺少標記:\n</string>
     <string name="wallet_connect_error_timeout">無法建立 WalletConnect 連接:超時錯誤。請稍後再試</string>
+    <string name="wallet_connect_error_unsupported_blockchains">會話請求包含不支持 WalletConnect 連接的區塊鏈。不支持的區塊鏈：\n</string>
     <string name="wallet_connect_error_unsupported_dapp">由於技術問題，無法與此 Dapp 建立連接</string>
+    <string name="wallet_connect_generic_error_with_code">我們遇到了未知錯誤。錯誤代碼：%d。如果問題仍然存在-請隨時聯繫我們的支持人員</string>
     <string name="wallet_connect_network_not_found_format">沒有 %s 網路，請先加入後再試一次</string>
     <string name="wallet_connect_no_sessions_message">沒有打開中的WalletConnect連接</string>
     <string name="wallet_connect_no_sessions_title">Ooops, 沒有連接</string>
@@ -462,7 +475,4 @@
     <string name="welcome_unlock_card">掃描卡片</string>
     <string name="welcome_unlock_description">使用 %s 或掃描卡片以訪問該應用程序</string>
     <string name="welcome_unlock_title">歡迎回來!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index 73635a7a23..dc9d444a4d 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -24,12 +24,18 @@
     <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
     <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
     <string name="app_settings_title">App Settings</string>
+    <string name="biometric_lockout_permanent_warning_description">Please scan the card</string>
+    <string name="biometric_lockout_warning_description">Please try again in 30 seconds or scan the card</string>
+    <string name="biometric_lockout_warning_title">Too many attempts</string>
+    <string name="card_settings_action_sheet_reset">Reset</string>
+    <string name="card_settings_action_sheet_title">Are you sure you want to do this?</string>
     <string name="card_settings_change_access_code">Change Access Code</string>
     <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
     <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
     <string name="card_settings_security_mode">Security Mode</string>
     <string name="card_settings_title">Card Settings</string>
     <string name="chat_bot_name">Tangem Bot</string>
+    <string name="chat_button_title">Support</string>
     <string name="common_accept">Accept</string>
     <string name="common_add">Add</string>
     <string name="common_attention">Attention</string>
@@ -134,13 +140,13 @@
     <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
     <string name="main_scan_card_warning_view_title">Scan your card</string>
     <string name="main_tokens">Tokens</string>
-    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets</string>
     <string name="onboarding_access_code_feature_1_title">Protect</string>
-    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set up an individual access code on each card later</string>
     <string name="onboarding_access_code_feature_2_title">Personalize</string>
-    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place</string>
     <string name="onboarding_access_code_feature_3_title">Restore</string>
-    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code</string>
     <string name="onboarding_access_code_intro_title">Create Access Code</string>
     <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
     <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
@@ -163,7 +169,6 @@
     <string name="onboarding_button_scan_origin_card">Scan primary card</string>
     <string name="onboarding_button_skip_backup">Skip for later</string>
     <string name="onboarding_button_what_does_it_mean">How does it work?</string>
-    <string name="onboarding_chat_button_title">Support</string>
     <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
     <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
     <string name="onboarding_create_wallet_header">Create a wallet</string>
@@ -178,7 +183,7 @@
     <string name="onboarding_navbar_register_wallet">Connect</string>
     <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
     <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add the Tangem card as your backup</string>
     <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
     <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
     <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
@@ -191,7 +196,7 @@
     <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
     <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
     <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_subtitle_pin">Set up a 4-digit code.\nIt will be used for payments.</string>
     <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
     <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
     <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
@@ -199,7 +204,6 @@
     <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
     <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
     <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
     <string name="onboarding_title">Activating card</string>
     <string name="onboarding_title_backup_card_format">Backup card #%d</string>
     <string name="onboarding_title_claim">Claim %s</string>
@@ -219,7 +223,7 @@
     <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
     <string name="onboarding_top_up_header">Top up your wallet</string>
     <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
-    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over</string>
     <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
     <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
     <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
@@ -360,6 +364,10 @@
     <string name="token_details_unable_hide_alert_message">The %1$s token is the main currency on the %2$s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
     <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
     <string name="token_item_no_rate">No rate</string>
+    <string name="transaction_history_empty_transactions">You don\'t have any transactions yet</string>
+    <string name="transaction_history_error_failed_to_load">Failed to load transactions</string>
+    <string name="transaction_history_title">Transactions</string>
+    <string name="transaction_history_tx_in_progress">In progress...</string>
     <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
     <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
     <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
@@ -402,8 +410,11 @@
     <string name="wallet_connect_create_tx_message">Request to create transaction for %1$s\n%2$s\n\nAmount: %3$s\nFee: %4$s\nTotal: %5$s\nBalance: %6$s</string>
     <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
     <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="wallet_connect_error_missing_blockchains">Not all tokens were added to your list. Please add them first and try again. Missing tokens:\n</string>
     <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_error_unsupported_blockchains">Session request contains unsupported blockchains for WalletConnect connection. Unsupported blockchains:\n</string>
     <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="wallet_connect_generic_error_with_code">We\'ve encountered unknown error. Error code: %d. If the problem persists — feel free to contact our support</string>
     <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
     <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
     <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
@@ -464,7 +475,4 @@
     <string name="welcome_unlock_card">Scan card</string>
     <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
     <string name="welcome_unlock_title">Welcome back!</string>
-
-    <!-- Special string -->
-    <string name="common_custom_string">%s</string>
 </resources>
diff --git a/core/res/src/main/res/values/strings_untranslatable.xml b/core/res/src/main/res/values/strings_untranslatable.xml
new file mode 100644
index 0000000000..001e93f304
--- /dev/null
+++ b/core/res/src/main/res/values/strings_untranslatable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Special string -->
+    <string name="common_custom_string" translatable="false">%s</string>
+</resources>
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/MoshiConverter.kt b/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
deleted file mode 100644
index e69de29bb2..0000000000