Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt

@@ -20,7 +20,7 @@ import com.tangem.domain.DomainDialog
 import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.global.DomainGlobalAction
 import com.tangem.domain.redux.global.DomainGlobalState
-import com.tangem.tap.features.tokens.addCustomToken.DomainErrorConverter
+import com.tangem.tap.common.moduleMessage.ModuleMessageConverter
 import com.tangem.tap.features.tokens.addCustomToken.compose.SelectTokenNetworkDialog
 import com.tangem.wallet.R
 import org.rekotlin.StoreSubscriber
@@ -55,13 +55,13 @@ private fun ShowTheDialog(dialogState: MutableState<DomainDialog?>) {
     if (dialogState.value == null) return
 
     val context = LocalContext.current
-    val errorConverter = remember { DomainErrorConverter(context) }
+    val errorConverter = remember { ModuleMessageConverter(context) }
     val onDismissRequest = { domainStore.dispatch(DomainGlobalAction.ShowDialog(null)) }
 
     when (val dialog = dialogState.value) {
         is DomainDialog.DialogError -> ErrorDialog(
             title = stringResource(id = R.string.common_error),
-            body = errorConverter.convertError(dialog.error),
+            body = errorConverter.convert(dialog.error),
             onDismissRequest
         )
         is DomainDialog.SelectTokenDialog -> SelectTokenNetworkDialog(dialog, onDismissRequest)

app/src/main/java/com/tangem/tap/common/compose/OutlinedTextFieldWidget.kt

@@ -15,16 +15,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.domain.DomainError
-import com.tangem.domain.ErrorConverter
+import com.tangem.common.module.ModuleError
 import com.tangem.domain.common.form.Field
 import com.tangem.tap.common.compose.extensions.stringResourceDefault
+import com.tangem.tap.common.moduleMessage.ModuleMessageConverter
 
 /**
 [REDACTED_AUTHOR]
@@ -41,8 +42,8 @@ fun OutlinedTextFieldWidget(
     isEnabled: Boolean = true,
     isVisible: Boolean = true,
     isLoading: Boolean = false,
-    error: DomainError? = null,
-    errorConverter: ErrorConverter<String>? = null,
+    error: ModuleError? = null,
+    errorConverter: ModuleMessageConverter? = null,
     debounceTextChanges: Long = 400,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
@@ -79,7 +80,7 @@ private fun OutlinedProgressTextField(
     placeholder: String = "",
     isEnabled: Boolean = true,
     isLoading: Boolean = false,
-    error: DomainError? = null,
+    error: ModuleError? = null,
     debounce: Long = 400,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
@@ -132,8 +133,8 @@ private fun OutlinedProgressTextField(
 
 @Composable
 private fun AnimatedErrorView(
-    error: DomainError? = null,
-    errorConverter: ErrorConverter<String>,
+    error: ModuleError? = null,
+    errorConverter: ModuleMessageConverter,
 ) {
     AnimatedVisibility(
         visible = error != null,
@@ -141,7 +142,7 @@ private fun AnimatedErrorView(
         exit = slideOutVertically() + fadeOut(),
     ) {
         error?.let {
-            ErrorView(errorConverter.convertError(it), style = TextStyle(fontSize = 14.sp))
+            ErrorView(errorConverter.convert(it), style = TextStyle(fontSize = 14.sp))
         }
     }
 }
@@ -149,20 +150,14 @@ private fun AnimatedErrorView(
 @Preview
 @Composable
 fun OutlinedTextFieldWithErrorTest() {
-    val converter = remember {
-        object : ErrorConverter<String> {
-            override fun convertError(error: DomainError): String {
-                return "Hello, i'am the error: ${error::class.java.simpleName}"
-            }
-
-        }
-    }
+    val context = LocalContext.current
+    val converter = remember { ModuleMessageConverter(context) }
 
     class SimpleError(
         override val code: Int = 1,
         override val message: String = "Error message",
         override val data: Any? = null,
-    ) : DomainError
+    ) : ModuleError
 
     val modifier = Modifier
         .fillMaxWidth()

app/src/main/java/com/tangem/tap/common/moduleMessage/ModuleMessageConverter.kt

@@ -0,0 +1,24 @@
+package com.tangem.tap.common.moduleMessage
+
+import android.content.Context
+import com.tangem.common.module.ModuleMessage
+import com.tangem.common.module.ModuleMessageConverter
+import com.tangem.domain.DomainModuleMessage
+import com.tangem.tap.common.moduleMessage.domain.DomainMessageConverter
+
+class ModuleMessageConverter(
+    private val context: Context
+) : ModuleMessageConverter<ModuleMessage, String> {
+
+    override fun convert(message: ModuleMessage): String {
+        val convertedMessage = when (message) {
+            is DomainModuleMessage -> DomainMessageConverter(context).convert(message)
+            else -> null
+        }
+        return convertedMessage ?: convertUnknownMessage(message)
+    }
+
+    private fun convertUnknownMessage(message: ModuleMessage): String {
+        return "Unknown message: ${message::class.java.simpleName}"
+    }
+}

app/src/main/java/com/tangem/tap/common/moduleMessage/domain/DomainErrorConverters.kt

@@ -1,10 +1,9 @@
-package com.tangem.tap.features.tokens.addCustomToken
+package com.tangem.tap.common.moduleMessage.domain
 
 import android.content.Context
+import com.tangem.common.module.ModuleMessageConverter
+import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.DomainError
-import com.tangem.domain.ErrorConverter
-import com.tangem.domain.features.addCustomToken.AddCustomTokenError
-import com.tangem.domain.features.addCustomToken.AddCustomTokenWarning
 import com.tangem.wallet.R
 
 /**
@@ -12,27 +11,23 @@ import com.tangem.wallet.R
  */
 class DomainErrorConverter(
     private val context: Context
-) : ErrorConverter<String> {
-
-    override fun convertError(error: DomainError): String {
-        val errorMessage = when (error) {
-            is AddCustomTokenError -> AddCustomTokenConverter(context).convertError(error)
-            else -> null
-        }
-        return errorMessage?.let { it } ?: "Unknown error: ${error::class.java.simpleName}"
+) : ModuleMessageConverter<DomainError, String?> {
+    override fun convert(message: DomainError): String? = when (message) {
+        is AddCustomTokenError -> AddCustomTokenConverter(context).convert(message)
+        else -> null
     }
 }
 
 private class AddCustomTokenConverter(
     private val context: Context
-) : ErrorConverter<String> {
+) : ModuleMessageConverter<DomainError, String?> {
 
-    override fun convertError(error: DomainError): String {
-        val customTokenError = (error as? AddCustomTokenError) ?: throw UnsupportedOperationException()
+    override fun convert(message: DomainError): String? {
+        val customTokenError = (message as? AddCustomTokenError) ?: throw UnsupportedOperationException()
 
         val rawMessage = when (customTokenError) {
-            AddCustomTokenWarning.PotentialScamToken -> R.string.custom_token_validation_error_not_found
-            AddCustomTokenWarning.TokenAlreadyAdded -> R.string.custom_token_validation_error_already_added
+            AddCustomTokenError.Warning.PotentialScamToken -> R.string.custom_token_validation_error_not_found
+            AddCustomTokenError.Warning.TokenAlreadyAdded -> R.string.custom_token_validation_error_already_added
             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
@@ -42,10 +37,11 @@ private class AddCustomTokenConverter(
             AddCustomTokenError.FieldIsEmpty -> R.string.custom_token_creation_error_required_field
             else -> null
         }
+
         return when (rawMessage) {
             is Int -> context.getString(rawMessage)
             is String -> rawMessage
-            else -> "Unknown error: ${customTokenError::class.java.simpleName}"
+            else -> null
         }
     }
 }

app/src/main/java/com/tangem/tap/common/moduleMessage/domain/DomainMessageConverter.kt

@@ -0,0 +1,20 @@
+package com.tangem.tap.common.moduleMessage.domain
+
+import android.content.Context
+import com.tangem.common.module.ModuleMessageConverter
+import com.tangem.domain.DomainError
+import com.tangem.domain.DomainModuleMessage
+
+/**
+[REDACTED_AUTHOR]
+ */
+class DomainMessageConverter(
+    private val context: Context
+) : ModuleMessageConverter<DomainModuleMessage, String?> {
+    override fun convert(message: DomainModuleMessage): String? {
+        return when (message) {
+            is DomainError -> DomainErrorConverter(context).convert(message)
+            else -> null
+        }
+    }
+}

app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/AddCustomTokenScreen.kt

@@ -13,11 +13,9 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.domain.ErrorConverter
+import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.common.form.DataField
 import com.tangem.domain.common.form.FieldId
-import com.tangem.domain.features.addCustomToken.AddCustomTokenError
-import com.tangem.domain.features.addCustomToken.AddCustomTokenWarning
 import com.tangem.domain.features.addCustomToken.CustomTokenFieldId.*
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
@@ -27,7 +25,7 @@ import com.tangem.domain.redux.domainStore
 import com.tangem.tap.common.compose.ComposeDialogManager
 import com.tangem.tap.common.compose.ToggledRippleTheme
 import com.tangem.tap.common.compose.keyboardAsState
-import com.tangem.tap.features.tokens.addCustomToken.DomainErrorConverter
+import com.tangem.tap.common.moduleMessage.ModuleMessageConverter
 import com.tangem.wallet.R
 
 /**
@@ -82,7 +80,7 @@ fun AddCustomTokenScreen(state: MutableState<AddCustomTokenState>) {
 @Composable
 private fun FormFields(state: MutableState<AddCustomTokenState>) {
     val context = LocalContext.current
-    val errorConverter = remember { DomainErrorConverter(context) }
+    val errorConverter = remember { ModuleMessageConverter(context) }
 
     val stateValue = state.value
     stateValue.form.fieldList.forEach { field ->
@@ -99,11 +97,11 @@ private fun FormFields(state: MutableState<AddCustomTokenState>) {
 }
 
 @Composable
-fun Warnings(warnings: List<AddCustomTokenWarning>) {
+fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
     if (warnings.isEmpty()) return
 
     val context = LocalContext.current
-    val warningConverter = remember { DomainErrorConverter(context) }
+    val warningConverter = remember { ModuleMessageConverter(context) }
 
     Column {
         warnings.forEachIndexed { index, item ->
@@ -120,7 +118,7 @@ fun Warnings(warnings: List<AddCustomTokenWarning>) {
             ) {
                 Text(
                     modifier = Modifier.padding(16.dp),
-                    text = warningConverter.convertError(item),
+                    text = warningConverter.convert(item),
                     color = colorResource(id = R.color.white),
                     fontSize = 14.sp
                 )
@@ -172,14 +170,14 @@ private fun AddCustomTokenFab(
 data class ScreenFieldData(
     val field: DataField<*>,
     val error: AddCustomTokenError?,
-    val errorConverter: ErrorConverter<String>,
+    val errorConverter: ModuleMessageConverter,
     val viewState: ViewStates.TokenField
 ) {
     companion object {
         fun fromState(
             field: DataField<*>,
             state: AddCustomTokenState,
-            errorConverter: DomainErrorConverter
+            errorConverter: ModuleMessageConverter
         ): ScreenFieldData {
             return ScreenFieldData(
                 field = field,