diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt index 8885e2055d..c81feb5cfb 100644 --- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt +++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/ImportSeedPhraseScreen.kt @@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.material.OutlinedTextField import androidx.compose.material.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource @@ -89,6 +90,9 @@ private fun PhraseBlock( state: ImportSeedPhraseState, modifier: Modifier = Modifier, ) { + // TODO: replace by TextReference + val errorConverter = remember { SeedPhraseErrorConverter() } + Column( modifier = modifier.fillMaxWidth(), ) { @@ -112,7 +116,7 @@ private fun PhraseBlock( .fillMaxWidth() .height(TangemTheme.dimens.size32), ) { - val message = SeedPhraseErrorConverter(LocalContext.current).convert(state.error) + val message = errorConverter.convert(LocalContext.current to state.error) if (message != null) { Text( modifier = Modifier.fillMaxSize(), diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt index a8a387cde6..dbb553ba63 100644 --- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt +++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/viewmodel/SeedPhraseErrorConverter.kt @@ -8,12 +8,10 @@ import com.tangem.feature.onboarding.domain.SeedPhraseError /** [REDACTED_AUTHOR] */ -class SeedPhraseErrorConverter( - private val context: Context, -) : ModuleMessageConverter { +class SeedPhraseErrorConverter : ModuleMessageConverter, String?> { - override fun convert(message: SeedPhraseError?): String? { - message ?: return null + override fun convert(source: Pair): String? { + val (context, message) = source val convertedMessage = when (message) { SeedPhraseError.InvalidEntropyLength -> {