diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/DomainErrorConverter.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/DomainErrorConverter.kt
index 89c205afee..db6b5aa462 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/DomainErrorConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/DomainErrorConverter.kt
@@ -36,13 +36,15 @@ private class AddCustomTokenConverter(
             AddCustomTokenError.InvalidContractAddress -> R.string.custom_token_creation_error_invalid_contract_address
             AddCustomTokenError.NetworkIsNotSelected -> R.string.custom_token_creation_error_network_not_selected
             AddCustomTokenError.InvalidDerivationPath -> R.string.custom_token_creation_error_invalid_derivation_path
-            AddCustomTokenError.InvalidDecimalsCount -> R.string.custom_token_creation_error_wrong_decimals
-            AddCustomTokenError.FieldIsEmpty -> R.string.custom_token_creation_error_empty_fields
+            AddCustomTokenError.InvalidDecimalsCount -> {
+                context.getString(R.string.custom_token_creation_error_wrong_decimals, 30)
+            }
+            AddCustomTokenError.FieldIsEmpty -> R.string.custom_token_creation_error_required_field
             else -> null
         }
         return when (rawMessage) {
             is Int -> context.getString(rawMessage)
-//            is String -> rawMessage
+            is String -> rawMessage
             else -> "Unknown error: ${customTokenError::class.java.simpleName}"
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/DebugActions.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/DebugActions.kt
index 18c1a5fc2e..0db334c34b 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/DebugActions.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/DebugActions.kt
@@ -68,7 +68,7 @@ private fun AllInOne() {
     )
     // unknown
     ContractAddressButton(
-        name = "unk",
+        name = "unknown",
         address = "0x1111111111111111112111111111111111111113"
     )
 }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 02169fe239..9a0a6881fd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -202,6 +202,7 @@
     <string name="token_icon">Значок токена</string>
     <string name="add_custom_token_title" translatable="false">Добавить токен</string>
     <string name="custom_token_contract_address_input_title">Адрес контракта</string>
+    <string name="custom_token_creation_error_required_field">Обязательное поле</string>
     <string name="custom_token_creation_error_network_not_selected">Пожалуйста, выберите сеть</string>
     <string name="custom_token_creation_error_empty_fields">Пожалуйста, заполните все поля</string>
     <string name="custom_token_creation_error_wrong_decimals">Количество знаков после запятой должно быть корректным числом не больше %d</string>
diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml
index be969d2aae..649081be00 100644
--- a/app/src/main/res/values/strings_untranslated.xml
+++ b/app/src/main/res/values/strings_untranslated.xml
@@ -84,6 +84,7 @@
 
     <string name="add_custom_token_title" translatable="false">Add Token</string>
     <string name="custom_token_contract_address_input_title" translatable="false">Contract address</string>
+    <string name="custom_token_creation_error_required_field" translatable="false">Required field</string>
     <string name="custom_token_creation_error_network_not_selected" translatable="false">Please select the network</string>
     <string name="custom_token_creation_error_empty_fields" translatable="false">Please fill in all the fields</string>
     <string name="custom_token_creation_error_wrong_decimals" translatable="false">Decimal number must be a valid integer, no higher than %d</string>