Updated on 2026-08-14

app/src/main/java/com/tangem/tap/TapApplication.kt

@@ -22,7 +22,6 @@ import com.tangem.datasource.config.ConfigManager
 import com.tangem.datasource.config.FeaturesLocalLoader
 import com.tangem.datasource.config.models.Config
 import com.tangem.datasource.connection.NetworkConnectionManager
-import com.tangem.domain.DomainLayer
 import com.tangem.domain.appcurrency.repository.AppCurrencyRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.common.LogConfig
@@ -210,7 +209,6 @@ class TapApplication : Application(), ImageLoaderFactory {
         activityResultCaller = foregroundActivityObserver
         registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)
 
-        DomainLayer.init()
         preferencesStorage = preferencesDataSource
         walletConnectRepository = WalletConnectRepository(this)
 

app/src/main/java/com/tangem/tap/common/CompositionCounter.kt

@@ -1,40 +0,0 @@
-package com.tangem.tap.common
-
-import timber.log.Timber
-
-class CompositionCounter(
-    val id: String,
-    count: Int = 0,
-) {
-    var count: Int = count
-        private set
-
-    fun increase(id: String): CompositionCounter {
-        if (this.id != id) return this
-
-        count += 1
-        return CompositionCounter(id, count)
-    }
-}
-
-class CompositionLogger(
-    private val recomposeViewId: String,
-    private val tag: String = recomposeViewId,
-    private var turnOnForIds: List<String> = listOf(recomposeViewId),
-) {
-    val count: Int
-        get() = compositionCounter.count
-
-    private var compositionCounter: CompositionCounter = CompositionCounter(recomposeViewId)
-
-    fun nextComposition() {
-        compositionCounter = compositionCounter.increase(recomposeViewId)
-        log("")
-    }
-
-    fun log(message: String) {
-        if (!turnOnForIds.contains(recomposeViewId)) return
-
-        Timber.d("$tag[$recomposeViewId]:[${compositionCounter.count}]: $message")
-    }
-}

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

@@ -1,277 +0,0 @@
-package com.tangem.tap.common.compose
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Text
-import androidx.compose.material.TextFieldColors
-import androidx.compose.runtime.Composable
-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.common.module.ModuleError
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.domain.common.form.Field
-import com.tangem.tap.common.CompositionLogger
-import com.tangem.tap.common.compose.extensions.stringResourceDefault
-import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun OutlinedTextFieldWidget(
-    fieldData: Field.Data<String>,
-    labelId: Int? = null,
-    label: String = "",
-    placeholderId: Int? = null,
-    placeholder: String = "",
-    trailingIcon: @Composable (() -> Unit)? = null,
-    isEnabled: Boolean = true,
-    isVisible: Boolean = true,
-    isLoading: Boolean = false,
-    error: ModuleError? = null,
-    errorConverter: ModuleMessageConverter? = null,
-    debounceTextChanges: Long = 400,
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    onTextChange: (String) -> Unit,
-) {
-    if (!isVisible) return
-
-    Column(modifier = Modifier.animateContentSize()) {
-        OutlinedProgressTextField(
-            fieldData = fieldData,
-            label = stringResourceDefault(labelId, label),
-            placeholder = stringResourceDefault(placeholderId, placeholder),
-            trailingIcon = trailingIcon,
-            isEnabled = isEnabled,
-            isLoading = isLoading,
-            error = error,
-            debounce = debounceTextChanges,
-            visualTransformation = visualTransformation,
-            keyboardOptions = keyboardOptions,
-            onTextChange = onTextChange,
-        )
-        errorConverter?.let { AnimatedErrorView(errorConverter = it, error = error) }
-    }
-}
-
-@Suppress("LongMethod", "NestedBlockDepth", "MagicNumber", "MaxLineLength")
-@Composable
-private fun OutlinedProgressTextField(
-    fieldData: Field.Data<String>,
-    label: String = "",
-    placeholder: String = "",
-    isEnabled: Boolean = true,
-    isLoading: Boolean = false,
-    error: ModuleError? = null,
-    debounce: Long = 400,
-    visualTransformation: VisualTransformation = VisualTransformation.None,
-    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    colors: TextFieldColors = TangemTextFieldsDefault.defaultTextFieldColors,
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    trailingIcon: @Composable (() -> Unit)? = null,
-    onTextChange: (String) -> Unit,
-) {
-    val logger = remember {
-        CompositionLogger(label, "OutlinedProgressTextField", listOf("Символ токена"))
-    }
-    logger.nextComposition()
-
-    val textValueState = remember { mutableStateOf(fieldData.value) }
-    val textDebouncer = valueDebouncerAsState(
-        initialValue = fieldData.value,
-        debounce = debounce,
-        onEmitValueReceive = {
-            logger.log("DEBOUNCER: onEmitValueReceived: [$it]")
-            logger.log("DEBOUNCER: start RECOMPOSE by new value for textValueState.value = [$it]")
-            textValueState.value = it
-        },
-        onValueChange = {
-            logger.log("DEBOUNCER: onValueChanged:  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  dispatch.toStore([$it])")
-            onTextChange(it)
-        },
-    )
-
-    logger.log("RECOMPOSE ---------------------------------------------------------------START [${logger.count}]")
-    logger.log("RECOMPOSE --data: fieldData.value: [$fieldData]")
-    logger.log("RECOMPOSE --data: textValueState.value: [${textValueState.value}]")
-    logger.log("RECOMPOSE --data: textDebouncer.emittedValue = [${textDebouncer.emittedValue}]")
-    logger.log("RECOMPOSE --data: textDebouncer.debounced = [${textDebouncer.debounced}]")
-
-    if (!fieldData.isUserInput) {
-        // initial value is not from an user
-        val isNotUserInput = "-- IS NOT USER INPUT"
-        logger.log("recompose $isNotUserInput")
-        if (textValueState.value == fieldData.value) {
-            logger.log("$isNotUserInput: внешние данные ОДИНАКОВЫ с данными в поле")
-        } else {
-            logger.log("$isNotUserInput: внешние данные РАЗЛИЧАЮТСЯ с данными в поле")
-            if (textDebouncer.emittedValue != textDebouncer.debounced || textDebouncer.emitsCountBeforeDebounce > 0) {
-                logger.log("$isNotUserInput: пользователь ВВОДИТ данные -> внешние данные игнорируем, ждем RECOMPOSE")
-            } else {
-                logger.log("$isNotUserInput: пользователь НЕ вводит данные -> пытаемся обработать внешние данные")
-                if (textValueState.value != textDebouncer.emittedValue ||
-                    textValueState.value != textDebouncer.debounced
-                ) {
-                    logger.log("$isNotUserInput: даннные в поле не соответствуют данным из textDebouncer")
-                    if (textDebouncer.emittedValue.isEmpty() && textDebouncer.debounced.isEmpty()) {
-                        logger.log(
-                            "$isNotUserInput: даннные в textDebouncer ПУСТЫ -> start RECOMPOSE новые данные для " +
-                                "textValueState.value = [${fieldData.value}]",
-                        )
-                        textValueState.value = fieldData.value
-                    } else {
-                        logger.log(
-                            "$isNotUserInput: даннные в textDebouncer НЕ ПУСТЫ  -> start RECOMPOSE новые данные для " +
-                                "textValueState.value = [${fieldData.value}]",
-                        )
-                        textValueState.value = fieldData.value
-                    }
-                } else {
-                    logger.log(
-                        "$isNotUserInput: в пустое поле вставляются данные -> start RECOMPOSE новые данные для " +
-                            "textValueState.value = [${fieldData.value}]",
-                    )
-                    textValueState.value = fieldData.value
-                }
-            }
-        }
-    }
-    logger.log("recompose --------------------------------------------------------------FINISH [${logger.count}]")
-
-    Box {
-        OutlinedTextField(
-            modifier = Modifier
-                .fillMaxWidth(),
-            value = textValueState.value,
-            onValueChange = {
-                logger.log("WIDGET: textDebouncer.emmit([$it])")
-                textDebouncer.emmit(it)
-            },
-            keyboardOptions = keyboardOptions,
-            label = {
-                Text(
-                    text = label,
-                    style = TangemTheme.typography.caption,
-                    color = colors.labelColor(
-                        enabled = isEnabled,
-                        error = error != null,
-                        interactionSource = interactionSource,
-                    ).value,
-                )
-            },
-            placeholder = {
-                Text(
-                    text = placeholder,
-                    style = TangemTheme.typography.body1,
-                    color = colors.placeholderColor(enabled = isEnabled).value,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                )
-            },
-            trailingIcon = trailingIcon,
-            singleLine = true,
-            enabled = isEnabled,
-            isError = error != null,
-            visualTransformation = visualTransformation,
-            colors = colors,
-            interactionSource = interactionSource,
-        )
-        AnimatedVisibility(
-            modifier = Modifier
-                .fillMaxWidth()
-                .align(Alignment.BottomCenter)
-                .padding(start = 6.dp, top = 0.dp, end = 6.dp, bottom = 6.dp),
-            visible = isLoading,
-        ) {
-            LinearProgressIndicator(
-                color = TangemTheme.colors.icon.primary1,
-            )
-        }
-    }
-}
-
-@Composable
-private fun AnimatedErrorView(errorConverter: ModuleMessageConverter, error: ModuleError? = null) {
-    AnimatedVisibility(
-        visible = error != null,
-        enter = fadeIn() + slideInVertically(),
-        exit = slideOutVertically() + fadeOut(),
-    ) {
-        error?.let {
-            ErrorView(
-                text = errorConverter.convert(it).message,
-                style = TextStyle(fontSize = 14.sp),
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun OutlinedTextFieldWithErrorTest() {
-    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,
-    ) : ModuleError()
-
-    val modifier = Modifier
-        .fillMaxWidth()
-        .padding(16.dp)
-    Column {
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            isLoading = true,
-            error = null,
-            errorConverter = converter,
-        ) {}
-        OutlinedTextFieldWidget(
-            fieldData = Field.Data("First", false),
-            label = "First label",
-            placeholder = "1 placeholder",
-            error = SimpleError(),
-            errorConverter = converter,
-        ) {}
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.tangem.tap.common.compose
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.sp
-
-/**
-[REDACTED_AUTHOR]
- * Compose views are not typically used as a main or base view.
- */
-
-@Composable
-fun TitleSubtitle(title: String, subtitle: String) {
-    Column {
-        Text(text = title)
-        Text(
-            text = subtitle,
-            fontSize = 12.sp,
-            color = Color.Gray,
-        )
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.tangem.tap.common.compose.extensions
-
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun stringResourceDefault(@StringRes id: Int?, default: String = ""): String {
-    val resources = LocalContext.current.resources
-    return try {
-        resources.getString(requireNotNull(id))
-    } catch (ex: Resources.NotFoundException) {
-        default
-    } catch (ex: IllegalArgumentException) {
-        default
-    }
-}

app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt

@@ -6,7 +6,7 @@ import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.FragmentShareTransition
 import com.tangem.feature.referral.ReferralFragment
 import com.tangem.feature.swap.presentation.SwapFragment
-import com.tangem.tap.features.customtoken.legacy.AddCustomTokenFragment
+import com.tangem.tap.features.customtoken.impl.presentation.AddCustomTokenFragment
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsFragment
 import com.tangem.tap.features.details.ui.cardsettings.CardSettingsFragment
 import com.tangem.tap.features.details.ui.cardsettings.coderecovery.AccessCodeRecoveryFragment
@@ -33,7 +33,6 @@ import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import timber.log.Timber
-import com.tangem.tap.features.customtoken.impl.presentation.AddCustomTokenFragment as RedesignedAddCustomTokenFragment
 
 fun FragmentActivity.openFragment(
     screen: AppScreen,
@@ -155,18 +154,7 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.AccessCodeRecovery -> AccessCodeRecoveryFragment()
         AppScreen.Disclaimer -> DisclaimerFragment()
         AppScreen.AddTokens -> TokensListFragment()
-
-        AppScreen.AddCustomToken -> {
-            val featureToggles = store.state.daggerGraphState.get(
-                getDependency = DaggerGraphState::customTokenFeatureToggles,
-            )
-            if (featureToggles.isRedesignedScreenEnabled) {
-                RedesignedAddCustomTokenFragment()
-            } else {
-                AddCustomTokenFragment()
-            }
-        }
-
+        AppScreen.AddCustomToken -> AddCustomTokenFragment()
         AppScreen.WalletDetails -> {
             val featureToggles = store.state.daggerGraphState.get(
                 getDependency = DaggerGraphState::tokenDetailsFeatureToggles,

app/src/main/java/com/tangem/tap/common/extensions/ValueCallback.kt

@@ -1,6 +0,0 @@
-package com.tangem.tap.common.extensions
-
-/**
-[REDACTED_AUTHOR]
- */
-typealias ValueCallback<T> = (T) -> Unit

app/src/main/java/com/tangem/tap/features/customtoken/api/featuretoggles/CustomTokenFeatureToggles.kt

@@ -7,8 +7,5 @@ package com.tangem.tap.features.customtoken.api.featuretoggles
  */
 interface CustomTokenFeatureToggles {
 
-    /** Availability of redesigned screen (internal feature) */
-    val isRedesignedScreenEnabled: Boolean
-
     val isNewCardScanningEnabled: Boolean
 }

app/src/main/java/com/tangem/tap/features/customtoken/impl/featuretoggles/DefaultCustomTokenFeatureToggles.kt

@@ -14,9 +14,6 @@ internal class DefaultCustomTokenFeatureToggles(
     private val featureTogglesManager: FeatureTogglesManager,
 ) : CustomTokenFeatureToggles {
 
-    override val isRedesignedScreenEnabled: Boolean
-        get() = featureTogglesManager.isFeatureEnabled(name = "REDESIGNED_CUSTOM_TOKEN_SCREEN_ENABLED")
-
     override val isNewCardScanningEnabled: Boolean
         get() = featureTogglesManager.isFeatureEnabled(name = "NEW_CARD_SCANNING_ENABLED")
 }

app/src/main/java/com/tangem/tap/features/customtoken/legacy/AddCustomTokenFragment.kt

@@ -1,79 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy
-
-import android.os.Bundle
-import android.view.View
-import android.view.WindowManager
-import androidx.appcompat.widget.Toolbar
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.ComposeView
-import com.tangem.core.analytics.Analytics
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.analytics.events.ManageTokens
-import com.tangem.tap.features.BaseStoreFragment
-import com.tangem.tap.features.FragmentOnBackPressedHandler
-import com.tangem.tap.features.addBackPressHandler
-import com.tangem.tap.features.customtoken.legacy.compose.AddCustomTokenScreen
-import com.tangem.tap.features.customtoken.legacy.compose.ClosePopupTrigger
-import com.tangem.wallet.R
-import org.rekotlin.StoreSubscriber
-
-/**
-[REDACTED_AUTHOR]
- */
-class AddCustomTokenFragment : BaseStoreFragment(R.layout.view_compose_fragment), StoreSubscriber<AddCustomTokenState> {
-
-    private var state: MutableState<AddCustomTokenState> = mutableStateOf(domainStore.state.addCustomTokensState)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        Analytics.send(ManageTokens.CustomToken.ScreenOpened)
-    }
-
-    override fun subscribeToStore() {
-        domainStore.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.addCustomTokensState == newState.addCustomTokensState
-            }.select { it.addCustomTokensState }
-        }
-    }
-
-    override fun newState(state: AddCustomTokenState) {
-        if (activity == null || view == null) return
-
-        this.state.value = state
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
-        view.findViewById<Toolbar>(R.id.toolbar)?.setTitle(R.string.add_custom_token_title)
-
-        val closePopupTrigger = initClosingPopupTriggerEvent()
-        view.findViewById<ComposeView>(R.id.view_compose)?.setContent {
-            TangemTheme {
-                Box(
-                    modifier = Modifier
-                        .fillMaxSize(),
-                ) {
-                    AddCustomTokenScreen(state, closePopupTrigger)
-                }
-            }
-        }
-    }
-
-    private fun initClosingPopupTriggerEvent(): ClosePopupTrigger = ClosePopupTrigger().apply {
-        onCloseComplete = ::handleOnBackPressed
-        addBackPressHandler(
-            object : FragmentOnBackPressedHandler {
-                override fun handleOnBackPressed() = close()
-            },
-        )
-    }
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/AddCustomTokenScreen.kt

@@ -1,208 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.PrimaryButtonIconStart
-import com.tangem.core.ui.components.keyboardAsState
-import com.tangem.core.ui.res.TangemTheme
-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.CustomTokenFieldId.*
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.features.addCustomToken.redux.ScreenState
-import com.tangem.domain.features.addCustomToken.redux.ViewStates
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.compose.AddCustomTokenWarning
-import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
-import com.tangem.tap.features.customtoken.legacy.compose.test.TestCase
-import com.tangem.tap.features.customtoken.legacy.compose.test.TestCasesList
-import com.tangem.wallet.R
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-fun AddCustomTokenScreen(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val selectedTestCase = remember { mutableStateOf(TestCase.ContractAddress) }
-
-    val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
-        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed),
-    )
-    val coroutineScope = rememberCoroutineScope()
-    val toggleBottomSheet = { coroutineScope.launch { bottomSheetScaffoldState.toggle() } }
-
-    BottomSheetScaffold(
-        scaffoldState = bottomSheetScaffoldState,
-        sheetContent = {
-            Surface(color = colorResource(id = R.color.lightGray5)) {
-                selectedTestCase.value.content(toggleBottomSheet)
-            }
-        },
-        sheetPeekHeight = 0.dp,
-    ) {
-        Column {
-            TestCasesList(
-                onItemClick = {
-                    selectedTestCase.value = it
-                    toggleBottomSheet()
-                },
-            )
-            ScreenContent(state, closePopupTrigger)
-        }
-    }
-
-    ComposeDialogManager()
-    LaunchedEffect(key1 = Unit, block = { domainStore.dispatch(AddCustomTokenAction.OnCreate) })
-    DisposableEffect(key1 = Unit, effect = { onDispose { domainStore.dispatch(AddCustomTokenAction.OnDestroy) } })
-}
-
-@OptIn(ExperimentalMaterialApi::class)
-private suspend fun BottomSheetScaffoldState.toggle() {
-    if (bottomSheetState.isCollapsed) {
-        bottomSheetState.expand()
-    } else {
-        bottomSheetState.collapse()
-    }
-}
-
-@Composable
-private fun ScreenContent(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val scaffoldState = rememberScaffoldState()
-
-    Scaffold(
-        scaffoldState = scaffoldState,
-        backgroundColor = colorResource(id = R.color.backgroundLightGray),
-        floatingActionButton = {
-            HangingOverKeyboardView(keyboardState = keyboardAsState()) {
-                AddButton(state)
-            }
-        },
-        floatingActionButtonPosition = FabPosition.Center,
-    ) { paddings ->
-        Box(
-            modifier = Modifier
-                .padding(paddings)
-                .fillMaxSize(),
-        ) {
-            LazyColumn(
-                contentPadding = PaddingValues(bottom = 90.dp),
-            ) {
-                item {
-                    Surface(
-                        modifier = Modifier.padding(16.dp),
-                        shape = MaterialTheme.shapes.small,
-                        elevation = 4.dp,
-                    ) {
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(16.dp),
-                        ) {
-                            FormFields(state, closePopupTrigger)
-                        }
-                    }
-                }
-                item { Warnings(state.value.warnings.toList()) }
-            }
-        }
-    }
-}
-
-@Composable
-private fun FormFields(state: MutableState<AddCustomTokenState>, closePopupTrigger: ClosePopupTrigger) {
-    val context = LocalContext.current
-    val errorConverter = remember { ModuleMessageConverter(context) }
-
-    val stateValue = state.value
-    stateValue.form.fieldList.forEach { field ->
-        val data = ScreenFieldData.fromState(field, stateValue, errorConverter)
-        when (field.id) {
-            ContractAddress -> TokenContractAddressView(data)
-            Network -> TokenNetworkView(data, stateValue, closePopupTrigger)
-            Name -> TokenNameView(data)
-            Symbol -> TokenSymbolView(data)
-            Decimals -> TokenDecimalsView(data)
-            DerivationPath -> TokenDerivationPathView(data, stateValue, closePopupTrigger)
-        }
-    }
-}
-
-@Composable
-fun Warnings(warnings: List<AddCustomTokenError.Warning>) {
-    if (warnings.isEmpty()) return
-
-    val context = LocalContext.current
-    val warningConverter = remember { ModuleMessageConverter(context) }
-
-    Column {
-        warnings.forEachIndexed { index, item ->
-            val modifier = when (index) {
-                0 -> Modifier.padding(vertical = 0.dp)
-                warnings.lastIndex -> Modifier.padding(top = 8.dp, bottom = 16.dp)
-                else -> Modifier.padding(top = 8.dp, bottom = 0.dp)
-            }
-            AddCustomTokenWarning(
-                modifier = modifier
-                    .padding(horizontal = TangemTheme.dimens.spacing16)
-                    .fillMaxWidth(),
-                warning = item,
-                converter = warningConverter,
-            )
-        }
-    }
-}
-
-@Composable
-private fun AddButton(state: MutableState<AddCustomTokenState>) {
-    PrimaryButtonIconStart(
-        modifier = Modifier
-            .padding(horizontal = TangemTheme.dimens.spacing16)
-            .fillMaxWidth(),
-        text = stringResource(id = R.string.common_add),
-        iconResId = R.drawable.ic_plus_24,
-        enabled = state.value.screenState.addButton.isEnabled,
-        onClick = { domainStore.dispatch(AddCustomTokenAction.OnAddCustomTokenClicked) },
-    )
-}
-
-data class ScreenFieldData(
-    val field: DataField<*>,
-    val error: AddCustomTokenError?,
-    val errorConverter: ModuleMessageConverter,
-    val viewState: ViewStates.TokenField,
-) {
-    companion object {
-        fun fromState(
-            field: DataField<*>,
-            state: AddCustomTokenState,
-            errorConverter: ModuleMessageConverter,
-        ): ScreenFieldData {
-            return ScreenFieldData(
-                field = field,
-                error = state.getError(field.id),
-                errorConverter = errorConverter,
-                viewState = selectField(field.id, state.screenState),
-            )
-        }
-
-        private fun selectField(id: FieldId, screenState: ScreenState): ViewStates.TokenField {
-            return when (id) {
-                ContractAddress -> screenState.contractAddressField
-                Network -> screenState.network
-                Name -> screenState.name
-                Symbol -> screenState.symbol
-                Decimals -> screenState.decimals
-                DerivationPath -> screenState.derivationPath
-                else -> throw UnsupportedOperationException()
-            }
-        }
-    }
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/BlockchainSpinner.kt

@@ -1,33 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.domain.common.form.Field
-
-@Composable
-fun BlockchainSpinner(
-    @StringRes title: Int,
-    itemList: List<Blockchain>,
-    selectedItem: Field.Data<Blockchain>,
-    isEnabled: Boolean = true,
-    textFieldConverter: (Blockchain) -> String,
-    dropdownItemView: @Composable ((Blockchain) -> Unit)? = null,
-    closePopupTrigger: ClosePopupTrigger = ClosePopupTrigger(),
-    onItemSelect: (Blockchain) -> Unit,
-) {
-    OutlinedSpinner(
-        modifier = Modifier.fillMaxWidth(),
-        label = stringResource(id = title),
-        itemList = itemList,
-        selectedItem = selectedItem,
-        textFieldConverter = textFieldConverter,
-        dropdownItemView = dropdownItemView,
-        isEnabled = isEnabled,
-        onItemSelected = onItemSelect,
-        closePopupTrigger = closePopupTrigger,
-    )
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/ComposeDialogManager.kt

@@ -1,157 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.Button
-import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
-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.res.stringResource
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import com.tangem.core.ui.components.SpacerH16
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.datasource.api.tangemTech.models.CoinsResponse
-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.domain.moduleMessage.ModuleMessageConverter
-import com.tangem.wallet.R
-import org.rekotlin.StoreSubscriber
-
-@Composable
-internal fun ComposeDialogManager() {
-    val dialogSate = remember { mutableStateOf<DomainDialog?>(null) }
-    val subscriber = remember {
-        object : StoreSubscriber<DomainGlobalState> {
-            override fun newState(state: DomainGlobalState) {
-                dialogSate.value = state.dialog
-            }
-        }
-    }
-
-    ShowTheDialog(dialogSate)
-
-    LaunchedEffect(
-        key1 = Unit,
-        block = {
-            domainStore.subscribe(subscriber) { state ->
-                state.skipRepeats { oldState, newState ->
-                    oldState.globalState == newState.globalState
-                }.select { it.globalState }
-            }
-        },
-    )
-    DisposableEffect(
-        key1 = Unit,
-        effect = {
-            onDispose { domainStore.unsubscribe(subscriber) }
-        },
-    )
-}
-
-@Composable
-private fun ShowTheDialog(dialogState: MutableState<DomainDialog?>) {
-    if (dialogState.value == null) return
-
-    val context = LocalContext.current
-    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.convert(dialog.error).message,
-            onDismissRequest,
-        )
-        is DomainDialog.SelectTokenDialog -> SelectTokenNetworkDialog(dialog, onDismissRequest)
-        else -> {}
-    }
-}
-
-/**
- * Dialog with single item selection
- */
-@Composable
-fun SimpleDialog(
-    title: String,
-    items: List<CoinsResponse.Coin.Network>,
-    onSelect: (CoinsResponse.Coin.Network) -> Unit,
-    onDismissRequest: () -> Unit,
-    itemContent: @Composable (CoinsResponse.Coin.Network) -> Unit,
-) {
-    Dialog(
-        properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
-        onDismissRequest = { },
-    ) {
-        Surface(modifier = Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.medium) {
-            Column(modifier = Modifier.padding(TangemTheme.dimens.spacing22)) {
-                DialogTitle(title = title)
-                LazyColumn {
-                    items(items = items, key = CoinsResponse.Coin.Network::networkId) { item ->
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(56.dp)
-                                .clickable {
-                                    onSelect(item)
-                                    onDismissRequest()
-                                },
-                            verticalAlignment = Alignment.CenterVertically,
-                        ) { itemContent(item) }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DialogTitle(title: String) {
-    Text(
-        text = title,
-        style = LocalTextStyle.provides(
-            TextStyle(
-                fontWeight = FontWeight.Bold,
-                fontSize = 20.sp,
-            ),
-        ).value,
-    )
-    SpacerH16()
-}
-
-@Composable
-fun ErrorDialog(title: String, body: String, onDismissRequest: () -> Unit) {
-    AlertDialog(
-        title = { DialogTitle(title) },
-        text = { Text(body) },
-        onDismissRequest = onDismissRequest,
-        confirmButton = {
-            Button(onClick = onDismissRequest) {
-                Text(text = stringResource(id = R.string.common_ok))
-            }
-        },
-    )
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/FormFieldViews.kt

@@ -1,149 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
-import com.tangem.core.ui.components.SpacerH8
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.features.addCustomToken.TokenBlockchainField
-import com.tangem.domain.features.addCustomToken.TokenDerivationPathField
-import com.tangem.domain.features.addCustomToken.TokenField
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenContractAddressChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDecimalsChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDerivationPathChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNameChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNetworkChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenSymbolChanged
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
-import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.compose.OutlinedTextFieldWidget
-import com.tangem.tap.common.compose.TitleSubtitle
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun TokenContractAddressView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_contract_address_input_title,
-        placeholder = "0x0000000000000000000000000000000000000000",
-        isEnabled = screenFieldData.viewState.isEnabled,
-        isLoading = screenFieldData.viewState.isLoading,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-//        trailingIcon = { PasteClearButton(showFirst = tokenField.data.value.isEmpty()) }
-    ) {
-        domainStore.dispatch(OnTokenContractAddressChanged(Field.Data(it, true)))
-    }
-    SpacerH8()
-}
-
-@Composable
-fun TokenNameView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_name_input_title,
-        placeholderId = R.string.custom_token_name_input_placeholder,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-    ) {
-        domainStore.dispatch(OnTokenNameChanged(Field.Data(it, true)))
-    }
-    SpacerH8()
-}
-
-@Composable
-fun TokenNetworkView(
-    screenFieldData: ScreenFieldData,
-    state: AddCustomTokenState,
-    closePopupTrigger: ClosePopupTrigger,
-) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val notSelected = stringResource(id = R.string.custom_token_network_input_not_selected)
-    val networkField = screenFieldData.field as TokenBlockchainField
-
-    BlockchainSpinner(
-        title = R.string.custom_token_network_input_title,
-        itemList = networkField.itemList,
-        selectedItem = networkField.data,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        textFieldConverter = { state.blockchainToName(it) ?: notSelected },
-        closePopupTrigger = closePopupTrigger,
-    ) { domainStore.dispatch(OnTokenNetworkChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenSymbolView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_token_symbol_input_title,
-        placeholderId = R.string.custom_token_token_symbol_input_placeholder,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-    ) { domainStore.dispatch(OnTokenSymbolChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenDecimalsView(screenFieldData: ScreenFieldData) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val tokenField = screenFieldData.field as TokenField
-
-    OutlinedTextFieldWidget(
-        fieldData = tokenField.data,
-        labelId = R.string.custom_token_decimals_input_title,
-        placeholder = "8",
-        isEnabled = screenFieldData.viewState.isEnabled,
-        error = screenFieldData.error,
-        errorConverter = screenFieldData.errorConverter,
-        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-    ) { domainStore.dispatch(OnTokenDecimalsChanged(Field.Data(it, true))) }
-    SpacerH8()
-}
-
-@Composable
-fun TokenDerivationPathView(
-    screenFieldData: ScreenFieldData,
-    state: AddCustomTokenState,
-    closePopupTrigger: ClosePopupTrigger,
-) {
-    if (!screenFieldData.viewState.isVisible) return
-
-    val notSelected = stringResource(id = R.string.custom_token_derivation_path_default)
-    val networkField = screenFieldData.field as TokenDerivationPathField
-
-    BlockchainSpinner(
-        title = R.string.custom_token_derivation_path_input_title,
-        itemList = networkField.itemList,
-        selectedItem = networkField.data,
-        isEnabled = screenFieldData.viewState.isEnabled,
-        textFieldConverter = { state.blockchainToName(it) ?: notSelected },
-        dropdownItemView = { blockchain ->
-            val derivationPathName = state.blockchainToName(blockchain, true) ?: notSelected
-            val blockchainName = state.blockchainToName(blockchain) ?: notSelected
-            TitleSubtitle(derivationPathName, blockchainName)
-        },
-        closePopupTrigger = closePopupTrigger,
-    ) { domainStore.dispatch(OnTokenDerivationPathChanged(Field.Data(it, true))) }
-    SpacerH8()
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/HangingOverKeyboardView.kt

@@ -1,32 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxScope
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.Keyboard
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun HangingOverKeyboardView(
-    modifier: Modifier = Modifier,
-    keyboardState: State<Keyboard>,
-    spaceBetweenKeyboard: Dp = 0.dp,
-    content: @Composable (BoxScope.() -> Unit),
-) {
-    val padding = remember(keyboardState) {
-        when (val state = keyboardState.value) {
-            is Keyboard.Closed -> 0.dp
-            is Keyboard.Opened -> state.height + spaceBetweenKeyboard
-        }
-    }
-
-    Box(modifier.padding(bottom = padding)) { content() }
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/OutlinedSpinner.kt

@@ -1,103 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import android.os.Handler
-import android.os.Looper
-import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.key
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.core.os.postDelayed
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.domain.common.form.Field
-import com.tangem.tap.common.compose.TangemTextFieldsDefault
-import com.tangem.tap.common.extensions.ValueCallback
-
-/**
-[REDACTED_AUTHOR]
- */
-@Suppress("MagicNumber")
-@OptIn(ExperimentalMaterialApi::class)
-@Composable
-internal fun <T> OutlinedSpinner(
-    label: String,
-    itemList: List<T>,
-    selectedItem: Field.Data<T>,
-    onItemSelected: ValueCallback<T>,
-    modifier: Modifier = Modifier,
-    textFieldConverter: (T) -> String = { it.toString() },
-    dropdownItemView: @Composable ((T) -> Unit)? = null,
-    isEnabled: Boolean = true,
-    onClose: VoidCallback = {},
-    closePopupTrigger: ClosePopupTrigger = ClosePopupTrigger(),
-) {
-    val rIsExpanded = remember { mutableStateOf(false) }
-    val stateSelectedItem = remember { mutableStateOf(selectedItem.value) }
-    if (!selectedItem.isUserInput) {
-        stateSelectedItem.value = selectedItem.value
-    }
-
-    val onDropDownItemSelectedInternal: (T) -> Unit = {
-        stateSelectedItem.value = it
-        rIsExpanded.value = false
-        onItemSelected(it)
-    }
-    val onDismissRequest = {
-        rIsExpanded.value = false
-        onClose()
-    }
-
-    closePopupTrigger.close = {
-        onDismissRequest()
-        Handler(Looper.getMainLooper()).postDelayed(100) {
-            closePopupTrigger.onCloseComplete()
-        }
-    }
-
-    ExposedDropdownMenuBox(
-        expanded = rIsExpanded.value,
-        onExpandedChange = { rIsExpanded.value = !rIsExpanded.value },
-    ) {
-        OutlinedTextField(
-            modifier = modifier,
-            readOnly = true,
-            enabled = isEnabled,
-            value = textFieldConverter(stateSelectedItem.value),
-            onValueChange = {},
-            label = { Text(label) },
-            trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = rIsExpanded.value) },
-            colors = TangemTextFieldsDefault.defaultTextFieldColors,
-        )
-
-        if (isEnabled) {
-            ExposedDropdownMenu(expanded = rIsExpanded.value, onDismissRequest = onDismissRequest) {
-                itemList.forEach { item ->
-                    key(item) {
-                        DropdownMenuItem(onClick = { onDropDownItemSelectedInternal(item) }) {
-                            if (dropdownItemView == null) Text(textFieldConverter(item)) else dropdownItemView(item)
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-class ClosePopupTrigger {
-    var close: () -> Unit = {}
-    var onCloseComplete: () -> Unit = {}
-}
-
-@Preview
-@Composable
-private fun TestSpinnerPreview() {
-    OutlinedSpinner(
-        label = "Blockchain name",
-        itemList = listOf(Blockchain.values()),
-        selectedItem = Field.Data(Blockchain.Avalanche, false),
-        onItemSelected = {},
-    )
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/SelectTokenNetworkDialog.kt

@@ -1,20 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import com.tangem.domain.DomainDialog
-import com.tangem.tap.common.compose.TitleSubtitle
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun SelectTokenNetworkDialog(dialog: DomainDialog.SelectTokenDialog, onDismissRequest: () -> Unit) {
-    SimpleDialog(
-        title = stringResource(id = R.string.custom_token_network_input_title),
-        items = dialog.items,
-        onSelect = dialog.onSelect,
-        onDismissRequest = onDismissRequest,
-    ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.contractAddress ?: "") }
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/ContractAddressTests.kt

@@ -1,120 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose.test
-
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.Button
-import androidx.compose.material.Divider
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.domain.common.form.Field
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
-import com.tangem.domain.redux.domainStore
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun ContractAddressTests(onItemClick: VoidCallback) {
-    val casesInfo = listOf(
-        "USDC on ETH" to "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-        "BUSD on ETH" to "0x4fabb145d64652a948d72533023f6e7a623c7c53",
-        "ETH on AVALANCHE" to "0xf20d962a6c8f70c731bd838a3a388d7d48fa6e15",
-        "USDC on ETH (invalid - cut address)" to "0xa0b86991c6218b36c1d1",
-        "Custom EVM" to "0x1111111111111111112111111111111111111113",
-        "Supported by several networks" to "0xa1faa113cbe53436df28ff0aee54275c13b40975",
-        "Invalid" to "!@#_  _-%%^&&*((){P P2iOWsdfFQLA",
-    )
-    CasesListContent(casesInfo, onItemClick)
-}
-
-@Composable
-fun SolanaAddressTests(onItemClick: VoidCallback) {
-    val casesInfo = listOf(
-        "USDT (full)" to "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
-        "USDT (valid - 2/3 of address)" to "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8Ben",
-        "USDT (invalid - 1/3 of address)" to "Es9vMFrzaCERmJ",
-        "ETH (full)" to "2FPyTwcZLUg1MDrwsyoP4D6s1tM7hAkHYRjkNb5w6Pxk",
-    )
-    CasesListContent(casesInfo, onItemClick)
-}
-
-@Composable
-private fun CasesListContent(casesList: List<Pair<String, String>>, onItemClick: VoidCallback) {
-    LazyColumn(
-        content = {
-            item {
-                Row {
-                    ResetContractAddressButton(onItemClick)
-                    Text("", modifier = Modifier.weight(1f))
-                    ResetAllFieldsButton(onItemClick)
-                }
-                Divider()
-            }
-            items(casesList.size) {
-                val (info, address) = casesList[it]
-                ContractAddressButton(info, address, onItemClick)
-            }
-        },
-    )
-}
-
-@Composable
-fun ResetAllFieldsButton(onItemClick: VoidCallback) {
-    ActionButton(
-        name = "Reset",
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenNetworkChanged(Field.Data(Blockchain.Unknown, false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenNameChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenSymbolChanged(Field.Data("", false)))
-            domainStore.dispatch(AddCustomTokenAction.OnTokenDecimalsChanged(Field.Data("", false)))
-            domainStore.dispatch(
-                AddCustomTokenAction.OnTokenDerivationPathChanged(
-                    Field.Data(
-                        Blockchain.Unknown,
-                        false,
-                    ),
-                ),
-            )
-        },
-    )
-}
-
-@Composable
-fun ResetContractAddressButton(onItemClick: VoidCallback) {
-    ActionButton(
-        name = "Set empty address",
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data("", false)))
-        },
-    )
-}
-
-@Composable
-private fun ContractAddressButton(name: String, address: String, onItemClick: VoidCallback) {
-    ActionButton(
-        modifier = Modifier.fillMaxWidth(),
-        name = name,
-        onClick = {
-            onItemClick()
-            domainStore.dispatch(AddCustomTokenAction.OnTokenContractAddressChanged(Field.Data(address, false)))
-        },
-    )
-}
-
-@Composable
-fun ActionButton(name: String, onClick: () -> Unit, modifier: Modifier = Modifier) {
-    Button(
-        modifier = modifier.padding(horizontal = 8.dp),
-        onClick = onClick,
-    ) { Text(name, fontSize = 12.sp) }
-}

app/src/main/java/com/tangem/tap/features/customtoken/legacy/compose/test/TestCasesList.kt

@@ -1,53 +0,0 @@
-package com.tangem.tap.features.customtoken.legacy.compose.test
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
-import androidx.compose.ui.unit.dp
-import com.tangem.common.extensions.VoidCallback
-import com.tangem.wallet.BuildConfig
-import com.tangem.wallet.R
-
-/**
-[REDACTED_AUTHOR]
- */
-@Composable
-fun TestCasesList(onItemClick: (TestCase) -> Unit) {
-    if (!BuildConfig.TEST_ACTION_ENABLED) return
-
-    Surface(color = colorResource(id = R.color.lightGray5)) {
-        Column(Modifier.padding(horizontal = 16.dp)) {
-            listOf(TestCase.ContractAddress, TestCase.SolanaTokens)
-                .map { case -> TestCaseListItem(testCase = case, onItemClick = { onItemClick(case) }) }
-        }
-    }
-}
-
-@Composable
-fun TestCaseListItem(testCase: TestCase, onItemClick: () -> Unit) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            modifier = Modifier.weight(1f),
-            text = testCase.description,
-        )
-        Button(
-            onClick = onItemClick,
-        ) { Text("Start") }
-    }
-}
-
-enum class TestCase(val description: String, val content: @Composable (VoidCallback) -> Unit) {
-    ContractAddress("Test contract address field", { ContractAddressTests(it) }),
-    Auto("Test contract address field", { ContractAddressTests(it) }),
-    SolanaTokens("Test Solana contract addresses", { SolanaAddressTests(it) }),
-    ;
-}

app/src/main/java/com/tangem/tap/features/tokens/impl/di/TokensListRouterModule.kt

@@ -1,6 +1,5 @@
 package com.tangem.tap.features.tokens.impl.di
 
-import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
 import com.tangem.tap.features.tokens.impl.presentation.router.DefaultTokensListRouter
 import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter
 import dagger.Module
@@ -18,7 +17,5 @@ internal object TokensListRouterModule {
 
     @Provides
     @ViewModelScoped
-    fun provideTokensListRouter(customTokenFeatureToggles: CustomTokenFeatureToggles): TokensListRouter {
-        return DefaultTokensListRouter(customTokenFeatureToggles)
-    }
+    fun provideTokensListRouter(): TokensListRouter = DefaultTokensListRouter()
 }

app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt

@@ -6,8 +6,6 @@ import com.tangem.core.navigation.NavigationAction
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchNotification
 import com.tangem.tap.common.redux.AppDialog
-import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
-import com.tangem.tap.features.tokens.legacy.redux.TokensAction
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.store
 import com.tangem.wallet.R
@@ -18,20 +16,14 @@ import com.tangem.wallet.R
  *
 [REDACTED_AUTHOR]
  */
-internal class DefaultTokensListRouter(
-    private val customTokenFeatureToggles: CustomTokenFeatureToggles,
-) : TokensListRouter {
+internal class DefaultTokensListRouter : TokensListRouter {
 
     override fun popBackStack() {
         store.dispatch(NavigationAction.PopBackTo())
     }
 
     override fun openAddCustomTokenScreen() {
-        if (customTokenFeatureToggles.isRedesignedScreenEnabled) {
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
-        } else {
-            store.dispatch(TokensAction.PrepareAndNavigateToAddCustomToken)
-        }
+        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
     }
 
     override fun showAddressCopiedNotification() {

app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensAction.kt

@@ -17,7 +17,4 @@ sealed interface TokensAction : Action {
 
     // TODO: [REDACTED_TASK_KEY] Remove this action
     data class SaveChanges(val tokens: List<TokenWithBlockchain>, val blockchains: List<Blockchain>) : TokensAction
-
-    // TODO: Remove this action in 4.7 release
-    object PrepareAndNavigateToAddCustomToken : TokensAction
 }

app/src/main/java/com/tangem/tap/features/tokens/legacy/redux/TokensMiddleware.kt

@@ -9,28 +9,19 @@ import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.flatMap
-import com.tangem.core.analytics.Analytics
-import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.crypto.hdWallet.DerivationPath
-import com.tangem.domain.DomainWrapped
 import com.tangem.domain.common.configs.CardConfig
 import com.tangem.domain.common.util.derivationStyleProvider
-import com.tangem.domain.common.util.hasDerivation
 import com.tangem.domain.common.util.supportsHdWallet
-import com.tangem.domain.features.addCustomToken.CustomCurrency
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.redux.domainStore
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.*
-import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
-import com.tangem.tap.domain.model.WalletDataModel
 import com.tangem.tap.features.wallet.models.Currency
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -44,7 +35,6 @@ object TokensMiddleware {
             { action ->
                 when (action) {
                     is TokensAction.SaveChanges -> handleSaveChanges(action)
-                    is TokensAction.PrepareAndNavigateToAddCustomToken -> handleAddingCustomToken()
                 }
                 next(action)
             }
@@ -231,56 +221,4 @@ object TokensMiddleware {
         }
         walletCurrenciesManager.removeCurrencies(selectedUserWallet, currencies)
     }
-
-    private fun isNeedToDerive(scanResponse: ScanResponse, currency: Currency): Boolean {
-        return currency.derivationPath?.let {
-            !scanResponse.hasDerivation(currency.blockchain, it)
-        } ?: false
-    }
-
-    private fun handleAddingCustomToken() = scope.launch {
-        val onAddCustomToken = fun(customCurrency: CustomCurrency) {
-            val scanResponse = store.state.globalState.scanResponse ?: return
-
-            fun submitAndPopBack(scanResponse: ScanResponse, currencyList: List<Currency>) {
-                submitAdd(scanResponse, currencyList)
-                // pop from the AddCustomTokenScreen
-                store.dispatchOnMain(NavigationAction.PopBackTo())
-                store.dispatchOnMain(NavigationAction.PopBackTo())
-            }
-
-            Analytics.send(ManageTokens.CustomToken.TokenWasAdded(customCurrency))
-            val currency = Currency.fromCustomCurrency(customCurrency)
-            val isNeedToDerive = isNeedToDerive(scanResponse, currency)
-            val currencyList = listOf(currency)
-            if (isNeedToDerive) {
-                deriveMissingBlockchains(scanResponse, currencyList) {
-                    submitAndPopBack(it, currencyList)
-                }
-            } else {
-                submitAndPopBack(scanResponse, currencyList)
-            }
-        }
-
-        val addedCurrencies = store.state.walletState.walletsStores
-            .map { walletStore -> walletStore.walletsData.map(WalletDataModel::currency) }
-            .flatten()
-            .map { currency ->
-                when (currency) {
-                    is Currency.Blockchain -> DomainWrapped.Currency.Blockchain(
-                        currency.blockchain,
-                        currency.derivationPath,
-                    )
-
-                    is Currency.Token -> DomainWrapped.Currency.Token(
-                        currency.token,
-                        currency.blockchain,
-                        currency.derivationPath,
-                    )
-                }
-            }
-        domainStore.dispatch(AddCustomTokenAction.Init.SetAddedCurrencies(addedCurrencies))
-        domainStore.dispatch(AddCustomTokenAction.Init.SetOnAddTokenCallback(onAddCustomToken))
-        store.dispatch(NavigationAction.NavigateTo(AppScreen.AddCustomToken))
-    }
 }