diff --git a/.gitignore b/.gitignore
index 7f43fa6dc1..cb56a9e269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 **/build/outputs/**
 **/build/reports/**
 **/build/tmp/**
+**/test-results/**
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8f2af51f2d..9d98629279 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,39 @@
     <JavaCodeStyleSettings>
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="3" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
diff --git a/.idea/file.template.settings.xml b/.idea/file.template.settings.xml
new file mode 100644
index 0000000000..2c3dda55a9
--- /dev/null
+++ b/.idea/file.template.settings.xml
@@ -0,0 +1,40 @@
+<application>
+  <component name="ExportableFileTemplateSettings">
+    <default_templates>
+      <template name="Decompose component.kt" file-name="${NAME}Component" reformat="true" live-template-enabled="false">
+        <template name="Decompose component.kt.child.5.kt" file-name="di/${NAME}ModelModule" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.4.kt" file-name="di/${NAME}ComponentModule" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.0.kt" file-name="entity/${NAME}UM" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.1.kt" file-name="ui/${NAME}Content" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.2.kt" file-name="model/${NAME}Model" reformat="true" live-template-enabled="false" />
+        <template name="Decompose component.kt.child.3.kt" file-name="Default${NAME}Component" reformat="true" live-template-enabled="false" />
+      </template>
+      <template name="Decompose component.kt.child.0.kt" file-name="entity/${NAME}UM" reformat="true" live-template-enabled="false" />
+      <template name="Decompose component.kt.child.1.kt" file-name="ui/${NAME}Content" reformat="true" live-template-enabled="false" />
+      <template name="Decompose component.kt.child.2.kt" file-name="model/${NAME}Model" reformat="true" live-template-enabled="false" />
+      <template name="Decompose component.kt.child.3.kt" file-name="Default${NAME}Component" reformat="true" live-template-enabled="false" />
+      <template name="Decompose component.kt.child.4.kt" file-name="di/${NAME}ComponentModule" reformat="true" live-template-enabled="false" />
+      <template name="Decompose component.kt.child.5.kt" file-name="di/${NAME}ModelModule" reformat="true" live-template-enabled="false" />
+      <template name="FeatureToggles.kt" file-name="${NAME}FeatureToggles" reformat="true" live-template-enabled="false">
+        <template name="FeatureToggles.kt.child.0.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
+      </template>
+      <template name="FeatureToggles.kt.child.0.kt" file-name="Default${NAME}FeatureToggles" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt" file-name="producer/${NAME}Producer" reformat="true" live-template-enabled="false">
+        <template name="FlowPackaging.kt.child.0.kt" file-name="di/${NAME}FetcherModule" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.1.kt" file-name="di/${NAME}ProducerFactoryModule" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.2.kt" file-name="di/${NAME}SupplierModule" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.3.kt" file-name="fetcher/Default${NAME}Fetcher" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.4.kt" file-name="producer/Default${NAME}Producer" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.5.kt" file-name="fetcher/${NAME}Fetcher" reformat="true" live-template-enabled="false" />
+        <template name="FlowPackaging.kt.child.6.kt" file-name="supplier/${NAME}Supplier" reformat="true" live-template-enabled="false" />
+      </template>
+      <template name="FlowPackaging.kt.child.0.kt" file-name="di/${NAME}FetcherModule" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.1.kt" file-name="di/${NAME}ProducerFactoryModule" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.2.kt" file-name="di/${NAME}SupplierModule" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.3.kt" file-name="fetcher/Default${NAME}Fetcher" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.4.kt" file-name="producer/Default${NAME}Producer" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.5.kt" file-name="fetcher/${NAME}Fetcher" reformat="true" live-template-enabled="false" />
+      <template name="FlowPackaging.kt.child.6.kt" file-name="supplier/${NAME}Supplier" reformat="true" live-template-enabled="false" />
+    </default_templates>
+  </component>
+</application>
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt b/.idea/fileTemplates/Decompose component.kt
new file mode 100644
index 0000000000..6e80375530
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt	
@@ -0,0 +1,13 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
+
+import com.tangem.core.decompose.factory.ComponentFactory
+import com.tangem.core.ui.decompose.ComposableContentComponent
+
+interface ${NAME}Component : ComposableContentComponent {
+
+    data class Params(
+        val data: Any, // TODO("Not yet implemented")
+    )
+    
+    interface Factory : ComponentFactory<Params, ${NAME}Component>
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.0.kt b/.idea/fileTemplates/Decompose component.kt.child.0.kt
new file mode 100644
index 0000000000..2fc14ed4ee
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.0.kt	
@@ -0,0 +1,5 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.entity#end
+
+internal data class ${NAME}UM(
+    val onBackClick: () -> Unit,
+)
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.1.kt b/.idea/fileTemplates/Decompose component.kt.child.1.kt
new file mode 100644
index 0000000000..1ebfb9ccfb
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.1.kt	
@@ -0,0 +1,56 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.ui#end
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import ${PACKAGE_NAME}.entity.${NAME}UM
+
+@Composable
+internal fun ${NAME}Content(state: ${NAME}UM, modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier
+            .background(color = TangemTheme.colors.background.secondary)
+            .fillMaxSize()
+            .imePadding()
+            .systemBarsPadding(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        AppBarWithBackButton(
+            onBackClick = state.onBackClick,
+            modifier = Modifier.height(TangemTheme.dimens.size56),
+        )
+
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .weight(1f),
+
+        ) {
+        }
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun ${NAME}ContentPreview(@PreviewParameter(PreviewStateProvider::class) state: ${NAME}UM) {
+    TangemThemePreview {
+        ${NAME}Content(state = state)
+    }
+}
+
+private class PreviewStateProvider : CollectionPreviewParameterProvider<${NAME}UM>(
+    buildList {
+        TODO("Not yet implemented")
+    },
+)
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.2.kt b/.idea/fileTemplates/Decompose component.kt.child.2.kt
new file mode 100644
index 0000000000..4e0b35fd69
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.2.kt	
@@ -0,0 +1,31 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.model#end
+
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.decompose.navigation.Router
+import com.tangem.core.decompose.ui.UiMessageSender
+import ${PACKAGE_NAME}.${NAME}Component
+import ${PACKAGE_NAME}.entity.${NAME}UM
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import javax.inject.Inject
+
+@ModelScoped
+internal class ${NAME}Model @Inject constructor(
+    paramsContainer: ParamsContainer,
+    private val messageSender: UiMessageSender,
+    private val router: Router,
+    override val dispatchers: CoroutineDispatcherProvider,
+) : Model() {
+
+    private val params = paramsContainer.require<${NAME}Component.Params>()
+
+    val uiState: StateFlow<${NAME}UM>
+        field: MutableStateFlow<${NAME}UM> = MutableStateFlow(getInitialState())
+
+    private fun getInitialState(): ${NAME}UM {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.3.kt b/.idea/fileTemplates/Decompose component.kt.child.3.kt
new file mode 100644
index 0000000000..240ab70b6a
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.3.kt	
@@ -0,0 +1,39 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}#end
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import ${PACKAGE_NAME}.model.${NAME}Model
+import ${PACKAGE_NAME}.ui.${NAME}Content
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+
+internal class Default${NAME}Component @AssistedInject constructor(
+    @Assisted appComponentContext: AppComponentContext,
+    @Assisted params: ${NAME}Component.Params,
+) : AppComponentContext by appComponentContext, ${NAME}Component {
+
+    private val model: ${NAME}Model = getOrCreateModel(params)
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val state by model.uiState.collectAsStateWithLifecycle()
+        
+        ${NAME}Content(modifier = modifier, state = state)
+        
+        BackHandler(onBack = state.onBackClick)
+    }
+
+    @AssistedFactory
+    interface Factory : ${NAME}Component.Factory {
+        override fun create(
+            context: AppComponentContext,
+            params: ${NAME}Component.Params,
+        ): Default${NAME}Component
+    }
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.4.kt b/.idea/fileTemplates/Decompose component.kt.child.4.kt
new file mode 100644
index 0000000000..9add024d3b
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.4.kt	
@@ -0,0 +1,20 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
+
+import ${PACKAGE_NAME}.Default${NAME}Component
+import ${PACKAGE_NAME}.${NAME}Component
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface ${NAME}ComponentModule {
+
+    @Binds
+    @Singleton
+    fun bind${NAME}ComponentFactory(
+        factory: Default${NAME}Component.Factory,
+    ): ${NAME}Component.Factory
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/Decompose component.kt.child.5.kt b/.idea/fileTemplates/Decompose component.kt.child.5.kt
new file mode 100644
index 0000000000..8fc6d30c21
--- /dev/null
+++ b/.idea/fileTemplates/Decompose component.kt.child.5.kt	
@@ -0,0 +1,20 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
+
+import com.tangem.core.decompose.di.ModelComponent
+import com.tangem.core.decompose.model.Model
+import ${PACKAGE_NAME}.model.${NAME}Model
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+@InstallIn(ModelComponent::class)
+internal interface ${NAME}ModelModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(${NAME}Model::class)
+    fun bind${NAME}Model(model: ${NAME}Model): Model
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FeatureToggles.kt b/.idea/fileTemplates/FeatureToggles.kt
new file mode 100644
index 0000000000..a5606b1361
--- /dev/null
+++ b/.idea/fileTemplates/FeatureToggles.kt
@@ -0,0 +1,11 @@
+#if ($TOGGLE_NAME && $TOGGLE_NAME != "")
+    #set($TOGGLE = $TOGGLE_NAME)
+#else
+    #set($TOGGLE = "TODO")
+#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+
+interface ${NAME}FeatureToggles {
+
+    val isFeatureEnabled: Boolean
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FeatureToggles.kt.child.0.kt b/.idea/fileTemplates/FeatureToggles.kt.child.0.kt
new file mode 100644
index 0000000000..4078ac6093
--- /dev/null
+++ b/.idea/fileTemplates/FeatureToggles.kt.child.0.kt
@@ -0,0 +1,16 @@
+#if ($TOGGLE_NAME && $TOGGLE_NAME != "")
+    #set($TOGGLE = $TOGGLE_NAME)
+#else
+    #set($TOGGLE = "TODO")
+#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
+
+import com.tangem.core.configtoggle.feature.FeatureTogglesManager
+
+internal class Default${NAME}FeatureToggles(
+    private val featureTogglesManager: FeatureTogglesManager,
+) : ${NAME}FeatureToggles {
+
+    override val isFeatureEnabled: Boolean
+        get() = featureTogglesManager.isFeatureEnabled(name = "$TOGGLE")
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt b/.idea/fileTemplates/FlowPackaging.kt
new file mode 100644
index 0000000000..ac3c0c8000
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt
@@ -0,0 +1,17 @@
+#if ($FlowType && $FlowType != "")
+    #set($Type = $FlowType)
+#else
+    #set($Type = "TODO")
+#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.producer#end
+
+import com.tangem.domain.core.flow.FlowProducer
+
+interface ${NAME}Producer : FlowProducer<${FlowType}> {
+
+    data class Params(
+        val id: String, // TODO("Not yet implemented")
+    )
+
+    interface Factory : FlowProducer.Factory<Params, ${NAME}Producer>
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.0.kt b/.idea/fileTemplates/FlowPackaging.kt.child.0.kt
new file mode 100644
index 0000000000..5cabc5491d
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.0.kt
@@ -0,0 +1,18 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
+
+import ${PACKAGE_NAME}.fetcher.Default${NAME}Fetcher
+import ${PACKAGE_NAME}.fetcher.${NAME}Fetcher
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface ${NAME}FetcherModule {
+
+    @Binds
+    @Singleton
+    fun bind${NAME}Fetcher(impl: Default${NAME}Fetcher): ${NAME}Fetcher
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.1.kt b/.idea/fileTemplates/FlowPackaging.kt.child.1.kt
new file mode 100644
index 0000000000..67c5ccff53
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.1.kt
@@ -0,0 +1,20 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
+
+import ${PACKAGE_NAME}.producer.Default${NAME}Producer
+import ${PACKAGE_NAME}.producer.${NAME}Producer
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface ${NAME}ProducerFactoryModule {
+
+    @Binds
+    @Singleton
+    fun bind${NAME}ProducerFactory(
+        impl: Default${NAME}Producer.Factory,
+    ): ${NAME}Producer.Factory
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.2.kt b/.idea/fileTemplates/FlowPackaging.kt.child.2.kt
new file mode 100644
index 0000000000..e706f14285
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.2.kt
@@ -0,0 +1,23 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.di#end
+
+import ${PACKAGE_NAME}.producer.${NAME}Producer
+import ${PACKAGE_NAME}.supplier.${NAME}Supplier
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object ${NAME}SupplierModule {
+
+    @Provides
+    @Singleton
+    fun provide${NAME}Supplier(factory: ${NAME}Producer.Factory): ${NAME}Supplier {
+        return object : ${NAME}Supplier(
+            factory = factory,
+            keyCreator = { TODO("Not yet implemented") },
+        ) {}
+    }
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.3.kt b/.idea/fileTemplates/FlowPackaging.kt.child.3.kt
new file mode 100644
index 0000000000..8cf215c774
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.3.kt
@@ -0,0 +1,14 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.fetcher#end
+
+import arrow.core.Either
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import javax.inject.Inject
+
+internal class Default${NAME}Fetcher @Inject constructor(
+    private val dispatchers: CoroutineDispatcherProvider,
+) : ${NAME}Fetcher {
+    
+    override suspend fun invoke(params: ${NAME}Fetcher.Params): Either<Throwable, Unit> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.4.kt b/.idea/fileTemplates/FlowPackaging.kt.child.4.kt
new file mode 100644
index 0000000000..572696e7d0
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.4.kt
@@ -0,0 +1,31 @@
+#if ($FlowType && $FlowType != "")
+    #set($Type = $FlowType)
+#else
+    #set($Type = "TODO")
+#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.producer#end
+
+import arrow.core.Option
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.Flow
+
+internal class Default${NAME}Producer @AssistedInject constructor(
+    @Assisted val params: ${NAME}Producer.Params,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : TestProducer {
+
+    override val fallback: Option<$Type>
+        get() = TODO("Not yet implemented")
+
+    override fun produce(): Flow<$Type> {
+        TODO("Not yet implemented")
+    }
+
+    @AssistedFactory
+    interface Factory : ${NAME}Producer.Factory {
+        override fun create(params: ${NAME}Producer.Params): Default${NAME}Producer
+    }
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.5.kt b/.idea/fileTemplates/FlowPackaging.kt.child.5.kt
new file mode 100644
index 0000000000..a4a91bec1b
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.5.kt
@@ -0,0 +1,10 @@
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.fetcher#end
+
+import com.tangem.domain.core.flow.FlowFetcher
+
+interface ${NAME}Fetcher : FlowFetcher<${NAME}Fetcher.Params> {
+
+    data class Params(
+        val id: String, // TODO("Not yet implemented")
+    )
+}
\ No newline at end of file
diff --git a/.idea/fileTemplates/FlowPackaging.kt.child.6.kt b/.idea/fileTemplates/FlowPackaging.kt.child.6.kt
new file mode 100644
index 0000000000..e354307a9b
--- /dev/null
+++ b/.idea/fileTemplates/FlowPackaging.kt.child.6.kt
@@ -0,0 +1,15 @@
+#if ($FlowType && $FlowType != "")
+    #set($Type = $FlowType)
+#else
+    #set($Type = "TODO")
+#end
+#if (${PACKAGE_NAME} != "")package ${PACKAGE_NAME}.supplier#end
+
+import ${PACKAGE_NAME}.producer.${NAME}Producer
+import com.tangem.domain.core.flow.FlowCachingSupplier
+import kotlinx.coroutines.flow.Flow
+
+abstract class ${NAME}Supplier(
+    override val factory: ${NAME}Producer.Factory,
+    override val keyCreator: (${NAME}Producer.Params) -> String,
+) : FlowCachingSupplier<${NAME}Producer, ${NAME}Producer.Params, $Type>()
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a046ec5c66..2de49eab54 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,6 +28,7 @@ android {
     packaging {
         jniLibs {
             useLegacyPackaging = true
+            excludes.add("lib/x86_64/libargon2.so")
         }
         resources.excludes.add("META-INF/LICENSE.md")
         resources.excludes.add("META-INF/NOTICE.md")
@@ -96,6 +97,9 @@ configurations.all {
 
         force(
             "org.bouncycastle:bcpkix-jdk15on:1.70",
+            deps.kotlin.coroutines,
+            deps.kotlin.coroutines.jvm,
+            deps.kotlin.coroutines.android,
         )
     }
 }
@@ -111,6 +115,7 @@ dependencies {
     implementation(projects.domain.account)
     implementation(projects.domain.models)
     implementation(projects.domain.core)
+    api(projects.domain.common)
     implementation(projects.domain.card)
     implementation(projects.domain.demo)
     implementation(projects.domain.demo.models)
@@ -154,6 +159,7 @@ dependencies {
     implementation(projects.domain.walletManager)
     implementation(projects.domain.walletManager.models)
     implementation(projects.domain.yieldSupply)
+    implementation(projects.domain.blockaid)
 
     implementation(projects.common)
     implementation(projects.common.routing)
diff --git a/app/src/androidTest/kotlin/com/tangem/common/ApplicationInjectionExecutionRule.kt b/app/src/androidTest/kotlin/com/tangem/common/ApplicationInjectionExecutionRule.kt
index e1c23e8e9b..75662e25d4 100644
--- a/app/src/androidTest/kotlin/com/tangem/common/ApplicationInjectionExecutionRule.kt
+++ b/app/src/androidTest/kotlin/com/tangem/common/ApplicationInjectionExecutionRule.kt
@@ -19,6 +19,7 @@ class ApplicationInjectionExecutionRule : TestRule {
                 OnComponentReadyRunner.addListener(
                     tangemApplication, ApplicationEntryPoint::class.java
                 ) { _: ApplicationEntryPoint ->
+                    tangemApplication.preInit()
                     tangemApplication.init()
                 }
                 base.evaluate()
diff --git a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt
index c27c9c93db..798d610177 100644
--- a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt
+++ b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt
@@ -100,6 +100,12 @@ abstract class BaseTestCase : TestCase(
                     value = false
                 )
             }
+            appPreferencesStore.editData { mutablePreferences ->
+                mutablePreferences.set(
+                    key = PreferencesKeys.getShouldShowNotificationKey("EnablePushesReminderNotification"),
+                    value = false
+                )
+            }
             promoRepository.setNeverToShowWalletPromo(PromoId.Sepa)
         }
         apiEnvironmentRule.setup(apiConfigsManager)
@@ -130,15 +136,14 @@ abstract class BaseTestCase : TestCase(
         composeTestRule.onRoot(useUnmergedTree = useUnmergedTree).printToLog(tag, maxDepth)
     }
 
+    fun waitForIdle() = composeTestRule.waitForIdle()
 
     private fun setFeatureToggles() {
         runBlocking {
             with(featureTogglesManager as MutableFeatureTogglesManager) {
                 changeToggle("WALLET_CONNECT_REDESIGN_ENABLED", true)
                 changeToggle("WALLET_BALANCE_FETCHER_ENABLED", true)
-                changeToggle("SEND_VIA_SWAP_ENABLED", true)
                 changeToggle("SWAP_REDESIGN_ENABLED", true)
-                changeToggle("SEND_REDESIGN_ENABLED", true)
                 changeToggle("NEW_ONRAMP_MAIN_ENABLED", true)
             }
         }
diff --git a/app/src/androidTest/kotlin/com/tangem/common/constants/TestConstants.kt b/app/src/androidTest/kotlin/com/tangem/common/constants/TestConstants.kt
index 2cbb09b422..82b612164d 100644
--- a/app/src/androidTest/kotlin/com/tangem/common/constants/TestConstants.kt
+++ b/app/src/androidTest/kotlin/com/tangem/common/constants/TestConstants.kt
@@ -4,8 +4,10 @@ object TestConstants {
     const val TOTAL_BALANCE = "$3,299.18"
 
     const val RECIPIENT_ADDRESS = "0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0"
+    const val CARDANO_ADDRESS = "addr1q8f9499e58k4hhfd9vhawprxt3xd94x7rmlyp33ee4xkatakcl2zgkrg0p6ceqkndtkw4cumfe9enhdph8yhuswn785srksm9p"
 
     const val WAIT_UNTIL_TIMEOUT = 20_000L
+    const val WAIT_UNTIL_TIMEOUT_LONG = 30_000L
 
     const val MARKETS_MAIN_NETWORK_SUFFIX = "MAIN"
 
diff --git a/app/src/androidTest/kotlin/com/tangem/common/extensions/BaseTestCaseExt.kt b/app/src/androidTest/kotlin/com/tangem/common/extensions/UiDeviceExt.kt
similarity index 72%
rename from app/src/androidTest/kotlin/com/tangem/common/extensions/BaseTestCaseExt.kt
rename to app/src/androidTest/kotlin/com/tangem/common/extensions/UiDeviceExt.kt
index daace0f71a..b8751cb679 100644
--- a/app/src/androidTest/kotlin/com/tangem/common/extensions/BaseTestCaseExt.kt
+++ b/app/src/androidTest/kotlin/com/tangem/common/extensions/UiDeviceExt.kt
@@ -25,7 +25,7 @@ fun BaseTestCase.pullToRefresh() {
         direction = SwipeDirection.DOWN,
         startHeightRatio = 0.2f,
         endHeightRatio = 0.8f,
-        steps = 2000
+        steps = 1000
     )
 }
 
@@ -53,6 +53,31 @@ fun BaseTestCase.openTheAppFromRecents() {
     device.uiDevice.click(centerX, centerY)
 }
 
+fun BaseTestCase.disableWiFi() {
+    device.uiDevice.executeShellCommand("svc wifi disable")
+}
+
+fun BaseTestCase.disableMobileData() {
+    device.uiDevice.executeShellCommand("svc data disable")
+}
+
+fun BaseTestCase.enableWiFi() {
+    device.uiDevice.executeShellCommand("svc wifi enable")
+}
+
+fun BaseTestCase.enableMobileData() {
+    device.uiDevice.executeShellCommand("svc data enable")
+}
+
+fun BaseTestCase.stopApp(packageName: String) {
+    device.apps.kill(packageName)
+}
+
+fun BaseTestCase.launchApp(packageName: String) {
+    device.apps.waitForAppLaunchAndReady(packageName = packageName)
+    device.apps.launch(packageName)
+}
+
 enum class SwipeDirection {
     UP, DOWN
 }
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt
index ad6edeb6d9..3212a90432 100644
--- a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt
+++ b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt
@@ -9,10 +9,11 @@ import com.tangem.tap.domain.sdk.mocks.MockContent
 import com.tangem.tap.domain.sdk.mocks.MockProvider
 import io.qameta.allure.kotlin.Allure.step
 
-fun BaseTestCase.openMainScreen(
+fun BaseTestCase.scanCard(
     productType: ProductType? = null,
     mockContent: MockContent? = null,
-    alreadyActivatedDialogIsShown : Boolean = false
+    alreadyActivatedDialogIsShown: Boolean = false,
+    isTwinsCard: Boolean = false,
 ) {
     if (productType != null) {
         MockProvider.setMocks(productType)
@@ -28,10 +29,34 @@ fun BaseTestCase.openMainScreen(
     }
     if (alreadyActivatedDialogIsShown) {
         step("Click on 'This is my wallet' button") {
-            composeTestRule.waitForIdle()
+            waitForIdle()
             AlreadyUsedWalletDialogPageObject { thisIsMyWalletButton.click() }
         }
     }
+    if (isTwinsCard) {
+        step("Click on 'Continue' button") {
+            onOnboardingScreen { continueButton.clickWithAssertion() }
+        }
+        step("Click on 'Continue to my wallet' button") {
+            onOnboardingScreen { continueToMyWalletButton.clickWithAssertion() }
+        }
+    }
+}
+
+fun BaseTestCase.openMainScreen(
+    productType: ProductType? = null,
+    mockContent: MockContent? = null,
+    alreadyActivatedDialogIsShown: Boolean = false,
+    isTwinsCard: Boolean = false,
+) {
+    step("Scan card") {
+        scanCard(
+            productType = productType,
+            mockContent = mockContent,
+            alreadyActivatedDialogIsShown = alreadyActivatedDialogIsShown,
+            isTwinsCard = isTwinsCard,
+        )
+    }
     step("Assert 'Main' screen is displayed") {
         onMainScreen { screenContainer.assertIsDisplayed() }
     }
@@ -51,6 +76,7 @@ fun BaseTestCase.synchronizeAddresses(balance: String) {
 
 fun BaseTestCase.openDeviceSettingsScreen() {
     step("Open wallet details") {
+        waitForIdle()
         onTopBar { moreButton.clickWithAssertion() }
     }
     step("Open 'Wallet settings' screen") {
diff --git a/app/src/androidTest/kotlin/com/tangem/scenarios/CheckMainScreenScenarios.kt b/app/src/androidTest/kotlin/com/tangem/scenarios/CheckMainScreenScenarios.kt
new file mode 100644
index 0000000000..0c3430dc3c
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/scenarios/CheckMainScreenScenarios.kt
@@ -0,0 +1,118 @@
+package com.tangem.scenarios
+
+import com.tangem.common.BaseTestCase
+import com.tangem.common.extensions.SwipeDirection
+import com.tangem.common.extensions.swipeVertical
+import com.tangem.screens.onMainScreen
+import io.qameta.allure.kotlin.Allure.step
+
+fun BaseTestCase.checkSingleCurrencyMainScreen(
+    cardBlockchain: String,
+    cardTitle: String,
+    withTransactions: Boolean = false,
+    withWalletImage: Boolean = true
+) {
+    step("Assert card title equal '$cardTitle'") {
+        onMainScreen { walletNameText.assertTextEquals(cardTitle) }
+    }
+    if (withWalletImage) {
+        step("Assert card image is displayed") { //TODO: create assertion method for checking images
+            onMainScreen { walletImage.assertIsDisplayed() }
+        }
+    } else {
+        step("Assert card image is not displayed") {
+            onMainScreen { walletImage.assertIsNotDisplayed() }
+        }
+    }
+    step("Assert 'Receive' button is displayed") {
+        onMainScreen { receiveButton.assertIsDisplayed() }
+    }
+    step("Assert 'Buy' button is displayed") {
+        onMainScreen { buyButton.assertIsDisplayed() }
+    }
+    step("Assert 'Send' button is displayed") {
+        onMainScreen { sendButton.assertIsDisplayed() }
+    }
+    step("Assert 'Sell' button is displayed") {
+        onMainScreen { sellButton.assertIsDisplayed() }
+    }
+    step("Assert 'Swap' button is not displayed") {
+        onMainScreen { swapButton.assertIsNotDisplayed() }
+    }
+    step("Assert 'Market Price' on single card main screen is displayed") {
+        onMainScreen { marketPriceBlock().assertIsDisplayed() }
+    }
+    step("Assert 'Market Price' title equals $cardBlockchain Market Price") {
+        onMainScreen { marketPriceText.assertTextContains("$cardBlockchain Market Price") }
+    }
+    step("Swipe up") {
+        swipeVertical(SwipeDirection.UP)
+    }
+    if (withTransactions) {
+        step("Assert 'Transactions' block is displayed") {
+            onMainScreen { transactionsExplorerText.assertIsDisplayed() }
+        }
+        step("Assert 'Transactions' title is displayed") {
+            onMainScreen { transactionsTitle.assertIsDisplayed() }
+        }
+        step("Assert 'Explorer' icon is displayed") {
+            onMainScreen { transactionsExplorerIcon.assertIsDisplayed() }
+        }
+    } else {
+        step("Assert empty 'Transactions' block is displayed") {
+            onMainScreen { emptyTransactionBlock.assertIsDisplayed() }
+        }
+        step("Assert empty 'Transactions' block icon is displayed") {
+            onMainScreen { emptyTransactionBlockIcon.assertIsDisplayed() }
+        }
+        step("Assert empty 'Transactions' block text is displayed") {
+            onMainScreen { emptyTransactionBlockText.assertIsDisplayed() }
+        }
+        step("Assert empty 'Transactions' block 'Explore' button is displayed") {
+            onMainScreen { emptyTransactionBlockExploreButton.assertIsDisplayed() }
+        }
+    }
+    step("Assert 'Organize tokens' button is not displayed") {
+        onMainScreen { organizeTokensButtonWithoutLazySearch.assertIsNotDisplayed() }
+    }
+}
+
+fun BaseTestCase.checkMultiCurrencyMainScreen(
+    devicesCount: String,
+    cardTitle: String,
+    withWalletImage: Boolean = true
+) {
+    step("Assert card title equal '$cardTitle'") {
+        onMainScreen { walletNameText.assertTextEquals(cardTitle) }
+    }
+    if (withWalletImage) {
+        step("Assert card image is displayed") {
+            onMainScreen { walletImage.assertIsDisplayed() }
+        }
+    } else {
+        step("Assert card image is not displayed") {
+            onMainScreen { walletImage.assertIsNotDisplayed() }
+        }
+    }
+    step("Assert devices count equal to '$devicesCount'") {
+        onMainScreen { walletDevicesCount.assertTextContains(devicesCount) }
+    }
+    step("Assert 'Buy' button is displayed") {
+        onMainScreen { buyButton.assertIsDisplayed() }
+    }
+    step("Assert 'Swap' button is displayed") {
+        onMainScreen { swapButton.assertIsDisplayed() }
+    }
+    step("Assert 'Sell' button is displayed") {
+        onMainScreen { sellButton.assertIsDisplayed() }
+    }
+    step("Assert 'Send' button is not displayed") {
+        onMainScreen { sendButton.assertIsNotDisplayed() }
+    }
+    step("Assert 'Receive' button is not displayed") {
+        onMainScreen { receiveButton.assertIsNotDisplayed() }
+    }
+    step("Assert 'Organize tokens' button is displayed") {
+        onMainScreen { organizeTokensButton().assertIsDisplayed() }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/scenarios/OnboardingScenarios.kt b/app/src/androidTest/kotlin/com/tangem/scenarios/OnboardingScenarios.kt
new file mode 100644
index 0000000000..f13cbf8b67
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/scenarios/OnboardingScenarios.kt
@@ -0,0 +1,112 @@
+package com.tangem.scenarios
+
+import com.tangem.common.BaseTestCase
+import com.tangem.screens.onOnboardingScreen
+import io.qameta.allure.kotlin.Allure.step
+
+fun BaseTestCase.checkBackupScreen() {
+    step("Assert 'Creating a backup' top bar title is displayed") {
+        onOnboardingScreen { creatingBackupTobBarTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Prepare your scan or ring' title is displayed") {
+        onOnboardingScreen { prepareYouCardOrRingTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Start backup' text is displayed") {
+        onOnboardingScreen { startBackupText.assertIsDisplayed() }
+    }
+    step("Assert 'Scan card' button is displayed") {
+        onOnboardingScreen { scanCardButton.assertIsDisplayed() }
+    }
+    step("Assert 'Skip for later' button is not displayed") {
+        onOnboardingScreen { skipForLaterButton.assertIsNotDisplayed() }
+    }
+}
+
+fun BaseTestCase.checkCreateWalletScreenForWalletNoWallets() {
+    step("Assert 'Create wallet' tob bar title is displayed") {
+        onOnboardingScreen { createWalletTopBarTitle.assertIsDisplayed() }
+    }
+    step("Assert top bar 'Back' button is displayed") {
+        onOnboardingScreen { topBarBackButton.assertIsDisplayed() }
+    }
+    step("Assert top bar 'More' button is displayed") {
+        onOnboardingScreen { topBarMoreButton.assertIsDisplayed() }
+    }
+    step("Assert 'Create wallet' title is displayed") {
+        onOnboardingScreen { createWalletTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Create wallet' text is displayed") {
+        onOnboardingScreen { createWalletText.assertIsDisplayed() }
+    }
+    step("Assert 'Create wallet' button is displayed") {
+        onOnboardingScreen { createWalletButton.assertIsDisplayed() }
+    }
+}
+
+fun BaseTestCase.openAndCheckBackupScreenForWalletNoWallets() {
+    step("Click on 'Create wallet' button") {
+        onOnboardingScreen { createWalletButton.performClick() }
+    }
+    step("Assert 'Getting started' top bar title is displayed") {
+        onOnboardingScreen { gettingStartedTobBarTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Backup wallet' title is displayed") {
+        onOnboardingScreen { backupWalletTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Backup wallet' text is displayed") {
+        onOnboardingScreen { backupWalletText.assertIsDisplayed() }
+    }
+    step("Assert 'Backup now' button is displayed") {
+        onOnboardingScreen { backupWalletButton.assertIsDisplayed() }
+    }
+    step("Assert 'Skip for later' button is not displayed") {
+        onOnboardingScreen { skipForLaterButton.assertIsNotDisplayed() }
+    }
+}
+
+fun BaseTestCase.checkCreateWalletScreenForWallet2NoWallets() {
+    step("Assert 'Create a wallet' top bar title is displayed") {
+        onOnboardingScreen { createWalletTopBarTitle.assertIsDisplayed() }
+    }
+    step("Assert top bar 'Back' button is displayed") {
+        onOnboardingScreen { topBarBackButton.assertIsDisplayed() }
+    }
+    step("Assert top bar 'More' button is displayed") {
+        onOnboardingScreen { topBarMoreButton.assertIsDisplayed() }
+    }
+    step("Assert 'Generate keys privately' title is displayed") {
+        onOnboardingScreen { generateKeysPrivatelyTitle.assertIsDisplayed() }
+    }
+    step("Assert 'Generate keys privately' text is displayed") {
+        onOnboardingScreen { generateKeysPrivatelyText.assertIsDisplayed() }
+    }
+    step("Assert 'Create wallet' button is displayed") {
+        onOnboardingScreen { createWalletButton.assertIsDisplayed() }
+    }
+    step("Assert 'Other options' button is displayed") {
+        onOnboardingScreen { otherOptionsButton.assertIsDisplayed() }
+    }
+}
+fun BaseTestCase.openAndCheckBackupScreenForWallet2NoWallets() {
+    step("Click on 'Create wallet' button") {
+        onOnboardingScreen { createWalletButton.performClick() }
+    }
+    step("Assert 'Creating a backup' top bar title is displayed") {
+        onOnboardingScreen { creatingBackupTobBarTitle.assertIsDisplayed() }
+    }
+    step("Assert 'No backup devices' title is displayed") {
+        onOnboardingScreen { noBackupDevicesTitle.assertIsDisplayed() }
+    }
+    step("Assert 'No backup devices' text is displayed") {
+        onOnboardingScreen { noBackupDevicesText.assertIsDisplayed() }
+    }
+    step("Assert 'Add card or ring' button is displayed") {
+        onOnboardingScreen { addCardOrRingButton.assertIsDisplayed() }
+    }
+    step("Assert 'Finalize backup' button is displayed") {
+        onOnboardingScreen { finalizeBackupButton.assertIsDisplayed() }
+    }
+    step("Assert 'Skip for later' button is not displayed") {
+        onOnboardingScreen { skipForLaterButton.assertIsNotDisplayed() }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/BuyTokenDetailsPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/BuyTokenDetailsPageObject.kt
index 2b4e330704..4f0037cbab 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/BuyTokenDetailsPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/BuyTokenDetailsPageObject.kt
@@ -3,15 +3,13 @@ package com.tangem.screens
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
 import com.tangem.core.ui.R
-import com.tangem.core.ui.test.BaseButtonTestTags
-import com.tangem.core.ui.test.BuyTokenDetailsScreenTestTags
-import com.tangem.core.ui.test.NotificationTestTags
-import com.tangem.core.ui.test.TopAppBarTestTags
+import com.tangem.core.ui.test.*
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
 import io.github.kakaocup.compose.node.element.KNode
 import io.github.kakaocup.kakao.common.utilities.getResourceString
 import androidx.compose.ui.test.hasTestTag as withTestTag
+import com.tangem.features.onramp.impl.R as OnrampImplR
 
 class BuyTokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
     ComposeScreen<BuyTokenDetailsPageObject>(semanticsProvider = semanticsProvider) {
@@ -68,31 +66,65 @@ class BuyTokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProv
         useUnmergedTree = true
     }
 
-    val providerLoadingTitle: KNode = child {
-        hasTestTag(BuyTokenDetailsScreenTestTags.PROVIDER_LOADING_TITLE)
+    val recommendedTitle: KNode = child {
+        hasText(getResourceString(OnrampImplR.string.onramp_recommended_title))
     }
 
-    val providerLoadingText: KNode = child {
-        hasTestTag(BuyTokenDetailsScreenTestTags.PROVIDER_LOADING_TEXT)
-    }
-
-    val providerTitle: KNode = child {
-        hasTestTag(BuyTokenDetailsScreenTestTags.PROVIDER_TITLE)
+    val bestRateIcon: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.BEST_RATE_ICON)
         useUnmergedTree = true
     }
 
-    val providerText: KNode = child {
-        hasTestTag(BuyTokenDetailsScreenTestTags.PROVIDER_TEXT)
+    val bestRateTitle: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.BEST_RATE_TITLE)
+        useUnmergedTree = true
+    }
+
+    val offerTokenAmount: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.OFFER_TOKEN_AMOUNT)
+        useUnmergedTree = true
+    }
+
+    val timingIcon: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.TIMING_ICON)
+        useUnmergedTree = true
+    }
+
+    val payWith: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.PAY_WITH)
+        useUnmergedTree = true
+    }
+
+    val paymentMethodIcon: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.PAYMENT_METHOD_ICON)
+        useUnmergedTree = true
+    }
+
+    val instantProcessingSpeedText: KNode = child {
+        hasText(getResourceString(R.string.onramp_instant_status))
+        useUnmergedTree = true
+    }
+
+    val providerName: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.PROVIDER_NAME)
         useUnmergedTree = true
     }
 
     val buyButton: KNode = child {
-        hasTestTag(BaseButtonTestTags.BUTTON)
+        hasTestTag(BaseButtonTestTags.TEXT)
         hasText(getResourceString(R.string.common_buy))
+        useUnmergedTree = true
     }
 
-    val toSBlock: KNode = child {
-        hasTestTag(BuyTokenDetailsScreenTestTags.TOS_BLOCK)
+    val continueButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(R.string.common_continue))
+        useUnmergedTree = true
+    }
+
+    val allOffersButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(R.string.onramp_all_offers_button_title))
         useUnmergedTree = true
     }
 }
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt
index f8abf2f869..da077e296f 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt
@@ -44,10 +44,30 @@ class MainScreenPageObject(semanticsProvider: SemanticsNodeInteractionsProvider)
     }
 
     val buyButton: KNode = child {
-        hasTestTag(MainScreenTestTags.MULTI_CURRENCY_ACTION_BUTTON)
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
         hasText(getResourceString(R.string.common_buy))
     }
 
+    val sendButton: KNode = child {
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
+        hasText(getResourceString(R.string.common_send))
+    }
+
+    val receiveButton: KNode = child {
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
+        hasText(getResourceString(R.string.common_receive))
+    }
+
+    val sellButton: KNode = child {
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
+        hasText(getResourceString(R.string.common_sell))
+    }
+
+    val swapButton: KNode = child {
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
+        hasText(getResourceString(R.string.common_swap))
+    }
+
     val walletNameText: KNode = child {
         hasTestTag(MainScreenTestTags.CARD_TITLE)
         useUnmergedTree = true
@@ -58,11 +78,19 @@ class MainScreenPageObject(semanticsProvider: SemanticsNodeInteractionsProvider)
         useUnmergedTree = true
     }
 
-    val marketPriceBlock: KNode = child {
-        hasTestTag(MarketPriceBlockTestTags.BLOCK)
+    val walletDevicesCount: KNode = child {
+        hasTestTag(MainScreenTestTags.DEVICES_COUNT)
         useUnmergedTree = true
     }
 
+    @OptIn(ExperimentalTestApi::class)
+    fun marketPriceBlock(): LazyListItemNode {
+        return lazyList.childWith<LazyListItemNode> {
+            hasTestTag(MarketPriceBlockTestTags.BLOCK)
+            useUnmergedTree = true
+        }
+    }
+
     val marketPriceText: KNode = child {
         hasTestTag(MarketPriceBlockTestTags.TEXT)
         useUnmergedTree = true
@@ -79,12 +107,26 @@ class MainScreenPageObject(semanticsProvider: SemanticsNodeInteractionsProvider)
         useUnmergedTree = true
     }
 
-    fun transactionsExplorer(): KNode {
-        return child {
-            hasTestTag(TransactionHistoryBlockTestTags.EXPLORER_TEXT)
-            hasText(getResourceString(R.string.common_explorer))
-            useUnmergedTree = true
-        }
+    val transactionsExplorerText: KNode = child {
+        hasTestTag(TransactionHistoryBlockTestTags.EXPLORER_TEXT)
+        hasText(getResourceString(R.string.common_explorer))
+        useUnmergedTree = true
+    }
+
+    val emptyTransactionBlock: KNode = child {
+        hasTestTag(EmptyTransactionBlockTestTags.BLOCK)
+    }
+
+    val emptyTransactionBlockIcon: KNode = child {
+        hasTestTag(EmptyTransactionBlockTestTags.ICON)
+    }
+
+    val emptyTransactionBlockText: KNode = child {
+        hasTestTag(EmptyTransactionBlockTestTags.TEXT)
+    }
+
+    val emptyTransactionBlockExploreButton: KNode = child {
+        hasTestTag(EmptyTransactionBlockTestTags.EXPLORE_BUTTON)
     }
 
     val notificationContainer: KNode = child {
@@ -182,12 +224,10 @@ class MainScreenPageObject(semanticsProvider: SemanticsNodeInteractionsProvider)
         }
     }
 
-    fun organizeTokensButtonWithoutLazySearch(): KNode {
-        return child {
-            hasTestTag(MainScreenTestTags.ORGANIZE_TOKENS_BUTTON)
-            hasText(getResourceString(R.string.organize_tokens_title))
-            useUnmergedTree = true
-        }
+    val organizeTokensButtonWithoutLazySearch: KNode = child {
+        hasTestTag(MainScreenTestTags.ORGANIZE_TOKENS_BUTTON)
+        hasText(getResourceString(R.string.organize_tokens_title))
+        useUnmergedTree = true
     }
 
     fun tokenNetworkGroupTitle(tokenNetwork: String): KNode {
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/OnboardingPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/OnboardingPageObject.kt
new file mode 100644
index 0000000000..ab0ed99290
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/screens/OnboardingPageObject.kt
@@ -0,0 +1,163 @@
+package com.tangem.screens
+
+import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
+import com.tangem.common.BaseTestCase
+import com.tangem.core.ui.test.BaseButtonTestTags
+import com.tangem.core.ui.test.StoriesScreenTestTags
+import com.tangem.core.ui.test.TopAppBarTestTags
+import com.tangem.wallet.R
+import io.github.kakaocup.compose.node.element.ComposeScreen
+import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
+import io.github.kakaocup.compose.node.element.KNode
+import io.github.kakaocup.kakao.common.utilities.getResourceString
+import io.github.kakaocup.kakao.common.views.KView
+import io.github.kakaocup.kakao.text.KButton
+import com.tangem.features.onboarding.v2.impl.R as OnboardingImplR
+
+class OnboardingPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
+    ComposeScreen<OnboardingPageObject>(semanticsProvider = semanticsProvider) {
+
+    val topBarBackButton: KNode = child {
+        hasTestTag(TopAppBarTestTags.CLOSE_BUTTON)
+        useUnmergedTree = true
+    }
+
+    val continueButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(R.string.common_continue))
+        useUnmergedTree = true
+    }
+
+    val continueToMyWalletButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(R.string.onboarding_button_continue_wallet))
+        useUnmergedTree = true
+    }
+
+    val createWalletTopBarTitle: KNode = child {
+        hasTestTag(TopAppBarTestTags.TITLE)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_header))
+        useUnmergedTree = true
+    }
+
+    val createWalletTitle: KNode = child {
+        hasTestTag(StoriesScreenTestTags.TITLE)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_header))
+        useUnmergedTree = true
+    }
+
+    val createWalletText: KNode = child {
+        hasTestTag(StoriesScreenTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_body))
+        useUnmergedTree = true
+    }
+
+    val gettingStartedTobBarTitle: KNode = child {
+        hasTestTag(TopAppBarTestTags.TITLE)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_getting_started))
+        useUnmergedTree = true
+    }
+
+    val creatingBackupTobBarTitle: KNode = child {
+        hasTestTag(TopAppBarTestTags.TITLE)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_navbar_title_creating_backup))
+        useUnmergedTree = true
+    }
+
+    val prepareYouCardOrRingTitle: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_title_scan_origin_card))
+        useUnmergedTree = true
+    }
+
+    val startBackupText: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_subtitle_scan_primary))
+        useUnmergedTree = true
+    }
+
+    val topBarMoreButton: KNode = child {
+        hasTestTag(TopAppBarTestTags.MORE_BUTTON)
+    }
+
+    val backupWalletTitle: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_wallet_info_title_first))
+        useUnmergedTree = true
+    }
+
+    val backupWalletText: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_wallet_info_subtitle_first))
+        useUnmergedTree = true
+    }
+
+    val generateKeysPrivatelyTitle: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_options_title))
+        useUnmergedTree = true
+    }
+
+    val generateKeysPrivatelyText: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_options_message))
+        useUnmergedTree = true
+    }
+
+    val noBackupDevicesTitle: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_subtitle_no_backup_cards))
+        useUnmergedTree = true
+    }
+
+    val noBackupDevicesText: KNode = child {
+        hasText(getResourceString(OnboardingImplR.string.onboarding_title_no_backup_cards))
+        useUnmergedTree = true
+    }
+
+    val createWalletButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_button_create_wallet))
+        useUnmergedTree = true
+    }
+
+    val backupWalletButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_button_backup_now))
+        useUnmergedTree = true
+    }
+
+    val scanCardButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_button_backup_card))
+        useUnmergedTree = true
+    }
+
+    val otherOptionsButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_create_wallet_options_button_options))
+        useUnmergedTree = true
+    }
+
+    val addCardOrRingButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_button_add_backup_card))
+        useUnmergedTree = true
+    }
+
+    val finalizeBackupButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_button_finalize_backup))
+        useUnmergedTree = true
+    }
+
+    val skipForLaterButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(OnboardingImplR.string.onboarding_button_skip_backup))
+        useUnmergedTree = true
+    }
+
+    val enableNFCAlert: KView = KView {
+        withId(R.id.alertTitle)
+    }
+
+    val cancelButton: KButton = KButton {
+        withId(android.R.id.button2)
+    }
+}
+
+internal fun BaseTestCase.onOnboardingScreen(function: OnboardingPageObject.() -> Unit) =
+    onComposeScreen(composeTestRule, function)
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/SelectPaymentMethodPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/SelectPaymentMethodPageObject.kt
index 0739883572..b629ddae76 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/SelectPaymentMethodPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/SelectPaymentMethodPageObject.kt
@@ -1,17 +1,14 @@
 package com.tangem.screens
 
-import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
-import com.tangem.common.utils.LazyListItemNode
+import com.tangem.core.ui.test.BaseBottomSheetTestTags
+import com.tangem.core.ui.test.OnrampOffersBlockTestTags
 import com.tangem.core.ui.test.SelectPaymentMethodBottomSheetTestTags
-import com.tangem.core.ui.test.TopAppBarTestTags
-import com.tangem.core.ui.utils.LazyListItemPositionSemantics
 import com.tangem.features.onramp.impl.R
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
 import io.github.kakaocup.compose.node.element.KNode
-import io.github.kakaocup.compose.node.element.lazylist.KLazyListNode
 import io.github.kakaocup.kakao.common.utilities.getResourceString
 import androidx.compose.ui.test.hasTestTag as withTestTag
 import androidx.compose.ui.test.hasText as withText
@@ -19,30 +16,31 @@ import androidx.compose.ui.test.hasText as withText
 class SelectPaymentMethodPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
     ComposeScreen<SelectPaymentMethodPageObject>(semanticsProvider = semanticsProvider) {
 
-
-    private val lazyList = KLazyListNode(
-        semanticsProvider = semanticsProvider,
-        viewBuilderAction = { hasTestTag(SelectPaymentMethodBottomSheetTestTags.LAZY_LIST) },
-        itemTypeBuilder = { itemType(::LazyListItemNode) },
-        positionMatcher = { position ->
-            SemanticsMatcher.expectValue(
-                LazyListItemPositionSemantics,
-                position
-            )
-        }
-    )
-
     val title: KNode = child {
-        hasTestTag(TopAppBarTestTags.TITLE)
-        hasText(getResourceString(R.string.onramp_pay_with))
+        hasTestTag(BaseBottomSheetTestTags.TITLE)
+        hasText(getResourceString(R.string.onramp_all_offers_button_title))
     }
 
-    fun paymentMethodWithNameAndIcon(name: String): KNode {
-        return lazyList.child<KNode> {
-            hasAnyDescendant(withText(name))
-            hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD_ICON))
-            useUnmergedTree = true
-        }
+    val subtitle: KNode = child {
+        hasTestTag(BaseBottomSheetTestTags.SUBTITLE)
+        hasText(getResourceString(R.string.onramp_payment_method_subtitle))
+    }
+
+    val closeButton: KNode = child {
+        hasTestTag(BaseBottomSheetTestTags.CLOSE_BUTTON)
+    }
+
+    fun paymentMethodWithName(name: String): KNode = child {
+        hasTestTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD)
+        hasAnyDescendant(withText(name))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD_ICON))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.TIMING_ICON))
+        hasAnyDescendant(withTestTag(OnrampOffersBlockTestTags.TIMING_TEXT))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.TOKEN_AMOUNT))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.PROVIDER_COUNT_ICON))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.PROVIDER_COUNT_TEXT))
+        hasAnyDescendant(withTestTag(SelectPaymentMethodBottomSheetTestTags.UP_TO_TEXT))
+        useUnmergedTree = true
     }
 }
 
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/SelectProviderPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/SelectProviderPageObject.kt
index 2c8a050019..0be8e56d9d 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/SelectProviderPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/SelectProviderPageObject.kt
@@ -2,87 +2,78 @@ package com.tangem.screens
 
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
-import com.tangem.core.ui.test.SelectProviderBottomSheetTestTags
+import com.tangem.core.ui.test.BaseBottomSheetTestTags
+import com.tangem.core.ui.test.BaseButtonTestTags
+import com.tangem.core.ui.test.OnrampOffersBlockTestTags
 import com.tangem.features.onramp.impl.R
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
 import io.github.kakaocup.compose.node.element.KNode
 import io.github.kakaocup.kakao.common.utilities.getResourceString
-import androidx.compose.ui.test.hasText as withText
+import com.tangem.core.ui.R as CoreUiR
 
 class SelectProviderPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
     ComposeScreen<SelectProviderPageObject>(semanticsProvider = semanticsProvider) {
 
     val title: KNode = child {
-        hasText(getResourceString(R.string.onramp_choose_provider_title_hint))
+        hasTestTag(BaseBottomSheetTestTags.TITLE)
+        hasText(getResourceString(R.string.onramp_all_offers_button_title))
+    }
+
+    val subtitle: KNode = child {
+        hasTestTag(BaseBottomSheetTestTags.SUBTITLE)
+        hasText(getResourceString(R.string.express_provider))
         useUnmergedTree = true
     }
 
+    val bestRateIcon: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.BEST_RATE_ICON)
+        useUnmergedTree = true
+    }
+
+    val bestRateTitle: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.BEST_RATE_TITLE)
+        useUnmergedTree = true
+    }
+
+    val offerTokenAmount: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.OFFER_TOKEN_AMOUNT)
+        useUnmergedTree = true
+    }
+
+    val timingIcon: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.TIMING_ICON)
+        useUnmergedTree = true
+    }
+
+    val payWith: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.PAY_WITH)
+        useUnmergedTree = true
+    }
+
+    val youGetText: KNode = child {
+        hasText(getResourceString(R.string.onramp_title_you_get))
+    }
+
     val paymentMethodIcon: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.PAYMENT_METHOD_ICON)
+        hasTestTag(OnrampOffersBlockTestTags.PAYMENT_METHOD_ICON)
         useUnmergedTree = true
     }
 
-    val paymentMethodTitle: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.PAYMENT_METHOD_NAME)
+    val providerName: KNode = child {
+        hasTestTag(OnrampOffersBlockTestTags.PROVIDER_NAME)
         useUnmergedTree = true
     }
 
-    val paymentMethodName: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.PAYMENT_METHOD_NAME)
+
+    val instantProcessingSpeedText: KNode = child {
+        hasText(getResourceString(com.tangem.core.ui.R.string.onramp_instant_status))
         useUnmergedTree = true
     }
 
-    val paymentMethodExpandButton: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.PAYMENT_METHOD_EXPAND_BUTTON)
-        useUnmergedTree = true
-    }
-
-    val availableProviderItem: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.AVAILABLE_PROVIDER_ITEM)
-        useUnmergedTree = true
-    }
-
-    val availableProviderName: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.AVAILABLE_PROVIDER_NAME)
-        useUnmergedTree = true
-    }
-
-    val tokenAmount: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.TOKEN_AMOUNT)
-        useUnmergedTree = true
-    }
-
-    val unavailableProviderItem: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.UNAVAILABLE_PROVIDER_ITEM)
-        useUnmergedTree = true
-    }
-
-    val unavailableProviderName: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.UNAVAILABLE_PROVIDER_NAME)
-        useUnmergedTree = true
-    }
-
-    val moreProvidersIcon: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.MORE_PROVIDERS_ICON)
-        useUnmergedTree = true
-    }
-
-    val moreProvidersText: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.MORE_PROVIDERS_TEXT)
-        useUnmergedTree = true
-    }
-
-    val bestRateLabel: KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.BEST_RATE_LABEL)
-        useUnmergedTree = true
-    }
-
-    fun availableProviderWithName(name: String, tokenAmount: String, rate: String): KNode = child {
-        hasTestTag(SelectProviderBottomSheetTestTags.AVAILABLE_PROVIDER_ITEM)
-        hasAnyChild(withText(name))
-        hasAnyChild(withText(tokenAmount))
-        hasAnyChild(withText(rate))
+    val buyButton: KNode = child {
+        hasTestTag(BaseButtonTestTags.TEXT)
+        hasText(getResourceString(CoreUiR.string.common_buy))
         useUnmergedTree = true
     }
 }
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/SendConfirmPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/SendConfirmPageObject.kt
index 900ead781c..32772d416d 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/SendConfirmPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/SendConfirmPageObject.kt
@@ -4,11 +4,14 @@ import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
 import com.tangem.core.ui.R
 import com.tangem.core.ui.test.BaseButtonTestTags
+import com.tangem.core.ui.test.NotificationTestTags
 import com.tangem.core.ui.test.TopAppBarTestTags
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
 import io.github.kakaocup.compose.node.element.KNode
 import io.github.kakaocup.kakao.common.utilities.getResourceString
+import androidx.compose.ui.test.hasText as withText
+import com.tangem.common.ui.R as CommonUiR
 
 class SendConfirmPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
     ComposeScreen<SendConfirmPageObject>(semanticsProvider = semanticsProvider) {
@@ -24,6 +27,41 @@ class SendConfirmPageObject(semanticsProvider: SemanticsNodeInteractionsProvider
         useUnmergedTree = true
     }
 
+
+    val minimumSendAmountErrorTitle: KNode = child {
+        hasTestTag(NotificationTestTags.TITLE)
+        hasText(getResourceString(CommonUiR.string.send_notification_invalid_amount_title))
+        useUnmergedTree = true
+    }
+
+    fun minimumSendAmountErrorIcon(amount: String): KNode = child {
+        hasAnySibling(
+            withText(
+                getResourceString(
+                    CommonUiR.string.send_notification_invalid_minimum_amount_text,
+                    amount,
+                    amount,
+                )
+            )
+        )
+        hasTestTag(NotificationTestTags.ICON)
+        useUnmergedTree = true
+    }
+
+    fun minimumSendAmountErrorMessage(
+        amount: String,
+    ): KNode = child {
+        hasTestTag(NotificationTestTags.MESSAGE)
+        hasText(
+            getResourceString(
+                CommonUiR.string.send_notification_invalid_minimum_amount_text,
+                amount,
+                amount,
+            )
+        )
+        useUnmergedTree = true
+    }
+
 }
 
 internal fun BaseTestCase.onSendConfirmScreen(function: SendConfirmPageObject.() -> Unit) =
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/StoriesPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/StoriesPageObject.kt
index 63934bb015..f9666ceeb4 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/StoriesPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/StoriesPageObject.kt
@@ -3,18 +3,12 @@ package com.tangem.screens
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
 import com.tangem.core.ui.test.StoriesScreenTestTags
-import com.tangem.wallet.R
 import io.github.kakaocup.compose.node.element.ComposeScreen
 import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen
 import io.github.kakaocup.compose.node.element.KNode
-import io.github.kakaocup.kakao.common.views.KView
-import io.github.kakaocup.kakao.text.KButton
 
 class StoriesPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
-    ComposeScreen<StoriesPageObject>(
-        semanticsProvider = semanticsProvider,
-        viewBuilderAction = { hasTestTag(StoriesScreenTestTags.SCREEN_CONTAINER) }
-    ) {
+    ComposeScreen<StoriesPageObject>(semanticsProvider = semanticsProvider) {
 
     val scanButton: KNode = child {
         hasTestTag(StoriesScreenTestTags.SCAN_BUTTON)
@@ -23,14 +17,6 @@ class StoriesPageObject(semanticsProvider: SemanticsNodeInteractionsProvider) :
     val orderButton: KNode = child {
         hasTestTag(StoriesScreenTestTags.ORDER_BUTTON)
     }
-
-    val enableNFCAlert: KView = KView {
-        withId(R.id.alertTitle)
-    }
-
-    val cancelButton: KButton = KButton {
-        withId(android.R.id.button2)
-    }
 }
 
 internal fun BaseTestCase.onStoriesScreen(function: StoriesPageObject.() -> Unit) =
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt
index 3a0cd0962d..1c3fa1fbb1 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt
@@ -5,6 +5,7 @@ import androidx.compose.ui.test.SemanticsMatcher
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
 import com.tangem.common.utils.LazyListItemNode
+import com.tangem.core.ui.test.BaseActionButtonsBlockTestTags
 import com.tangem.core.ui.test.BaseButtonTestTags
 import com.tangem.core.ui.test.NotificationTestTags
 import com.tangem.core.ui.test.TokenDetailsScreenTestTags
@@ -85,7 +86,7 @@ class TokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvide
 
     private val horizontalActionChips = KLazyListNode(
         semanticsProvider = semanticsProvider,
-        viewBuilderAction = { hasTestTag(TokenDetailsScreenTestTags.HORIZONTAL_ACTION_CHIPS) },
+        viewBuilderAction = { hasTestTag(BaseActionButtonsBlockTestTags.HORIZONTAL_ACTION_CHIPS) },
         itemTypeBuilder = { itemType(::LazyListItemNode) },
         positionMatcher = { position ->
             SemanticsMatcher.expectValue(
@@ -97,25 +98,25 @@ class TokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvide
 
     @OptIn(ExperimentalTestApi::class)
     val swapButton: LazyListItemNode = horizontalActionChips.childWith<LazyListItemNode> {
-        hasTestTag(TokenDetailsScreenTestTags.ACTION_BUTTON)
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
         hasText(getResourceString(R.string.common_swap))
     }
 
     @OptIn(ExperimentalTestApi::class)
     val sellButton: LazyListItemNode = horizontalActionChips.childWith<LazyListItemNode> {
-        hasTestTag(TokenDetailsScreenTestTags.ACTION_BUTTON)
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
         hasText(getResourceString(R.string.common_sell))
     }
 
     @OptIn(ExperimentalTestApi::class)
     val buyButton: LazyListItemNode = horizontalActionChips.childWith<LazyListItemNode> {
-        hasTestTag(TokenDetailsScreenTestTags.ACTION_BUTTON)
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
         hasText(getResourceString(R.string.common_buy))
     }
 
     @OptIn(ExperimentalTestApi::class)
     val sendButton: LazyListItemNode = horizontalActionChips.childWith<LazyListItemNode> {
-        hasTestTag(TokenDetailsScreenTestTags.ACTION_BUTTON)
+        hasTestTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON)
         hasText(getResourceString(R.string.common_send))
     }
 
@@ -131,6 +132,18 @@ class TokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvide
         useUnmergedTree = true
     }
 
+    val topUpYourWalletNotificationTitle: KNode = child {
+        hasTestTag(NotificationTestTags.TITLE)
+        hasText(getResourceString(R.string.warning_no_account_title))
+        useUnmergedTree = true
+    }
+
+    val topUpYourWalletNotificationIcon: KNode = child {
+        hasAnySibling(withText(getResourceString(R.string.warning_no_account_title)))
+        hasTestTag(NotificationTestTags.ICON)
+        useUnmergedTree = true
+    }
+
     fun networkFeeNotificationMessage(
         currencyName: String,
         networkName: String,
@@ -151,6 +164,23 @@ class TokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvide
         useUnmergedTree = true
     }
 
+    fun topUpYourWalletNotificationMessage(
+        networkName: String,
+        amount: String,
+        currencySymbol: String,
+    ): KNode = child {
+        hasTestTag(NotificationTestTags.MESSAGE)
+        hasText(
+            getResourceString(
+                R.string.no_account_generic,
+                networkName,
+                amount,
+                currencySymbol,
+            )
+        )
+        useUnmergedTree = true
+    }
+
     fun goToBuyCurrencyButton(feeCurrencySymbol: String): KNode = child {
         hasTestTag(BaseButtonTestTags.TEXT)
         hasText(getResourceString(R.string.common_buy_currency, feeCurrencySymbol))
diff --git a/app/src/androidTest/kotlin/com/tangem/screens/WalletConnectDetailsBottonSheetPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/WalletConnectDetailsBottonSheetPageObject.kt
index e4eb48fde7..6ad955d669 100644
--- a/app/src/androidTest/kotlin/com/tangem/screens/WalletConnectDetailsBottonSheetPageObject.kt
+++ b/app/src/androidTest/kotlin/com/tangem/screens/WalletConnectDetailsBottonSheetPageObject.kt
@@ -2,6 +2,7 @@ package com.tangem.screens
 
 import androidx.compose.ui.test.SemanticsNodeInteractionsProvider
 import com.tangem.common.BaseTestCase
+import com.tangem.core.ui.test.BaseBottomSheetTestTags
 import com.tangem.core.ui.test.BaseButtonTestTags
 import com.tangem.core.ui.test.WalletConnectBottomSheetTestTags
 import com.tangem.core.ui.test.WalletConnectDetailsBottomSheetTestTags
@@ -15,18 +16,18 @@ class WalletConnectDetailsBottomSheetPageObject(semanticsProvider: SemanticsNode
     ComposeScreen<WalletConnectDetailsBottomSheetPageObject>(semanticsProvider = semanticsProvider) {
 
     val title: KNode = child {
-        hasTestTag(WalletConnectDetailsBottomSheetTestTags.TITLE)
+        hasTestTag(BaseBottomSheetTestTags.TITLE)
         hasText(getResourceString(WalletConnectImplR.string.wc_connected_app_title))
         useUnmergedTree = true
     }
 
     val date: KNode = child {
-        hasTestTag(WalletConnectDetailsBottomSheetTestTags.DATE)
+        hasTestTag(BaseBottomSheetTestTags.SUBTITLE)
         useUnmergedTree = true
     }
 
     val closeButton: KNode = child {
-        hasTestTag(WalletConnectDetailsBottomSheetTestTags.CLOSE_BUTTON)
+        hasTestTag(BaseBottomSheetTestTags.CLOSE_BUTTON)
         useUnmergedTree = true
     }
 
diff --git a/app/src/androidTest/kotlin/com/tangem/steps/SingleCurrencyCardScenario.kt b/app/src/androidTest/kotlin/com/tangem/steps/SingleCurrencyCardScenario.kt
deleted file mode 100644
index f9c68f5096..0000000000
--- a/app/src/androidTest/kotlin/com/tangem/steps/SingleCurrencyCardScenario.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.tangem.steps
-
-import com.tangem.common.BaseTestCase
-import com.tangem.common.extensions.assertElementDoesNotExist
-import com.tangem.screens.onMainScreen
-import io.qameta.allure.kotlin.Allure.step
-
-fun BaseTestCase.checkSingleCurrencyMainScreen(cardBlockchain: String, cardTitle: String) {
-    step("Assert card title equal '$cardTitle'") {
-        onMainScreen { walletNameText.assertTextEquals(cardTitle) }
-    }
-    step("Assert  'Transactions' block is displayed") {
-        onMainScreen { transactionsExplorer().assertExists() }
-    }
-    step("Assert 'Transactions' title is displayer") {
-        onMainScreen { transactionsTitle.assertIsDisplayed() }
-    }
-    step("Assert 'Explorer Icon' is displayed") {
-        onMainScreen { transactionsExplorerIcon.assertIsDisplayed() }
-    }
-    step("Assert card image is displayed") { //TODO: Придумать нормальную проверку / реализовать скриншот-тестинг
-        onMainScreen { walletImage.assertIsDisplayed() }
-    }
-    step("Assert 'Market Price' on single card main screen is displayed") {
-        onMainScreen { marketPriceBlock.assertIsDisplayed() }
-    }
-    step("Assert 'Market Price' title equals $cardBlockchain Market Price") {
-        onMainScreen { marketPriceText.assertTextContains("$cardBlockchain Market Price") }
-    }
-    step("Assert  'Organize tokens' button is not displayed") {
-        onMainScreen {
-            assertElementDoesNotExist({ organizeTokensButtonWithoutLazySearch() }, "Organize tokens button")
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/BlockchainTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/BlockchainTest.kt
new file mode 100644
index 0000000000..d1ca4801ee
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/tests/BlockchainTest.kt
@@ -0,0 +1,203 @@
+package com.tangem.tests
+
+import com.tangem.common.BaseTestCase
+import com.tangem.common.constants.TestConstants.CARDANO_ADDRESS
+import com.tangem.common.extensions.clickWithAssertion
+import com.tangem.common.extensions.pullToRefresh
+import com.tangem.common.utils.resetWireMockScenarioState
+import com.tangem.common.utils.setWireMockScenarioState
+import com.tangem.scenarios.openMainScreen
+import com.tangem.scenarios.synchronizeAddresses
+import com.tangem.screens.*
+import com.tangem.screens.onMainScreen
+import com.tangem.screens.onSendAddressScreen
+import com.tangem.screens.onSendScreen
+import com.tangem.screens.onTokenDetailsScreen
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.qameta.allure.kotlin.AllureId
+import io.qameta.allure.kotlin.junit4.DisplayName
+import org.junit.Test
+
+@HiltAndroidTest
+class BlockchainTest : BaseTestCase() {
+
+    @AllureId("3644")
+    @DisplayName("ADA: Checking the min amount/change = 1ADA")
+    @Test
+    fun adaCheckMinAmountTest() {
+        val tokenName = "Cardano"
+        val balance = "$0.00"
+        val errorSendAmount = "0.1"
+        val validSendAmount = "10"
+        val minAmount = "ADA 1.00"
+        val address = CARDANO_ADDRESS
+        val scenarioName = "user_tokens_api"
+        val scenarioState = "Cardano"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(scenarioName)
+            }
+        ).run {
+            step("Set WireMock scenario: '$scenarioName' to state: '$scenarioState'") {
+                setWireMockScenarioState(scenarioName = scenarioName, state = scenarioState)
+            }
+            step("Open 'Main Screen'") {
+                openMainScreen()
+            }
+            step("Synchronize addresses") {
+                synchronizeAddresses(balance)
+            }
+            step("Click on token with name: '$tokenName'") {
+                onMainScreen { tokenWithTitleAndAddress(tokenName).clickWithAssertion() }
+            }
+            step("Click on 'Send' button") {
+                onTokenDetailsScreen { sendButton.performClick() }
+            }
+            step("Type '$errorSendAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(errorSendAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Type address in input text field") {
+                onSendAddressScreen { addressTextField.performTextReplacement(address) }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert 'Invalid amount' error title is displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorTitle.assertIsDisplayed() }
+            }
+            step("Assert 'Invalid amount' error icon is displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorIcon(minAmount).assertIsDisplayed() }
+            }
+            step("Assert 'Invalid amount' error message is displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorMessage(minAmount).assertIsDisplayed() }
+            }
+            step("Press system 'Back' button") {
+                device.uiDevice.pressBack()
+            }
+            step("Assert address text field is displayed") {
+                onSendAddressScreen { addressTextField.assertIsDisplayed() }
+            }
+            step("Press system 'Back' button") {
+                device.uiDevice.pressBack()
+            }
+            step("Type '$validSendAmount' in input text field") {
+                onSendScreen {
+                    amountInputTextField.performClick()
+                    amountInputTextField.performTextReplacement(errorSendAmount)
+                }
+            }
+            step("Click on 'Next' button") {
+                onSendScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert address text field is displayed") {
+                onSendAddressScreen { addressTextField.assertIsDisplayed() }
+            }
+            step("Click on 'Next' button") {
+                onSendAddressScreen { nextButton.clickWithAssertion() }
+            }
+            step("Assert 'Invalid amount' error title is not displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorTitle.assertIsNotDisplayed() }
+            }
+            step("Assert 'Invalid amount' error icon is not displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorIcon(minAmount).assertIsNotDisplayed() }
+            }
+            step("Assert 'Invalid amount' error message is not displayed") {
+                onSendConfirmScreen { minimumSendAmountErrorMessage(minAmount).assertIsNotDisplayed() }
+            }
+        }
+    }
+
+    @AllureId("990")
+    @DisplayName("XRP: Check warning")
+    @Test
+    fun xrpCheckWarningTest() {
+        val tokenName = "XRP Ledger"
+        val amount = "1.00"
+        val currencySymbol = "XRP"
+        val balance = "$0.00"
+        val userTokensScenarioName = "user_tokens_api"
+        val userTokensScenarioState = "XRP"
+        val rippleAccountInfoScenarioName = "ripple_account_info"
+        val rippleAccountInfoStartedState = "Started"
+        val rippleAccountInfoErrorState = "AccountNotFound"
+        val rippleAccountLinesScenarioName = "ripple_account_lines"
+        val rippleAccountLinesStartedState = "Started"
+        val rippleAccountLinesErrorState = "AccountNotFound"
+
+        setupHooks(
+            additionalAfterSection = {
+                resetWireMockScenarioState(userTokensScenarioName)
+                resetWireMockScenarioState(rippleAccountInfoScenarioName)
+                resetWireMockScenarioState(rippleAccountLinesScenarioName)
+            }
+        ).run {
+            step("Set WireMock scenario: '$userTokensScenarioName' to state: '$userTokensScenarioState'") {
+                setWireMockScenarioState(scenarioName = userTokensScenarioName, state = userTokensScenarioState)
+            }
+            step("Set WireMock scenario: '$rippleAccountInfoScenarioName' to state: '$rippleAccountInfoErrorState'") {
+                setWireMockScenarioState(scenarioName = rippleAccountInfoScenarioName, state = rippleAccountInfoErrorState)
+            }
+            step("Set WireMock scenario: '$rippleAccountLinesScenarioName' to state: '$rippleAccountLinesErrorState'") {
+                setWireMockScenarioState(scenarioName = rippleAccountLinesScenarioName, state = rippleAccountLinesErrorState)
+            }
+            step("Open 'Main Screen'") {
+                openMainScreen()
+            }
+            step("Synchronize addresses") {
+                synchronizeAddresses(balance)
+            }
+            step("Click on token with name: '$tokenName'") {
+                onMainScreen { tokenWithTitleAndAddress(tokenName).performClick() }
+            }
+            step("Assert 'Top up wallet' notification title is displayed") {
+                onTokenDetailsScreen { topUpYourWalletNotificationTitle.assertIsDisplayed() }
+            }
+            step("Assert 'Top up wallet' notification message is displayed") {
+                onTokenDetailsScreen {
+                    topUpYourWalletNotificationMessage(
+                        networkName = tokenName,
+                        amount = amount,
+                        currencySymbol = currencySymbol,
+                    ).assertIsDisplayed()
+                }
+            }
+            step("Assert 'Top up wallet' notification icon is displayed") {
+                onTokenDetailsScreen { topUpYourWalletNotificationIcon.assertIsDisplayed() }
+            }
+            step("Set WireMock scenario: '$userTokensScenarioName' to state: '$userTokensScenarioState'") {
+                setWireMockScenarioState(scenarioName = userTokensScenarioName, state = userTokensScenarioState)
+            }
+            step("Set WireMock scenario: '$rippleAccountInfoScenarioName' to state: '$rippleAccountInfoStartedState'") {
+                setWireMockScenarioState(scenarioName = rippleAccountInfoScenarioName, state = rippleAccountInfoStartedState)
+            }
+            step("Set WireMock scenario: '$rippleAccountLinesScenarioName' to state: '$rippleAccountLinesStartedState'") {
+                setWireMockScenarioState(scenarioName = rippleAccountLinesScenarioName, state = rippleAccountLinesStartedState)
+            }
+            step("Pull to refresh") {
+                pullToRefresh()
+            }
+            step("Assert 'Top up wallet' notification title is not displayed") {
+                onTokenDetailsScreen { topUpYourWalletNotificationTitle.assertIsNotDisplayed() }
+            }
+            step("Assert 'Top up wallet' notification message not is displayed") {
+                onTokenDetailsScreen {
+                    topUpYourWalletNotificationMessage(
+                        networkName = tokenName,
+                        amount = amount,
+                        currencySymbol = currencySymbol,
+                    ).assertIsNotDisplayed()
+                }
+            }
+            step("Assert 'Top up wallet' notification icon not is displayed") {
+                onTokenDetailsScreen { topUpYourWalletNotificationIcon.assertIsNotDisplayed() }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
index abea9913ef..1cdfa840e5 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/BuyTokenTest.kt
@@ -2,13 +2,12 @@ package com.tangem.tests
 
 import com.tangem.common.BaseTestCase
 import com.tangem.common.constants.TestConstants.TOTAL_BALANCE
-import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT
 import com.tangem.common.extensions.clickWithAssertion
 import com.tangem.common.utils.resetWireMockScenarioState
 import com.tangem.common.utils.setWireMockScenarioState
-import com.tangem.screens.*
 import com.tangem.scenarios.openMainScreen
 import com.tangem.scenarios.synchronizeAddresses
+import com.tangem.screens.*
 import dagger.hilt.android.testing.HiltAndroidTest
 import io.qameta.allure.kotlin.AllureId
 import io.qameta.allure.kotlin.junit4.DisplayName
@@ -74,7 +73,7 @@ class BuyTokenTest : BaseTestCase() {
             val otherCurrenciesTitle = "Other currencies"
             val australianDollar = "AUD"
             val fiatAmount = "1"
-            val tokenAmount = "POL 488.24938338"
+            val tokenAmount = "~488.24938338 POL"
             val scenarioName = "payment_methods"
 
             step("Reset WireMock scenario '$scenarioName'") {
@@ -102,18 +101,6 @@ class BuyTokenTest : BaseTestCase() {
             step("Write fiat amount = '$fiatAmount'") {
                 onBuyTokenDetailsScreen { fiatAmountTextField.performTextInput(fiatAmount) }
             }
-            step("Assert 'Provider loading block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerLoadingTitle.assertIsDisplayed()
-                    providerLoadingText.assertIsDisplayed()
-                }
-            }
-            step("Assert 'Provider block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerTitle.assertIsDisplayed()
-                    providerText.assertIsDisplayed()
-                }
-            }
             step("Assert token amount = '$tokenAmount'") {
                 onBuyTokenDetailsScreen {
                     tokenAmountField.assertTextContains(tokenAmount)
@@ -162,7 +149,7 @@ class BuyTokenTest : BaseTestCase() {
             val balance = TOTAL_BALANCE
             val euro = "EUR"
             val fiatAmount = "1"
-            val tokenAmount = "POL 488.24938338"
+            val tokenAmount = "~488.24938338 POL"
             val scenarioName = "payment_methods"
 
             step("Reset WireMock scenario '$scenarioName'") {
@@ -199,27 +186,45 @@ class BuyTokenTest : BaseTestCase() {
             step("Assert fiat amount = '$fiatAmount'") {
                 onBuyTokenDetailsScreen { fiatAmountTextField.assertTextContains(euro + fiatAmount) }
             }
-            step("Assert 'Provider loading block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerLoadingTitle.assertIsDisplayed()
-                    providerLoadingText.assertIsDisplayed()
-                }
-            }
-            step("Assert 'Provider block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerTitle.assertIsDisplayed()
-                    providerText.assertIsDisplayed()
-                }
-            }
             step("Assert token amount = '$tokenAmount'") {
                 onBuyTokenDetailsScreen { tokenAmountField.assertTextContains(tokenAmount) }
             }
-            step("Assert 'ToS' block is displayed") {
-                onBuyTokenDetailsScreen { toSBlock.assertIsDisplayed()}
+            step("Click on 'Continue' button") {
+                onBuyTokenDetailsScreen { continueButton.clickWithAssertion() }
+            }
+            step("Assert 'Recommended' title is displayed") {
+                onBuyTokenDetailsScreen { recommendedTitle.clickWithAssertion() }
+            }
+            step("Assert 'Best rate' icon is displayed") {
+                onBuyTokenDetailsScreen { bestRateIcon.assertIsDisplayed() }
+            }
+            step("Assert 'Best rate' title is displayed") {
+                onBuyTokenDetailsScreen { bestRateTitle.assertIsDisplayed() }
+            }
+            step("Assert offer amount is displayed") {
+                onBuyTokenDetailsScreen { offerTokenAmount.assertIsDisplayed() }
             }
             step("Assert 'Buy' button is displayed") {
                 onBuyTokenDetailsScreen { buyButton.assertIsDisplayed()}
             }
+            step("Assert timing icon is displayed") {
+                onBuyTokenDetailsScreen { timingIcon.assertIsDisplayed() }
+            }
+            step("Assert 'Instant' processing time text is displayed") {
+                onBuyTokenDetailsScreen { instantProcessingSpeedText.assertIsDisplayed() }
+            }
+            step("Assert provider name is displayed") {
+                onBuyTokenDetailsScreen { providerName.assertIsDisplayed() }
+            }
+            step("Assert 'Pay with' is displayed") {
+                onBuyTokenDetailsScreen { payWith.assertIsDisplayed() }
+            }
+            step("Assert payment method icon is displayed") {
+                onBuyTokenDetailsScreen { paymentMethodIcon.assertIsDisplayed() }
+            }
+            step("Assert 'All offers' button is displayed") {
+                onBuyTokenDetailsScreen { allOffersButton.assertIsDisplayed() }
+            }
             step("Assert 'Close' button in top bar is displayed") {
                 onBuyTokenDetailsScreen { topBarCloseButton.assertIsDisplayed() }
             }
@@ -314,13 +319,10 @@ class BuyTokenTest : BaseTestCase() {
         setupHooks().run {
             val tokenTitle = "Polygon"
             val balance = TOTAL_BALANCE
-            val paymentMethod = "Card"
+            val paymentMethod = "Invoice Revolut Pay"
             val fiatAmount = "1"
             val providerNameMercuryo = "Mercuryo"
-            val providerNameSimplex = "Simplex"
-            val tokenAmount = "POL 488.24938338"
-            val bestRate = "Best rate"
-            val rate = "-0.00%"
+            val tokenAmount = "~488.24938338 POL"
             val scenarioName = "payment_methods"
 
             step("Reset WireMock scenario '$scenarioName'") {
@@ -348,58 +350,53 @@ class BuyTokenTest : BaseTestCase() {
             step("Write fiat amount = '$fiatAmount'") {
                 onBuyTokenDetailsScreen { fiatAmountTextField.performTextInput(fiatAmount) }
             }
+            step("Assert token amount = '$tokenAmount'") {
+                onBuyTokenDetailsScreen { tokenAmountField.assertTextContains(tokenAmount) }
+            }
+            step("Click on 'Continue' button") {
+                onBuyTokenDetailsScreen { continueButton.clickWithAssertion() }
+            }
             step("Assert 'Provider block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerTitle.assertIsDisplayed()
-                    providerText.assertIsDisplayed()
-                }
+                onBuyTokenDetailsScreen { providerName.assertIsDisplayed() }
             }
-            step("Open 'Select Provider' bottom sheet") {
-                onBuyTokenDetailsScreen { providerTitle.performClick() }
+            step("Click on 'All offers' button") {
+                onBuyTokenDetailsScreen { allOffersButton.clickWithAssertion() }
             }
-            step("Assert available provider name is displayed") {
-                onSelectProviderBottomSheet {
-                    flakySafely(WAIT_UNTIL_TIMEOUT) {
-                        availableProviderItem.assertIsDisplayed()
-                    }
-                }
+            step("Click on '$paymentMethod' payment method") {
+                onSelectPaymentMethodBottomSheet { paymentMethodWithName(paymentMethod).clickWithAssertion() }
             }
-            step("Click on 'Expand payment methods' button") {
-                onSelectProviderBottomSheet { paymentMethodExpandButton.clickWithAssertion() }
-            }
-            step("Click on payment method: '$paymentMethod'") {
-                onSelectPaymentMethodBottomSheet { paymentMethodWithNameAndIcon(paymentMethod).clickWithAssertion() }
-            }
-            step("Assert 'Select Provider' bottom sheet title is displayed") {
+            step("Assert 'Provider' bottom sheet title is displayed") {
                 onSelectProviderBottomSheet { title.assertIsDisplayed() }
             }
+            step("Assert 'Provider' bottom sheet subtitle is displayed") {
+                onSelectProviderBottomSheet { subtitle.assertIsDisplayed() }
+            }
+            step("Assert 'Best rate' icon is displayed") {
+                onSelectProviderBottomSheet { bestRateIcon.assertIsDisplayed() }
+            }
+            step("Assert 'Best rate' title is displayed") {
+                onSelectProviderBottomSheet { bestRateTitle.assertIsDisplayed() }
+            }
+            step("Assert offer token amount is displayed") {
+                onSelectProviderBottomSheet { offerTokenAmount.assertIsDisplayed() }
+            }
+            step("Assert 'Buy' button is displayed") {
+                onSelectProviderBottomSheet { buyButton.assertIsDisplayed() }
+            }
+            step("Assert timing icon is displayed") {
+                onSelectProviderBottomSheet { timingIcon.assertIsDisplayed() }
+            }
+            step("Assert 'Instant' processing time text is displayed") {
+                onSelectProviderBottomSheet { instantProcessingSpeedText.assertIsDisplayed() }
+            }
+            step("Assert 'Pay with' text is displayed") {
+                onSelectProviderBottomSheet { payWith.assertIsDisplayed() }
+            }
             step("Assert payment method icon is displayed") {
                 onSelectProviderBottomSheet { paymentMethodIcon.assertIsDisplayed() }
             }
-            step("Assert payment method title is displayed") {
-                onSelectProviderBottomSheet { paymentMethodTitle.assertIsDisplayed() }
-            }
-            step("Assert payment method name is displayed") {
-                onSelectProviderBottomSheet { paymentMethodName.assertIsDisplayed() }
-            }
-            step("Assert provider with name: '$providerNameMercuryo' and rate: '$bestRate' is displayed") {
-                onSelectProviderBottomSheet {
-                    availableProviderWithName(providerNameMercuryo, tokenAmount, bestRate).assertIsDisplayed()
-                }
-            }
-            step("Assert provider with name: '$providerNameSimplex' and rate: '$rate' is displayed") {
-                onSelectProviderBottomSheet {
-                    availableProviderWithName(providerNameSimplex, tokenAmount, rate).assertIsDisplayed()
-                }
-            }
-            step("Assert 'More providers' icon is displayed") {
-                onSelectProviderBottomSheet { moreProvidersIcon.assertIsDisplayed() }
-            }
-            step("Assert 'More providers' text is displayed") {
-                onSelectProviderBottomSheet { moreProvidersText.assertIsDisplayed() }
-            }
-            step("Assert 'Best rate' label is displayed") {
-                onSelectProviderBottomSheet { bestRateLabel.assertIsDisplayed() }
+            step("Assert provider name: '$providerNameMercuryo'") {
+                onSelectProviderBottomSheet { providerName.assertTextContains(providerNameMercuryo) }
             }
         }
     }
@@ -416,6 +413,7 @@ class BuyTokenTest : BaseTestCase() {
             val invoiceRevolutPay = "Invoice Revolut Pay"
             val sepa = "Sepa"
             val fiatAmount = "1"
+            val tokenAmount = "~488.24938338 POL"
             val scenarioName = "payment_methods"
 
             step("Reset WireMock scenario '$scenarioName'") {
@@ -443,40 +441,39 @@ class BuyTokenTest : BaseTestCase() {
             step("Write fiat amount = '$fiatAmount'") {
                 onBuyTokenDetailsScreen { fiatAmountTextField.performTextInput(fiatAmount) }
             }
+            step("Assert token amount = '$tokenAmount'") {
+                onBuyTokenDetailsScreen { tokenAmountField.assertTextContains(tokenAmount) }
+            }
+            step("Click on 'Continue' button") {
+                onBuyTokenDetailsScreen { continueButton.clickWithAssertion() }
+            }
             step("Assert 'Provider block' is displayed") {
-                onBuyTokenDetailsScreen {
-                    providerTitle.assertIsDisplayed()
-                    providerText.assertIsDisplayed()
-                }
+                onBuyTokenDetailsScreen { providerName.assertIsDisplayed() }
             }
-            step("Open 'Select Provider' bottom sheet") {
-                onBuyTokenDetailsScreen { providerTitle.performClick() }
-            }
-            step("Click on 'Expand payment methods' button") {
-                onSelectProviderBottomSheet { paymentMethodExpandButton.clickWithAssertion() }
+            step("Click on 'All offers' button") {
+                onBuyTokenDetailsScreen { allOffersButton.clickWithAssertion() }
             }
             step("Assert 'Select Payment Method' bottom sheet title is displayed") {
                 onSelectPaymentMethodBottomSheet { title.assertIsDisplayed() }
             }
+            step("Assert 'Select Payment Method' bottom sheet subtitle is displayed") {
+                onSelectPaymentMethodBottomSheet { subtitle.assertIsDisplayed() }
+            }
+            step("Assert 'Select Payment Method' bottom sheet close button is displayed") {
+                onSelectPaymentMethodBottomSheet { closeButton.assertIsDisplayed() }
+            }
             step("Assert payment method: '$card' is displayed") {
-                onSelectPaymentMethodBottomSheet { paymentMethodWithNameAndIcon(card).assertIsDisplayed() }
+                onSelectPaymentMethodBottomSheet { paymentMethodWithName(card).assertIsDisplayed() }
             }
             step("Assert payment method: '$googlePay' is displayed") {
-                onSelectPaymentMethodBottomSheet { paymentMethodWithNameAndIcon(googlePay).assertIsDisplayed() }
+                onSelectPaymentMethodBottomSheet { paymentMethodWithName(googlePay).assertIsDisplayed() }
             }
             step("Assert payment method: '$invoiceRevolutPay' is displayed") {
-                onSelectPaymentMethodBottomSheet { paymentMethodWithNameAndIcon(invoiceRevolutPay).assertIsDisplayed() }
+                onSelectPaymentMethodBottomSheet { paymentMethodWithName(invoiceRevolutPay).assertIsDisplayed() }
             }
             step("Assert payment method: '$sepa' is displayed") {
-                onSelectPaymentMethodBottomSheet { paymentMethodWithNameAndIcon(sepa).assertIsDisplayed() }
-            }
-            step("Press 'Back' button") {
-                onSelectPaymentMethodBottomSheet { device.uiDevice.pressBack() }
-            }
-            step("Assert 'Select Provider' bottom sheet title is displayed") {
-                onSelectProviderBottomSheet { title.assertIsDisplayed() }
+                onSelectPaymentMethodBottomSheet { paymentMethodWithName(sepa).assertIsDisplayed() }
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
index 9742ee2362..2264356999 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
@@ -87,12 +87,13 @@ class FeedbackTest : BaseTestCase() {
                 onSendScreen { nextButton.clickWithAssertion() }
             }
             step("Enter address") {
-                onSendAddressScreen { addressTextField.performTextReplacement(recipientAddress) }
+                onSendAddressScreen { addressTextField.performTextInput(recipientAddress) }
             }
             step("Click 'Next' button") {
                 onSendAddressScreen { nextButton.clickWithAssertion() }
             }
             step("Click 'Send' button") {
+                waitForIdle()
                 onSendConfirmScreen {
                     sendButton.assertIsEnabled()
                     sendButton.performClick()
@@ -138,6 +139,7 @@ class FeedbackTest : BaseTestCase() {
                 }
             }
             step("Check 'Scan warning' dialog") {
+                waitForIdle()
                 checkScanWarningDialog()
             }
             step("Click on 'Request support' button") {
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt
new file mode 100644
index 0000000000..c1e7d608de
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt
@@ -0,0 +1,64 @@
+package com.tangem.tests
+
+import com.tangem.common.BaseTestCase
+import com.tangem.scenarios.*
+import com.tangem.tap.domain.sdk.mocks.content.ShibaNoBackupMockContent
+import com.tangem.tap.domain.sdk.mocks.content.ShibaNoBackupNoWalletsMockContent
+import com.tangem.tap.domain.sdk.mocks.content.Wallet2NoBackupMockContent
+import com.tangem.tap.domain.sdk.mocks.content.Wallet2NoBackupNoWalletsMockContent
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.qameta.allure.kotlin.AllureId
+import io.qameta.allure.kotlin.junit4.DisplayName
+import org.junit.Test
+
+@HiltAndroidTest
+class OnboardingTest : BaseTestCase() {
+
+    @AllureId("248")
+    @DisplayName("Onboarding: 'Shiba' no wallets backup screen test")
+    @Test
+    fun shibaNoWalletsBackupScreenTest() {
+        setupHooks().run {
+            scanCard(mockContent = ShibaNoBackupNoWalletsMockContent)
+            checkCreateWalletScreenForWalletNoWallets()
+            openAndCheckBackupScreenForWalletNoWallets()
+        }
+    }
+
+    @AllureId("3989")
+    @DisplayName("Onboarding: 'Shiba' with wallets backup screen test")
+    @Test
+    fun shibaBackupScreenTest() {
+        setupHooks().run {
+            scanCard(
+                mockContent = ShibaNoBackupMockContent,
+                alreadyActivatedDialogIsShown = true
+            )
+            checkBackupScreen()
+        }
+    }
+
+    @AllureId("246")
+    @DisplayName("Onboarding: 'Wallet 2' no wallets backup screen test")
+    @Test
+    fun wallet2NoWalletsBackupScreenTest() {
+        setupHooks().run {
+            scanCard(mockContent = Wallet2NoBackupNoWalletsMockContent)
+            checkCreateWalletScreenForWallet2NoWallets()
+            openAndCheckBackupScreenForWallet2NoWallets()
+        }
+    }
+
+    @AllureId("3990")
+    @DisplayName("Onboarding: 'Wallet 2' with wallets backup screen test")
+    @Test
+    fun wallet2BackupScreenTest() {
+        setupHooks().run {
+            scanCard(
+                mockContent = Wallet2NoBackupMockContent,
+                alreadyActivatedDialogIsShown = true
+            )
+            checkBackupScreen()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt
new file mode 100644
index 0000000000..f1639df077
--- /dev/null
+++ b/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt
@@ -0,0 +1,196 @@
+package com.tangem.tests
+
+import com.tangem.common.BaseTestCase
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.scenarios.checkMultiCurrencyMainScreen
+import com.tangem.scenarios.checkSingleCurrencyMainScreen
+import com.tangem.scenarios.openMainScreen
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import com.tangem.tap.domain.sdk.mocks.content.*
+import dagger.hilt.android.testing.HiltAndroidTest
+import io.qameta.allure.kotlin.AllureId
+import io.qameta.allure.kotlin.junit4.DisplayName
+import org.junit.Test
+
+@HiltAndroidTest
+class ScanCardTest : BaseTestCase() {
+
+    @AllureId("868")
+    @DisplayName("Scan: Scanning single-currency cards")
+    @Test
+    fun singleTokenNoteCardScanTest() {
+        val cardBlockchain = "DOGE"
+        val cardType: ProductType = ProductType.Note
+
+        setupHooks().run {
+                step("Open 'Main Screen' on '${cardType.name}' card") {
+                    openMainScreen(cardType)
+                }
+                step("Check 'Main' screen for '${cardType.name}' $cardBlockchain card") {
+                    checkSingleCurrencyMainScreen(
+                        cardBlockchain = cardBlockchain,
+                        cardTitle = cardType.name,
+                        withTransactions = true
+                    )
+                }
+        }
+    }
+
+    @AllureId("869")
+    @DisplayName("Scan: 'Twin' card")
+    @Test
+    fun twinsCardScanTest() {
+        val cardBlockchain = "BTC"
+        val cardType: MockContent = TwinsMockContent
+        val cardName = "Twin"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$cardName' card") {
+                openMainScreen(mockContent = cardType, isTwinsCard = true)
+            }
+            step("Check 'Main' screen for '$cardName' $cardBlockchain card") {
+                checkSingleCurrencyMainScreen(cardBlockchain = cardBlockchain, cardTitle = cardName)
+            }
+        }
+    }
+
+    @AllureId("872")
+    @DisplayName("Scan: Card with Secp256k1 curve")
+    @Test
+    fun secpk1CurveCardScanTest() {
+        val devicesCount = "1 device"
+        val cardType: MockContent = Secpk1CurveMockContent
+        val cardName = "Wallet"
+        val card = "card with Secp256k1 curve"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on $card") {
+                openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true)
+            }
+            step("Check 'Main' screen for $card curve with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(
+                    devicesCount = devicesCount,
+                    cardTitle = cardName,
+                    withWalletImage = false
+                )
+            }
+        }
+    }
+
+    @AllureId("870")
+    @DisplayName("Scan: Card with Ed25519 curve")
+    @Test
+    fun edCurveCardScanTest() {
+        val cardBlockchain = "XLM"
+        val cardType: MockContent = EdCurveMockContent
+        val cardName = "Tangem card"
+        val card = "card with Ed25519 curve"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on $card") {
+                openMainScreen(mockContent = cardType)
+            }
+            step("Check 'Main' screen for $card with blockchain: '$cardBlockchain'") {
+                checkSingleCurrencyMainScreen(
+                    cardBlockchain = cardBlockchain,
+                    cardTitle = cardName,
+                    withWalletImage = false
+                )
+            }
+        }
+    }
+
+    @AllureId("866")
+    @DisplayName("Scan: 'Shiba' card")
+    @Test
+    fun shibaCardScanTest() {
+        val devicesCount = "2 devices"
+        val cardType: MockContent = ShibaMockContent
+        val cardName = "Wallet"
+        val card = "Shiba"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$card' card") {
+                openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true)
+            }
+            step("Check 'Main' screen for '$card' card with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(devicesCount, cardName)
+            }
+        }
+    }
+
+    @AllureId("864")
+    @DisplayName("Scan: 'Ring'")
+    @Test
+    fun ringScanTest() {
+        val devicesCount = "3 devices"
+        val cardType: ProductType = ProductType.Ring
+        val cardName = "Wallet"
+        val ring = "Ring"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$ring'") {
+                openMainScreen(productType = cardType, alreadyActivatedDialogIsShown = true)
+            }
+            step("Check 'Main' screen for '$ring' with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(devicesCount, cardName)
+            }
+        }
+    }
+
+    @AllureId("867")
+    @DisplayName("Scan: 'Wallet' card")
+    @Test
+    fun walletCardScanTest() {
+        val devicesCount = "1 device"
+        val cardType: ProductType = ProductType.Wallet
+        val cardName = "Wallet"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$cardName' card") {
+                openMainScreen(productType = cardType)
+            }
+            step("Check 'Main' screen for '$cardName' card with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(devicesCount, cardName)
+            }
+        }
+    }
+
+    @AllureId("865")
+    @DisplayName("Scan: 'Wallet 2' card")
+    @Test
+    fun wallet2ScanTest() {
+        val devicesCount = "2 devices"
+        val cardType: MockContent = Wallet2MockContent
+        val cardName = "Wallet"
+        val card = "Wallet 2"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$card' card") {
+                openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true)
+            }
+            step("Check 'Main' screen for '$card' card with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(devicesCount, cardName)
+            }
+        }
+    }
+
+    @AllureId("871")
+    @DisplayName("Scan: Card with 4.12 firmware")
+    @Test
+    fun firmware412CardScanTest() {
+        val devicesCount = "1 device"
+        val cardType: MockContent = Firmware412MockContent
+        val cardName = "Tangem card"
+        val card = "card with 4.12 firmware"
+
+        setupHooks().run {
+            step("Open 'Main Screen' on '$card'") {
+                openMainScreen(mockContent = cardType)
+            }
+            step("Check 'Main' screen for '$card' with devices count = '$devicesCount'") {
+                checkMultiCurrencyMainScreen(devicesCount, cardName)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/SendTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/SendTest.kt
index 7cf0a321e3..b4a7286a5f 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/SendTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/SendTest.kt
@@ -1,7 +1,9 @@
 package com.tangem.tests
 
 import com.tangem.common.BaseTestCase
+import com.tangem.common.extensions.SwipeDirection
 import com.tangem.common.extensions.clickWithAssertion
+import com.tangem.common.extensions.swipeVertical
 import com.tangem.common.utils.resetWireMockScenarioState
 import com.tangem.common.utils.setWireMockScenarioState
 import com.tangem.scenarios.openMainScreen
@@ -42,6 +44,9 @@ class SendTest : BaseTestCase() {
             step("Synchronize addresses") {
                 synchronizeAddresses(balance)
             }
+            step("Swipe up") {
+                swipeVertical(SwipeDirection.UP)
+            }
             step("Click on token with name: $currencyName") {
                 onMainScreen { tokenWithTitleAndAddress(currencyName).clickWithAssertion() }
             }
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/SingleCurrencyCardsScan.kt b/app/src/androidTest/kotlin/com/tangem/tests/SingleCurrencyCardsScan.kt
deleted file mode 100644
index 34d745794f..0000000000
--- a/app/src/androidTest/kotlin/com/tangem/tests/SingleCurrencyCardsScan.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.tangem.tests
-
-import com.tangem.common.BaseTestCase
-import com.tangem.domain.models.scan.ProductType
-import com.tangem.scenarios.openMainScreen
-import com.tangem.steps.checkSingleCurrencyMainScreen
-import dagger.hilt.android.testing.HiltAndroidTest
-import io.qameta.allure.kotlin.AllureId
-import io.qameta.allure.kotlin.junit4.DisplayName
-import org.junit.Test
-
-@HiltAndroidTest
-class SingleCurrencyCardsScan : BaseTestCase() {
-
-    @AllureId("868")
-    @DisplayName("Scan: Scanning single-currency cards")
-    @Test
-    fun singleTokenNoteScanTest() {
-        val cardBlockchain = "DOGE"
-        val cardType: ProductType = ProductType.Note
-
-        setupHooks().run {
-                step("Open 'Main Screen' on ${cardType.name} card") {
-                    openMainScreen(cardType)
-                }
-                step("Check 'Main' screen for ${cardType.name} $cardBlockchain card") {
-                    checkSingleCurrencyMainScreen(cardBlockchain = cardBlockchain, cardTitle = cardType.name)
-                }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/StakingTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/StakingTest.kt
index 5eb2c98591..8bbb02ebab 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/StakingTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/StakingTest.kt
@@ -2,7 +2,9 @@ package com.tangem.tests
 
 import com.tangem.common.BaseTestCase
 import com.tangem.common.constants.TestConstants.TOTAL_BALANCE
+import com.tangem.common.extensions.SwipeDirection
 import com.tangem.common.extensions.clickWithAssertion
+import com.tangem.common.extensions.swipeVertical
 import com.tangem.common.utils.resetWireMockScenarioState
 import com.tangem.common.utils.setWireMockScenarioState
 import com.tangem.screens.*
@@ -44,6 +46,9 @@ class StakingTest : BaseTestCase() {
             step("Assert 'Organize tokens' button is displayed") {
                 onMainScreen { organizeTokensButton().assertIsDisplayed() }
             }
+            step("Swipe up") {
+                swipeVertical(SwipeDirection.UP)
+            }
             step("Click on token with name: '$tokenTitle'") {
                 onMainScreen { tokenWithTitleAndAddress(tokenTitle).clickWithAssertion() }
             }
@@ -100,6 +105,9 @@ class StakingTest : BaseTestCase() {
             step("Assert 'Organize tokens' button is displayed") {
                 onMainScreen { organizeTokensButton().assertIsDisplayed() }
             }
+            step("Swipe up") {
+                swipeVertical(SwipeDirection.UP)
+            }
             step("Click on token with name: '$tokenTitle'") {
                 onMainScreen { tokenWithTitleAndAddress(tokenTitle).clickWithAssertion() }
             }
@@ -252,6 +260,9 @@ class StakingTest : BaseTestCase() {
             step("Assert 'Organize tokens' button is displayed") {
                 onMainScreen { organizeTokensButton().assertIsDisplayed() }
             }
+            step("Swipe up") {
+                swipeVertical(SwipeDirection.UP)
+            }
             step("Click on token with name: '$tokenTitle'") {
                 onMainScreen { tokenWithTitleAndAddress(tokenTitle).clickWithAssertion() }
             }
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/SwapTokenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/SwapTokenTest.kt
index 887bffc37a..e30447031f 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/SwapTokenTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/SwapTokenTest.kt
@@ -6,7 +6,9 @@ import com.tangem.common.annotations.ApiEnv
 import com.tangem.common.annotations.ApiEnvConfig
 import com.tangem.common.constants.TestConstants.TOTAL_BALANCE
 import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT
-import com.tangem.common.extensions.clickWithAssertion
+import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT_LONG
+import com.tangem.common.extensions.*
+import com.tangem.common.utils.*
 import com.tangem.datasource.api.common.config.ApiConfig
 import com.tangem.datasource.api.common.config.ApiEnvironment
 import com.tangem.screens.*
@@ -28,10 +30,12 @@ class SwapTokenTest : BaseTestCase() {
     @Test
     fun networkFeeTest() {
         val inputAmount = "100"
-        setupHooks().run {
-            val tokenTitle = "Polygon"
-            val balance = TOTAL_BALANCE
+        val tokenTitle = "Polygon"
+        val balance = TOTAL_BALANCE
 
+        setupHooks().run {
+
+            resetWireMockScenarios()
             step("Open 'Main Screen'") {
                 openMainScreen()
             }
@@ -71,7 +75,7 @@ class SwapTokenTest : BaseTestCase() {
                 }
             }
             step("Input swap amount = '$inputAmount'") {
-                composeTestRule.waitForIdle()
+                waitForIdle()
                 onSwapTokenScreen {
                     textInput.clickWithAssertion()
                     textInput.performTextReplacement(inputAmount)
@@ -89,7 +93,7 @@ class SwapTokenTest : BaseTestCase() {
             }
             step("Assert 'Network fee' block is displayed") {
                 onSwapTokenScreen {
-                    flakySafely(WAIT_UNTIL_TIMEOUT) {
+                    flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
                         networkFeeBlock.assertIsDisplayed()
                     }
                 }
@@ -104,7 +108,12 @@ class SwapTokenTest : BaseTestCase() {
     @DisplayName("Swap: network error test")
     @Test
     fun networkErrorSwapTest() {
-        setupHooks().run {
+        setupHooks(
+            additionalAfterSection = {
+                enableWiFi()
+                enableMobileData()
+            }
+        ).run {
             val tokenTitle = "Polygon"
             val balance = TOTAL_BALANCE
 
@@ -120,6 +129,10 @@ class SwapTokenTest : BaseTestCase() {
             step("Click on token with name: '$tokenTitle'") {
                 onTokenDetailsScreen { title.assertIsDisplayed() }
             }
+            step("Turn off Wi-Fi and Mobile Data") {
+                disableWiFi()
+                disableMobileData()
+            }
             step("Click on 'Swap' button") {
                 onTokenDetailsScreen { swapButton.performClick() }
             }
@@ -189,7 +202,7 @@ class SwapTokenTest : BaseTestCase() {
                 }
             }
             step("Input swap amount = '$inputAmount'") {
-                composeTestRule.waitForIdle()
+                waitForIdle()
                 onSwapTokenScreen {
                     textInput.clickWithAssertion()
                     textInput.performTextReplacement(inputAmount)
@@ -200,7 +213,7 @@ class SwapTokenTest : BaseTestCase() {
             }
             step("Click on 'Network fee' block") {
                 onSwapTokenScreen {
-                    flakySafely(WAIT_UNTIL_TIMEOUT) {
+                    flakySafely(WAIT_UNTIL_TIMEOUT_LONG) {
                         networkFeeBlock.clickWithAssertion()
                     }
                 }
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/TermsOfServiceTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/TermsOfServiceTest.kt
index 379b5b898e..3b956d2bea 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/TermsOfServiceTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/TermsOfServiceTest.kt
@@ -2,9 +2,9 @@ package com.tangem.tests
 
 import androidx.test.InstrumentationRegistry.getTargetContext
 import com.tangem.common.BaseTestCase
-import com.tangem.common.extensions.SwipeDirection
 import com.tangem.common.extensions.clickWithAssertion
-import com.tangem.common.extensions.swipeVertical
+import com.tangem.common.extensions.launchApp
+import com.tangem.common.extensions.stopApp
 import com.tangem.screens.onDisclaimerScreen
 import com.tangem.screens.onStoriesScreen
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -49,8 +49,9 @@ class TermsOfServiceTest : BaseTestCase() {
     @Test
     fun acceptTermsOfServiceAfterAppRestart() {
         val packageName = getTargetContext().packageName
+        val tosUrl = "https://tangem.com/tangem_tos.html"
+
         setupHooks().run {
-            val tosUrl = "https://tangem.com/tangem_tos.html"
             step("Assert title of 'Disclaimer screen' is displayed") {
                 onDisclaimerScreen { title.assertIsDisplayed() }
             }
@@ -65,14 +66,11 @@ class TermsOfServiceTest : BaseTestCase() {
             step("'Accept' button is displayed") {
                 onDisclaimerScreen { acceptButton.assertIsDisplayed() }
             }
-            step("Open recent apps") {
-                device.uiDevice.pressRecentApps()
-            }
-            step("Stop app by swipe") {
-                swipeVertical(SwipeDirection.UP, startHeightRatio = 0.5f)
+            step("Stop app") {
+                stopApp(packageName)
             }
             step("Launch app") {
-                device.apps.launch(packageName)
+                launchApp(packageName)
             }
             step("Assert title of 'Disclaimer screen' is displayed") {
                 onDisclaimerScreen { title.assertIsDisplayed() }
@@ -86,16 +84,22 @@ class TermsOfServiceTest : BaseTestCase() {
                 }
             }
             step("Click on 'Accept' button") {
-                onDisclaimerScreen { acceptButton.clickWithAssertion() }
+                onDisclaimerScreen {
+                    waitForIdle()
+                    acceptButton.clickWithAssertion()
+                }
             }
-            step("Open recent apps") {
-                device.uiDevice.pressRecentApps()
+            step("Assert 'Stories' screen is opened") {
+                onStoriesScreen {
+                    scanButton.assertIsDisplayed()
+                    orderButton.assertIsDisplayed()
+                }
             }
-            step("Stop app by swipe") {
-                swipeVertical(SwipeDirection.UP, startHeightRatio = 0.5f)
+            step("Stop app") {
+                stopApp(packageName)
             }
             step("Launch app") {
-                device.apps.launch(packageName)
+                launchApp(packageName)
             }
             step("Assert 'Stories' screen is opened") {
                 onStoriesScreen {
diff --git a/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt
index 1c7fd38068..6fbc4b4812 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt
@@ -74,7 +74,7 @@ class TotalBalanceUpdateTest : BaseTestCase() {
             }
             step("Open 'Markets screen'") {
                 swipeMarketsBlock(SwipeDirection.UP)
-                composeTestRule.waitForIdle()
+                waitForIdle()
             }
             step("Click on $tokenTitle token") {
                 onMarketsScreen { tokenWithTitle(tokenTitle).clickWithAssertion() }
@@ -95,7 +95,7 @@ class TotalBalanceUpdateTest : BaseTestCase() {
                 onDialog { continueButton.assertIsNotDisplayed() }
             }
             step("Go back to 'Markets: tokens list'") {
-                composeTestRule.waitForIdle()
+                waitForIdle()
                 onMarketsScreen { topBarBackButton.clickWithAssertion() }
             }
             step("Close 'Markets screen'") {
@@ -151,7 +151,7 @@ class TotalBalanceUpdateTest : BaseTestCase() {
                 onMainScreen { totalBalanceText.assertTextContains(TOTAL_BALANCE) }
             }
             step("Long click on token with name: '$tokenTitle'") {
-                composeTestRule.waitForIdle()
+                waitForIdle()
                 onMainScreen {
                     tokenWithTitleAndAddress(tokenTitle).performTouchInput {
                         longClick(
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ee754f78cc..882377e5e5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
 
     <application
         android:name="com.tangem.tap.TangemHiltApplication"
+        android:theme="@style/AppTheme"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
diff --git a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
index 2f4c389818..7098dad4f2 100644
--- a/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
+++ b/app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
@@ -28,7 +28,7 @@ import com.tangem.domain.apptheme.repository.AppThemeModeRepository
 import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.repository.CardRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
 import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
diff --git a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
index 98ce5cd24b..30db15d90c 100644
--- a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
+++ b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
@@ -13,9 +13,9 @@ object ForegroundActivityObserver {
 
     val foregroundActivity: AppCompatActivity?
         get() = activities.entries
-            .firstOrNull {
-                Timber.i("foregroundActivity: ${it.key} | ${it.value.isDestroyed}")
-                it.value.isDestroyed == false
+            .firstOrNull { entry ->
+                Timber.i("foregroundActivity: ${entry.key} | ${entry.value.isDestroyed}")
+                entry.value.isDestroyed == false
             }
             ?.value
 
@@ -28,9 +28,9 @@ object ForegroundActivityObserver {
 
         override fun onActivityResumed(activity: Activity) {
             Timber.i("onActivityResumed ${activity::class}")
-            (activity as? AppCompatActivity)?.let {
+            if (activity is AppCompatActivity) {
                 Timber.i("onActivityResumed store activity")
-                activities[activity::class] = it
+                activities[activity::class] = activity
             }
         }
 
diff --git a/app/src/main/java/com/tangem/tap/LockTimerWorker.kt b/app/src/main/java/com/tangem/tap/LockTimerWorker.kt
index f6b3c93141..85497cc56b 100644
--- a/app/src/main/java/com/tangem/tap/LockTimerWorker.kt
+++ b/app/src/main/java/com/tangem/tap/LockTimerWorker.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.asLockable
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
diff --git a/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
index 4a26816830..32ea789431 100644
--- a/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
+++ b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
@@ -7,10 +7,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
 import com.tangem.common.routing.AppRoute
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.asLockable
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.domain.wallets.usecase.ClearAllHotWalletContextualUnlockUseCase
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.tap.LockTimerWorker.Companion.TAG
@@ -22,6 +22,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
 
 @Suppress("LongParameterList")
 internal class LockUserWalletsTimer(
diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 24653ac2e5..9d6af9296f 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -38,7 +38,7 @@ import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.settings.SetGooglePayAvailabilityUseCase
 import com.tangem.domain.settings.SetGoogleServicesAvailabilityUseCase
 import com.tangem.domain.settings.ShouldInitiallyAskPermissionUseCase
@@ -264,7 +264,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder {
         tangemSdkManager = injectedTangemSdkManager
 
         backupServiceHolder.createAndSetService(cardSdkConfigRepository.sdk, this)
-        backupService = backupServiceHolder.backupService.get()!! // will be deleted eventually
+        backupService = requireNotNull(backupServiceHolder.backupService.get()) // will be deleted eventually
 
         lockUserWalletsTimer = LockUserWalletsTimer(
             context = this,
@@ -371,17 +371,15 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
 
-        val fromPush = intent?.extras?.containsKey(OPENED_FROM_GCM_PUSH) ?: false
-        if (fromPush) {
+        val isFromPush = intent.extras?.containsKey(OPENED_FROM_GCM_PUSH) == true
+        if (isFromPush) {
             analyticsEventsHandler.send(Push.PushNotificationOpened)
         }
 
-        if (intent != null) {
-            handleDeepLink(intent = intent, isFromOnNewIntent = true)
-        }
+        handleDeepLink(intent = intent, isFromOnNewIntent = true)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -406,8 +404,8 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder {
     }
 
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
-        val result = WindowObscurationObserver.dispatchTouchEvent(event, analyticsEventsHandler)
-        return if (result) super.dispatchTouchEvent(event) else false
+        val isHandled = WindowObscurationObserver.dispatchTouchEvent(event, analyticsEventsHandler)
+        return if (isHandled) super.dispatchTouchEvent(event) else false
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -451,9 +449,9 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder {
             getPolkadotCheckHasImmortalUseCase()
                 .flowWithLifecycle(lifecycle, minActiveState = Lifecycle.State.CREATED)
                 .distinctUntilChanged()
-                .collect {
+                .collect { (_, hasImmortalTransaction) ->
                     analyticsEventsHandler.send(
-                        WalletScreenAnalyticsEvent.Token.PolkadotImmortalTransactions(it.second),
+                        WalletScreenAnalyticsEvent.Token.PolkadotImmortalTransactions(hasImmortalTransaction),
                     )
                 }
         }
diff --git a/app/src/main/java/com/tangem/tap/TangemApplication.kt b/app/src/main/java/com/tangem/tap/TangemApplication.kt
index 8adc257a55..0920d365f9 100644
--- a/app/src/main/java/com/tangem/tap/TangemApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TangemApplication.kt
@@ -88,7 +88,7 @@ lateinit var store: Store<AppState>
 val foregroundActivityObserver = ForegroundActivityObserver
 internal lateinit var derivationsFinder: DerivationsFinder
 
-abstract class TangemApplication : Application(), ImageLoaderFactory, Configuration.Provider {
+open class TangemApplication : Application(), ImageLoaderFactory, Configuration.Provider {
 
     // region DI
     private val entryPoint: ApplicationEntryPoint
@@ -290,7 +290,7 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
     /**
      * Initialize components that need to be initialized before [super.onCreate] is called
      */
-    private fun preInit() {
+    fun preInit() {
         tangemAppLoggerInitializer.initialize()
         registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)
     }
diff --git a/app/src/main/java/com/tangem/tap/common/TestActions.kt b/app/src/main/java/com/tangem/tap/common/TestActions.kt
index 5dc923cf58..95edcd851e 100644
--- a/app/src/main/java/com/tangem/tap/common/TestActions.kt
+++ b/app/src/main/java/com/tangem/tap/common/TestActions.kt
@@ -7,7 +7,7 @@ package com.tangem.tap.common
 object TestActions {
 
     // It used only for the test actions in debug or debug_beta builds
-    var testAmountInjectionForWalletManagerEnabled = false
+    var isTestAmountInjectionForWalletManagerEnabled = false
 }
 
 typealias TestAction = Pair<String, () -> Unit>
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/converters/AnalyticsErrorConverter.kt b/app/src/main/java/com/tangem/tap/common/analytics/converters/AnalyticsErrorConverter.kt
index 4f32eee854..a94aa24beb 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/converters/AnalyticsErrorConverter.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/AnalyticsErrorConverter.kt
@@ -58,7 +58,7 @@ private class BlockchainSdkErrorConverter(
         if (value.customMessage.contains(DemoTransactionSender.ID)) return emptyMap()
 
         if (value is BlockchainSdkError.WrappedTangemError) {
-            return (value.tangemError as? TangemSdkError)?.let { cardSdkErrorConverter.convert(it) } ?: emptyMap()
+            return (value.tangemError as? TangemSdkError)?.let { cardSdkErrorConverter.convert(it) }.orEmpty()
         }
 
         return mapOf(
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
index f4b9dbc61f..e239d1ccc6 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Chat.kt
@@ -7,7 +7,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
  */
 sealed class Chat(
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent("Chat", event, params) {
 
     class ScreenOpened : Chat("Chat Screen Opened")
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
index f35a636601..a4fcb32fe0 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
@@ -8,7 +8,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
 sealed class Onboarding(
     category: String,
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent(category, event, params) {
 
     class Started : Onboarding("Onboarding", "Onboarding Started")
@@ -16,7 +16,7 @@ sealed class Onboarding(
 
     sealed class CreateWallet(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Onboarding("Onboarding / Create Wallet", event, params) {
 
         class ScreenOpened : CreateWallet("Create Wallet Screen Opened")
@@ -36,7 +36,7 @@ sealed class Onboarding(
 
     sealed class Backup(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Onboarding("Onboarding / Backup", event, params) {
 
         class ScreenOpened : Backup("Backup Screen Opened")
@@ -64,7 +64,7 @@ sealed class Onboarding(
 
     sealed class Topup(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Onboarding("Onboarding / Top Up", event, params) {
 
         class ScreenOpened : Topup("Activation Screen Opened")
@@ -79,7 +79,7 @@ sealed class Onboarding(
 
     sealed class Twins(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Onboarding("Onboarding / Twins", event, params) {
 
         class ScreenOpened : Twins("Twinning Screen Opened")
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
index 4234256e8c..3ac65172d2 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
@@ -8,7 +8,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
 sealed class Settings(
     category: String = "Settings",
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent(category, event, params) {
 
     class ScreenOpened : Settings(event = "Settings Screen Opened")
@@ -17,7 +17,7 @@ sealed class Settings(
 
     sealed class CardSettings(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Settings("Settings / Card Settings", event, params) {
 
         class ButtonFactoryReset : CardSettings("Button - Factory Reset")
@@ -54,7 +54,7 @@ sealed class Settings(
 
     sealed class AppSettings(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Settings(category = "Settings / App Settings", event = event, params = params) {
 
         class SaveWalletSwitcherChanged(state: AnalyticsParam.OnOffState) : AppSettings(
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
index a9a52c5e25..d34334ec34 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/SignIn.kt
@@ -7,7 +7,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
  */
 sealed class SignIn(
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent("Sign In", event, params) {
 
     class ScreenOpened : SignIn(event = "Sign In Screen Opened")
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
index 9f6214a78a..bac4bcc6d2 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
@@ -9,12 +9,12 @@ import com.tangem.core.analytics.models.AnalyticsParam.Key.TOKEN_PARAM
 sealed class Token(
     category: String,
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent(category, event, params) {
 
     sealed class Receive(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Token("Token / Receive", event, params) {
 
         class ScreenOpened(
@@ -29,7 +29,7 @@ sealed class Token(
 
     sealed class Topup(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Token("Token / Topup", event, params) {
 
         class ScreenOpened : Topup("Top Up Screen Opened")
@@ -38,7 +38,7 @@ sealed class Token(
 
     sealed class Withdraw(
         event: String,
-        params: Map<String, String> = mapOf(),
+        params: Map<String, String> = emptyMap(),
     ) : Token("Token / Withdraw", event, params) {
 
         class ScreenOpened : Withdraw("Withdraw Screen Opened")
diff --git a/app/src/main/java/com/tangem/tap/common/clipboard/DefaultClipboardManager.kt b/app/src/main/java/com/tangem/tap/common/clipboard/DefaultClipboardManager.kt
index 73f2ebd5ef..1c33fe0909 100644
--- a/app/src/main/java/com/tangem/tap/common/clipboard/DefaultClipboardManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/clipboard/DefaultClipboardManager.kt
@@ -19,6 +19,7 @@ internal class DefaultClipboardManager(private val clipboardManager: AndroidClip
         clipboardManager.setPrimaryClip(clip)
     }
 
+    @Suppress("UseIsNullOrEmpty")
     override fun getText(default: String?): String? {
         val clip = clipboardManager.primaryClip
 
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Store.kt b/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
index 5d48278690..62bf0eb950 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
@@ -90,6 +90,6 @@ fun Store<AppState>.dispatchNavigationAction(action: AppRouter.() -> Unit) {
 
 inline fun <reified T> Store<AppState>.inject(getDependency: DaggerGraphState.() -> T?): T {
     return requireNotNull(state.daggerGraphState.getDependency()) {
-        "${T::class.simpleName} isn't initialized "
+        "${T::class.simpleName.orEmpty()} isn't initialized "
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
index 55ebaa1ea3..3aeeb7d9cd 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
@@ -22,9 +22,9 @@ import timber.log.Timber
 )
 @Suppress("MagicNumber")
 suspend fun WalletManager.safeUpdate(isDemoCard: Boolean): Result<Wallet> = try {
-    if (isDemoCard || TestActions.testAmountInjectionForWalletManagerEnabled) {
+    if (isDemoCard || TestActions.isTestAmountInjectionForWalletManagerEnabled) {
         delay(500)
-        TestActions.testAmountInjectionForWalletManagerEnabled = false
+        TestActions.isTestAmountInjectionForWalletManagerEnabled = false
         Result.Success(wallet)
     } else {
         update()
@@ -35,7 +35,7 @@ suspend fun WalletManager.safeUpdate(isDemoCard: Boolean): Result<Wallet> = try
 
     val networkConnectionManager = store.inject(DaggerGraphState::networkConnectionManager)
     if (!networkConnectionManager.isOnline) {
-        Result.Failure(TapError.NoInternetConnection)
+        Result.Failure(TapError.NoInternetConnection())
     } else {
         val blockchain = wallet.blockchain
         val amountToCreateAccount = blockchain.amountToCreateAccount(this, wallet.getFirstToken())
diff --git a/app/src/main/java/com/tangem/tap/common/log/TangemAppLoggerInitializer.kt b/app/src/main/java/com/tangem/tap/common/log/TangemAppLoggerInitializer.kt
index a2011ff5e7..924cbede00 100644
--- a/app/src/main/java/com/tangem/tap/common/log/TangemAppLoggerInitializer.kt
+++ b/app/src/main/java/com/tangem/tap/common/log/TangemAppLoggerInitializer.kt
@@ -44,6 +44,7 @@ class TangemAppLoggerInitializer(
         }
     }
 
+    @Suppress("BooleanPropertyNaming")
     private companion object {
         val IS_LOG_ENABLED: Boolean = BuildConfig.LOG_ENABLED
         val PERMITTED_PRIORITY = listOf(Log.ERROR, Log.INFO)
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
index 090cbc72f8..598ad3be24 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt
@@ -20,6 +20,6 @@ data class GlobalState(
 typealias CryptoCurrencyName = String
 
 data class OnboardingState(
-    val onboardingStarted: Boolean = false,
+    val isOnboardingStarted: Boolean = false,
     val shouldResetOnCreate: Boolean = false,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/core/navigation/email/AndroidEmailSender.kt b/app/src/main/java/com/tangem/tap/core/navigation/email/AndroidEmailSender.kt
index 8d7beb3948..12e69c91b8 100644
--- a/app/src/main/java/com/tangem/tap/core/navigation/email/AndroidEmailSender.kt
+++ b/app/src/main/java/com/tangem/tap/core/navigation/email/AndroidEmailSender.kt
@@ -61,9 +61,9 @@ internal class AndroidEmailSender : EmailSender {
             .setSubject(email.subject)
             .setText(email.message)
 
-        email.attachment?.let {
+        email.attachment?.let { file ->
             builder.setStream(
-                FileProvider.getUriForFile(activity, "${activity.packageName}.provider", it),
+                FileProvider.getUriForFile(activity, "${activity.packageName}.provider", file),
             )
         }
 
diff --git a/app/src/main/java/com/tangem/tap/data/DefaultTangemPayStorage.kt b/app/src/main/java/com/tangem/tap/data/DefaultTangemPayStorage.kt
index f990fdc0fd..58e979c7dc 100644
--- a/app/src/main/java/com/tangem/tap/data/DefaultTangemPayStorage.kt
+++ b/app/src/main/java/com/tangem/tap/data/DefaultTangemPayStorage.kt
@@ -14,7 +14,7 @@ import javax.inject.Singleton
 import kotlin.text.encodeToByteArray
 
 private const val DEFAULT_KEY = "tangem_pay_default_key"
-private const val DEFAULT_CUSTOMER_WALLET_ADDRESS_KEY = "tangem_pay_default_customer_wallet_address_key"
+private const val ORDER_ID_KEY = "tangem_pay_order_id_key"
 
 @Singleton
 internal class DefaultTangemPayStorage @Inject constructor(
@@ -54,24 +54,25 @@ internal class DefaultTangemPayStorage @Inject constructor(
                 ?.let(tokensAdapter::fromJson)
         }
 
-    /**
-     * Store the only customer wallet address, since for the f&f user can issue only one card tied to one address
-     */
-    override suspend fun storeCustomerWalletAddress(customerWalletAddress: String) =
+    override suspend fun storeOrderId(customerWalletAddress: String, orderId: String) {
         withContext(dispatcherProvider.io) {
             secureStorage.store(
-                customerWalletAddress.encodeToByteArray(throwOnInvalidSequence = true),
-                DEFAULT_CUSTOMER_WALLET_ADDRESS_KEY,
+                orderId.encodeToByteArray(throwOnInvalidSequence = true),
+                createOrderIdKey(customerWalletAddress),
             )
         }
+    }
 
-    override suspend fun getCustomerWalletAddress(): String? = withContext(dispatcherProvider.io) {
-        secureStorage.get(DEFAULT_CUSTOMER_WALLET_ADDRESS_KEY)?.decodeToString(throwOnInvalidSequence = true)
+    override suspend fun getOrderId(customerWalletAddress: String): String? = withContext(dispatcherProvider.io) {
+        secureStorage.get(createOrderIdKey(customerWalletAddress))?.decodeToString(throwOnInvalidSequence = true)
     }
 
     override suspend fun clear(customerWalletAddress: String) = withContext(dispatcherProvider.io) {
         secureStorage.delete(createKey(customerWalletAddress))
+        secureStorage.delete(createOrderIdKey(customerWalletAddress))
     }
 
-    private fun createKey(cardId: String): String = "${DEFAULT_KEY}_$cardId"
+    private fun createKey(address: String): String = "${DEFAULT_KEY}_$address"
+
+    private fun createOrderIdKey(address: String): String = "${ORDER_ID_KEY}_$address"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/data/UserWalletsStoreRepositoryProxy.kt b/app/src/main/java/com/tangem/tap/data/UserWalletsStoreRepositoryProxy.kt
index d41ea29466..f167597c1a 100644
--- a/app/src/main/java/com/tangem/tap/data/UserWalletsStoreRepositoryProxy.kt
+++ b/app/src/main/java/com/tangem/tap/data/UserWalletsStoreRepositoryProxy.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.data
 import com.tangem.common.CompletionResult
 import com.tangem.common.catching
 import com.tangem.datasource.local.userwallet.UserWalletsStore
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt b/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
index 2fe50e3705..f08b09fb11 100644
--- a/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/data/UserWalletsStoreModule.kt
@@ -1,8 +1,8 @@
 package com.tangem.tap.di.data
 
 import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.tap.data.RuntimeUserWalletsStore
 import com.tangem.tap.data.UserWalletsStoreRepositoryProxy
diff --git a/app/src/main/java/com/tangem/tap/di/domain/AccountDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/AccountDomainModule.kt
index d90cfcd00a..34f9a1101c 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/AccountDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/AccountDomainModule.kt
@@ -1,7 +1,9 @@
 package com.tangem.tap.di.domain
 
 import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
+import com.tangem.domain.account.fetcher.SingleAccountListFetcher
 import com.tangem.domain.account.repository.AccountsCRUDRepository
+import com.tangem.domain.account.tokens.MainAccountTokensMigration
 import com.tangem.domain.account.usecase.*
 import dagger.Module
 import dagger.Provides
@@ -15,8 +17,16 @@ internal object AccountDomainModule {
 
     @Provides
     @Singleton
-    fun provideAddCryptoPortfolioUseCase(accountsCRUDRepository: AccountsCRUDRepository): AddCryptoPortfolioUseCase {
-        return AddCryptoPortfolioUseCase(crudRepository = accountsCRUDRepository)
+    fun provideAddCryptoPortfolioUseCase(
+        accountsCRUDRepository: AccountsCRUDRepository,
+        singleAccountListFetcher: SingleAccountListFetcher,
+        mainAccountTokensMigration: MainAccountTokensMigration,
+    ): AddCryptoPortfolioUseCase {
+        return AddCryptoPortfolioUseCase(
+            crudRepository = accountsCRUDRepository,
+            singleAccountListFetcher = singleAccountListFetcher,
+            mainAccountTokensMigration = mainAccountTokensMigration,
+        )
     }
 
     @Provides
diff --git a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
index a674e4ac97..f814746b0a 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardDomainModule.kt
@@ -1,18 +1,16 @@
 package com.tangem.tap.di.domain
 
-import com.tangem.domain.card.*
+import com.tangem.domain.card.DeleteSavedAccessCodesUseCase
+import com.tangem.domain.card.ResetCardUseCase
+import com.tangem.domain.card.SetCardWasScannedUseCase
 import com.tangem.domain.card.repository.CardRepository
-import com.tangem.domain.wallets.derivations.DerivationsRepository
-import com.tangem.domain.demo.models.DemoConfig
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.demo.IsDemoCardUseCase
+import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.derivations.DerivationsRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.wallets.usecase.DerivePublicKeysUseCase
-import com.tangem.domain.wallets.usecase.GetExtendedPublicKeyForCurrencyUseCase
-import com.tangem.domain.wallets.usecase.HasMissedDerivationsUseCase
-import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
-import com.tangem.domain.wallets.usecase.NetworkHasDerivationUseCase
+import com.tangem.domain.wallets.usecase.*
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.domain.card.DefaultDeleteSavedAccessCodesUseCase
diff --git a/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
index 5f8a03b7d2..b84ebc02b6 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
@@ -2,8 +2,8 @@ package com.tangem.tap.di.domain
 
 import com.tangem.core.configtoggle.feature.FeatureTogglesManager
 import com.tangem.domain.card.ScanCardProcessor
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
diff --git a/app/src/main/java/com/tangem/tap/di/domain/MarketsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/MarketsDomainModule.kt
index 1989f4868e..4a0fe276d8 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/MarketsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/MarketsDomainModule.kt
@@ -1,7 +1,7 @@
 package com.tangem.tap.di.domain
 
 import com.tangem.blockchainsdk.utils.ExcludedBlockchains
-import com.tangem.domain.wallets.derivations.DerivationsRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.markets.*
 import com.tangem.domain.markets.repositories.MarketsTokenRepository
 import com.tangem.domain.networks.multi.MultiNetworkStatusFetcher
@@ -12,8 +12,8 @@ import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.staking.StakingIdFactory
 import com.tangem.domain.staking.multi.MultiYieldBalanceFetcher
 import com.tangem.domain.tokens.repository.CurrenciesRepository
+import com.tangem.domain.wallets.derivations.DerivationsRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import dagger.Module
 import dagger.Provides
diff --git a/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt
index 0c20fd0993..0f50feba84 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/OnrampDomainModule.kt
@@ -179,6 +179,20 @@ internal object OnrampDomainModule {
         )
     }
 
+    @Provides
+    @Singleton
+    fun provideGetOnrampV2QuotesUseCase(
+        settingsRepository: SettingsRepository,
+        onrampRepository: OnrampRepository,
+        onrampErrorResolver: OnrampErrorResolver,
+    ): GetOnrampV2QuotesUseCase {
+        return GetOnrampV2QuotesUseCase(
+            settingsRepository = settingsRepository,
+            repository = onrampRepository,
+            errorResolver = onrampErrorResolver,
+        )
+    }
+
     @Provides
     @Singleton
     fun provideGetOnrampProviderWithQuoteUseCase(
diff --git a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
index 726ee06efc..960857e2eb 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/TokensDomainModule.kt
@@ -24,6 +24,7 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.CurrencyChecksRepository
 import com.tangem.domain.tokens.repository.PolkadotAccountHealthCheckRepository
 import com.tangem.domain.tokens.repository.TokenReceiveWarningsViewedRepository
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
 import com.tangem.domain.tokens.wallet.WalletBalanceFetcher
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.tap.domain.tokens.DefaultTokensFeatureToggles
@@ -455,4 +456,21 @@ internal object TokensDomainModule {
     ): SaveViewedTokenReceiveWarningUseCase {
         return SaveViewedTokenReceiveWarningUseCase(tokenReceiveWarningsViewedRepository)
     }
+
+    @Provides
+    @Singleton
+    fun provideNeedShowYieldSupplyDepositedWarningUseCase(
+        yieldSupplyWarningsViewedRepository: YieldSupplyWarningsViewedRepository,
+        dispatchers: CoroutineDispatcherProvider,
+    ): NeedShowYieldSupplyDepositedWarningUseCase {
+        return NeedShowYieldSupplyDepositedWarningUseCase(yieldSupplyWarningsViewedRepository, dispatchers)
+    }
+
+    @Provides
+    @Singleton
+    fun provideSaveViewedYieldSupplyWarningUseCase(
+        yieldSupplyWarningsViewedRepository: YieldSupplyWarningsViewedRepository,
+    ): SaveViewedYieldSupplyWarningUseCase {
+        return SaveViewedYieldSupplyWarningUseCase(yieldSupplyWarningsViewedRepository)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
index 6304510867..0f7e759701 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
@@ -1,6 +1,6 @@
 package com.tangem.tap.di.domain
 
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.transaction.WalletAddressServiceRepository
@@ -16,6 +16,9 @@ import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletNamesMigrationRepository
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.*
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyUpdateUseCase
 import com.tangem.feature.wallet.presentation.wallet.domain.IsWalletNFTEnabledSyncUseCase
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletNameMigrationUseCase
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
@@ -448,4 +451,24 @@ internal object WalletsDomainModule {
             userWalletUseCase = getUserWalletUseCase,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyApyFlowUseCase(
+        yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+    ): YieldSupplyApyFlowUseCase {
+        return YieldSupplyApyFlowUseCase(
+            yieldSupplyMarketRepository = yieldSupplyMarketRepository,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyApyUpdateUseCase(
+        yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+    ): YieldSupplyApyUpdateUseCase {
+        return YieldSupplyApyUpdateUseCase(
+            yieldSupplyMarketRepository = yieldSupplyMarketRepository,
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/di/domain/YieldSupplyDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/YieldSupplyDomainModule.kt
index 1b342eb608..70ce92ea14 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/YieldSupplyDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/YieldSupplyDomainModule.kt
@@ -1,11 +1,12 @@
 package com.tangem.tap.di.domain
 
+import com.tangem.domain.blockaid.BlockAidGasEstimate
 import com.tangem.domain.transaction.FeeRepository
 import com.tangem.domain.transaction.error.FeeErrorResolver
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
 import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
-import com.tangem.domain.yield.supply.usecase.YieldSupplyEstimateEnterFeeUseCase
-import com.tangem.domain.yield.supply.usecase.YieldSupplyStartEarningUseCase
-import com.tangem.domain.yield.supply.usecase.YieldSupplyStopEarningUseCase
+import com.tangem.domain.yield.supply.usecase.*
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,9 +21,11 @@ internal object YieldSupplyDomainModule {
     @Singleton
     fun provideYieldSupplyStartEarningUseCase(
         yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+        yieldSupplyErrorResolver: YieldSupplyErrorResolver,
     ): YieldSupplyStartEarningUseCase {
         return YieldSupplyStartEarningUseCase(
             yieldSupplyTransactionRepository = yieldSupplyTransactionRepository,
+            yieldSupplyErrorResolver = yieldSupplyErrorResolver,
         )
     }
 
@@ -30,9 +33,11 @@ internal object YieldSupplyDomainModule {
     @Singleton
     fun provideYieldSupplyStopEarningUseCase(
         yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+        yieldSupplyErrorResolver: YieldSupplyErrorResolver,
     ): YieldSupplyStopEarningUseCase {
         return YieldSupplyStopEarningUseCase(
             yieldSupplyTransactionRepository = yieldSupplyTransactionRepository,
+            yieldSupplyErrorResolver = yieldSupplyErrorResolver,
         )
     }
 
@@ -41,10 +46,66 @@ internal object YieldSupplyDomainModule {
     fun provideYieldSupplyEstimateEnterFeeUseCase(
         feeRepository: FeeRepository,
         feeErrorResolver: FeeErrorResolver,
+        blockAidGasEstimate: BlockAidGasEstimate,
     ): YieldSupplyEstimateEnterFeeUseCase {
         return YieldSupplyEstimateEnterFeeUseCase(
             feeRepository = feeRepository,
             feeErrorResolver = feeErrorResolver,
+            blockAidGasEstimate = blockAidGasEstimate,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyGetContractAddressUseCase(
+        yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+        yieldSupplyErrorResolver: YieldSupplyErrorResolver,
+    ): YieldSupplyGetContractAddressUseCase {
+        return YieldSupplyGetContractAddressUseCase(
+            yieldSupplyTransactionRepository = yieldSupplyTransactionRepository,
+            yieldSupplyErrorResolver = yieldSupplyErrorResolver,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyGetProtocolBalanceUseCase(
+        yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+        yieldSupplyErrorResolver: YieldSupplyErrorResolver,
+    ): YieldSupplyGetProtocolBalanceUseCase {
+        return YieldSupplyGetProtocolBalanceUseCase(
+            yieldSupplyTransactionRepository = yieldSupplyTransactionRepository,
+            yieldSupplyErrorResolver = yieldSupplyErrorResolver,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyGetTokenStatusUseCase(
+        yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+    ): YieldSupplyGetTokenStatusUseCase {
+        return YieldSupplyGetTokenStatusUseCase(
+            yieldSupplyMarketRepository = yieldSupplyMarketRepository,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyGetApyUseCase(
+        yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+    ): YieldSupplyGetApyUseCase {
+        return YieldSupplyGetApyUseCase(
+            yieldSupplyMarketRepository = yieldSupplyMarketRepository,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyGetChartUseCase(
+        yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+    ): YieldSupplyGetChartUseCase {
+        return YieldSupplyGetChartUseCase(
+            yieldSupplyMarketRepository = yieldSupplyMarketRepository,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt b/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
index dffd82ec11..67e1652a6e 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
@@ -39,7 +39,7 @@ class TangemSigner(
                             TangemSignerResponse(
                                 totalSignedHashes = result.data.totalSignedHashes,
                                 remainingSignatures = result.data.remainingSignatures,
-                                isRing = result.data.batchId?.let(::isRing) ?: false,
+                                isRing = result.data.batchId?.let(::isRing) == true,
                             ),
                         )
                         if (continuation.isActive) {
@@ -85,7 +85,7 @@ class TangemSigner(
                             TangemSignerResponse(
                                 totalSignedHashes = result.data.totalSignedHashes,
                                 remainingSignatures = result.data.remainingSignatures,
-                                isRing = result.data.batchId?.let(::isRing) ?: false,
+                                isRing = result.data.batchId?.let(::isRing) == true,
                             ),
                         )
                         if (continuation.isActive) {
diff --git a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
index 1fc37a0267..2f1677fc5d 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
@@ -20,23 +20,23 @@ sealed class TapError(
     override val args: List<Any>? = null,
 ) : Throwable(), TapErrors, ArgError {
 
-    object UnknownError : TapError(R.string.send_error_unknown)
+    class UnknownError : TapError(R.string.send_error_unknown)
     open class CustomError(val customMessage: String) : TapError(R.string.common_custom_string, listOf(customMessage))
 
-    object NoInternetConnection : TapError(R.string.wallet_notification_no_internet)
+    class NoInternetConnection : TapError(R.string.wallet_notification_no_internet)
 
     sealed class WalletManager {
         class NoAccountError(amountToCreateAccount: String) : CustomError(amountToCreateAccount)
         class InternalError(message: String) : CustomError(message)
-        object BlockchainIsUnreachableTryLater : TapError(R.string.wallet_balance_blockchain_unreachable_try_later)
+        class BlockchainIsUnreachableTryLater : TapError(R.string.wallet_balance_blockchain_unreachable_try_later)
     }
 }
 
 sealed class TapSdkError(override val messageResId: Int?) : TangemError(code = 50100) {
     override var customMessage: String = code.toString()
 
-    object CardForDifferentApp : TapSdkError(R.string.alert_unsupported_card)
-    object CardNotSupportedByRelease : TapSdkError(R.string.error_wrong_card_type)
+    class CardForDifferentApp : TapSdkError(R.string.alert_unsupported_card)
+    class CardNotSupportedByRelease : TapSdkError(R.string.error_wrong_card_type)
 }
 
 fun TapErrors.assembleErrors(): MutableList<Pair<Int, List<Any>?>> {
diff --git a/app/src/main/java/com/tangem/tap/domain/card/DefaultResetCardUseCase.kt b/app/src/main/java/com/tangem/tap/domain/card/DefaultResetCardUseCase.kt
index b86f57ce33..cd94802690 100644
--- a/app/src/main/java/com/tangem/tap/domain/card/DefaultResetCardUseCase.kt
+++ b/app/src/main/java/com/tangem/tap/domain/card/DefaultResetCardUseCase.kt
@@ -70,7 +70,7 @@ internal class DefaultResetCardUseCase(
             null
         }
 
-        type?.let {
+        if (type != null) {
             tangemSdkManager.setUserCodeRequestPolicy(policy = UserCodeRequestPolicy.Always(type))
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
index 5b44a91292..17ce65a238 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
@@ -119,14 +119,14 @@ internal class LegacyScanProcessor @Inject constructor(
     }
 
     private fun sendAnalytics(analyticsEvent: AnalyticsEvent?, scanResponse: ScanResponse) {
-        analyticsEvent?.let {
+        analyticsEvent?.let { event ->
             // this workaround needed to send CardWasScannedEvent without adding a context
             val interceptor = CardContextInterceptor(scanResponse)
-            val params = it.params.toMutableMap()
+            val params = event.params.toMutableMap()
             interceptor.intercept(params)
-            it.params = params.toMap()
+            event.params = params.toMap()
 
-            Analytics.send(it)
+            Analytics.send(event)
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
index abf3f1f23d..6076dd07d3 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/UseCaseScanProcessor.kt
@@ -33,8 +33,8 @@ internal object UseCaseScanProcessor {
 
         return scanCardUseCase(cardId, allowsRequestAccessCodeFromRepository)
             .fold(
-                ifLeft = {
-                    val error = scanCardExceptionConverter.convertBack(it)
+                ifLeft = { scanCardException ->
+                    val error = scanCardExceptionConverter.convertBack(scanCardException)
 
                     Analytics.sendErrorEvent(TangemSdkErrorEvent(error))
                     CompletionResult.Failure(error)
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/chains/ScanChainException.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/chains/ScanChainException.kt
index b36fb89f0e..cd7a62cab3 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/chains/ScanChainException.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/chains/ScanChainException.kt
@@ -8,10 +8,10 @@ sealed class ScanChainException : ScanCardException.ChainException() {
     /**
      * May be returned from [DisclaimerChain]
      * */
-    data object DisclaimerWasCanceled : ScanChainException() {
+    class DisclaimerWasCanceled : ScanChainException() {
 
         @Suppress("UnusedPrivateMember")
-        private fun readResolve(): Any = DisclaimerWasCanceled
+        private fun readResolve(): Any = DisclaimerWasCanceled()
     }
 
     /**
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/utils/ScanCardExceptionConverter.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/utils/ScanCardExceptionConverter.kt
index add75d87d0..a7fd680230 100644
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/utils/ScanCardExceptionConverter.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/utils/ScanCardExceptionConverter.kt
@@ -23,10 +23,10 @@ internal class ScanCardExceptionConverter : TwoWayConverter<TangemError, ScanCar
     }
 
     private fun convertTangemSdkError(value: TangemSdkError): ScanCardException = when (value) {
-        is TangemSdkError.UserCancelled -> ScanCardException.UserCancelled
+        is TangemSdkError.UserCancelled -> ScanCardException.UserCancelled()
         is TangemSdkError.WrongAccessCode,
         is TangemSdkError.WrongPasscode,
-        -> ScanCardException.WrongAccessCode
+        -> ScanCardException.WrongAccessCode()
         is TangemSdkError.WrongCardNumber -> ScanCardException.WrongCardId(value.cardId)
         else -> ScanCardException.UnknownException(value)
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/MockProvider.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/MockProvider.kt
index 3019dbeba0..704c10dd50 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/MockProvider.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/MockProvider.kt
@@ -5,27 +5,25 @@ import com.tangem.common.core.TangemError
 import com.tangem.common.core.TangemSdkError
 import com.tangem.domain.models.scan.ProductType
 import com.tangem.sdk.api.CreateProductWalletTaskResponse
-import com.tangem.tap.domain.sdk.mocks.content.Wallet2WithSeedPhraseMockContent
-import com.tangem.tap.domain.sdk.mocks.content.NoteMockContent
-import com.tangem.tap.domain.sdk.mocks.content.WalletMockContent
+import com.tangem.tap.domain.sdk.mocks.content.*
 
 object MockProvider {
 
     private var content: MockContent = getMockContent(ProductType.Wallet)
 
-    private var emulateError: Boolean = false
+    private var isEmulatingError: Boolean = false
 
     private var emulatedError: TangemError = TangemSdkError.TagLost()
 
     fun setEmulateError(error: TangemError? = null) {
-        emulateError = true
+        isEmulatingError = true
         error?.let {
             emulatedError = it
         }
     }
 
     fun resetEmulateError() {
-        emulateError = false
+        isEmulatingError = false
     }
 
     fun setMocks(productType: ProductType) {
@@ -69,12 +67,14 @@ object MockProvider {
             ProductType.Wallet -> WalletMockContent
             ProductType.Wallet2 -> Wallet2WithSeedPhraseMockContent
             ProductType.Note -> NoteMockContent
+            ProductType.Ring -> RingMockContent
+            ProductType.Twins -> TwinsMockContent
             else -> TODO()
         }
     }
 
     private fun <T> CompletionResult.Success<T>.orFailure(): CompletionResult<T> {
-        return if (emulateError) {
+        return if (isEmulatingError) {
             CompletionResult.Failure(emulatedError)
         } else {
             this
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/BackupWalletMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/BackupWalletMockContent.kt
index c2c8d9ba23..284c59ef1a 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/BackupWalletMockContent.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/BackupWalletMockContent.kt
@@ -168,52 +168,52 @@ object BackupWalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
-                                publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
-                                chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
-                                publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
-                                chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
     )
 
@@ -234,24 +234,24 @@ object BackupWalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
         primaryCard = primaryCard,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/DevWalletMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/DevWalletMockContent.kt
index 29b0ec5fee..e37fa805a0 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/DevWalletMockContent.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/DevWalletMockContent.kt
@@ -168,52 +168,52 @@ object DevWalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
-                                publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
-                                chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
-                                publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
-                                chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
     )
 
@@ -234,24 +234,24 @@ object DevWalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
         primaryCard = primaryCard,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/EdCurveMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/EdCurveMockContent.kt
new file mode 100644
index 0000000000..3629378cad
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/EdCurveMockContent.kt
@@ -0,0 +1,116 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object EdCurveMockContent : MockContent {
+
+    override val cardDto = CardDTO(
+        cardId = "CB43000000000004",
+        batchId = "0052",
+        cardPublicKey = byteArrayOf(4, 20, -44, 84, -19, -94, 62, -88, 17, -60, -54, 115, 109, -105, 116, -4, 79, 74, 50, 55, -57, 118, -84, -17, -64, 74, 98, -104, -11, 101, 64, -85, -23, -69, 18, 96, -105, -125, -93, 87, -9, -96, -38, 32, -99, -116, 124, -34, -59, 64, -125, 96, 94, 47, -128, 61, 58, -100, 103, 84, 21, -103, 77, -91, 64),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 3,
+            minor = 5,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1583971200),
+            signature = byteArrayOf(54, 94, -56, 20, 66, -33, 103, 86, -108, 28, -101, -113, 31, 118, -89, 86, 75, 4, 21, -70, -115, 82, -98, 45, -95, 92, 45, 29, -33, 53, -16, 9, -27, 44, 44, 13, 9, -71, -85, -43, -3, 58, -82, -40, -59, -114, 7, 89, 39, -16, -60, -58, 95, -87, -54, -71, -70, -95, -59, -44, 125, -42, -66, -26),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 1,
+            isSettingAccessCodeAllowed = false,
+            isSettingPasscodeAllowed = true,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = false,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = false,
+            isKeysImportAllowed = false,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = false),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = false,
+        isPasscodeSet = null,
+        supportedCurves = listOf(EllipticCurve.Ed25519),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(71, -83, -58, -126, 43, 71, -27, 47, 85, -5, 120, -20, -124, -68, 14, 64, 61, 47, -95, -125, 76, -56, -98, 12, 70, 2, -18, -73, 4, -29, 62, -124),
+                chainCode = null,
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = 1000000,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = null,
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = null,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = WalletData(
+            blockchain = "XLM",
+            token = null,
+        ),
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = emptyMap(),
+    )
+
+    override val extendedPublicKey
+        get() = error("Available only for Wallet+")
+
+    override val successResponse = SuccessResponse(cardId = "CB43000000000004")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Firmware412MockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Firmware412MockContent.kt
new file mode 100644
index 0000000000..ae5b7e8beb
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Firmware412MockContent.kt
@@ -0,0 +1,266 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object Firmware412MockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AC07000000035437",
+        batchId = "CB79",
+        cardPublicKey = byteArrayOf(2, -120, -3, -32, -122, -127, -120, -104, 59, 72, 76, 114, 94, 75, -37, -55, 55, 99, 66, 123, 85, -87, 80, 106, 105, -116, 87, -83, -12, 70, 108, -68, -39),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM AG",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 4,
+            minor = 12,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AC07000000035437",
+        batchId = "CB79",
+        cardPublicKey = byteArrayOf(2, -120, -3, -32, -122, -127, -120, -104, 59, 72, 76, 114, 94, 75, -37, -55, 55, 99, 66, 123, 85, -87, 80, 106, 105, -116, 87, -83, -12, 70, 108, -68, -39),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 4,
+            minor = 12,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM AG",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = false,
+            isSettingPasscodeAllowed = false,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = false,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = false,
+            isHDWalletAllowed = false,
+            isKeysImportAllowed = false,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = false),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = false,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+                chainCode = byteArrayOf(80, 13, -8, -108, -35, 116, -92, 125, -65, -28, 85, 72, -113, 59, 83, 13, 5, -83, -102, 123, 124, -22, 94, 108, -71, 95, 65, -2, 38, 38, -108, 14),
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = mapOf(
+                    DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                        chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                    ),
+                    DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                        chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                    ),
+                    DerivationPath("m/44'/1'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                ),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+                    chainCode = byteArrayOf(80, 13, -8, -108, -35, 116, -92, 125, -65, -28, 85, 72, -113, 59, 83, 13, 5, -83, -102, 123, 124, -22, 94, 108, -71, 95, 65, -2, 38, 38, -108, 14),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+                chainCode = byteArrayOf(-81, 15, 125, 28, -115, -22, 87, 81, 87, -123, -25, -74, 86, 2, 1, 110, -115, 65, -110, 63, -64, 83, -93, -97, -104, 123, 12, -26, 94, 27, 84, -6),
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 1,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+                    chainCode = byteArrayOf(-81, 15, 125, 28, -115, -22, 87, 81, 87, -123, -25, -74, 86, 2, 1, 110, -115, 65, -110, 63, -64, 83, -93, -97, -104, 123, 12, -26, 94, 27, 84, -6),
+                ),
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.NoBackup,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AC07000000035437")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/RingMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/RingMockContent.kt
new file mode 100644
index 0000000000..de2571ece4
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/RingMockContent.kt
@@ -0,0 +1,270 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object RingMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "BA00000100129772",
+        batchId = "BA000001",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "Tangem 2.0",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(44, 8, 116, 111, -57, 20, -93, 101, -104, 97, -104, -15, 58, -8, 41, -53, 95, 99, 107, 47, -29, -118, 41, 64, 22, 94, 33, -81, 114, -47, 10, -16, 97, 14, 94, -36, -82, -108, 74, -9, 35, -38, 66, 67, -116, -55, 65, -30, -58, -33, 31, 120, -45, 42, -3, -120, -74, -97, 97, -102, -13, -28, 29, -41),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "BA00000100129772",
+        batchId = "BA000001",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "Tangem 2.0",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = false,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                chainCode = byteArrayOf(74, -90, -85, -117, -116, -78, 98, 63, 83, 12, 43, -69, 43, -54, -119, -62, 80, 107, -127, 53, 73, 108, 114, -102, 81, -123, 68, 92, 65, -25, 107, 86),
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 0,
+                hasBackup = true,
+                derivedKeys = mapOf(
+                    DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                        chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                    ),
+                    DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                        chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                    ),
+                    DerivationPath("m/44'/1'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                ),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                    chainCode = byteArrayOf(80, 13, -8, -108, -35, 116, -92, 125, -65, -28, 85, 72, -113, 59, 83, 13, 5, -83, -102, 123, 124, -22, 94, 108, -71, 95, 65, -2, 38, 38, -108, 14),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-123, -48, -77, -113, -63, -124, -18, 36, -14, -127, 104, 89, 48, 103, 69, -12, 107, -103, 64, -2, 97, 126, -78, -99, -9, -72, 94, -68, 30, 43, 38, 42),
+                chainCode = byteArrayOf(104, 109, 56, -52, 125, -119, -49, -51, -46, -122, -111, 75, 51, 103, 15, 25, -101, 72, -101, 101, -128, -2, -51, 3, 74, 62, -49, -6, -95, 91, -104, -58),
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 1,
+                hasBackup = true,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+                    chainCode = byteArrayOf(-81, 15, 125, 28, -115, -22, 87, 81, 87, -123, -25, -74, 86, 2, 1, 110, -115, 65, -110, 63, -64, 83, -93, -97, -104, 123, 12, -26, 94, 27, 84, -6),
+                ),
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.Active(cardCount = 2),
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Ring,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "BA00000100129772")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Secpk1CurveMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Secpk1CurveMockContent.kt
new file mode 100644
index 0000000000..61310fcb8e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Secpk1CurveMockContent.kt
@@ -0,0 +1,188 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object Secpk1CurveMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "CB37000000000002",
+        batchId = "0045",
+        cardPublicKey = byteArrayOf(4, 9, -112, -60, 29, -62, 102, -43, -38, -63, 56, 87, -76, 74, 91, -68, 127, -98, -56, 15, 12, -52, 37, -99, -104, -104, -7, -111, 6, 86, -90, 44, 87, 18, 73, 126, -104, 9, 83, -17, -11, -80, 115, 86, -90, -97, 119, -66, 114, 48, -95, -40, 10, 64, 121, -40, -15, 92, -64, 31, -21, 126, -31, 0, -40),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3,
+        isHDWalletAllowed = false,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(4, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34, -11, 83, -57, -34, -17, -75, 79, -45, -44, -13, 97, -47, 78, 109, -61, -15, 27, 125, 78, -95, -125, 37, 10, 96, 114, 14, -67, -7, -31, 16, -51, 38),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(18, -101, -119, 75, 82, 4, 71, -45, 4, 74, -109, 68, 100, 48, 49, 82, 35, 13, 35, -43, 14, -123, -15, -13, -94, 122, -8, 12, -73, -52, 48, 16, 112, 41, 17, 52, -51, 38, 123, 50, 97, -32, -12, 76, -102, 29, -39, 126, 55, 65, -5, -1, -32, -28, -10, -33, 77, 105, -24, 93, -30, 73, -77, 82),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1),
+        firmwareVersion = FirmwareVersion(
+            major = 3,
+            minor = 5,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "CB37000000000002",
+        batchId = "0045",
+        cardPublicKey = byteArrayOf(4, 9, -112, -60, 29, -62, 102, -43, -38, -63, 56, 87, -76, 74, 91, -68, 127, -98, -56, 15, 12, -52, 37, -99, -104, -104, -7, -111, 6, 86, -90, 44, 87, 18, 73, 126, -104, 9, 83, -17, -11, -80, 115, 86, -90, -97, 119, -66, 114, 48, -95, -40, 10, 64, 121, -40, -15, 92, -64, 31, -21, 126, -31, 0, -40),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 3,
+            minor = 5,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM SDk",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 1,
+            isSettingAccessCodeAllowed = false,
+            isSettingPasscodeAllowed = true,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = false,
+            isKeysImportAllowed = false,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(EllipticCurve.Secp256k1),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(4, -45, -28, -111, 109, -9, -113, 17, 107, -45, 43, -55, -126, 103, -70, -13, 79, -103, -59, -69, 83, -47, -37, -49, -18, -65, 55, 6, 121, 17, 54, 32, 105, 2, 25, -101, -118, 91, 109, 49, 99, -42, -113, 105, 21, 109, 66, -7, -57, 55, 25, -37, 63, 16, 22, -118, 121, -127, -13, 47, -89, -4, -38, -65, -27),
+                chainCode = null,
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = 1000000,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = null,
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = null,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = WalletData(
+            blockchain = "BTC",
+            token = null,
+        ),
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "CB37000000000002")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaMockContent.kt
new file mode 100644
index 0000000000..9d3449a462
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaMockContent.kt
@@ -0,0 +1,270 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object ShibaMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(44, 8, 116, 111, -57, 20, -93, 101, -104, 97, -104, -15, 58, -8, 41, -53, 95, 99, 107, 47, -29, -118, 41, 64, 22, 94, 33, -81, 114, -47, 10, -16, 97, 14, 94, -36, -82, -108, 74, -9, 35, -38, 66, 67, -116, -55, 65, -30, -58, -33, 31, 120, -45, 42, -3, -120, -74, -97, 97, -102, -13, -28, 29, -41),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM SDK",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = false,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                chainCode = byteArrayOf(74, -90, -85, -117, -116, -78, 98, 63, 83, 12, 43, -69, 43, -54, -119, -62, 80, 107, -127, 53, 73, 108, 114, -102, 81, -123, 68, 92, 65, -25, 107, 86),
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = mapOf(
+                    DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                        chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                    ),
+                    DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                        chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                    ),
+                    DerivationPath("m/44'/1'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                ),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                    chainCode = byteArrayOf(80, 13, -8, -108, -35, 116, -92, 125, -65, -28, 85, 72, -113, 59, 83, 13, 5, -83, -102, 123, 124, -22, 94, 108, -71, 95, 65, -2, 38, 38, -108, 14),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-123, -48, -77, -113, -63, -124, -18, 36, -14, -127, 104, 89, 48, 103, 69, -12, 107, -103, 64, -2, 97, 126, -78, -99, -9, -72, 94, -68, 30, 43, 38, 42),
+                chainCode = byteArrayOf(104, 109, 56, -52, 125, -119, -49, -51, -46, -122, -111, 75, 51, 103, 15, 25, -101, 72, -101, 101, -128, -2, -51, 3, 74, 62, -49, -6, -95, 91, -104, -58),
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 1,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+                    chainCode = byteArrayOf(-81, 15, 125, 28, -115, -22, 87, 81, 87, -123, -25, -74, 86, 2, 1, 110, -115, 65, -110, 63, -64, 83, -93, -97, -104, 123, 12, -26, 94, 27, 84, -6),
+                ),
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.Active(cardCount = 1),
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AF02010000000002")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupMockContent.kt
new file mode 100644
index 0000000000..fc03dab84c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupMockContent.kt
@@ -0,0 +1,270 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object ShibaNoBackupMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(44, 8, 116, 111, -57, 20, -93, 101, -104, 97, -104, -15, 58, -8, 41, -53, 95, 99, 107, 47, -29, -118, 41, 64, 22, 94, 33, -81, 114, -47, 10, -16, 97, 14, 94, -36, -82, -108, 74, -9, 35, -38, 66, 67, -116, -55, 65, -30, -58, -33, 31, 120, -45, 42, -3, -120, -74, -97, 97, -102, -13, -28, 29, -41),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM SDK",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = false,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                chainCode = byteArrayOf(74, -90, -85, -117, -116, -78, 98, 63, 83, 12, 43, -69, 43, -54, -119, -62, 80, 107, -127, 53, 73, 108, 114, -102, 81, -123, 68, 92, 65, -25, 107, 86),
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = mapOf(
+                    DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                        chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                    ),
+                    DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                        chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                    ),
+                    DerivationPath("m/44'/1'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                ),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+                    chainCode = byteArrayOf(80, 13, -8, -108, -35, 116, -92, 125, -65, -28, 85, 72, -113, 59, 83, 13, 5, -83, -102, 123, 124, -22, 94, 108, -71, 95, 65, -2, 38, 38, -108, 14),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-123, -48, -77, -113, -63, -124, -18, 36, -14, -127, 104, 89, 48, 103, 69, -12, 107, -103, 64, -2, 97, 126, -78, -99, -9, -72, 94, -68, 30, 43, 38, 42),
+                chainCode = byteArrayOf(104, 109, 56, -52, 125, -119, -49, -51, -46, -122, -111, 75, 51, 103, 15, 25, -101, 72, -101, 101, -128, -2, -51, 3, 74, 62, -49, -6, -95, 91, -104, -58),
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 1,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+                    chainCode = byteArrayOf(-81, 15, 125, 28, -115, -22, 87, 81, 87, -123, -25, -74, 86, 2, 1, 110, -115, 65, -110, 63, -64, 83, -93, -97, -104, 123, 12, -26, 94, 27, 84, -6),
+                ),
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.NoBackup,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AF02010000000002")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupNoWalletsMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupNoWalletsMockContent.kt
new file mode 100644
index 0000000000..a1b1b15b20
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/ShibaNoBackupNoWalletsMockContent.kt
@@ -0,0 +1,223 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.Card
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.EncryptionMode
+import com.tangem.common.card.FirmwareVersion
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object ShibaNoBackupNoWalletsMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(44, 8, 116, 111, -57, 20, -93, 101, -104, 97, -104, -15, 58, -8, 41, -53, 95, 99, 107, 47, -29, -118, 41, 64, 22, 94, 33, -81, 114, -47, 10, -16, 97, 14, 94, -36, -82, -108, 74, -9, 35, -38, 66, 67, -116, -55, 65, -30, -58, -33, 31, 120, -45, 42, -3, -120, -74, -97, 97, -102, -13, -28, 29, -41),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AF02010000000002",
+        batchId = "AF02",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 21,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM SDK",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(-20, 98, -101, 94, -23, 73, 122, -21, 74, 76, 79, -55, -102, -62, -30, 44, -38, 118, 75, 121, -36, 118, -62, 60, -38, -63, 33, -14, -98, -69, 112, 22, 48, -43, 47, 65, -61, -56, 38, -94, -45, 44, 95, -22, 6, -31, -40, -25, 42, 38, 94, -99, 71, 98, -33, 27, -102, 30, 52, -7, 51, -27, 84, 66),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM",
+            publicKey = byteArrayOf(3, 86, -25, -61, 55, 99, 41, -33, -82, 115, -120, -33, 22, -107, 103, 3, -122, 16, 60, -110, 72, 106, -121, 100, 79, -87, -27, 18, -55, -49, 78, -110, -2),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = false,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = emptyList(),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.NoBackup,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AF02010000000002")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/TwinsMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/TwinsMockContent.kt
new file mode 100644
index 0000000000..bdb96fa680
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/TwinsMockContent.kt
@@ -0,0 +1,208 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object TwinsMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "CB64000000015006",
+        batchId = "CB64",
+        cardPublicKey = byteArrayOf(4, -122, 60, 93, 121, 108, 26, 78, -33, 36, 112, 61, -4, 108, 82, 6, 47, -50, 109, 37, -109, 58, -102, 3, 50, 127, -123, -68, -96, 18, -78, 56, -50, 102, -112, 51, -25, 96, -69, 97, 31, 35, -68, 22, 38, 61, 60, -97, -69, -51, -62, -37, -63, 91, 127, -103, 103, -39, 85, 85, 85, 92, -70, -58, 109),
+        linkingKey = byteArrayOf(
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 3, isHDWalletAllowed = false,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(4, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34, -11, 83, -57, -34, -17, -75, 79, -45, -44, -13, 97, -47, 78, 109, -61, -15, 27, 125, 78, -95, -125, 37, 10, 96, 114, 14, -67, -7, -31, 16, -51, 38),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(89, -15, -31, 86, 117, 59, -27, -111, 33, 23, -44, 15, -55, -46, -52, 63, 66, 41, -73, -22, 4, -26, 96, -33, -91, 28, 111, 55, -105, -83, -19, -10, 39, -88, 47, 60, 41, -71, 81, 50, -1, -121, 86, -48, -93, 103, -42, 12, -3, -126, -47, -79, 44, 115, 126, 8, -63, 10, 77, 2, 107, -87, -54, -65),
+        ),
+        walletCurves = listOf(EllipticCurve.Secp256k1, EllipticCurve.Ed25519, EllipticCurve.Bls12381G2Aug),
+        firmwareVersion = FirmwareVersion(
+            major = 3,
+            minor = 38,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "CB64000000015006",
+        batchId = "CB64",
+        cardPublicKey = byteArrayOf(2, 48, 4, 54, -34, -33, 22, 53, -92, 8, 72, 50, 69, 1, 105, -53, 9, -126, -23, -61, -62, -85, -24, -112, -32, 76, -88, -66, -25, -83, -70, -95, 90),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 3,
+            minor = 38,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1649635200000),
+            signature = byteArrayOf(89, -15, -31, 86, 117, 59, -27, -111, 33, 23, -44, 15, -55, -46, -52, 63, 66, 41, -73, -22, 4, -26, 96, -33, -91, 28, 111, 55, -105, -83, -19, -10, 39, -88, 47, 60, 41, -71, 81, 50, -1, -121, 86, -48, -93, 103, -42, 12, -3, -126, -47, -79, 44, 115, 126, 8, -63, 10, 77, 2, 107, -87, -54, -65),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(4, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34, -11, 83, -57, -34, -17, -75, 79, -45, -44, -13, 97, -47, 78, 109, -61, -15, 27, 125, 78, -95, -125, 37, 10, 96, 114, 14, -67, -7, -31, 16, -51, 38),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 1,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = true,
+            isResettingUserCodesAllowed = true,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = false,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = false,
+            isKeysImportAllowed = false,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = false),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = false,
+        isPasscodeSet = null,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(4, 42, -7, -17, 16, -16, -85, 8, 70, 36, -114, 18, 45, -126, 101, -89, 22, 96, 53, -107, 61, -109, -118, 83, 116, 100, -79, -90, 119, 123, -67, 23, -76, -49, -124, 71, 61, -50, -91, -18, -100, -34, 93, -48, 36, -82, -28, 45, 125, -3, 56, 8, 68, -40, 40, -34, -112, -67, -43, 35, 84, -106, 20, 62, -79),
+                chainCode = null,
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 1,
+                remainingSignatures = 999999,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = null,
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = null,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Twins,
+        walletData = WalletData(
+            blockchain = "BTC",
+            token = null,
+        ),
+        secondTwinPublicKey = "041535EF77F57A7E7C1541858E5BD3C096A81CEB39FCC72FB9354BBC55FEF86B3C2D5A44750FABE59D268BEC0CB1BAC854A7678F48A26BD355CE39FE197457E2FF",
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -74, 50, 45, -105, 119, 115, 87, -7, -110, 33, 10, -41, -9, -41, 1, 63, -73, 31, -77, 86, 66, -47, -31, 16, 32, 63, 122, 87, 94, 41, 68, 125),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
+        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "CB61000000001264")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = emptyMap(),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = error("Available only for Wallet 2")
+
+    override val createFirstTwinResponse: CreateWalletResponse = CreateWalletResponse(
+        cardId = "CB64000000015006",
+        wallet = CardWallet(
+            publicKey = byteArrayOf(4, 42, -7, -17, 16, -16, -85, 8, 70, 36, -114, 18, 45, -126, 101, -89, 22, 96, 53, -107, 61, -109, -118, 83, 116, 100, -79, -90, 119, 123, -67, 23, -76, -49, -124, 71, 61, -50, -91, -18, -100, -34, 93, -48, 36, -82, -28, 45, 125, -3, 56, 8, 68, -40, 40, -34, -112, -67, -43, 35, 84, -106, 20, 62, -79),
+            chainCode = null,
+            curve = EllipticCurve.Secp256k1,
+            settings = CardWallet.Settings(isPermanent = false),
+            totalSignedHashes = 1,
+            remainingSignatures = 999999,
+            index = 0,
+            isImported = false,
+            hasBackup = false,
+            derivedKeys = emptyMap(),
+        ),
+    )
+
+    override val createSecondTwinResponse: CreateWalletResponse = CreateWalletResponse(
+        cardId = "CB65000000015005",
+        wallet = CardWallet(
+            publicKey = byteArrayOf(4, 21, 53, -17, 119, -11, 122, 126, 124, 21, 65, -123, -114, 91, -45, -64, -106, -88, 28, -21, 57, -4, -57, 47, -71, 53, 75, -68, 85, -2, -8, 107, 60, 45, 90, 68, 117, 15, -85, -27, -99, 38, -117, -20, 12, -79, -70, -56, 84, -89, 103, -113, 72, -94, 107, -45, 85, -50, 57, -2, 25, 116, 87, -30, -1),
+            chainCode = null,
+            curve = EllipticCurve.Secp256k1,
+            settings = CardWallet.Settings(isPermanent = false),
+            totalSignedHashes = 1,
+            remainingSignatures = 999999,
+            index = 0,
+            isImported = false,
+            hasBackup = false,
+            derivedKeys = emptyMap(),
+        ),
+    )
+
+    override val finalizeTwinResponse: ScanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Twins,
+        walletData = WalletData(
+            blockchain = "BTC",
+            token = null,
+        ),
+        secondTwinPublicKey = "041535EF77F57A7E7C1541858E5BD3C096A81CEB39FCC72FB9354BBC55FEF86B3C2D5A44750FABE59D268BEC0CB1BAC854A7678F48A26BD355CE39FE197457E2FF",
+        derivedKeys = emptyMap(),
+        primaryCard = primaryCard,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2MockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2MockContent.kt
index 9b8fcc752f..e9204cdc06 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2MockContent.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2MockContent.kt
@@ -20,20 +20,20 @@ import java.util.Date
 object Wallet2MockContent : MockContent {
 
     private val primaryCard = PrimaryCard(
-        cardId = "AF10000000981426",
-        batchId = "AF10",
-        cardPublicKey = byteArrayOf(3, 7, 80, -118, 6, 77, -15, -22, 107, 105, -64, 103, 77, -79, -102, 106, 46, 84, 21, -34, 47, -74, -56, 124, 17, -49, -29, 76, 84, 59, 50, -15, -52),
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
         linkingKey = byteArrayOf( //
             2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
             -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
         ),
         existingWalletsCount = 5, isHDWalletAllowed = true,
         issuer = Card.Issuer(
-            name = "TANGEM 2.0",
-            publicKey = byteArrayOf(2, -120, 89, -52, -60, 36, -73, -17, 103, 107, -110, -36, 3, 110, -122, 72, 43, -38, 8, 30, -50, 25, -23, -17, 38, 94, 5, -112, -20, 9, 54, -24, -32),
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
         ),
         manufacturer = Card.Manufacturer(
-            name = "TANGEM SDK",
+            name = "TANGEM",
             manufactureDate = Date(1743759687),
             signature = byteArrayOf(),
         ),
@@ -58,9 +58,9 @@ object Wallet2MockContent : MockContent {
     )
 
     override val cardDto = CardDTO(
-        cardId = "AF10000000981426",
-        batchId = "AF10",
-        cardPublicKey = byteArrayOf(3, 7, 80, -118, 6, 77, -15, -22, 107, 105, -64, 103, 77, -79, -102, 106, 46, 84, 21, -34, 47, -74, -56, 124, 17, -49, -29, 76, 84, 59, 50, -15, -52),
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
         firmwareVersion = CardDTO.FirmwareVersion(
             major = 6,
             minor = 33,
@@ -70,11 +70,11 @@ object Wallet2MockContent : MockContent {
         manufacturer = CardDTO.Manufacturer(
             name = "TANGEM",
             manufactureDate = Date(1698094800000),
-            signature = byteArrayOf(71, -20, 9, 31, 25, 111, 61, 119, 109, -123, -63, 51, 58, -71, -44, 53, 57, 20, -16, 97, -87, -82, 1, -35, -48, 63, 77, -78, -89, -112, -27, 25, -10, 90, 7, -53, -84, -125, 112, 68, -14, -85, -100, -64, -115, 31, 42, 119, 87, -79, 127, 42, -87, -102, 13, -9, -10, -51, -29, -63, -1, -52, -117, 57),
+            signature = byteArrayOf(51, -12, 14, -56, 7, -39, 5, 63, 59, 24, 102, 99, -126, 124, -127, -108, -118, 71, -19, -71, 4, -47, -121, -46, 49, -51, -31, 100, -56, -15, 96, -37, 25, 82, 94, -88, 48, 98, -105, -97, -40, 41, 27, 116, 65, 26, 78, -85, 66, -94, -92, 15, 50, -2, 7, -69, 41, 56, -75, 59, 86, 68, -38, -3),
         ),
         issuer = CardDTO.Issuer(
-            name = "TANGEM 2.0",
-            publicKey = byteArrayOf(2, -120, 89, -52, -60, 36, -73, -17, 103, 107, -110, -36, 3, 110, -122, 72, 43, -38, 8, 30, -50, 25, -23, -17, 38, 94, 5, -112, -20, 9, 54, -24, -32),
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
         ),
         settings = CardDTO.Settings(
             securityDelay = 15000,
@@ -87,7 +87,7 @@ object Wallet2MockContent : MockContent {
             supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
             isFilesAllowed = true,
             isHDWalletAllowed = true,
-            isKeysImportAllowed = false,
+            isKeysImportAllowed = true,
         ),
         userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
         linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
@@ -105,11 +105,11 @@ object Wallet2MockContent : MockContent {
         ),
         wallets = listOf(
             CardDTO.Wallet(
-                publicKey = byteArrayOf(2, -114, -64, 120, -121, 11, -28, 89, -91, 114, 10, 84, -87, -36, 36, 19, -69, 95, 66, 14, 32, -35, -99, -67, 118, 51, 26, 71, -78, -36, 59, -126, -58),
-                chainCode = byteArrayOf(-47, -8, 74, 69, -1, 52, 10, -56, -85, 118, 56, 77, 125, -12, 85, -23, 42, -58, 99, 47, -87, -34, -83, 72, -122, -29, 88, -85, 46, -118, -26, 116),
+                publicKey = byteArrayOf(3, 17, 59, -102, -56, 66, 10, 36, 97, -106, -92, -117, -105, -88, -2, -3, -95, -75, -54, -2, 57, 27, -90, -19, 82, 103, -12, -52, -126, -105, -120, -55, -2),
+                chainCode = byteArrayOf(-34, -28, -28, -12, 80, -109, -90, -31, -74, 36, -78, -21, 39, -125, -39, -91, 63, 40, -26, 3, 66, 27, -62, -55, -97, 52, -65, -11, 26, -80, 33, -45),
                 curve = EllipticCurve.Secp256k1,
                 settings = CardWallet.Settings(isPermanent = false),
-                totalSignedHashes = 73,
+                totalSignedHashes = 0,
                 remainingSignatures = null,
                 index = 0,
                 hasBackup = true,
@@ -128,14 +128,14 @@ object Wallet2MockContent : MockContent {
                     ),
                 ),
                 extendedPublicKey = ExtendedPublicKey(
-                    publicKey = byteArrayOf(2, -114, -64, 120, -121, 11, -28, 89, -91, 114, 10, 84, -87, -36, 36, 19, -69, 95, 66, 14, 32, -35, -99, -67, 118, 51, 26, 71, -78, -36, 59, -126, -58),
-                    chainCode = byteArrayOf(-47, -8, 74, 69, -1, 52, 10, -56, -85, 118, 56, 77, 125, -12, 85, -23, 42, -58, 99, 47, -87, -34, -83, 72, -122, -29, 88, -85, 46, -118, -26, 116),
+                    publicKey = byteArrayOf(-109, 42, -80, -115, -12, 44, 48, -118, -89, 10, 21, 59, 98, -110, -86, -14, 123, 105, -30, -49, -40, -4, -7, 32, 60, 67, -88, -52, -96, -10, -14, 123),
+                    chainCode = byteArrayOf(-101, -10, -92, 72, 19, 121, -38, 105, -55, -82, -68, 13, -6, 17, 66, -10, -75, 58, 119, -127, 74, 68, 82, 25, 45, -110, 3, 3, 108, -97, -51, -127),
                 ),
                 isImported = false,
             ),
             CardDTO.Wallet(
-                publicKey = byteArrayOf(-64, 18, -128, 121, -89, -37, -99, 44, -125, -72, -111, -79, 7, 85, 40, 67, -39, 117, 123, 11, 105, -6, -5, -79, 19, -10, -29, 20, -14, -40, 5, 90),
-                chainCode = byteArrayOf(33, -97, 53, -112, 61, 112, -24, 74, -87, -85, -124, -4, 103, -94, -97, 76, -41, -27, 118, 33, 55, 121, -17, -52, 60, 122, 27, 25, 29, -76, 78, 11),
+                publicKey = byteArrayOf(-109, 42, -80, -115, -12, 44, 48, -118, -89, 10, 21, 59, 98, -110, -86, -14, 123, 105, -30, -49, -40, -4, -7, 32, 60, 67, -88, -52, -96, -10, -14, 123),
+                chainCode = byteArrayOf(-101, -10, -92, 72, 19, 121, -38, 105, -55, -82, -68, 13, -6, 17, 66, -10, -75, 58, 119, -127, 74, 68, 82, 25, 45, -110, 3, 3, 108, -97, -51, -127),
                 curve = EllipticCurve.Ed25519,
                 settings = CardWallet.Settings(isPermanent = false),
                 totalSignedHashes = 0,
@@ -150,7 +150,7 @@ object Wallet2MockContent : MockContent {
                 isImported = false,
             ),
             CardDTO.Wallet(
-                publicKey = byteArrayOf(-94, 111, -89, -77, -62, -113, 16, -118, -46, -16, -20, 28, 53, -82, -109, 28, 99, -98, -54, 59, -3, 99, 16, -70, -73, 43, -6, 33, -53, -66, 76, -72, 6, -49, 83, -121, -122, 111, -111, -116, -119, 98, -94, -98, -121, -37, 20, -95),
+                publicKey = byteArrayOf(-118, -77, -109, 8, -119, 101, -91, 46, -44, 15, 52, -64, -92, 5, -102, 126, 52, 121, 63, -76, -54, 80, -82, -5, 31, -35, 105, -119, -96, -54, 38, 2, -6, 109, 117, -26, -47, -20, 108, 106, -69, 72, -37, -117, -30, -9, 104, -123),
                 chainCode = null,
                 curve = EllipticCurve.Bls12381G2Aug,
                 settings = CardWallet.Settings(isPermanent = false),
@@ -163,8 +163,8 @@ object Wallet2MockContent : MockContent {
                 isImported = false,
             ),
             CardDTO.Wallet(
-                publicKey = byteArrayOf(115, 14, 11, 0, -93, 81, -103, -95, -75, -84, 18, -120, -31, 76, -83, -81, 91, 25, -75, 36, -99, -53, -25, -15, -1, -57, 14, -39, 98, -116, -63, -123),
-                chainCode = byteArrayOf(23, 5, 38, -48, 67, -42, -31, -21, 89, 11, 22, -28, 44, -19, -115, -78, 123, -27, 57, 57, -24, -86, 55, 15, 104, 114, -36, 80, 81, -108, -41, 112),
+                publicKey = byteArrayOf(17, -78, 53, 101, 96, -110, -10, -48, -84, 88, -64, 58, -26, -13, -2, -6, -25, 23, -79, -45, 58, 77, 52, -75, -123, 121, 32, 92, 84, -74, -111, -8),
+                chainCode = byteArrayOf(-110, 73, -124, -65, -1, -70, 64, -89, 95, -74, 15, 46, -110, 87, 15, -61, 120, -51, 111, 111, -45, 37, 123, -114, 65, -116, 21, 39, -77, 86, -3, -26),
                 curve = EllipticCurve.Bip0340,
                 settings = CardWallet.Settings(isPermanent = false),
                 totalSignedHashes = 0,
@@ -179,11 +179,11 @@ object Wallet2MockContent : MockContent {
                 isImported = false,
             ),
             CardDTO.Wallet(
-                publicKey = byteArrayOf(-43, 1, -81, -47, -8, -103, -66, 42, 37, -7, 65, 54, 57, -24, 127, -89, 69, -112, 42, -46, -128, 36, -117, -28, 30, -48, 37, 52, 93, -47, 92, -47),
-                chainCode = byteArrayOf(4, -97, 81, -37, 76, -67, -87, -4, -82, -36, -45, -28, -117, -59, -62, 93, -73, 50, 65, -91, -83, 25, -95, 89, -64, -40, 113, 28, 59, 113, -99, 89),
+                publicKey = byteArrayOf(-52, -92, 64, 108, -8, -100, 87, -86, -60, 18, -18, -81, 114, -84, 76, -24, 84, 52, -34, 79, -30, -66, -112, -55, -35, -119, 127, -109, 35, 18, -29, -25),
+                chainCode = byteArrayOf(94, -33, -94, -63, 40, -20, -26, 71, 111, 9, 87, -36, -42, -33, 40, -53, 85, 31, -36, -29, 65, -121, 2, -23, -119, -51, 114, -17, -39, -74, 23, -97),
                 curve = EllipticCurve.Ed25519Slip0010,
                 settings = CardWallet.Settings(isPermanent = false),
-                totalSignedHashes = 15,
+                totalSignedHashes = 0,
                 remainingSignatures = null,
                 index = 4,
                 hasBackup = true,
@@ -219,76 +219,76 @@ object Wallet2MockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
-                                publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
-                                chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
     )
 
     override val extendedPublicKey = ExtendedPublicKey(
-        publicKey = byteArrayOf(3, 2, 95, 53, 40, -87, -60, 11, -8, -47, 41, 37, 100, 15, -69, 1, -122, 127, -20, -81, -32, -20, -24, 5, -28, 113, 106, -90, -59, -30, -27, -110, -110),
-        chainCode = byteArrayOf(-95, -87, -95, -25, 27, 96, -57, -92, -69, -106, -45, 10, 85, 4, -92, -68, 49, -24, -28, -50, -49, -77, -20, 118, -50, -27, 104, -93, 115, -50, -46, -34),
+        publicKey = byteArrayOf(2, -93, -36, -105, 121, -52, -30, -43, -67, -7, -31, -26, -35, 25, 99, 25, -20, 118, -20, -125, -89, 12, -101, -86, 74, -91, 23, -24, 93, -86, 20, -53, -8),
+        chainCode = byteArrayOf(32, 60, 63, -96, 97, 58, 121, 108, 75, 59, 63, -113, 60, -49, 47, 33, 15, -65, -69, 45, -7, -26, 65, -5, -91, -55, -42, -102, -127, -104, -111, 96),
         depth = 0,
         parentFingerprint = byteArrayOf(0, 0, 0, 0),
         childNumber = 0,
     )
 
-    override val successResponse = SuccessResponse(cardId = "AF10000000981426")
+    override val successResponse = SuccessResponse(cardId = "AF05888888880018")
 
     override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
         card = cardDto,
         derivedKeys = mapOf(
             ByteArrayKey(
-                byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+                byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
         primaryCard = primaryCard,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupMockContent.kt
new file mode 100644
index 0000000000..fd3fe78bbc
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupMockContent.kt
@@ -0,0 +1,307 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.*
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object Wallet2NoBackupMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+        linkingKey = byteArrayOf( //
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 5, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(),
+        ),
+        walletCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Ed25519Slip0010,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1698094800000),
+            signature = byteArrayOf(51, -12, 14, -56, 7, -39, 5, 63, 59, 24, 102, 99, -126, 124, -127, -108, -118, 71, -19, -71, 4, -47, -121, -46, 49, -51, -31, 100, -56, -15, 96, -37, 25, 82, 94, -88, 48, 98, -105, -97, -40, 41, 27, 116, 65, 26, 78, -85, 66, -94, -92, 15, 50, -2, 7, -69, 41, 56, -75, 59, 86, 68, -38, -3),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = true,
+            isResettingUserCodesAllowed = false,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Ed25519Slip0010,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = listOf(
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(3, 17, 59, -102, -56, 66, 10, 36, 97, -106, -92, -117, -105, -88, -2, -3, -95, -75, -54, -2, 57, 27, -90, -19, 82, 103, -12, -52, -126, -105, -120, -55, -2),
+                chainCode = byteArrayOf(-34, -28, -28, -12, 80, -109, -90, -31, -74, 36, -78, -21, 39, -125, -39, -91, 63, 40, -26, 3, 66, 27, -62, -55, -97, 52, -65, -11, 26, -80, 33, -45),
+                curve = EllipticCurve.Secp256k1,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 0,
+                hasBackup = false,
+                derivedKeys = mapOf(
+                    DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, 55, -114, -94, -73, -61, -50, 51, -115, 55, -79, 63, -96, -44, -64, -24, -36, -122, -123, -38, 81, -15, -127, -97, -42, 72, -85, -62, -98, 46, 119, 16, -55),
+                        chainCode = byteArrayOf(31, 17, 71, -28, -29, 17, 72, -29, -98, 112, 31, -8, 72, -75, 4, -11, 60, -100, 9, 35, 58, -42, -38, 96, -71, -68, 24, -119, -43, -18, -122, 72),
+                    ),
+                    DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -26, 103, 96, 112, 127, -125, 0, 7, 53, 30, -12, -82, 45, 14, 107, -9, 126, 75, 104, -67, -49, 35, -12, -82, -90, 101, -101, 125, -76, 88, -54, 99),
+                        chainCode = byteArrayOf(-42, 36, 97, 65, -64, -113, 76, -91, -9, 11, 89, 123, -9, -3, 21, 103, -113, -60, 48, -31, -34, 108, 111, -38, -110, -80, 109, 17, -29, 2, 45, -71),
+                    ),
+                    DerivationPath("m/44'/1'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -96, -3, -83, 101, 63, -25, -125, -4, -65, -42, -56, 24, -52, 118, -11, -104, -105, 40, -59, 20, -109, -97, 29, -95, -6, -80, 2, 67, 103, -80, -22, -94),
+                        chainCode = byteArrayOf(-125, 27, -91, 38, -66, 109, -92, 16, -37, 93, 107, -29, -128, -1, 115, -64, 108, -63, 17, 27, 58, 78, -2, 39, 88, -39, 44, 89, 32, -38, -16, -38),
+                    ),
+                ),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-109, 42, -80, -115, -12, 44, 48, -118, -89, 10, 21, 59, 98, -110, -86, -14, 123, 105, -30, -49, -40, -4, -7, 32, 60, 67, -88, -52, -96, -10, -14, 123),
+                    chainCode = byteArrayOf(-101, -10, -92, 72, 19, 121, -38, 105, -55, -82, -68, 13, -6, 17, 66, -10, -75, 58, 119, -127, 74, 68, 82, 25, 45, -110, 3, 3, 108, -97, -51, -127),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-109, 42, -80, -115, -12, 44, 48, -118, -89, 10, 21, 59, 98, -110, -86, -14, 123, 105, -30, -49, -40, -4, -7, 32, 60, 67, -88, -52, -96, -10, -14, 123),
+                chainCode = byteArrayOf(-101, -10, -92, 72, 19, 121, -38, 105, -55, -82, -68, 13, -6, 17, 66, -10, -75, 58, 119, -127, 74, 68, 82, 25, 45, -110, 3, 3, 108, -97, -51, -127),
+                curve = EllipticCurve.Ed25519,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 1,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-64, 18, -128, 121, -89, -37, -99, 44, -125, -72, -111, -79, 7, 85, 40, 67, -39, 117, 123, 11, 105, -6, -5, -79, 19, -10, -29, 20, -14, -40, 5, 90),
+                    chainCode = byteArrayOf(33, -97, 53, -112, 61, 112, -24, 74, -87, -85, -124, -4, 103, -94, -97, 76, -41, -27, 118, 33, 55, 121, -17, -52, 60, 122, 27, 25, 29, -76, 78, 11),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-118, -77, -109, 8, -119, 101, -91, 46, -44, 15, 52, -64, -92, 5, -102, 126, 52, 121, 63, -76, -54, 80, -82, -5, 31, -35, 105, -119, -96, -54, 38, 2, -6, 109, 117, -26, -47, -20, 108, 106, -69, 72, -37, -117, -30, -9, 104, -123),
+                chainCode = null,
+                curve = EllipticCurve.Bls12381G2Aug,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 1,
+                remainingSignatures = null,
+                index = 2,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = null,
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(17, -78, 53, 101, 96, -110, -10, -48, -84, 88, -64, 58, -26, -13, -2, -6, -25, 23, -79, -45, 58, 77, 52, -75, -123, 121, 32, 92, 84, -74, -111, -8),
+                chainCode = byteArrayOf(-110, 73, -124, -65, -1, -70, 64, -89, 95, -74, 15, 46, -110, 87, 15, -61, 120, -51, 111, 111, -45, 37, 123, -114, 65, -116, 21, 39, -77, 86, -3, -26),
+                curve = EllipticCurve.Bip0340,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 3,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(115, 14, 11, 0, -93, 81, -103, -95, -75, -84, 18, -120, -31, 76, -83, -81, 91, 25, -75, 36, -99, -53, -25, -15, -1, -57, 14, -39, 98, -116, -63, -123),
+                    chainCode = byteArrayOf(23, 5, 38, -48, 67, -42, -31, -21, 89, 11, 22, -28, 44, -19, -115, -78, 123, -27, 57, 57, -24, -86, 55, 15, 104, 114, -36, 80, 81, -108, -41, 112),
+                ),
+                isImported = false,
+            ),
+            CardDTO.Wallet(
+                publicKey = byteArrayOf(-52, -92, 64, 108, -8, -100, 87, -86, -60, 18, -18, -81, 114, -84, 76, -24, 84, 52, -34, 79, -30, -66, -112, -55, -35, -119, 127, -109, 35, 18, -29, -25),
+                chainCode = byteArrayOf(94, -33, -94, -63, 40, -20, -26, 71, 111, 9, 87, -36, -42, -33, 40, -53, 85, 31, -36, -29, 65, -121, 2, -23, -119, -51, 114, -17, -39, -74, 23, -97),
+                curve = EllipticCurve.Ed25519Slip0010,
+                settings = CardWallet.Settings(isPermanent = false),
+                totalSignedHashes = 0,
+                remainingSignatures = null,
+                index = 4,
+                hasBackup = false,
+                derivedKeys = emptyMap(),
+                extendedPublicKey = ExtendedPublicKey(
+                    publicKey = byteArrayOf(-43, 1, -81, -47, -8, -103, -66, 42, 37, -7, 65, 54, 57, -24, 127, -89, 69, -112, 42, -46, -128, 36, -117, -28, 30, -48, 37, 52, 93, -47, 92, -47),
+                    chainCode = byteArrayOf(4, -97, 81, -37, 76, -67, -87, -4, -82, -36, -45, -28, -117, -59, -62, 93, -73, 50, 65, -91, -83, 25, -95, 89, -64, -40, 113, 28, 59, 113, -99, 89),
+                ),
+                isImported = false,
+            ),
+        ),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.NoBackup,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet2,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(2, -93, -36, -105, 121, -52, -30, -43, -67, -7, -31, -26, -35, 25, 99, 25, -20, 118, -20, -125, -89, 12, -101, -86, 74, -91, 23, -24, 93, -86, 20, -53, -8),
+        chainCode = byteArrayOf(32, 60, 63, -96, 97, 58, 121, 108, 75, 59, 63, -113, 60, -49, 47, 33, 15, -65, -69, 45, -7, -26, 65, -5, -91, -55, -42, -102, -127, -104, -111, 96),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AF05888888880018")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = TODO("Not yet implemented")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupNoWalletsMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupNoWalletsMockContent.kt
new file mode 100644
index 0000000000..682794f29b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2NoBackupNoWalletsMockContent.kt
@@ -0,0 +1,219 @@
+package com.tangem.tap.domain.sdk.mocks.content
+
+import com.tangem.common.SuccessResponse
+import com.tangem.common.card.Card
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.EncryptionMode
+import com.tangem.common.card.FirmwareVersion
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.crypto.hdWallet.DerivationPath
+import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
+import com.tangem.domain.models.scan.CardDTO
+import com.tangem.domain.models.scan.ProductType
+import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.operations.attestation.Attestation
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.DerivationTaskResponse
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.operations.wallet.CreateWalletResponse
+import com.tangem.sdk.api.CreateProductWalletTaskResponse
+import com.tangem.tap.domain.sdk.mocks.MockContent
+import java.util.Date
+
+object Wallet2NoBackupNoWalletsMockContent : MockContent {
+
+    private val primaryCard = PrimaryCard(
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+        linkingKey = byteArrayOf( //
+            2, 121, 98, 127, -70, 14, 5, -23, -76, 115, -30, -26, 111, 17, 110, 34, -100, -121,
+            -57, -123, 74, 3, -91, 56, -20, 56, 50, -40, -101, 96, 82, 70, -91,
+        ),
+        existingWalletsCount = 5, isHDWalletAllowed = true,
+        issuer = Card.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        manufacturer = Card.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1743759687),
+            signature = byteArrayOf(),
+        ),
+        walletCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Ed25519Slip0010,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        firmwareVersion = FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        isKeysImportAllowed = false,
+        certificate = null,
+    )
+
+    override val cardDto = CardDTO(
+        cardId = "AF05888888880018",
+        batchId = "AF05",
+        cardPublicKey = byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+        firmwareVersion = CardDTO.FirmwareVersion(
+            major = 6,
+            minor = 33,
+            patch = 0,
+            type = FirmwareVersion.FirmwareType.Release,
+        ),
+        manufacturer = CardDTO.Manufacturer(
+            name = "TANGEM",
+            manufactureDate = Date(1698094800000),
+            signature = byteArrayOf(51, -12, 14, -56, 7, -39, 5, 63, 59, 24, 102, 99, -126, 124, -127, -108, -118, 71, -19, -71, 4, -47, -121, -46, 49, -51, -31, 100, -56, -15, 96, -37, 25, 82, 94, -88, 48, 98, -105, -97, -40, 41, 27, 116, 65, 26, 78, -85, 66, -94, -92, 15, 50, -2, 7, -69, 41, 56, -75, 59, 86, 68, -38, -3),
+        ),
+        issuer = CardDTO.Issuer(
+            name = "TANGEM SDK",
+            publicKey = byteArrayOf(2, 95, 22, -67, 29, 46, -81, -28, 99, -26, 42, 51, 90, 9, -26, -78, -69, -53, -48, 68, 82, 82, 104, -123, -53, 103, -97, -60, -46, 122, -15, -67, 34),
+        ),
+        settings = CardDTO.Settings(
+            securityDelay = 15000,
+            maxWalletsCount = 20,
+            isSettingAccessCodeAllowed = true,
+            isSettingPasscodeAllowed = true,
+            isResettingUserCodesAllowed = false,
+            isLinkedTerminalEnabled = true,
+            isBackupAllowed = true,
+            supportedEncryptionModes = listOf(EncryptionMode.Strong, EncryptionMode.Fast, EncryptionMode.None),
+            isFilesAllowed = true,
+            isHDWalletAllowed = true,
+            isKeysImportAllowed = true,
+        ),
+        userSettings = CardDTO.UserSettings(isUserCodeRecoveryAllowed = true),
+        linkedTerminalStatus = CardDTO.LinkedTerminalStatus.None,
+        isAccessCodeSet = true,
+        isPasscodeSet = false,
+        supportedCurves = listOf(
+            EllipticCurve.Secp256k1,
+            EllipticCurve.Ed25519,
+            EllipticCurve.Bls12381G2Aug,
+            EllipticCurve.Secp256r1,
+            EllipticCurve.Ed25519Slip0010,
+            EllipticCurve.Bls12381G2,
+            EllipticCurve.Bls12381G2Pop,
+            EllipticCurve.Bip0340,
+        ),
+        wallets = emptyList(),
+        attestation = Attestation(
+            cardKeyAttestation = Attestation.Status.Verified,
+            walletKeysAttestation = Attestation.Status.Skipped,
+            firmwareAttestation = Attestation.Status.Skipped,
+            cardUniquenessAttestation = Attestation.Status.Skipped,
+        ),
+        backupStatus = CardDTO.BackupStatus.NoBackup,
+    )
+
+    override val scanResponse = ScanResponse(
+        card = cardDto,
+        productType = ProductType.Wallet2,
+        walletData = null,
+        secondTwinPublicKey = null,
+        derivedKeys = emptyMap(),
+        primaryCard = null,
+    )
+
+    override val derivationTaskResponse = DerivationTaskResponse(
+        entries = mapOf(
+            ByteArrayKey(
+                byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+    )
+
+    override val extendedPublicKey = ExtendedPublicKey(
+        publicKey = byteArrayOf(2, -93, -36, -105, 121, -52, -30, -43, -67, -7, -31, -26, -35, 25, 99, 25, -20, 118, -20, -125, -89, 12, -101, -86, 74, -91, 23, -24, 93, -86, 20, -53, -8),
+        chainCode = byteArrayOf(32, 60, 63, -96, 97, 58, 121, 108, 75, 59, 63, -113, 60, -49, 47, 33, 15, -65, -69, 45, -7, -26, 65, -5, -91, -55, -42, -102, -127, -104, -111, 96),
+        depth = 0,
+        parentFingerprint = byteArrayOf(0, 0, 0, 0),
+        childNumber = 0,
+    )
+
+    override val successResponse = SuccessResponse(cardId = "AF05888888880018")
+
+    override val createProductWalletTaskResponse = CreateProductWalletTaskResponse(
+        card = cardDto,
+        derivedKeys = mapOf(
+            ByteArrayKey(
+                byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+        ),
+        primaryCard = primaryCard,
+    )
+
+    override val importWalletResponse: CreateProductWalletTaskResponse
+        get() = TODO("Not yet implemented")
+
+    override val createFirstTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val createSecondTwinResponse: CreateWalletResponse
+        get() = error("Available only for Twin")
+
+    override val finalizeTwinResponse: ScanResponse
+        get() = error("Available only for Twin")
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2WithSeedPhraseMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2WithSeedPhraseMockContent.kt
index 06d7e7db26..d0625bd95a 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2WithSeedPhraseMockContent.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/Wallet2WithSeedPhraseMockContent.kt
@@ -219,38 +219,38 @@ object Wallet2WithSeedPhraseMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
-                                publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
-                                chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
     )
 
@@ -271,24 +271,24 @@ object Wallet2WithSeedPhraseMockContent : MockContent {
                 byteArrayOf(3, 23, -112, -57, 109, 60, -82, -36, 45, -14, -34, -12, 10, -89, 14, 37, 38, 36, -102, 37, 93, 90, 69, -113, -117, 120, -29, 12, -125, 43, -40, -31, 5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
         ),
         primaryCard = primaryCard,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/WalletMockContent.kt b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/WalletMockContent.kt
index 1db7cd1bb9..23afd7ef06 100644
--- a/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/WalletMockContent.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/mocks/content/WalletMockContent.kt
@@ -17,6 +17,7 @@ import com.tangem.sdk.api.CreateProductWalletTaskResponse
 import com.tangem.tap.domain.sdk.mocks.MockContent
 import java.util.Date
 
+@Suppress("LargeClass")
 object WalletMockContent : MockContent {
 
     private val primaryCard = PrimaryCard(
@@ -120,6 +121,14 @@ object WalletMockContent : MockContent {
                         publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
                         chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
                     ),
+                    DerivationPath("m/1852'/1815'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
+                    DerivationPath("m/44'/144'/0'/0/0") to ExtendedPublicKey(
+                        publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                        chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                    ),
                 ),
                 extendedPublicKey = ExtendedPublicKey(
                     publicKey = byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
@@ -168,59 +177,89 @@ object WalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/144'/0'/0/0") to ExtendedPublicKey( // xrp
-                                publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
-                                chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
-                                publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
-                                chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
-                                publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
-                                chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/84'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/145'/0'/0/0") to ExtendedPublicKey( // bch
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/144'/0'/0/0") to ExtendedPublicKey( // xrp
+                            publicKey = byteArrayOf(2, 38, -6, 92, -37, -91, -59, -108, -18, -119, -55, 41, 38, -33, 44, 59, 24, -79, -14, -38, -10, -123, 106, 56, 39, 8, 112, 29, -41, 99, 70, -104, -121),
+                            chainCode = byteArrayOf(105, -21, -61, -50, 68, -89, 119, 53, -96, -40, 119, 77, -122, 121, 16, 40, -50, -48, -105, -101, -74, -7, -94, -59, -90, 96, 59, 99, 43, -91, 115, -29),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/3'/0'/0/0") to ExtendedPublicKey( // doge
+                            publicKey = byteArrayOf(3, -25, -24, -97, -124, 24, -89, 44, 75, 123, 92, -86, -73, -93, 25, -90, -89, -95, 88, 3, 107, 37, -1, -85, -32, -57, -123, -41, 108, -9, -96, 77, -124),
+                            chainCode = byteArrayOf(119, 3, 41, 112, 71, 54, 72, 30, 39, 25, 25, -104, 92, 46, -109, 63, 93, 67, 43, -102, -87, 39, -95, 106, 45, 67, 109, -29, -35, 10, -107, 104),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/195'/0'/0/0") to ExtendedPublicKey(
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/144'/0'/0/0") to ExtendedPublicKey( // XRP
+                            publicKey = byteArrayOf(2, -40, 115, -15, 80, 104, 100, -29, 80, 29, 112, -35, -54, 64, -98, 45, 115, 108, 93, 113, -71, 89, 17, 72, 98, 21, 126, 82, -50, 50, -12, -87, -62),
+                            chainCode = byteArrayOf(-27, 56, 57, 54, 27, -40, 65, 109, 119, -54, -94, 88, -29, -115, -45, -112, -31, 57, 53, 56, 118, 87, 34, -16, -64, -45, 105, 77, 91, -106, -92, 41),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
+            ByteArrayKey(
+                byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/1852'/1815'/0'/0/0") to ExtendedPublicKey( // cardano
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/1852'/1815'/0'/2/0") to ExtendedPublicKey( // cardano extended
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
+
         ),
     )
 
@@ -241,24 +280,53 @@ object WalletMockContent : MockContent {
                 byteArrayOf(2, -109, 28, -27, -124, -58, -97, -61, 43, -84, 90, -9, -5, 4, 90, 17, 112, -125, -108, 44, 19, -79, -60, -23, 34, -20, -20, 61, 84, 113, 120, -90, -5),
             )
                 to
-                    ExtendedPublicKeysMap(
-                        mapOf(
-                            DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
-                                publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
-                                chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
-                            DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
-                                publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
-                                chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
-                                depth = 0,
-                                parentFingerprint = byteArrayOf(0, 0, 0, 0),
-                                childNumber = 0,
-                            ),
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/44'/0'/0'/0/0") to ExtendedPublicKey( // btc
+                            publicKey = byteArrayOf(3, 45, 58, -110, -52, -51, -83, -4, -45, -118, 119, 37, 123, -17, 66, -83, 61, -106, 115, 47, 121, 66, 84, -122, -57, -45, 7, -79, 70, -13, 28, -125, -52),
+                            chainCode = byteArrayOf(93, 51, 52, -66, -39, -38, 34, -84, 50, 1, -127, -20, 80, -20, -30, -72, 2, 1, -78, -81, -17, 51, -52, -25, 12, 108, 50, 89, -66, 18, 65, 70),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // eth
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/44'/60'/0'/0/0") to ExtendedPublicKey( // xrp
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
                         ),
                     ),
+                ),
+            ByteArrayKey(
+                byteArrayOf(-65, -53, -62, -12, -57, -32, -38, -9, -128, -52, -83, -61, 73, 39, 41, 15, -74, -97, 38, 52, -101, 63, 74, -56, -20, 15, 57, -127, 114, -93, -17, -109),
+            )
+                to
+                ExtendedPublicKeysMap(
+                    mapOf(
+                        DerivationPath("m/1852'/1815'/0'/0/0") to ExtendedPublicKey( // cardano
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                        DerivationPath("m/1852'/1815'/0'/2/0") to ExtendedPublicKey( // cardano extended
+                            publicKey = byteArrayOf(2, 34, 6, 119, -106, 5, -119, 111, -22, 8, 23, -108, -72, -56, 6, 77, -17, -61, -101, -85, 16, 28, 18, 3, -3, -89, -81, -108, 48, -7, -86, -82, -67),
+                            chainCode = byteArrayOf(-75, 55, 107, -106, -37, -81, -15, 72, -102, 94, 55, -39, 9, -112, 1, 90, -50, 103, 53, 120, -92, -36, -85, -39, -65, 1, 88, 46, 92, 104, -13, -109),
+                            depth = 0,
+                            parentFingerprint = byteArrayOf(0, 0, 0, 0),
+                            childNumber = 0,
+                        ),
+                    ),
+                ),
         ),
         primaryCard = primaryCard,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/SignHashesTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/SignHashesTask.kt
index 8d637b7c78..7e559abf8e 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/SignHashesTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/SignHashesTask.kt
@@ -42,7 +42,12 @@ class SignHashesTask(
                 is CompletionResult.Failure -> {
                     when {
                         response.error is TangemSdkError.WalletNotFound && pairWalletPublicKey != null -> {
-                            sign(session, pairWalletPublicKey, publicKey.derivationPath, callback)
+                            sign(
+                                session = session,
+                                publicKey = pairWalletPublicKey,
+                                derivationPath = publicKey.derivationPath,
+                                callback = callback,
+                            )
                         }
                         else -> callback(CompletionResult.Failure(response.error))
                     }
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
index fba95394c0..ac172d1b9c 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateProductWalletTask.kt
@@ -64,22 +64,28 @@ class CreateProductWalletTask(
             cardTypesResolver.isTangemTwins() ->
                 throw UnsupportedOperationException("Use the TwinCardsManager to create a wallet")
 
-            else -> CreateWalletTangemWallet(mnemonic, passphrase, shouldReset, derivationStyleProvider, cardDto)
+            else -> CreateWalletTangemWallet(
+                mnemonic = mnemonic,
+                passphrase = passphrase,
+                shouldReset = shouldReset,
+                derivationStyleProvider = derivationStyleProvider,
+                cardDTO = cardDto,
+            )
         }
-        commandProcessor.proceed(cardDto, session) {
-            when (it) {
+        commandProcessor.proceed(cardDto, session) { result ->
+            when (result) {
                 is CompletionResult.Success -> {
-                    val result = when (commandProcessor) {
+                    val createProductWalletTaskResponse = when (commandProcessor) {
                         is CreateWalletTangemWallet -> {
-                            it.data as CreateProductWalletTaskResponse
+                            result.data as CreateProductWalletTaskResponse
                         }
 
-                        else -> CreateProductWalletTaskResponse(card = session.environment.card!!)
+                        else -> CreateProductWalletTaskResponse(card = requireNotNull(session.environment.card))
                     }
-                    callback(CompletionResult.Success(result))
+                    callback(CompletionResult.Success(createProductWalletTaskResponse))
                 }
 
-                is CompletionResult.Failure -> callback(CompletionResult.Failure(it.error))
+                is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
             }
         }
     }
@@ -156,7 +162,12 @@ private class CreateWalletTangemWallet(
         CreateWalletsTask(cardConfig.mandatoryCurves, mnemonic, passphrase).run(session) { result ->
             when (result) {
                 is CompletionResult.Success -> {
-                    checkIfAllWalletsCreated(card, session, result.data, callback)
+                    checkIfAllWalletsCreated(
+                        card = card,
+                        session = session,
+                        createResponse = result.data,
+                        callback = callback,
+                    )
                 }
                 is CompletionResult.Failure -> {
                     callback(CompletionResult.Failure(result.error))
@@ -210,12 +221,16 @@ private class CreateWalletTangemWallet(
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
         val resetCommand = ResetToFactorySettingsTask(allowsRequestAccessCodeFromRepository = false)
-        resetCommand.run(session) {
-            when (it) {
+        resetCommand.run(session) { result ->
+            when (result) {
                 is CompletionResult.Success -> {
-                    createMultiWallet(card, session, callback)
+                    createMultiWallet(
+                        card = card,
+                        session = session,
+                        callback = callback,
+                    )
                 }
-                is CompletionResult.Failure -> callback(CompletionResult.Failure(it.error))
+                is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
             }
         }
     }
@@ -228,17 +243,27 @@ private class CreateWalletTangemWallet(
     ) {
         when {
             card.settings.isBackupAllowed -> {
-                linkPrimaryCard(card, createWalletResponses, session, callback)
+                linkPrimaryCard(
+                    card = card,
+                    createWalletResponses = createWalletResponses,
+                    session = session,
+                    callback = callback,
+                )
             }
 
             card.settings.isHDWalletAllowed -> {
-                deriveKeys(card, createWalletResponses, session, callback)
+                deriveKeys(
+                    card = card,
+                    createWalletResponses = createWalletResponses,
+                    session = session,
+                    callback = callback,
+                )
             }
 
             else -> {
                 callback(
                     CompletionResult.Success(
-                        CreateProductWalletTaskResponse(card = session.environment.card!!),
+                        CreateProductWalletTaskResponse(card = requireNotNull(session.environment.card)),
                     ),
                 )
             }
@@ -247,7 +272,7 @@ private class CreateWalletTangemWallet(
 
     private fun linkPrimaryCard(
         card: CardDTO,
-        createWalletResponse: List<CreateWalletResponse>,
+        createWalletResponses: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
@@ -257,14 +282,19 @@ private class CreateWalletTangemWallet(
                     primaryCard = result.data
                     when {
                         card.settings.isHDWalletAllowed -> {
-                            deriveKeys(card, createWalletResponse, session, callback)
+                            deriveKeys(
+                                card = card,
+                                createWalletResponses = createWalletResponses,
+                                session = session,
+                                callback = callback,
+                            )
                         }
 
                         else -> {
                             callback(
                                 CompletionResult.Success(
                                     CreateProductWalletTaskResponse(
-                                        card = session.environment.card!!,
+                                        card = requireNotNull(session.environment.card),
                                         primaryCard = primaryCard,
                                     ),
                                 ),
@@ -282,13 +312,13 @@ private class CreateWalletTangemWallet(
 
     private fun deriveKeys(
         card: CardDTO,
-        createWalletResponse: List<CreateWalletResponse>,
+        createWalletResponses: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
         val map = mutableMapOf<ByteArrayKey, List<DerivationPath>>()
         var isBlockchainsForCurvesExist = false
-        createWalletResponse.forEach { response ->
+        createWalletResponses.forEach { response ->
             val blockchainsForCurve = getBlockchains(response.cardId, card).filter {
                 it.getSupportedCurves().contains(response.wallet.curve)
             }
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
index c0ddcdeea3..628dbf9005 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/CreateWalletsTask.kt
@@ -42,7 +42,7 @@ class CreateWalletsTask(
         callback: (result: CompletionResult<CreateWalletsResponse>) -> Unit,
     ) {
         val extendedPrivateKey = mnemonic?.let {
-            AnyMasterKeyFactory(mnemonic = it, passphrase = passphrase ?: "").makeMasterKey(curve)
+            AnyMasterKeyFactory(mnemonic = it, passphrase = passphrase.orEmpty()).makeMasterKey(curve)
         }
         CreateWalletTask(curve, extendedPrivateKey).run(session) { result ->
             when (result) {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt
index fa255fdacb..c1475265db 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/DerivationsFinder.kt
@@ -7,7 +7,7 @@ import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.datasource.local.token.UserTokensResponseStore
 import com.tangem.domain.wallets.derivations.DerivationStyleProvider
-import com.tangem.domain.card.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.card.common.TapWorkarounds.hasOldStyleDerivation
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.builder.UserWalletIdBuilder
@@ -34,12 +34,10 @@ internal class DerivationsFinder(
         val userWalletId = UserWalletIdBuilder.card(card).build() ?: return emptySet()
         val derivationStyle = derivationStyleProvider.getDerivationStyle()
 
-        var blockchains = withContext(dispatchers.io) {
+        val blockchains = withContext(dispatchers.io) {
             getBlockchains(userWalletId)
-        }
-
-        if (blockchains.isEmpty()) {
-            blockchains = if (DemoHelper.isDemoCardId(card.cardId)) {
+        }.ifEmpty {
+            if (DemoHelper.isDemoCardId(card.cardId)) {
                 getDemoBlockchains(derivationStyle)
             } else {
                 getDefaultBlockchains(derivationStyle)
@@ -56,7 +54,7 @@ internal class DerivationsFinder(
         }
 
         // pay attention to this
-        if (!card.useOldStyleDerivation) {
+        if (!card.hasOldStyleDerivation) {
             blockchains.removeUnnecessaryBlockchains()
         }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
index 51ff0b2d80..c00639f1bd 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ResetToFactorySettingsTask.kt
@@ -19,10 +19,15 @@ class ResetToFactorySettingsTask(
     }
 
     private fun deleteWallets(session: CardSession, callback: (result: CompletionResult<Boolean>) -> Unit) {
-        val wallet = session.environment.card?.wallets?.lastOrNull().guard {
-            resetBackup(session, callback)
-            return
-        }
+        val wallet = session
+            .environment
+            .card
+            ?.wallets
+            ?.lastOrNull()
+            .guard {
+                resetBackup(session, callback)
+                return
+            }
 
         PurgeWalletCommand(wallet.publicKey).run(session) { result ->
             when (result) {
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
index df05ce2f7e..27bc6e7e13 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
@@ -111,13 +111,13 @@ internal class ScanProductTask(
     }
 
     private fun getErrorIfExcludedCard(cardDto: CardDTO, card: Card): TangemError? {
-        if (cardDto.isExcluded) return TapSdkError.CardForDifferentApp
-        if (cardDto.isNotSupportedInThatRelease) return TapSdkError.CardNotSupportedByRelease
+        if (cardDto.isExcluded) return TapSdkError.CardForDifferentApp()
+        if (cardDto.isNotSupportedInThatRelease) return TapSdkError.CardNotSupportedByRelease()
         // according ios decline card lower Ed25519Slip0010Available version and contains imported wallets
         if (card.firmwareVersion < FirmwareVersion.Ed25519Slip0010Available &&
             card.wallets.any { it.isImported }
         ) {
-            return TapSdkError.CardNotSupportedByRelease
+            return TapSdkError.CardNotSupportedByRelease()
         }
         return null
     }
@@ -253,12 +253,13 @@ private class ScanWalletProcessor(
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
         mainScope.launch {
-            val activationInProgress = store.inject(DaggerGraphState::cardRepository)
+            val isActivationInProgress = store.inject(DaggerGraphState::cardRepository)
                 .isActivationInProgress(card.cardId)
 
             @Suppress("ComplexCondition")
-            if (card.backupStatus == CardDTO.BackupStatus.NoBackup && card.wallets.isNotEmpty() &&
-                activationInProgress
+            if (card.backupStatus == CardDTO.BackupStatus.NoBackup &&
+                card.wallets.isNotEmpty() &&
+                isActivationInProgress
             ) {
                 StartPrimaryCardLinkingTask().run(session) { linkingResult ->
                     when (linkingResult) {
@@ -372,8 +373,8 @@ private class ScanTwinProcessor : ProductCommandProcessor<ScanResponse> {
                         return@run
                     }
 
-                    val verified = TwinsHelper.verifyTwinPublicKey(readDataResult.data.issuerData, publicKey)
-                    val response = if (verified) {
+                    val isVerified = TwinsHelper.verifyTwinPublicKey(readDataResult.data.issuerData, publicKey)
+                    val response = if (isVerified) {
                         val twinPublicKey = readDataResult.data.issuerData.sliceArray(0 until 65)
                         val walletData = session.environment.walletData
                         ScanResponse(
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCardActivationTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCardActivationTask.kt
index 9dd041b2ea..547876b22f 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCardActivationTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCardActivationTask.kt
@@ -153,9 +153,9 @@ class VisaCardActivationTask @AssistedInject constructor(
             val otpTaskDeferred = async { createOTP() }
 
             val dataToSign = dataToSignDeferred.await()
-                .getOrElse {
+                .getOrElse { error ->
                     otpTaskDeferred.cancel()
-                    return@coroutineScope CompletionResult.Failure(it)
+                    return@coroutineScope CompletionResult.Failure(error)
                 }
 
             otpTaskDeferred.await()
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCustomerWalletApproveTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCustomerWalletApproveTask.kt
index 4fa773c18c..64fc98c01d 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCustomerWalletApproveTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCustomerWalletApproveTask.kt
@@ -115,8 +115,8 @@ class VisaCustomerWalletApproveTask(
             extendedPublicKey = extendedPublicKey,
         )
 
-        validationResult.onLeft {
-            callback(CompletionResult.Failure(it.tangemError))
+        validationResult.onLeft { error ->
+            callback(CompletionResult.Failure(error.tangemError))
             return
         }
 
@@ -137,8 +137,8 @@ class VisaCustomerWalletApproveTask(
         val publicKey = findKeyWithoutDerivation(
             targetAddress = visaDataForApprove.targetAddress,
             card = CardDTO(card),
-        ).getOrElse {
-            callback(CompletionResult.Failure(it.tangemError))
+        ).getOrElse { error ->
+            callback(CompletionResult.Failure(error.tangemError))
             return
         }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
index d55d7d7d32..b466017130 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
@@ -37,7 +37,7 @@ class CreateSecondTwinWalletTask(
             }
 
             if (!TwinsHelper.isTwinsCompatible(firstCardId, card.cardId)) {
-                callback(CompletionResult.Failure(IncompatibleTwinCard))
+                callback(CompletionResult.Failure(IncompatibleTwinCard()))
                 return
             }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
index 8d2c83906c..2b20696ee9 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt
@@ -24,7 +24,7 @@ class FinalizeTwinTask(
                         when (readResult) {
                             is CompletionResult.Success ->
                                 ScanProductTask(
-                                    readResult.data,
+                                    card = readResult.data,
                                     derivationsFinder = null,
                                     visaCardScanHandler = null,
                                     visaCoroutineScope = null,
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/IncompatibleTwinCard.kt b/app/src/main/java/com/tangem/tap/domain/twins/IncompatibleTwinCard.kt
index 10afdb020a..a9c4f33eb4 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/IncompatibleTwinCard.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/IncompatibleTwinCard.kt
@@ -4,7 +4,7 @@ import com.tangem.common.core.TangemError
 import com.tangem.tap.tangemSdkManager
 import com.tangem.wallet.R
 
-object IncompatibleTwinCard : TangemError(code = 50005) {
+class IncompatibleTwinCard : TangemError(code = 50005) {
     override var customMessage: String = tangemSdkManager.getString(
         R.string.twin_error_wrong_twin,
     )
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
index 2a9dcc2d23..b503705f7e 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
@@ -41,7 +41,7 @@ class TwinCardsManager(card: CardDTO) {
         creatingWalletMessage: Message,
     ): CompletionResult<CreateWalletResponse> {
         val response = tangemSdkManager.createSecondTwinWallet(
-            firstPublicKey = currentCardPublicKey!!,
+            firstPublicKey = requireNotNull(currentCardPublicKey),
             firstCardId = firstCardId,
             issuerKeys = getIssuerKeys(),
             preparingMessage = preparingMessage,
@@ -58,7 +58,7 @@ class TwinCardsManager(card: CardDTO) {
 
     suspend fun complete(message: Message): CompletionResult<ScanResponse> {
         val response = tangemSdkManager.finalizeTwin(
-            secondCardPublicKey = secondCardPublicKey!!.hexToBytes(),
+            secondCardPublicKey = requireNotNull(secondCardPublicKey).hexToBytes(),
             issuerKeyPair = getIssuerKeys(),
             cardId = firstCardId,
             initialMessage = message,
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt
index 7eae636918..7dc2b0adff 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/WriteProtectedIssuerDataTask.kt
@@ -21,8 +21,9 @@ class WriteProtectedIssuerDataTask(
 
     override fun run(session: CardSession, callback: (result: CompletionResult<SuccessResponse>) -> Unit) {
         SignHashCommand(
-            twinPublicKey.calculateSha256(),
-            session.environment.card!!.wallets.first().publicKey,
+            hash = twinPublicKey.calculateSha256(),
+            walletPublicKey = requireNotNull(session.environment.card)
+                .wallets.first().publicKey,
         )
             .run(session) { signResult ->
                 when (signResult) {
@@ -31,12 +32,12 @@ class WriteProtectedIssuerDataTask(
                             when (readResult) {
                                 is CompletionResult.Success -> {
                                     writeIssuerData(
-                                        twinPublicKey,
-                                        issuerKeys,
-                                        signResult.data.signature,
-                                        readResult.data,
-                                        session,
-                                        callback,
+                                        twinPublicKey = twinPublicKey,
+                                        issuerKeys = issuerKeys,
+                                        cardSignature = signResult.data.signature,
+                                        readResponse = readResult.data,
+                                        session = session,
+                                        callback = callback,
                                     )
                                 }
                                 is CompletionResult.Failure -> callback(
@@ -78,7 +79,7 @@ class WriteProtectedIssuerDataTask(
         )
         WriteIssuerDataCommand(
             issuerData = data,
-            issuerDataSignature = signedByIssuer.finalizingSignature!!,
+            issuerDataSignature = requireNotNull(signedByIssuer.finalizingSignature),
             issuerDataCounter = counter,
             issuerPublicKey = issuerKeys.publicKey,
         ).run(session, callback)
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
index c521709443..5ea3c3c88b 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt
@@ -8,13 +8,13 @@ import com.tangem.common.json.TangemSdkAdapter
 import com.tangem.common.services.secure.SecureStorage
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.scan.serialization.*
 import com.tangem.domain.visa.model.VisaActivationRemoteState
 import com.tangem.domain.visa.model.VisaCardActivationStatus
+import com.tangem.domain.wallets.hot.HotWalletAccessCodeAttemptsRepository
 import com.tangem.domain.wallets.hot.HotWalletPasswordRequester
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.wallets.hot.HotWalletAccessCodeAttemptsRepository
 import com.tangem.sdk.storage.AndroidSecureStorage
 import com.tangem.sdk.storage.AndroidSecureStorageV2
 import com.tangem.sdk.storage.createEncryptedSharedPreferences
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
index 956ce71605..ae13a2ec94 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
@@ -57,12 +57,12 @@ internal class BiometricUserWalletsListManager(
     override val selectedUserWalletSync: UserWallet?
         get() = findSelectedUserWallet()
 
-    override val isLocked: Flow<Boolean>
+    override val lockedState: Flow<Boolean>
         get() = state
             .mapLatest { it.isLocked }
             .distinctUntilChanged()
 
-    override val isLockedSync: Boolean
+    override val isLocked: Boolean
         get() = state.value.isLocked
 
     override val hasUserWallets: Boolean
@@ -103,7 +103,9 @@ internal class BiometricUserWalletsListManager(
 
     override suspend fun select(userWalletId: UserWalletId): CompletionResult<UserWallet> = catching {
         if (state.value.selectedUserWalletId == userWalletId) {
-            return@catching findSelectedUserWallet()!!
+            return@catching requireNotNull(findSelectedUserWallet()) {
+                "Wallet is not found"
+            }
         }
 
         selectedUserWalletRepository.set(userWalletId)
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/GeneralUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/GeneralUserWalletsListManager.kt
index 4ae134f570..f38d94f5c8 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/GeneralUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/GeneralUserWalletsListManager.kt
@@ -93,23 +93,23 @@ internal class GeneralUserWalletsListManager(
     override val walletsCount: Int
         get() = requireImplementation.walletsCount
 
-    override val isLocked: Flow<Boolean>
+    override val lockedState: Flow<Boolean>
         get() = implementation.transformLatest { impl ->
             if (impl == null) return@transformLatest
 
             if (impl is UserWalletsListManager.Lockable) {
-                emitAll(impl.isLocked)
+                emitAll(impl.lockedState)
             } else {
                 error("RuntimeUserWalletsListManager is not lockable")
             }
         }
 
-    override val isLockedSync: Boolean
+    override val isLocked: Boolean
         get() {
             val impl = requireImplementation
 
             return if (impl is UserWalletsListManager.Lockable) {
-                impl.isLockedSync
+                impl.isLocked
             } else {
                 error("RuntimeUserWalletsListManager is not lockable")
             }
@@ -173,10 +173,10 @@ internal class GeneralUserWalletsListManager(
                 }
 
                 if (possibleManager == implementation.value) {
-                    Timber.e("Switch to the same manager ${possibleManager::class.simpleName}")
+                    Timber.e("Switch to the same manager ${possibleManager::class.simpleName.orEmpty()}")
                 }
 
-                Timber.i("Switch to ${possibleManager::class.simpleName}")
+                Timber.i("Switch to ${possibleManager::class.simpleName.orEmpty()}")
 
                 val previousManager = implementation.value
                 implementation.value = copySelectedUserWallet(
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/RuntimeUserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/RuntimeUserWalletsListManager.kt
index 900c4bb7bf..31ad6301f0 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/RuntimeUserWalletsListManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/RuntimeUserWalletsListManager.kt
@@ -74,11 +74,13 @@ internal class RuntimeUserWalletsListManager : UserWalletsListManager {
             ?.takeIf { it.walletId == userWalletId }
             ?: walletNotFound()
 
-        state.updateAndGet { prevState ->
-            prevState.copy(
-                userWallet = update(wallet),
-            )
-        }.userWallet!!
+        requireNotNull(
+            state.updateAndGet { prevState ->
+                prevState.copy(
+                    userWallet = update(wallet),
+                )
+            }.userWallet,
+        ) { "User wallet is null after update" }
     }
 
     override suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit> = clear()
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletInformation.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletInformation.kt
index b4019602d9..bc5d0c26ac 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletInformation.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletInformation.kt
@@ -21,6 +21,7 @@ internal data class UserWalletSensitiveInformation(
     val mobileWallets: List<MobileWallet>? = null,
 )
 
+@Suppress("BooleanPropertyNaming")
 @JsonClass(generateAdapter = true)
 internal data class UserWalletPublicInformation(
     // Common
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
index c4a0b716f7..36b368b111 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
@@ -4,17 +4,13 @@ import arrow.core.Either
 import arrow.core.left
 import arrow.core.raise.either
 import arrow.core.right
-import com.tangem.common.CompletionResult
-import com.tangem.common.doOnFailure
-import com.tangem.common.doOnSuccess
-import com.tangem.common.flatMap
-import com.tangem.common.map
+import com.tangem.common.*
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
 import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository.LockMethod
-import com.tangem.domain.core.wallets.error.*
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository.LockMethod
+import com.tangem.domain.common.wallets.error.*
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
@@ -125,7 +121,7 @@ internal class DefaultUserWalletsListRepository(
 
         // update the userWallets state and add if it doesn't exist
         updateWallets { currentWallets ->
-            val wallets = currentWallets ?: emptyList()
+            val wallets = currentWallets.orEmpty()
             if (wallets.any { it.walletId == userWallet.walletId }) {
                 wallets.map { if (it.walletId == userWallet.walletId) userWallet else it }
             } else {
@@ -332,12 +328,12 @@ internal class DefaultUserWalletsListRepository(
             raise(LockWalletsError.NothingToLock)
         }
 
-        updateWallets {
-            it?.map {
-                if (it.walletId !in unsecuredWalletIds) {
-                    it.lock()
+        updateWallets { wallets ->
+            wallets?.map { wallet ->
+                if (wallet.walletId !in unsecuredWalletIds) {
+                    wallet.lock()
                 } else {
-                    it
+                    wallet
                 }
             }
         }
@@ -395,17 +391,17 @@ internal class DefaultUserWalletsListRepository(
     }
 
     private suspend fun hasBiometry(): Boolean {
-        val useBiometricAuthentication = appPreferencesStore.getSyncOrDefault(
+        val isBiometricAuthenticationUsed = appPreferencesStore.getSyncOrDefault(
             key = PreferencesKeys.USE_BIOMETRIC_AUTHENTICATION_KEY,
             default = false,
         )
 
-        return tangemSdkManagerProvider.invoke().canUseBiometry && useBiometricAuthentication
+        return tangemSdkManagerProvider.invoke().canUseBiometry && isBiometricAuthenticationUsed
     }
 
     private fun updateWallets(block: (List<UserWallet>?) -> List<UserWallet>?) {
-        userWallets.update {
-            val updated = block(it)
+        userWallets.update { wallets ->
+            val updated = block(wallets)
             selectedUserWallet.update { currentSelected ->
                 if (currentSelected == null) return@update null
                 updated?.find { it.walletId == currentSelected.walletId }
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletEncryptionKeysRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletEncryptionKeysRepository.kt
index 104cfc0945..faf5553d90 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletEncryptionKeysRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletEncryptionKeysRepository.kt
@@ -137,8 +137,7 @@ internal class UserWalletEncryptionKeysRepository(
 
     private suspend fun UserWalletEncryptionKey.encode(): ByteArray {
         return withContext(dispatchers.default) {
-            this@encode
-                .let(encryptionKeyAdapter::toJson)
+            encryptionKeyAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
@@ -153,8 +152,7 @@ internal class UserWalletEncryptionKeysRepository(
 
     private suspend fun List<UserWalletId>.encode(): ByteArray {
         return withContext(dispatchers.default) {
-            this@encode
-                .let(userWalletsIdsListAdapter::toJson)
+            userWalletsIdsListAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
index 1a3d1c3b38..6f82167edd 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
@@ -164,8 +164,7 @@ internal class BiometricUserWalletsKeysRepository(
 
     private suspend fun UserWalletEncryptionKey.encode(): ByteArray {
         return withContext(Dispatchers.Default) {
-            this@encode
-                .let(encryptionKeyAdapter::toJson)
+            encryptionKeyAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
@@ -180,8 +179,7 @@ internal class BiometricUserWalletsKeysRepository(
 
     private suspend fun List<UserWalletId>.encode(): ByteArray {
         return withContext(Dispatchers.Default) {
-            this@encode
-                .let(userWalletsIdsListAdapter::toJson)
+            userWalletsIdsListAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsPublicInformationRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsPublicInformationRepository.kt
index a66ba5bdbb..c3e8f86072 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsPublicInformationRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsPublicInformationRepository.kt
@@ -80,8 +80,7 @@ internal class DefaultUserWalletsPublicInformationRepository(
     @JvmName("saveWithPublicInformation")
     private suspend fun save(publicInformation: List<UserWalletPublicInformation>): CompletionResult<Unit> = catching {
         withContext(Dispatchers.IO) {
-            publicInformation
-                .let(publicInformationAdapter::toJson)
+            publicInformationAdapter.toJson(publicInformation)
                 .encodeToByteArray(throwOnInvalidSequence = true)
                 .also { secureStorage.store(it, StorageKey.UserWalletPublicInformation.name) }
         }
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt
index 23d1e3e069..f4a2c32083 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt
@@ -110,18 +110,18 @@ internal class DefaultUserWalletsSensitiveInformationRepository(
 
     private suspend fun ByteArray.decodeToEncryptedSensitiveInformation(): Map<String, ByteArray>? {
         return withContext(Dispatchers.Default) {
-            this@decodeToEncryptedSensitiveInformation
-                .decodeToString(throwOnInvalidSequence = true)
-                .let(encryptedSensitiveInformationMapAdapter::fromJson)
+            encryptedSensitiveInformationMapAdapter.fromJson(
+                this@decodeToEncryptedSensitiveInformation.decodeToString(throwOnInvalidSequence = true),
+            )
         }
     }
 
     private suspend fun ByteArray.decodeToSensitiveInformation(): UserWalletSensitiveInformation? {
         return withContext(Dispatchers.Default) {
             try {
-                this@decodeToSensitiveInformation
-                    .decodeToString(throwOnInvalidSequence = true)
-                    .let(sensitiveInformationAdapter::fromJson)
+                sensitiveInformationAdapter.fromJson(
+                    this@decodeToSensitiveInformation.decodeToString(throwOnInvalidSequence = true),
+                )
             } catch (e: CharacterCodingException) {
                 Timber.e(e, "Unable to decode sensitive information")
 
@@ -132,16 +132,14 @@ internal class DefaultUserWalletsSensitiveInformationRepository(
 
     private suspend fun UserWalletSensitiveInformation.encode(): ByteArray {
         return withContext(Dispatchers.Default) {
-            this@encode
-                .let(sensitiveInformationAdapter::toJson)
+            sensitiveInformationAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
 
     private suspend fun Map<String, ByteArray>.encode(): ByteArray {
         return withContext(Dispatchers.Default) {
-            this@encode
-                .let(encryptedSensitiveInformationMapAdapter::toJson)
+            encryptedSensitiveInformationMapAdapter.toJson(this@encode)
                 .encodeToByteArray(throwOnInvalidSequence = true)
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt
index ec627a4e34..ea08934377 100644
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt
@@ -54,14 +54,14 @@ internal fun UserWalletPublicInformation.toUserWallet(): UserWallet {
             walletId = walletId,
             hotWalletId = hotWalletId,
             wallets = null,
-            backedUp = backedUp!!,
+            backedUp = requireNotNull(backedUp),
         )
     } else {
         UserWallet.Cold(
             name = name,
             walletId = walletId,
             cardsInWallet = cardsInWallet,
-            scanResponse = scanResponse!!,
+            scanResponse = requireNotNull(scanResponse),
             isMultiCurrency = isMultiCurrency,
             hasBackupError = hasBackupError,
         )
@@ -78,7 +78,7 @@ internal fun UserWallet.updateWith(sensitiveInformation: UserWalletSensitiveInfo
             copy(
                 scanResponse = scanResponse.copy(
                     card = scanResponse.card.copy(
-                        wallets = sensitiveInformation.wallets!!,
+                        wallets = requireNotNull(sensitiveInformation.wallets),
                     ),
                     visaCardActivationStatus = sensitiveInformation.visaCardActivationStatus,
                 ),
diff --git a/app/src/main/java/com/tangem/tap/domain/visa/VisaCardScanHandler.kt b/app/src/main/java/com/tangem/tap/domain/visa/VisaCardScanHandler.kt
index d074006981..931d258b38 100644
--- a/app/src/main/java/com/tangem/tap/domain/visa/VisaCardScanHandler.kt
+++ b/app/src/main/java/com/tangem/tap/domain/visa/VisaCardScanHandler.kt
@@ -87,9 +87,9 @@ internal class VisaCardScanHandler @Inject constructor(
             cardId = card.cardId,
             // This is the wallet public key, not the address and it's alright, as the API expects it in this format
             cardWalletAddress = wallet.publicKey.toHexString(),
-        ).getOrElse {
+        ).getOrElse { error ->
             Timber.i("Failed to get Access token for Wallet public key authorization")
-            return CompletionResult.Failure(it.tangemError)
+            return CompletionResult.Failure(error.tangemError)
         }
 
         val signChallengeResult = signChallengeWithWallet(
@@ -123,16 +123,16 @@ internal class VisaCardScanHandler @Inject constructor(
         signedChallenge: VisaAuthSignedChallenge,
     ): CompletionResult<VisaCardActivationStatus> {
         val authorizationTokensResponse = visaAuthRemoteDataSource.getAccessTokens(signedChallenge = signedChallenge)
-            .getOrElse {
+            .getOrElse { error ->
                 Timber.i("Failed to get Access token for Wallet public key authorization.")
                 return if (
-                    it is VisaApiError.ProductInstanceIsNotActivated ||
-                    it is VisaApiError.ProductInstanceNotFoundActivationRequired
+                    error is VisaApiError.ProductInstanceIsNotActivated ||
+                    error is VisaApiError.ProductInstanceNotFoundActivationRequired
                 ) {
                     Timber.i("Proceeding with card authorization.")
                     handleCardAuthorization(cardWalletAddress = cardWalletAddress)
                 } else {
-                    CompletionResult.Failure(it.tangemError)
+                    CompletionResult.Failure(error.tangemError)
                 }
             }
 
@@ -152,9 +152,9 @@ internal class VisaCardScanHandler @Inject constructor(
         val challengeResponse = visaAuthRemoteDataSource.getCardAuthChallenge(
             cardId = card.cardId,
             cardPublicKey = card.cardPublicKey.toHexString(),
-        ).getOrElse {
-            Timber.e("Failed to get challenge for Card authorization. Plain error: ${it.errorCode}")
-            return CompletionResult.Failure(it.tangemError)
+        ).getOrElse { error ->
+            Timber.e("Failed to get challenge for Card authorization. Plain error: ${error.errorCode}")
+            return CompletionResult.Failure(error.tangemError)
         }
 
         Timber.i("Received challenge to sign: ${challengeResponse.challenge}")
@@ -179,9 +179,9 @@ internal class VisaCardScanHandler @Inject constructor(
                 signedChallenge = attestCardKeyResponse.cardSignature.toHexString(),
                 salt = attestCardKeyResponse.salt.toHexString(),
             ),
-        ).getOrElse {
-            Timber.e("Failed to sign challenge with Card public key. Plain error: ${it.errorCode}")
-            return CompletionResult.Failure(it.tangemError)
+        ).getOrElse { error ->
+            Timber.e("Failed to sign challenge with Card public key. Plain error: ${error.errorCode}")
+            return CompletionResult.Failure(error.tangemError)
         }
 
         visaAuthTokenStorage.store(
@@ -189,9 +189,9 @@ internal class VisaCardScanHandler @Inject constructor(
             tokens = authorizationTokensResponse,
         )
 
-        val activationRemoteState = visaActivationRepository.getActivationRemoteState().getOrElse {
-            Timber.e("Failed to sign challenge with Card public key. Plain error: ${it.errorCode}")
-            return CompletionResult.Failure(it.tangemError)
+        val activationRemoteState = visaActivationRepository.getActivationRemoteState().getOrElse { error ->
+            Timber.e("Failed to sign challenge with Card public key. Plain error: ${error.errorCode}")
+            return CompletionResult.Failure(error.tangemError)
         }
 
         val error = when (activationRemoteState) {
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
index d398da42c9..0c647de6c4 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsAction.kt
@@ -6,6 +6,7 @@ import com.tangem.domain.models.scan.ScanResponse
 import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
 
+@Suppress("BooleanPropertyNaming")
 sealed class DetailsAction : Action {
 
     data class PrepareScreen(
@@ -32,7 +33,7 @@ sealed class DetailsAction : Action {
 
         data object EnrollBiometrics : AppSettings()
         data class BiometricsStatusChanged(
-            val needEnrollBiometrics: Boolean,
+            val isEnrollBiometricsNeeded: Boolean,
         ) : AppSettings()
 
         data class ChangeAppThemeMode(
@@ -40,7 +41,7 @@ sealed class DetailsAction : Action {
         ) : AppSettings()
 
         data class ChangeBalanceHiding(
-            val hideBalance: Boolean,
+            val shouldHideBalance: Boolean,
         ) : AppSettings()
 
         data class ChangeAppCurrency(
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
index 2ebe0494ab..25964c3070 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@@ -6,7 +6,7 @@ import com.tangem.common.doOnSuccess
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.apptheme.model.AppThemeMode
-import com.tangem.domain.core.wallets.UserWalletsListRepository.LockMethod
+import com.tangem.domain.common.wallets.UserWalletsListRepository.LockMethod
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.tap.common.analytics.events.AnalyticsParam
@@ -86,7 +86,7 @@ class DetailsMiddleware {
                     changeAppThemeMode(action.appThemeMode)
                 }
                 is DetailsAction.AppSettings.ChangeBalanceHiding -> {
-                    changeBalanceHiding(action.hideBalance)
+                    changeBalanceHiding(action.shouldHideBalance)
                 }
                 is DetailsAction.AppSettings.ChangeAppCurrency -> {
                     store.dispatch(GlobalAction.ChangeAppCurrency(action.currency))
@@ -153,9 +153,9 @@ class DetailsMiddleware {
         private suspend fun setBiometricLockForAllWallets() {
             val userWalletsListRepository = store.inject(DaggerGraphState::userWalletsListRepository)
             val userWallets = userWalletsListRepository.userWalletsSync()
-            userWallets.forEach {
+            userWallets.forEach { wallet ->
                 userWalletsListRepository.setLock(
-                    userWalletId = it.walletId,
+                    userWalletId = wallet.walletId,
                     lockMethod = LockMethod.Biometric,
                     changeUnsecured = false,
                 )
@@ -174,11 +174,11 @@ class DetailsMiddleware {
             deleteSavedAccessCodes()
             val userWalletsListRepository = store.inject(DaggerGraphState::userWalletsListRepository)
             val tangemHotSdk = store.inject(DaggerGraphState::tangemHotSdk)
-            userWalletsListRepository.userWalletsSync().forEach {
-                if (it is UserWallet.Hot) {
+            userWalletsListRepository.userWalletsSync().forEach { wallet ->
+                if (wallet is UserWallet.Hot) {
                     userWalletsListRepository.saveWithoutLock(
-                        userWallet = it.copy(
-                            hotWalletId = tangemHotSdk.removeBiometryAuthIfPresented(it.hotWalletId),
+                        userWallet = wallet.copy(
+                            hotWalletId = tangemHotSdk.removeBiometryAuthIfPresented(wallet.hotWalletId),
                         ),
                     )
                 }
@@ -188,10 +188,10 @@ class DetailsMiddleware {
         private fun observeBiometricsStatusChanges(scope: CoroutineScope) {
             val needEnrollBiometricsFlow = flow {
                 do {
-                    val needEnrollBiometrics = runCatching(tangemSdkManager::needEnrollBiometrics).getOrNull()
+                    val isEnrollBiometricsNeeded = runCatching(tangemSdkManager::needEnrollBiometrics).getOrNull()
 
-                    if (needEnrollBiometrics != null) {
-                        emit(needEnrollBiometrics)
+                    if (isEnrollBiometricsNeeded != null) {
+                        emit(isEnrollBiometricsNeeded)
                     }
 
                     delay(timeMillis = 200)
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
index e783c18e37..5b219a6c22 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@@ -84,7 +84,7 @@ private fun handlePrivacyAction(action: DetailsAction.AppSettings, state: Detail
         )
         is DetailsAction.AppSettings.BiometricsStatusChanged -> state.copy(
             appSettingsState = state.appSettingsState.copy(
-                needEnrollBiometrics = action.needEnrollBiometrics,
+                needEnrollBiometrics = action.isEnrollBiometricsNeeded,
             ),
         )
         is DetailsAction.AppSettings.ChangeAppThemeMode -> state.copy(
@@ -99,7 +99,7 @@ private fun handlePrivacyAction(action: DetailsAction.AppSettings, state: Detail
         )
         is DetailsAction.AppSettings.ChangeBalanceHiding -> state.copy(
             appSettingsState = state.appSettingsState.copy(
-                isHidingEnabled = action.hideBalance,
+                isHidingEnabled = action.shouldHideBalance,
             ),
         )
         // state should be copied to avoid concurrent modifications from different sources
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
index 980cacb286..f7e7eaa6dc 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsState.kt
@@ -11,6 +11,7 @@ data class DetailsState(
     val appSettingsState: AppSettingsState = AppSettingsState(),
 ) : StateType
 
+@Suppress("BooleanPropertyNaming")
 data class AppSettingsState(
     @Deprecated("Delete after hot wallet release")
     val saveWallets: Boolean = false,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
index c4cfcfd7ff..06eda3e12c 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/AppCurrencySelectorScreen.kt
@@ -341,24 +341,30 @@ private class AppCurrencySelectorStateProvider : CollectionPreviewParameterProvi
             .mapIndexed { index, s -> Currency(index.toString(), s) }
             .toPersistentList()
 
-        AppCurrencySelectorState.Loading(onBackClick = {}).let(::add)
-        AppCurrencySelectorState.Default(
-            selectedId = "0",
-            items = items,
-            scrollToSelected = consumedEvent(),
-            onCurrencyClick = {},
-            onBackClick = {},
-            onTopBarActionClick = {},
-        ).let(::add)
-        AppCurrencySelectorState.Search(
-            selectedId = "0",
-            items = items,
-            scrollToSelected = consumedEvent(),
-            onCurrencyClick = {},
-            onBackClick = {},
-            onSearchInputChange = {},
-            onTopBarActionClick = {},
-        ).let(::add)
+        add(AppCurrencySelectorState.Loading(onBackClick = {}))
+
+        add(
+            AppCurrencySelectorState.Default(
+                selectedId = "0",
+                items = items,
+                scrollToSelected = consumedEvent(),
+                onCurrencyClick = {},
+                onBackClick = {},
+                onTopBarActionClick = {},
+            ),
+        )
+
+        add(
+            AppCurrencySelectorState.Search(
+                selectedId = "0",
+                items = items,
+                scrollToSelected = consumedEvent(),
+                onCurrencyClick = {},
+                onBackClick = {},
+                onSearchInputChange = {},
+                onTopBarActionClick = {},
+            ),
+        )
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
index f3d0b721c9..438819ed0a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreen.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.domain.apptheme.model.AppThemeMode
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 import com.tangem.tap.features.details.ui.appsettings.components.*
@@ -27,16 +27,16 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 internal fun AppSettingsScreen(state: AppSettingsScreenState, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
     SettingsScreensScaffold(
+        onBackClick = onBackClick,
         modifier = modifier,
+        titleRes = R.string.app_settings_title,
+        addBottomInsets = false,
         content = {
             when (state) {
                 is AppSettingsScreenState.Content -> AppSettings(state = state)
                 is AppSettingsScreenState.Loading -> Unit
             }
         },
-        titleRes = R.string.app_settings_title,
-        onBackClick = onBackClick,
-        addBottomInsets = false,
     )
 }
 
@@ -103,10 +103,12 @@ private class AppSettingsScreenStateProvider : CollectionPreviewParameterProvide
             itemsFactory.createSelectThemeModeButton(AppThemeMode.DEFAULT, {}),
         )
 
-        AppSettingsScreenState.Content(
-            items = items,
-            dialog = null,
-        ).let(::add)
+        add(
+            AppSettingsScreenState.Content(
+                items = items,
+                dialog = null,
+            ),
+        )
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
index 29290619e6..f27a3d76d8 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
@@ -22,7 +22,7 @@ internal fun SettingsAlertDialog(dialog: Dialog.Alert) {
         isDismissable = false,
         confirmButton = DialogButtonUM(
             title = dialog.confirmText.resolveReference(),
-            warning = true,
+            isWarning = true,
             onClick = dialog.onConfirm,
         ),
         dismissButton = DialogButtonUM(
@@ -47,8 +47,8 @@ private class AlertDialogProvider : CollectionPreviewParameterProvider<Dialog.Al
     collection = buildList {
         val dialogsFactory = AppSettingsDialogsFactory()
 
-        dialogsFactory.createDeleteSavedAccessCodesAlert({}, {}).let(::add)
-        dialogsFactory.createDeleteSavedWalletsAlert({}, {}).let(::add)
+        add(dialogsFactory.createDeleteSavedAccessCodesAlert({}, {}))
+        add(dialogsFactory.createDeleteSavedWalletsAlert({}, {}))
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
index 537029db99..6c74614ff1 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsButtonItem.kt
@@ -14,8 +14,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -64,10 +64,12 @@ private class ButtonItemProvider : CollectionPreviewParameterProvider<Item.Butto
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        itemsFactory.createSelectAppCurrencyButton(
-            currentAppCurrencyName = "US Dollar",
-            onClick = { /* no-op */ },
-        ).let(::add)
+        add(
+            itemsFactory.createSelectAppCurrencyButton(
+                currentAppCurrencyName = "US Dollar",
+                onClick = { /* no-op */ },
+            ),
+        )
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
index 0303b21733..5a954d604e 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsCardItem.kt
@@ -16,8 +16,8 @@ import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.components.SpacerW16
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -71,9 +71,7 @@ private class CardItemProvider : CollectionPreviewParameterProvider<Item.Card>(
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        itemsFactory.createEnrollBiometricsCard(
-            onClick = { /* no-op */ },
-        ).let(::add)
+        add(itemsFactory.createEnrollBiometricsCard(onClick = { /* no-op */ }))
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
index 9ad210cbef..153b026e85 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsSwitchItem.kt
@@ -17,8 +17,8 @@ import com.tangem.core.ui.components.SpacerH4
 import com.tangem.core.ui.components.SpacerW32
 import com.tangem.core.ui.components.TangemSwitch
 import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsItemsFactory
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsScreenState.Item
 
@@ -85,26 +85,37 @@ private class SwitchItemProvider : CollectionPreviewParameterProvider<Item.Switc
     collection = buildList {
         val itemsFactory = AppSettingsItemsFactory()
 
-        itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = true,
-            isEnabled = true,
-            onCheckedChange = { /* no-op */ },
-        ).let(::add)
-        itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = false,
-            isEnabled = true,
-            onCheckedChange = { /* no-op */ },
-        ).let(::add)
-        itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = true,
-            isEnabled = false,
-            onCheckedChange = { /* no-op */ },
-        ).let(::add)
-        itemsFactory.createSaveAccessCodeSwitch(
-            isChecked = false,
-            isEnabled = false,
-            onCheckedChange = { /* no-op */ },
-        ).let(::add)
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = true,
+                isEnabled = true,
+                onCheckedChange = { /* no-op */ },
+            ),
+        )
+
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = false,
+                isEnabled = true,
+                onCheckedChange = { /* no-op */ },
+            ),
+        )
+
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = true,
+                isEnabled = false,
+                onCheckedChange = { /* no-op */ },
+            ),
+        )
+
+        add(
+            itemsFactory.createSaveAccessCodeSwitch(
+                isChecked = false,
+                isEnabled = false,
+                onCheckedChange = { /* no-op */ },
+            ),
+        )
     },
 )
 // endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
index 8b9f0e5a01..d9d1ad29f8 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/model/AppSettingsModel.kt
@@ -32,6 +32,7 @@ import com.tangem.tap.store
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
+import com.tangem.utils.extensions.addIf
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.*
@@ -100,59 +101,72 @@ internal class AppSettingsModel @Inject constructor(
 
     private fun buildItems(state: AppSettingsState): ImmutableList<AppSettingsScreenState.Item> {
         val items = buildList {
-            if (state.needEnrollBiometrics) {
-                itemsFactory.createEnrollBiometricsCard(
-                    onClick = ::enrollBiometrics,
-                ).let(::add)
-            }
+            addIf(
+                condition = state.needEnrollBiometrics,
+                element = itemsFactory.createEnrollBiometricsCard(onClick = ::enrollBiometrics),
+            )
 
-            itemsFactory.createSelectAppCurrencyButton(
-                currentAppCurrencyName = state.selectedAppCurrency.name,
-                onClick = ::showAppCurrencySelector,
-            ).let(::add)
+            add(
+                itemsFactory.createSelectAppCurrencyButton(
+                    currentAppCurrencyName = state.selectedAppCurrency.name,
+                    onClick = ::showAppCurrencySelector,
+                ),
+            )
 
             if (hotWalletFeatureToggles.isHotWalletEnabled) {
                 val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                itemsFactory.createUseBiometricsSwitch(
-                    isChecked = state.useBiometricAuthentication,
-                    isEnabled = canUseBiometrics,
-                    onCheckedChange = ::onBiometricAuthenticationToggled,
-                ).let(::add)
+                add(
+                    itemsFactory.createUseBiometricsSwitch(
+                        isChecked = state.useBiometricAuthentication,
+                        isEnabled = canUseBiometrics,
+                        onCheckedChange = ::onBiometricAuthenticationToggled,
+                    ),
+                )
 
-                itemsFactory.createRequireAccessCodeSwitch(
-                    isChecked = state.requireAccessCode,
-                    isEnabled = canUseBiometrics && state.useBiometricAuthentication,
-                    onCheckedChange = ::onRequireAccessCodeToggled,
-                ).let(::add)
+                add(
+                    itemsFactory.createRequireAccessCodeSwitch(
+                        isChecked = state.requireAccessCode,
+                        isEnabled = canUseBiometrics && state.useBiometricAuthentication,
+                        onCheckedChange = ::onRequireAccessCodeToggled,
+                    ),
+                )
             } else {
                 if (state.isBiometricsAvailable) {
                     val canUseBiometrics = !state.needEnrollBiometrics && !state.isInProgress
 
-                    itemsFactory.createSaveWalletsSwitch(
-                        isChecked = state.saveWallets,
-                        isEnabled = canUseBiometrics,
-                        onCheckedChange = ::onSaveWalletsToggled,
-                    ).let(::add)
+                    add(
+                        itemsFactory.createSaveWalletsSwitch(
+                            isChecked = state.saveWallets,
+                            isEnabled = canUseBiometrics,
+                            onCheckedChange = ::onSaveWalletsToggled,
+                        ),
+                    )
 
-                    itemsFactory.createSaveAccessCodeSwitch(
-                        isChecked = state.saveAccessCodes,
-                        isEnabled = canUseBiometrics,
-                        onCheckedChange = ::onSaveAccessCodesToggled,
-                    ).let(::add)
+                    add(
+                        itemsFactory.createSaveAccessCodeSwitch(
+                            isChecked = state.saveAccessCodes,
+                            isEnabled = canUseBiometrics,
+                            onCheckedChange = ::onSaveAccessCodesToggled,
+                        ),
+                    )
                 }
             }
 
-            itemsFactory.createFlipToHideBalanceSwitch(
-                isChecked = state.isHidingEnabled,
-                isEnabled = true,
-                onCheckedChange = ::onFlipToHideBalanceToggled,
-            ).let(::add)
+            add(
+                itemsFactory.createFlipToHideBalanceSwitch(
+                    isChecked = state.isHidingEnabled,
+                    isEnabled = true,
+                    onCheckedChange = ::onFlipToHideBalanceToggled,
+                ),
+            )
 
-            itemsFactory.createSelectThemeModeButton(
-                currentThemeMode = state.selectedThemeMode,
-                onClick = { showThemeModeSelector(state.selectedThemeMode) },
-            ).let(::add)
+            add(
+                itemsFactory.createSelectThemeModeButton(
+                    currentThemeMode = state.selectedThemeMode,
+                    onClick = { showThemeModeSelector(state.selectedThemeMode) },
+                ),
+            )
         }
 
         return items.toImmutableList()
@@ -280,7 +294,7 @@ internal class AppSettingsModel @Inject constructor(
         val param = AnalyticsParam.OnOffState(enable)
         analyticsEventHandler.send(Settings.AppSettings.HideBalanceChanged(param))
 
-        store.dispatch(DetailsAction.AppSettings.ChangeBalanceHiding(hideBalance = enable))
+        store.dispatch(DetailsAction.AppSettings.ChangeBalanceHiding(shouldHideBalance = enable))
     }
 
     private fun dismissDialog() {
@@ -290,10 +304,10 @@ internal class AppSettingsModel @Inject constructor(
     private fun bootstrapAppCurrencyUpdates() {
         appCurrencyRepository
             .getSelectedAppCurrency()
-            .onEach {
-                if (it.code == store.state.globalState.appCurrency.code) return@onEach
+            .onEach { appCurrency ->
+                if (appCurrency.code == store.state.globalState.appCurrency.code) return@onEach
 
-                store.dispatchWithMain(DetailsAction.AppSettings.ChangeAppCurrency(it))
+                store.dispatchWithMain(DetailsAction.AppSettings.ChangeAppCurrency(appCurrency))
             }
             .launchIn(scope)
             .saveIn(appCurrencyUpdatesJobHolder)
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
index eb76dc0b7a..a81c2bdbd1 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreen.kt
@@ -26,19 +26,19 @@ import com.tangem.wallet.R
 
 @Composable
 internal fun CardSettingsScreen(state: CardSettingsScreenState, modifier: Modifier = Modifier) {
-    val needReadCard = state.cardDetails == null
+    val isCardReadingNeeded = state.cardDetails == null
 
     SettingsScreensScaffold(
+        onBackClick = state.onBackClick,
         modifier = modifier,
+        titleRes = R.string.card_settings_title,
         content = {
-            if (needReadCard) {
+            if (isCardReadingNeeded) {
                 CardSettingsReadCard(state.onScanCardClick)
             } else {
                 CardSettings(state = state)
             }
         },
-        titleRes = R.string.card_settings_title,
-        onBackClick = state.onBackClick,
     )
 }
 
@@ -123,8 +123,8 @@ private fun CardSettings(state: CardSettingsScreenState) {
             .fillMaxWidth()
             .testTag(DeviceSettingsScreenTestTags.LAZY_LIST),
     ) {
-        items(state.cardDetails) {
-            val paddingBottom = when (it) {
+        items(state.cardDetails) { cardInfo ->
+            val paddingBottom = when (cardInfo) {
                 is CardInfo.CardId, is CardInfo.Issuer -> TangemTheme.dimens.spacing12
                 is CardInfo.SignedHashes -> TangemTheme.dimens.spacing14
                 is CardInfo.SecurityMode -> TangemTheme.dimens.spacing16
@@ -132,7 +132,7 @@ private fun CardSettings(state: CardSettingsScreenState) {
                 is CardInfo.AccessCodeRecovery -> TangemTheme.dimens.spacing16
                 is CardInfo.ResetToFactorySettings -> TangemTheme.dimens.spacing28
             }
-            val paddingTop = when (it) {
+            val paddingTop = when (cardInfo) {
                 is CardInfo.CardId -> TangemTheme.dimens.spacing0
                 is CardInfo.Issuer -> TangemTheme.dimens.spacing12
                 is CardInfo.SignedHashes -> TangemTheme.dimens.spacing12
@@ -145,8 +145,8 @@ private fun CardSettings(state: CardSettingsScreenState) {
                 modifier = Modifier
                     .fillMaxWidth()
                     .clickable(
-                        enabled = it.clickable,
-                        onClick = { state.onElementClick(it) },
+                        enabled = cardInfo.isClickable,
+                        onClick = { state.onElementClick(cardInfo) },
                     )
                     .padding(
                         start = TangemTheme.dimens.spacing20,
@@ -155,25 +155,25 @@ private fun CardSettings(state: CardSettingsScreenState) {
                         top = paddingTop,
                     ),
             ) {
-                val titleColor = if (it.clickable) {
+                val titleColor = if (cardInfo.isClickable) {
                     TangemTheme.colors.text.primary1
                 } else {
                     TangemTheme.colors.text.tertiary
                 }
-                val subtitleColor = if (it.clickable) {
+                val subtitleColor = if (cardInfo.isClickable) {
                     TangemTheme.colors.text.secondary
                 } else {
                     TangemTheme.colors.text.tertiary
                 }
                 Text(
-                    text = it.titleRes.resolveReference(),
+                    text = cardInfo.titleRes.resolveReference(),
                     color = titleColor,
                     style = TangemTheme.typography.subtitle1,
                     modifier = Modifier.testTag(DeviceSettingsScreenTestTags.ITEM_TITLE),
                 )
                 Spacer(modifier = Modifier.size(TangemTheme.dimens.size4))
                 Text(
-                    text = it.subtitle.resolveReference(),
+                    text = cardInfo.subtitle.resolveReference(),
                     color = subtitleColor,
                     style = TangemTheme.typography.body2,
                     modifier = Modifier.testTag(DeviceSettingsScreenTestTags.ITEM_SUBTITLE),
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
index cbf005de4c..5f4415c577 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsScreenState.kt
@@ -18,7 +18,7 @@ internal data class CardSettingsScreenState(
 internal sealed class CardInfo(
     val titleRes: TextReference,
     val subtitle: TextReference,
-    val clickable: Boolean = false,
+    val isClickable: Boolean = false,
 ) {
     class CardId(subtitle: String) : CardInfo(
         titleRes = TextReference.Res(R.string.details_row_title_cid),
@@ -38,29 +38,29 @@ internal sealed class CardInfo(
     class SecurityMode(securityOption: SecurityOption, clickable: Boolean) : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_security_mode),
         subtitle = TextReference.Res(securityOption.toTitleRes()),
-        clickable = clickable,
+        isClickable = clickable,
     )
 
     data object ChangeAccessCode : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_change_access_code),
         subtitle = TextReference.Res(R.string.card_settings_change_access_code_footer),
-        clickable = true,
+        isClickable = true,
     )
 
-    class AccessCodeRecovery(val enabled: Boolean) : CardInfo(
+    class AccessCodeRecovery(val isEnabled: Boolean) : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_access_code_recovery_title),
-        subtitle = if (enabled) {
+        subtitle = if (isEnabled) {
             TextReference.Res(R.string.common_enabled)
         } else {
             TextReference.Res(R.string.common_disabled)
         },
-        clickable = true,
+        isClickable = true,
     )
 
     class ResetToFactorySettings(description: TextReference) : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_reset_card_to_factory),
         subtitle = description,
-        clickable = true,
+        isClickable = true,
     )
 }
 
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreen.kt
index 8315639120..c40418cc3d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreen.kt
@@ -16,8 +16,8 @@ import com.tangem.wallet.R
 @Composable
 fun AccessCodeRecoveryScreen(state: AccessCodeRecoveryScreenState, onBackClick: () -> Unit) {
     SettingsScreensScaffold(
-        content = { AccessCodeRecoveryOptions(state = state) },
         onBackClick = onBackClick,
+        content = { AccessCodeRecoveryOptions(state = state) },
     )
 }
 
@@ -38,13 +38,13 @@ fun AccessCodeRecoveryOptions(state: AccessCodeRecoveryScreenState) {
         DetailsRadioButtonElement(
             title = stringResourceSafe(id = R.string.common_enabled),
             subtitle = stringResourceSafe(id = R.string.card_settings_access_code_recovery_enabled_description),
-            selected = state.enabledSelection,
+            isSelected = state.isEnabledSelection,
             onClick = { state.onOptionClick(true) },
         )
         DetailsRadioButtonElement(
             title = stringResourceSafe(id = R.string.common_disabled),
             subtitle = stringResourceSafe(id = R.string.card_settings_access_code_recovery_disabled_description),
-            selected = !state.enabledSelection,
+            isSelected = !state.isEnabledSelection,
             onClick = { state.onOptionClick(false) },
         )
 
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreenState.kt
index b4b6c68535..2d2301ab70 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/AccessCodeRecoveryScreenState.kt
@@ -1,15 +1,15 @@
 package com.tangem.tap.features.details.ui.cardsettings.coderecovery
 
 /**
- * @property enabledOnCard Indicates whether access code recovery is enabled on the card
- * @property enabledSelection Represents the currently selected option in the app (not yet saved on the card)
+ * @property isEnabledOnCard Indicates whether access code recovery is enabled on the card
+ * @property isEnabledSelection Represents the currently selected option in the app (not yet saved on the card)
  * @property isSaveChangesEnabled Determines if the user is allowed to save their selection to the card
  * @property onSaveChangesClick Callback function called when the user wants to apply the selected option
  * @property onOptionClick Callback function called when the user selects an option
  * */
 data class AccessCodeRecoveryScreenState(
-    val enabledOnCard: Boolean,
-    val enabledSelection: Boolean,
+    val isEnabledOnCard: Boolean,
+    val isEnabledSelection: Boolean,
     val isSaveChangesEnabled: Boolean,
     val onSaveChangesClick: () -> Unit,
     val onOptionClick: (Boolean) -> Unit,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/model/AccessCodeRecoveryModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/model/AccessCodeRecoveryModel.kt
index 298d2ac7d7..ac083db4c6 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/model/AccessCodeRecoveryModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/coderecovery/model/AccessCodeRecoveryModel.kt
@@ -43,8 +43,8 @@ internal class AccessCodeRecoveryModel @Inject constructor(
         )
 
         return AccessCodeRecoveryScreenState(
-            enabledOnCard = isEnabled,
-            enabledSelection = isEnabled,
+            isEnabledOnCard = isEnabled,
+            isEnabledSelection = isEnabled,
             isSaveChangesEnabled = false,
             onSaveChangesClick = ::saveChanges,
             onOptionClick = ::selectOption,
@@ -52,7 +52,7 @@ internal class AccessCodeRecoveryModel @Inject constructor(
     }
 
     private fun saveChanges() = modelScope.launch {
-        val isEnabled = screenState.value.enabledSelection
+        val isEnabled = screenState.value.isEnabledSelection
 
         tangemSdkManager
             .setAccessCodeRecoveryEnabled(scannedScanResponse.card.cardId, isEnabled)
@@ -78,10 +78,10 @@ internal class AccessCodeRecoveryModel @Inject constructor(
     }
 
     private fun selectOption(isEnabled: Boolean) {
-        screenState.update {
-            it.copy(
-                enabledSelection = isEnabled,
-                isSaveChangesEnabled = isEnabled != it.enabledOnCard,
+        screenState.update { state ->
+            state.copy(
+                isEnabledSelection = isEnabled,
+                isSaveChangesEnabled = isEnabled != state.isEnabledOnCard,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/domain/CardSettingsInteractor.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/domain/CardSettingsInteractor.kt
index 73bbf10991..09eb4199ef 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/domain/CardSettingsInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/domain/CardSettingsInteractor.kt
@@ -23,9 +23,9 @@ internal class CardSettingsInteractor @Inject constructor() {
     }
 
     fun update(transform: (ScanResponse) -> ScanResponse) {
-        _scannedScanResponse.update {
-            requireNotNull(it)
-            transform(it)
+        _scannedScanResponse.update { scanResponse ->
+            requireNotNull(scanResponse)
+            transform(scanResponse)
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
index 1d5b58407d..08aa5ef0b0 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
@@ -12,9 +12,9 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.domain.card.CardTypesResolver
 import com.tangem.domain.card.ScanCardProcessor
-import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.common.util.getBackupCardsCount
+import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.requireColdWallet
@@ -34,6 +34,7 @@ import com.tangem.tap.features.details.ui.cardsettings.domain.CardSettingsIntera
 import com.tangem.tap.features.details.ui.common.utils.*
 import com.tangem.tap.store
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.addIf
 import com.tangem.wallet.R
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -57,7 +58,7 @@ internal class CardSettingsModel @Inject constructor(
 
     private val params = paramsContainer.require<CardSettingsComponent.Params>()
 
-    private var previousBiometricsRequestPolicy: Boolean = false
+    private var isBiometricsRequestPolicyPrevious: Boolean = false
 
     private val userWalletId = params.userWalletId
 
@@ -77,20 +78,19 @@ internal class CardSettingsModel @Inject constructor(
         // Reset card scanned data
         cardSettingsInteractor.clear()
         // Restore the previous value of access code request policy
-        cardSdkConfigRepository.isBiometricsRequestPolicy = previousBiometricsRequestPolicy
+        cardSdkConfigRepository.isBiometricsRequestPolicy = isBiometricsRequestPolicyPrevious
     }
 
     private fun updateAccessCodeRequestPolicy() {
         runBlocking {
             // !!!IMPORTANT!!!: Do not forget to restore the previous value in onCleared() method
-            previousBiometricsRequestPolicy = cardSdkConfigRepository.isBiometricsRequestPolicy
+            isBiometricsRequestPolicyPrevious = cardSdkConfigRepository.isBiometricsRequestPolicy
 
             val userWallet = getUserWalletUseCase(userWalletId)
                 .getOrElse { error("User wallet $userWalletId not found") }
                 .requireColdWallet()
 
-            cardSdkConfigRepository.isBiometricsRequestPolicy =
-                userWallet.scanResponse.card.isAccessCodeSet &&
+            cardSdkConfigRepository.isBiometricsRequestPolicy = userWallet.scanResponse.card.isAccessCodeSet &&
                 settingsRepository.shouldSaveAccessCodes()
         }
     }
@@ -135,34 +135,39 @@ internal class CardSettingsModel @Inject constructor(
         )
         val isResetCardAllowed = isResetToFactoryAllowedByCard(card, cardTypesResolver)
 
-        val cardDetails = buildList {
-            CardInfo.CardId(cardId).let(::add)
-            CardInfo.Issuer(card.issuer.name).let(::add)
+        val cardDetails: List<CardInfo> = buildList {
+            add(CardInfo.CardId(cardId))
+            add(CardInfo.Issuer(card.issuer.name))
 
-            if (!cardTypesResolver.isTangemTwins()) {
-                CardInfo.SignedHashes(card.signedHashesCount().toString()).let(::add)
-            }
+            addIf(
+                condition = !cardTypesResolver.isTangemTwins(),
+                element = CardInfo.SignedHashes(card.signedHashesCount().toString()),
+            )
 
-            CardInfo.SecurityMode(
-                currentSecurityOption,
-                clickable = allowedSecurityOptions.size > 1,
-            ).let(::add)
+            add(
+                CardInfo.SecurityMode(
+                    securityOption = currentSecurityOption,
+                    clickable = allowedSecurityOptions.size > 1,
+                ),
+            )
 
-            if (card.backupStatus?.isActive == true && card.isAccessCodeSet) {
-                CardInfo.ChangeAccessCode.let(::add)
-            }
+            addIf(
+                condition = card.backupStatus?.isActive == true && card.isAccessCodeSet,
+                element = CardInfo.ChangeAccessCode,
+            )
 
-            if (isAccessCodeRecoveryAllowed(cardTypesResolver)) {
-                CardInfo.AccessCodeRecovery(isAccessCodeRecoveryEnabled(cardTypesResolver, card)).let(::add)
-            }
+            addIf(
+                condition = isAccessCodeRecoveryAllowed(cardTypesResolver),
+                element = CardInfo.AccessCodeRecovery(isAccessCodeRecoveryEnabled(cardTypesResolver, card)),
+            )
 
-            if (isResetCardAllowed) {
+            addIf(isResetCardAllowed) {
                 CardInfo.ResetToFactorySettings(
                     description = getResetToFactoryDescription(
                         isActiveBackupStatus = card.backupStatus?.isActive == true,
                         typesResolver = cardTypesResolver,
                     ),
-                ).let(::add)
+                )
             }
         }
 
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt b/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
index 98c792c2ef..19afbf0689 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/common/DetailsComposeElements.kt
@@ -19,11 +19,11 @@ import com.tangem.wallet.R
 @Composable
 internal fun SettingsScreensScaffold(
     onBackClick: () -> Unit,
-    content: @Composable () -> Unit,
     modifier: Modifier = Modifier,
     @StringRes titleRes: Int? = null,
-    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
     addBottomInsets: Boolean = true,
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
+    content: @Composable () -> Unit,
     fab: @Composable () -> Unit = {},
 ) {
     val backgroundColor = TangemTheme.colors.background.secondary
@@ -129,18 +129,18 @@ internal fun DetailsMainButton(
 }
 
 @Composable
-internal fun DetailsRadioButtonElement(title: String, subtitle: String, selected: Boolean, onClick: () -> Unit) {
+internal fun DetailsRadioButtonElement(title: String, subtitle: String, isSelected: Boolean, onClick: () -> Unit) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .selectable(
-                selected = selected,
+                selected = isSelected,
                 onClick = { onClick() },
             )
             .padding(start = 20.dp, end = 20.dp, top = 16.dp, bottom = 16.dp),
     ) {
         RadioButton(
-            selected = selected,
+            selected = isSelected,
             onClick = null,
             modifier = Modifier.padding(end = 20.dp),
             colors = RadioButtonDefaults.colors(
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/common/utils/AccessCodeRecovery.kt b/app/src/main/java/com/tangem/tap/features/details/ui/common/utils/AccessCodeRecovery.kt
index 73af54606b..6d6a21df15 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/common/utils/AccessCodeRecovery.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/common/utils/AccessCodeRecovery.kt
@@ -7,7 +7,7 @@ internal fun isAccessCodeRecoveryAllowed(typeResolver: CardTypesResolver): Boole
 
 internal fun isAccessCodeRecoveryEnabled(typeResolver: CardTypesResolver, card: CardDTO): Boolean =
     if (typeResolver.isWallet2()) {
-        card.userSettings?.isUserCodeRecoveryAllowed ?: false
+        card.userSettings?.isUserCodeRecoveryAllowed == true
     } else {
         false
     }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
index e81602a4d2..e37cf7eac6 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt
@@ -27,11 +27,11 @@ import com.tangem.tap.features.details.ui.resetcard.ResetCardScreenState.Dialog
 @Composable
 internal fun ResetCardScreen(state: ResetCardScreenState, onBackClick: () -> Unit, modifier: Modifier = Modifier) {
     SettingsScreensScaffold(
+        onBackClick = onBackClick,
         modifier = modifier,
         content = {
             ResetCardView(state = state)
         },
-        onBackClick = onBackClick,
     )
 
     when (val dialog = state.dialog) {
@@ -65,7 +65,7 @@ private fun ResetCardView(state: ResetCardScreenState) {
         Conditions(state)
         DynamicSpacer(scrollState = scrollState)
         SpacerH16()
-        ResetButton(enabled = state.resetButtonEnabled, onResetButtonClick = state.onResetButtonClick)
+        ResetButton(enabled = state.isResetButtonEnabled, onResetButtonClick = state.onResetButtonClick)
         SpacerH16()
     }
 }
@@ -113,18 +113,18 @@ private fun Description(text: TextReference) {
 
 @Composable
 private fun Conditions(state: ResetCardScreenState) {
-    state.warningsToShow.forEach {
-        when (it) {
+    state.warningsToShow.forEach { warning ->
+        when (warning) {
             ResetCardScreenState.WarningsToReset.LOST_WALLET_ACCESS -> {
                 ConditionCheckBox(
-                    checkedState = state.acceptCondition1Checked,
+                    checkedState = state.isAcceptCondition1Checked,
                     onCheckedChange = state.onAcceptCondition1ToggleClick,
                     description = TextReference.Res(R.string.reset_card_to_factory_condition_1),
                 )
             }
             ResetCardScreenState.WarningsToReset.LOST_PASSWORD_RESTORE -> {
                 ConditionCheckBox(
-                    checkedState = state.acceptCondition2Checked,
+                    checkedState = state.isAcceptCondition2Checked,
                     onCheckedChange = state.onAcceptCondition2ToggleClick,
                     description = TextReference.Res(R.string.reset_card_to_factory_condition_2),
                 )
@@ -208,7 +208,7 @@ private fun CommonResetDialog(dialog: ResetCardScreenState.Dialog) {
         ),
         confirmButton = DialogButtonUM(
             title = stringResourceSafe(id = R.string.card_settings_action_sheet_reset),
-            warning = true,
+            isWarning = true,
             onClick = dialog.onConfirmClick,
         ),
         onDismissDialog = dialog.onDismiss,
@@ -238,12 +238,12 @@ private fun ResetCardScreenSample(modifier: Modifier = Modifier) {
     ) {
         ResetCardScreen(
             state = ResetCardScreenState(
-                resetButtonEnabled = true,
-                showResetPasswordButton = false,
+                isResetButtonEnabled = true,
+                isResetPasswordButtonShown = false,
                 warningsToShow = listOf(ResetCardScreenState.WarningsToReset.LOST_WALLET_ACCESS),
                 descriptionText = TextReference.Res(R.string.reset_card_with_backup_to_factory_message),
-                acceptCondition1Checked = false,
-                acceptCondition2Checked = false,
+                isAcceptCondition1Checked = false,
+                isAcceptCondition2Checked = false,
                 onAcceptCondition1ToggleClick = {},
                 onAcceptCondition2ToggleClick = {},
                 onResetButtonClick = {},
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
index 27dacf387f..32eb289aec 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreenState.kt
@@ -5,12 +5,12 @@ import com.tangem.tap.features.details.ui.cardsettings.TextReference
 import com.tangem.wallet.R
 
 internal data class ResetCardScreenState(
-    val resetButtonEnabled: Boolean,
+    val isResetButtonEnabled: Boolean,
     val descriptionText: TextReference,
     val warningsToShow: List<WarningsToReset>,
-    val showResetPasswordButton: Boolean,
-    val acceptCondition1Checked: Boolean,
-    val acceptCondition2Checked: Boolean,
+    val isResetPasswordButtonShown: Boolean,
+    val isAcceptCondition1Checked: Boolean,
+    val isAcceptCondition2Checked: Boolean,
     val onAcceptCondition1ToggleClick: (Boolean) -> Unit,
     val onAcceptCondition2ToggleClick: (Boolean) -> Unit,
     val onResetButtonClick: () -> Unit,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/model/ResetCardModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/model/ResetCardModel.kt
index 6cab06fac6..eaa4ce0a9f 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/model/ResetCardModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/model/ResetCardModel.kt
@@ -97,15 +97,15 @@ internal class ResetCardModel @Inject constructor(
         }
 
         return ResetCardScreenState(
-            resetButtonEnabled = false,
+            isResetButtonEnabled = false,
             descriptionText = getResetToFactoryDescription(
                 isActiveBackupStatus = isActiveBackupPrimaryCard,
                 typesResolver = currentCardTypesResolver,
             ),
             warningsToShow = warningsToShow,
-            showResetPasswordButton = shouldShowResetPasswordButton,
-            acceptCondition1Checked = false,
-            acceptCondition2Checked = false,
+            isResetPasswordButtonShown = shouldShowResetPasswordButton,
+            isAcceptCondition1Checked = false,
+            isAcceptCondition2Checked = false,
             onAcceptCondition1ToggleClick = ::toggleFirstCondition,
             onAcceptCondition2ToggleClick = ::toggleSecondCondition,
             onResetButtonClick = { showDialog(ResetCardDialog.StartResetDialog) },
@@ -121,26 +121,26 @@ internal class ResetCardModel @Inject constructor(
 
     private fun toggleFirstCondition(isAccepted: Boolean) {
         screenState.update { prevState ->
-            val resetButtonEnabled = if (prevState.showResetPasswordButton) {
-                isAccepted && prevState.acceptCondition2Checked
+            val isResetButtonEnabled = if (prevState.isResetPasswordButtonShown) {
+                isAccepted && prevState.isAcceptCondition2Checked
             } else {
                 isAccepted
             }
 
             prevState.copy(
-                acceptCondition1Checked = isAccepted,
-                resetButtonEnabled = resetButtonEnabled,
+                isAcceptCondition1Checked = isAccepted,
+                isResetButtonEnabled = isResetButtonEnabled,
             )
         }
     }
 
     private fun toggleSecondCondition(isAccepted: Boolean) {
         screenState.update { prevState ->
-            val resetButtonEnabled = prevState.acceptCondition1Checked && isAccepted
+            val isResetButtonEnabled = prevState.isAcceptCondition1Checked && isAccepted
 
             prevState.copy(
-                acceptCondition2Checked = isAccepted,
-                resetButtonEnabled = resetButtonEnabled,
+                isAcceptCondition2Checked = isAccepted,
+                isResetButtonEnabled = isResetButtonEnabled,
             )
         }
     }
@@ -183,14 +183,14 @@ internal class ResetCardModel @Inject constructor(
         modelScope.launch {
             resetCardUseCase(cardId = primaryCardId, params = currentUserCodeParams).onRight {
                 deleteSavedAccessCodesUseCase(cardId = primaryCardId)
-                val hasUserWallets = deleteWalletUseCase(userWalletId = currentUserWalletId).getOrElse {
-                    Timber.e("Unable to delete user wallet: $it")
+                val hasUserWallets = deleteWalletUseCase(userWalletId = currentUserWalletId).getOrElse { error ->
+                    Timber.e("Unable to delete user wallet: $error")
                     return@launch
                 }
 
                 if (hasUserWallets) {
-                    val newSelectedWallet = getSelectedWalletSyncUseCase().getOrElse {
-                        error("Failed to get selected wallet: $it")
+                    val newSelectedWallet = getSelectedWalletSyncUseCase().getOrElse { error ->
+                        error("Failed to get selected wallet: $error")
                     }
 
                     store.onUserWalletSelected(newSelectedWallet)
@@ -269,7 +269,7 @@ internal class ResetCardModel @Inject constructor(
             if (hotWalletFeatureToggles.isHotWalletEnabled) {
                 store.dispatchNavigationAction { replaceAll(AppRoute.Home()) }
             } else {
-                val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync }.isSuccess
+                val isLocked = runCatching { userWalletsListManager.asLockable()?.isLocked }.isSuccess
                 if (isLocked && userWalletsListManager.hasUserWallets) {
                     store.dispatchNavigationAction { popTo<AppRoute.Welcome>() }
                 } else {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
index 3a86a4f67c..981cd1c76a 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeScreen.kt
@@ -22,10 +22,10 @@ internal fun SecurityModeScreen(
     modifier: Modifier = Modifier,
 ) {
     SettingsScreensScaffold(
+        onBackClick = onBackClick,
         modifier = modifier,
         content = { SecurityModeOptions(state = state) },
         // titleRes = R.string.card_settings_security_mode,
-        onBackClick = onBackClick,
     )
 }
 
@@ -57,7 +57,7 @@ private fun SecurityModeOptions(state: SecurityModeScreenState) {
 
 @Composable
 private fun SecurityOption(option: SecurityOption, state: SecurityModeScreenState) {
-    val selected = option == state.selectedSecurityMode
+    val isSelected = option == state.selectedSecurityMode
 
     val title = option.toTitleRes()
 
@@ -70,7 +70,7 @@ private fun SecurityOption(option: SecurityOption, state: SecurityModeScreenStat
     DetailsRadioButtonElement(
         title = stringResourceSafe(id = title),
         subtitle = stringResourceSafe(id = subtitle),
-        selected = selected,
+        isSelected = isSelected,
         onClick = { state.onNewModeSelected(option) },
     )
 }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/model/SecurityModeModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/model/SecurityModeModel.kt
index ee9cf3dd51..36fdf29787 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/model/SecurityModeModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/model/SecurityModeModel.kt
@@ -77,9 +77,9 @@ internal class SecurityModeModel @Inject constructor(
                 SecurityOption.AccessCode -> tangemSdkManager.setAccessCode(cardId)
             }
 
-            cardSettingsInteractor.update {
-                it.copy(
-                    card = it.card.copy(
+            cardSettingsInteractor.update { scanResponse ->
+                scanResponse.copy(
+                    card = scanResponse.card.copy(
                         isAccessCodeSet = selectedOption == SecurityOption.AccessCode,
                         isPasscodeSet = selectedOption == SecurityOption.PassCode,
                     ),
diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
index 1734b45276..4afa4ca1bb 100644
--- a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt
@@ -150,7 +150,7 @@ internal class MainViewModel @Inject constructor(
             prepareSelectedWalletFeedback()
 
             // await while initial route stack is initialized
-            appRouterConfig.isInitialized.first { it }
+            appRouterConfig.initializedState.first { it }
 
             isSplashScreenShown = false
         }
@@ -165,7 +165,7 @@ internal class MainViewModel @Inject constructor(
     private fun launchAPIRequests(function: suspend CoroutineScope.() -> Unit) {
         viewModelScope.launch {
             if (BuildConfig.TESTER_MENU_ENABLED) {
-                apiConfigsManager.isInitialized
+                apiConfigsManager.initializedState
                     .filter { it }
                     .first() // wait until isInitialized becomes true
 
@@ -179,11 +179,9 @@ internal class MainViewModel @Inject constructor(
     private fun prepareSelectedWalletFeedback() {
         getSelectedWalletUseCase.invoke()
             .mapLeft { emptyFlow<UserWallet>() }
-            .onRight {
-                it.distinctUntilChanged()
-                    .onEach { userWallet ->
-                        Analytics.setContext(userWallet)
-                    }
+            .onRight { wallet ->
+                wallet.distinctUntilChanged()
+                    .onEach { Analytics.setContext(it) }
                     .flowOn(dispatchers.io)
                     .launchIn(viewModelScope)
             }
@@ -208,7 +206,7 @@ internal class MainViewModel @Inject constructor(
         return MoonPayService(
             apiKey = environmentConfig.moonPayApiKey,
             secretKey = environmentConfig.moonPayApiSecretKey,
-            logEnabled = LogConfig.network.moonPayService,
+            isLogEnabled = LogConfig.network.moonPayService,
             userWalletProvider = { getSelectedWalletUseCase.sync().getOrNull() },
         )
     }
@@ -224,8 +222,8 @@ internal class MainViewModel @Inject constructor(
             .filter {
                 it.isBalanceHidingNotificationEnabled && it.isBalanceHidden
             }
-            .onEach {
-                if (!it.isUpdateFromToast) {
+            .onEach { settings ->
+                if (!settings.isUpdateFromToast) {
                     listenToFlipsUseCase.changeUpdateEnabled(false)
 
                     val message = BottomSheetMessage.invoke(
@@ -354,6 +352,7 @@ internal class MainViewModel @Inject constructor(
         listenToFlipsUseCase.changeUpdateEnabled(isUpdateEnabled = true)
     }
 
+    @Suppress("NullableToStringCall")
     private fun sendKeyboardIdentifierEvent() {
         viewModelScope.launch {
             val keyboardId = keyboardValidator.getKeyboardId()
@@ -378,22 +377,26 @@ internal class MainViewModel @Inject constructor(
     private fun preloadImages() {
         try {
             viewModelScope.launch {
-                val swapStories = getStoryContentUseCase.invokeSync(
+                getStoryContentUseCase.invokeSync(
                     id = StoryContentIds.STORY_FIRST_TIME_SWAP.id,
                     refresh = true,
-                ).getOrNull()
-
-                if (swapStories == null) {
-                    analyticsEventHandler.send(
-                        StoriesEvents.Error(
-                            type = StoryContentIds.STORY_FIRST_TIME_SWAP.analyticType,
-                        ),
-                    )
-                } else {
-                    val storiesImages = swapStories.getImageUrls()
-                    // try to preload images for stories
-                    storiesImages.forEach(imagePreloader::preload)
-                }
+                ).fold(
+                    ifLeft = { error ->
+                        Timber.e(error)
+                        analyticsEventHandler.send(
+                            StoriesEvents.Error(
+                                type = StoryContentIds.STORY_FIRST_TIME_SWAP.analyticType,
+                            ),
+                        )
+                    },
+                    ifRight = { swapStories ->
+                        if (swapStories != null) {
+                            val storiesImages = swapStories.getImageUrls()
+                            // try to preload images for stories
+                            storiesImages.forEach(imagePreloader::preload)
+                        }
+                    },
+                )
             }
         } catch (ex: Exception) {
             Timber.e(ex)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index 231ce5256e..ec4e9e12ab 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -34,11 +34,11 @@ object OnboardingHelper {
             }
 
             response.cardTypesResolver.isWallet2() || response.cardTypesResolver.isShibaWallet() -> {
-                val emptyWallets = response.card.wallets.isEmpty()
-                val activationInProgress = cardRepository.isActivationInProgress(cardId)
+                val areWalletsEmpty = response.card.wallets.isEmpty()
+                val isActivationInProgress = cardRepository.isActivationInProgress(cardId)
                 val isNoBackup = response.card.backupStatus == CardDTO.BackupStatus.NoBackup &&
                     !DemoHelper.isDemoCard(response)
-                emptyWallets || activationInProgress || isNoBackup
+                areWalletsEmpty || isActivationInProgress || isNoBackup
             }
 
             response.card.wallets.isNotEmpty() -> cardRepository.isActivationInProgress(cardId)
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
index 2aa7a3ef24..6cbc795c53 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -50,8 +50,8 @@ object TradeCryptoMiddleware {
             fiatCurrencyName = action.appCurrencyCode,
             walletAddress = networkAddress,
             isDarkTheme = MutableAppThemeModeHolder.isDarkThemeActive,
-        )?.let {
-            store.dispatchOpenUrl(it)
+        )?.let { url ->
+            store.dispatchOpenUrl(url)
             Analytics.send(Token.Withdraw.ScreenOpened())
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/model/WelcomeModel.kt b/app/src/main/java/com/tangem/tap/features/welcome/model/WelcomeModel.kt
index ae5afc8d33..f6e882e5fb 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/model/WelcomeModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/model/WelcomeModel.kt
@@ -72,8 +72,8 @@ internal class WelcomeModel @Inject constructor(
 
         this.state.update { prevState ->
             prevState.copy(
-                showUnlockWithBiometricsProgress = state.isUnlockWithBiometricsInProgress,
-                showUnlockWithCardProgress = state.isUnlockWithCardInProgress,
+                isUnlockWithBiometricsProgressVisible = state.isUnlockWithBiometricsInProgress,
+                isUnlockWithCardProgressVisible = state.isUnlockWithCardInProgress,
                 warning = warning,
                 error = state.error
                     ?.takeIf { !it.silent && warning == null }
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
index 78fb0451e0..6d0e6b6183 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
@@ -13,7 +13,7 @@ internal sealed interface WelcomeAction : Action {
     object ProceedWithCard : WelcomeAction {
         object Success : WelcomeAction
         data class Error(val error: TangemError) : WelcomeAction
-        data class ChangeProgress(val showProgress: Boolean) : WelcomeAction
+        data class ChangeProgress(val isProgress: Boolean) : WelcomeAction
     }
 
     object CloseError : WelcomeAction
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index af60602c2b..be2955e491 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -141,13 +141,13 @@ internal class WelcomeMiddleware {
             onSuccess = { scanResponse ->
                 scope.launch { onCardScanned(scanResponse) }
             },
-            onFailure = {
-                when (it) {
+            onFailure = { error ->
+                when (error) {
                     is TangemSdkError.ExceptionError -> {
                         store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
                     }
                     else -> {
-                        store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(it))
+                        store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(error))
                     }
                 }
             },
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
index 0d9645dea6..f324887d0a 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
@@ -25,7 +25,7 @@ internal object WelcomeReducer {
                 isUnlockWithCardInProgress = false,
             )
             is WelcomeAction.ProceedWithCard.ChangeProgress -> state.copy(
-                isUnlockWithCardInProgress = action.showProgress,
+                isUnlockWithCardInProgress = action.isProgress,
             )
             is WelcomeAction.ProceedWithBiometrics.Success -> state.copy(isUnlockWithBiometricsInProgress = false)
             is WelcomeAction.ProceedWithCard.Success -> state.copy(isUnlockWithCardInProgress = false)
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeScreenState.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeScreenState.kt
index 3ede2ae446..7c7e43f2b5 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeScreenState.kt
@@ -5,8 +5,8 @@ import com.tangem.tap.features.welcome.ui.model.WarningModel
 
 internal data class WelcomeScreenState(
     val onPopBack: () -> Unit = {},
-    val showUnlockWithBiometricsProgress: Boolean = false,
-    val showUnlockWithCardProgress: Boolean = false,
+    val isUnlockWithBiometricsProgressVisible: Boolean = false,
+    val isUnlockWithCardProgressVisible: Boolean = false,
     val warning: WarningModel? = null,
     val error: TextReference? = null,
     val onUnlockClick: () -> Unit = {},
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
index ee1a00bb48..de791e45da 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreen.kt
@@ -39,8 +39,8 @@ internal fun WelcomeScreen(state: WelcomeScreenState, modifier: Modifier = Modif
             .systemBarsPadding(),
     ) {
         WelcomeScreenContent(
-            showUnlockProgress = state.showUnlockWithBiometricsProgress,
-            showScanCardProgress = state.showUnlockWithCardProgress,
+            showUnlockProgress = state.isUnlockWithBiometricsProgressVisible,
+            showScanCardProgress = state.isUnlockWithCardProgressVisible,
             onUnlockClick = state.onUnlockClick,
             onScanCardClick = state.onScanCardClick,
         )
@@ -57,8 +57,8 @@ internal fun WelcomeScreen(state: WelcomeScreenState, modifier: Modifier = Modif
     WarningDialog(warning)
 
     LaunchedEffect(errorMessage, state.onCloseError) {
-        errorMessage?.let {
-            snackbarHostState.showSnackbar(it)
+        errorMessage?.let { message ->
+            snackbarHostState.showSnackbar(message)
             state.onCloseError()
         }
     }
@@ -82,8 +82,8 @@ private class WelcomeComponentPreviewProvider : PreviewParameterProvider<Welcome
             PreviewWelcomeComponent(),
             PreviewWelcomeComponent(
                 initialState = WelcomeScreenState(
-                    showUnlockWithBiometricsProgress = true,
-                    showUnlockWithCardProgress = true,
+                    isUnlockWithBiometricsProgressVisible = true,
+                    isUnlockWithCardProgressVisible = true,
                 ),
             ),
             PreviewWelcomeComponent(
diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt
index 99425e0191..8982e6031a 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultAuthProvider.kt
@@ -2,14 +2,14 @@ package com.tangem.tap.network.auth
 
 import com.tangem.common.extensions.toHexString
 import com.tangem.datasource.api.common.AuthProvider
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 
 internal class DefaultAuthProvider(
     private val userWalletsListManager: UserWalletsListManager,
     private val userWalletsListRepository: UserWalletsListRepository,
-    private val useNewListRepository: Boolean = false,
+    private val shouldUseNewListRepository: Boolean = false,
 ) : AuthProvider {
 
     override suspend fun getCardPublicKey(): String {
@@ -39,7 +39,7 @@ internal class DefaultAuthProvider(
     }
 
     private suspend fun getWallets(): List<UserWallet> {
-        return if (useNewListRepository) {
+        return if (shouldUseNewListRepository) {
             userWalletsListRepository.userWalletsSync()
         } else {
             userWalletsListManager.userWalletsSync
@@ -47,7 +47,7 @@ internal class DefaultAuthProvider(
     }
 
     private suspend fun getSelectedWallet(): UserWallet? {
-        return if (useNewListRepository) {
+        return if (shouldUseNewListRepository) {
             userWalletsListRepository.selectedUserWalletSync()
         } else {
             userWalletsListManager.selectedUserWalletSync
diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
index 15e74c5498..47188c465b 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultExpressAuthProvider.kt
@@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicReference
 
 internal class DefaultExpressAuthProvider : ExpressAuthProvider {
 
-    private var uuid = AtomicReference(UUID.randomUUID())
+    private val uuid = AtomicReference(UUID.randomUUID())
 
     override fun getSessionId(): String {
         return uuid.get().toString()
diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
index 95004c11d8..f1aa594af8 100644
--- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
+++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
@@ -2,8 +2,8 @@ package com.tangem.tap.network.auth.di
 
 import com.tangem.datasource.api.common.AuthProvider
 import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.lib.auth.ExpressAuthProvider
 import com.tangem.lib.auth.StakeKitAuthProvider
@@ -32,7 +32,7 @@ internal class AuthModule {
         return DefaultAuthProvider(
             userWalletsListManager = userWalletsListManager,
             userWalletsListRepository = userWalletsListRepository,
-            useNewListRepository = hotWalletFeatureToggles.isHotWalletEnabled,
+            shouldUseNewListRepository = hotWalletFeatureToggles.isHotWalletEnabled,
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
index 6c4c20e0cc..5cf37e3a1c 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/DefaultRampManager.kt
@@ -54,7 +54,7 @@ internal class DefaultRampManager(
         sendUnavailabilityReason: ScenarioUnavailabilityReason?,
     ): Either<ScenarioUnavailabilityReason, Unit> {
         return either {
-            val sellSupportedByService = catch(
+            val isSellSupportedByService = catch(
                 block = {
                     val serviceCurrency = cryptoCurrencyConverter.convertBack(status.currency)
 
@@ -78,7 +78,7 @@ internal class DefaultRampManager(
                 }
             }
 
-            ensure(condition = sellSupportedByService) {
+            ensure(condition = isSellSupportedByService) {
                 ScenarioUnavailabilityReason.NotSupportedBySellService(status.currency.name)
             }
 
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
index c8235a8f74..554a0b4265 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayApi.kt
@@ -34,6 +34,7 @@ data class MoonPayUserStatus(
     val stateCode: String,
 )
 
+@Suppress("BooleanPropertyNaming")
 @JsonClass(generateAdapter = true)
 data class MoonPayCurrencies(
     @Json(name = "type") val type: String,
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
index 02bc4321ae..1f291b109b 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonPayService.kt
@@ -26,7 +26,7 @@ import javax.crypto.spec.SecretKeySpec
 class MoonPayService(
     private val apiKey: String,
     private val secretKey: String,
-    private val logEnabled: Boolean,
+    private val isLogEnabled: Boolean,
     private val userWalletProvider: () -> UserWallet?,
 ) : ExchangeService {
 
@@ -39,7 +39,7 @@ class MoonPayService(
     private val api: MoonPayApi by lazy {
         createRetrofitInstance(
             baseUrl = MoonPayApi.MOOONPAY_BASE_URL,
-            logEnabled = logEnabled,
+            logEnabled = isLogEnabled,
         ).create(MoonPayApi::class.java)
     }
 
@@ -104,24 +104,35 @@ class MoonPayService(
 
     override fun availableForSell(currency: Currency): Boolean {
         val userWallet = userWalletProvider() ?: return false
-        val checkCardExchange = userWallet !is UserWallet.Cold || !userWallet.scanResponse.card.isStart2Coin
+        val isExchangeSupported = userWallet !is UserWallet.Cold || !userWallet.scanResponse.card.isStart2Coin
 
-        if (!checkCardExchange) return false
+        if (!isExchangeSupported) return false
 
         if (!isSellAllowed()) return false
 
         val availableForSell = status?.availableForSell ?: return false
 
         val supportedCurrency = currency.blockchain.moonPaySupportedCurrency ?: return false
-        return availableForSell.any {
+        return availableForSell.any { availableCurrency ->
             when (currency) {
                 is Currency.Blockchain -> {
-                    it.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
-                        it.currencyCode.equals(other = supportedCurrency.currencyCode, ignoreCase = true)
+                    availableCurrency.networkCode.equals(
+                        other = supportedCurrency.networkCode,
+                        ignoreCase = true,
+                    ) && availableCurrency.currencyCode.equals(
+                        other = supportedCurrency.currencyCode,
+                        ignoreCase = true,
+                    )
                 }
                 is Currency.Token -> {
-                    it.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
-                        it.contractAddress.equals(other = currency.token.contractAddress, ignoreCase = true)
+                    availableCurrency.networkCode.equals(
+                        other = supportedCurrency.networkCode,
+                        ignoreCase = true,
+                    ) &&
+                        availableCurrency.contractAddress.equals(
+                            other = currency.token.contractAddress,
+                            ignoreCase = true,
+                        )
                 }
             }
         }
@@ -137,15 +148,18 @@ class MoonPayService(
         if (blockchain.isTestnet()) return blockchain.getTestnetTopUpUrl()
 
         val supportedCurrency = blockchain.moonPaySupportedCurrency ?: return null
-        val moonpayCurrency = status?.availableForSell?.firstOrNull {
+        val moonpayCurrency = status?.availableForSell?.firstOrNull { availableCurrency ->
             when (cryptoCurrency) {
                 is CryptoCurrency.Coin -> {
-                    it.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
-                        it.currencyCode.equals(other = supportedCurrency.currencyCode, ignoreCase = true)
+                    availableCurrency.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
+                        availableCurrency.currencyCode.equals(other = supportedCurrency.currencyCode, ignoreCase = true)
                 }
                 is CryptoCurrency.Token -> {
-                    it.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
-                        it.contractAddress.equals(other = cryptoCurrency.contractAddress, ignoreCase = true)
+                    availableCurrency.networkCode.equals(other = supportedCurrency.networkCode, ignoreCase = true) &&
+                        availableCurrency.contractAddress.equals(
+                            other = cryptoCurrency.contractAddress,
+                            ignoreCase = true,
+                        )
                 }
             }
         } ?: return null
@@ -184,7 +198,7 @@ class MoonPayService(
     }
 
     private fun isSellAllowed(): Boolean {
-        return status?.responseUserStatus?.isSellAllowed ?: false
+        return status?.responseUserStatus?.isSellAllowed == true
     }
 
     private companion object {
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
index 14757eae60..3a83c00641 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/moonpay/MoonpayBlockchainMapping.kt
@@ -159,4 +159,5 @@ internal val Blockchain.moonPaySupportedCurrency: MoonPaySupportedCurrency?
         KaspaTestnet -> null
         Pepecoin, PepecoinTestnet -> null
         Hyperliquid, HyperliquidTestnet -> null
+        Quai, QuaiTestnet -> null
     }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
index d11526b9f4..f8350e77a9 100644
--- a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
@@ -48,13 +48,13 @@ class UserWalletManagerImpl(
     override suspend fun getNativeTokenBalance(networkId: String, derivationPath: String?): ProxyAmount? {
         val blockchain = requireNotNull(Blockchain.fromNetworkId(networkId)) { "blockchain not found" }
         val walletManager = getActualWalletManager(blockchain, derivationPath)
-        return walletManager.wallet.amounts.firstNotNullOfOrNull {
-            it.takeIf { it.key is AmountType.Coin }
-        }?.value?.let {
+        return walletManager.wallet.amounts.firstNotNullOfOrNull { amountEntry ->
+            amountEntry.takeIf { amountEntry.key is AmountType.Coin }
+        }?.value?.let { amount ->
             ProxyAmount(
-                it.currencySymbol,
-                it.value ?: BigDecimal.ZERO,
-                it.decimals,
+                amount.currencySymbol,
+                amount.value ?: BigDecimal.ZERO,
+                amount.decimals,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
index ef68891955..0b32197bce 100644
--- a/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt
@@ -21,7 +21,7 @@ import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.card.ScanCardUseCase
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
 import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
diff --git a/app/src/main/java/com/tangem/tap/routing/RootContent.kt b/app/src/main/java/com/tangem/tap/routing/RootContent.kt
index 5c009849bc..66b66199d4 100644
--- a/app/src/main/java/com/tangem/tap/routing/RootContent.kt
+++ b/app/src/main/java/com/tangem/tap/routing/RootContent.kt
@@ -31,20 +31,21 @@ import com.tangem.core.ui.message.EventMessageEffect
 import com.tangem.core.ui.res.LocalRootBackgroundColor
 import com.tangem.core.ui.res.LocalSnackbarHostState
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.security.ProvideSecureFlagController
 import com.tangem.tap.routing.component.RoutingComponent
 import com.tangem.tap.routing.transitions.RoutingTransitionAnimationFactory
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "ReusedModifierInstance")
 @OptIn(ExperimentalDecomposeApi::class)
 @Composable
 internal fun RootContent(
     stack: Value<ChildStack<AppRoute, RoutingComponent.Child>>,
     backHandler: BackHandler,
     uiDependencies: UiDependencies,
-    wcContent: @Composable (modifier: Modifier) -> Unit,
-    hotAccessCodeContent: @Composable (modifier: Modifier) -> Unit,
     onBack: () -> Unit,
     modifier: Modifier = Modifier,
+    wcContent: @Composable (modifier: Modifier) -> Unit,
+    hotAccessCodeContent: @Composable (modifier: Modifier) -> Unit,
 ) {
     val context = LocalContext.current
 
@@ -52,39 +53,41 @@ internal fun RootContent(
         activity = context as Activity,
         uiDependencies = uiDependencies,
     ) {
-        val snackbarHostState = LocalSnackbarHostState.current
+        ProvideSecureFlagController {
+            val snackbarHostState = LocalSnackbarHostState.current
 
-        Box(Modifier.background(LocalRootBackgroundColor.current.value)) {
-            Children(
-                modifier = modifier,
-                animation = childrenAnimation(backHandler = backHandler, onBack = onBack),
-                stack = stack,
-            ) { child ->
-                when (val instance = child.instance) {
-                    is RoutingComponent.Child.Initial -> Unit
-                    is RoutingComponent.Child.ComposableComponent -> {
-                        instance.component.Content(Modifier.fillMaxSize())
-                    }
-                    is RoutingComponent.Child.LegacyIntent -> {
-                        // TODO: Remove and use it's own router: [REDACTED_JIRA]
-                        LaunchedEffect(instance) {
-                            startActivity(context, instance.intent, Bundle.EMPTY)
+            Box(Modifier.background(LocalRootBackgroundColor.current.value)) {
+                Children(
+                    modifier = modifier,
+                    animation = childrenAnimation(backHandler = backHandler, onBack = onBack),
+                    stack = stack,
+                ) { child ->
+                    when (val instance = child.instance) {
+                        is RoutingComponent.Child.Initial -> Unit
+                        is RoutingComponent.Child.ComposableComponent -> {
+                            instance.component.Content(Modifier.fillMaxSize())
+                        }
+                        is RoutingComponent.Child.LegacyIntent -> {
+                            // TODO: Remove and use it's own router: [REDACTED_JIRA]
+                            LaunchedEffect(instance) {
+                                startActivity(context, instance.intent, Bundle.EMPTY)
+                            }
                         }
                     }
                 }
+
+                wcContent(Modifier.fillMaxSize())
+
+                hotAccessCodeContent(Modifier.fillMaxSize())
+
+                TangemSnackbarHost(
+                    modifier = Modifier
+                        .align(Alignment.BottomCenter)
+                        .navigationBarsPadding()
+                        .padding(all = 16.dp),
+                    hostState = snackbarHostState,
+                )
             }
-
-            wcContent(Modifier.fillMaxSize())
-
-            hotAccessCodeContent(Modifier.fillMaxSize())
-
-            TangemSnackbarHost(
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .navigationBarsPadding()
-                    .padding(all = 16.dp),
-                hostState = snackbarHostState,
-            )
         }
         EventMessageEffect()
     }
diff --git a/app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt b/app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt
index 8030c44f97..7025664f0b 100644
--- a/app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt
+++ b/app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt
@@ -19,7 +19,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.domain.card.repository.CardRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.isLocked
 import com.tangem.domain.onboarding.repository.OnboardingRepository
 import com.tangem.features.hotwallet.HotAccessCodeRequestComponent
@@ -133,7 +133,7 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
                 AppRoute.Wallet
             }
         }.also {
-            appRouterConfig.isInitialized.value = true
+            appRouterConfig.initializedState.value = true
             checkForUnfinishedBackup()
         }
     }
@@ -141,13 +141,13 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         RootContent(
-            modifier = modifier,
             stack = stack,
+            backHandler = backHandler,
             uiDependencies = uiDependencies,
+            onBack = router::pop,
+            modifier = modifier,
             wcContent = { wcRoutingComponent.Content(it) },
             hotAccessCodeContent = { hotAccessCodeRequestComponent.Content(it) },
-            backHandler = backHandler,
-            onBack = router::pop,
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/routing/configurator/AppRouterConfig.kt b/app/src/main/java/com/tangem/tap/routing/configurator/AppRouterConfig.kt
index 393ab3a7df..a5ee03adad 100644
--- a/app/src/main/java/com/tangem/tap/routing/configurator/AppRouterConfig.kt
+++ b/app/src/main/java/com/tangem/tap/routing/configurator/AppRouterConfig.kt
@@ -11,7 +11,7 @@ internal interface AppRouterConfig {
     var routerScope: CoroutineScope?
     var componentRouter: Router?
     var stack: List<AppRoute>?
-    val isInitialized: MutableStateFlow<Boolean>
+    val initializedState: MutableStateFlow<Boolean>
 
     // TODO: Replace with UI message handler: [REDACTED_JIRA]
     var snackbarHandler: SnackbarHandler?
diff --git a/app/src/main/java/com/tangem/tap/routing/configurator/MutableAppRouterConfig.kt b/app/src/main/java/com/tangem/tap/routing/configurator/MutableAppRouterConfig.kt
index 776802e429..7831308228 100644
--- a/app/src/main/java/com/tangem/tap/routing/configurator/MutableAppRouterConfig.kt
+++ b/app/src/main/java/com/tangem/tap/routing/configurator/MutableAppRouterConfig.kt
@@ -11,5 +11,5 @@ internal class MutableAppRouterConfig : AppRouterConfig {
     override var componentRouter: Router? = null
     override var stack: List<AppRoute>? = null
     override var snackbarHandler: SnackbarHandler? = null
-    override val isInitialized: MutableStateFlow<Boolean> = MutableStateFlow(false)
+    override val initializedState: MutableStateFlow<Boolean> = MutableStateFlow(false)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/routing/transitions/RoutingTransitionAnimationFactory.kt b/app/src/main/java/com/tangem/tap/routing/transitions/RoutingTransitionAnimationFactory.kt
index b1332ff1c8..a28e2ff15e 100644
--- a/app/src/main/java/com/tangem/tap/routing/transitions/RoutingTransitionAnimationFactory.kt
+++ b/app/src/main/java/com/tangem/tap/routing/transitions/RoutingTransitionAnimationFactory.kt
@@ -4,13 +4,10 @@ import androidx.compose.animation.core.CubicBezierEasing
 import androidx.compose.animation.core.FiniteAnimationSpec
 import androidx.compose.animation.core.tween
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.layout.layout
 import com.arkivanov.decompose.extensions.compose.stack.animation.*
 import com.tangem.common.routing.AppRoute
-import kotlin.compareTo
-import kotlin.times
 
 object RoutingTransitionAnimationFactory {
 
@@ -58,7 +55,7 @@ object RoutingTransitionAnimationFactory {
 
     @Suppress("MagicNumber")
     private fun slideAndFade(directions: Set<Direction>? = null): StackAnimator {
-        val easing = CubicBezierEasing(0.55f, 0.0f, 0.0f, 1f)
+        val easing = CubicBezierEasing(a = 0.55f, b = 0.0f, c = 0.0f, d = 1f)
 
         return stackAnimator(
             animationSpec = tween(durationMillis = 400, easing = easing),
diff --git a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
index 4f4eca31b6..900514a667 100644
--- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
+++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt
@@ -16,6 +16,7 @@ import com.tangem.features.details.component.DetailsComponent
 import com.tangem.features.disclaimer.api.components.DisclaimerComponent
 import com.tangem.features.home.api.HomeComponent
 import com.tangem.features.hotwallet.*
+import com.tangem.features.kyc.KycComponent
 import com.tangem.features.managetokens.component.ChooseManagedTokensComponent
 import com.tangem.features.managetokens.component.ManageTokensComponent
 import com.tangem.features.managetokens.component.ManageTokensSource
@@ -35,6 +36,7 @@ import com.tangem.features.swap.SwapComponent
 import com.tangem.features.swap.v2.api.SendWithSwapComponent
 import com.tangem.features.tangempay.components.TangemPayDetailsComponent
 import com.tangem.features.tangempay.components.TangemPayOnboardingComponent
+import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.*
 import com.tangem.features.tokendetails.TokenDetailsComponent
 import com.tangem.features.wallet.WalletEntryComponent
 import com.tangem.features.walletconnect.components.WalletConnectEntryComponent
@@ -106,6 +108,7 @@ internal class ChildFactory @Inject constructor(
     private val sendEntryPointComponentFactory: SendEntryPointComponent.Factory,
     private val tangemPayDetailsComponentFactory: TangemPayDetailsComponent.Factory,
     private val tangemPayOnboardingComponentFactory: TangemPayOnboardingComponent.Factory,
+    private val kycComponentFactory: KycComponent.Factory,
     private val yieldSupplyPromoComponentFactory: YieldSupplyPromoComponent.Factory,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
 ) {
@@ -182,11 +185,11 @@ internal class ChildFactory @Inject constructor(
                     params = MarketsTokenDetailsComponent.Params(
                         token = route.token,
                         appCurrency = route.appCurrency,
-                        showPortfolio = route.showPortfolio,
-                        analyticsParams = route.analyticsParams?.let {
+                        shouldShowPortfolio = route.shouldShowPortfolio,
+                        analyticsParams = route.analyticsParams?.let { params ->
                             MarketsTokenDetailsComponent.AnalyticsParams(
-                                blockchain = it.blockchain,
-                                source = it.source,
+                                blockchain = params.blockchain,
+                                source = params.source,
                             )
                         },
                     ),
@@ -197,10 +200,10 @@ internal class ChildFactory @Inject constructor(
                 createComponentChild(
                     context = context,
                     params = OnrampComponent.Params(
-                        userWalletId = route.userWalletId,
+                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
                         cryptoCurrency = route.currency,
                         source = route.source,
-                        launchSepa = route.launchSepa,
+                        shouldLaunchSepa = route.shouldLaunchSepa,
                     ),
                     componentFactory = onrampComponentFactory,
                 )
@@ -271,7 +274,7 @@ internal class ChildFactory @Inject constructor(
                 createComponentChild(
                     context = context,
                     params = TokenDetailsComponent.Params(
-                        userWalletId = route.userWalletId,
+                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param
                         currency = route.currency,
                     ),
                     componentFactory = tokenDetailsComponentFactory,
@@ -281,7 +284,7 @@ internal class ChildFactory @Inject constructor(
                 createComponentChild(
                     context = context,
                     params = StakingComponent.Params(
-                        userWalletId = route.userWalletId,
+                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
                         cryptoCurrencyId = route.cryptoCurrencyId,
                         yieldId = route.yieldId,
                     ),
@@ -294,7 +297,7 @@ internal class ChildFactory @Inject constructor(
                     params = SwapComponent.Params(
                         currencyFrom = route.currencyFrom,
                         currencyTo = route.currencyTo,
-                        userWalletId = route.userWalletId,
+                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
                         isInitialReverseOrder = route.isInitialReverseOrder,
                         screenSource = route.screenSource,
                     ),
@@ -305,7 +308,7 @@ internal class ChildFactory @Inject constructor(
                 createComponentChild(
                     context = context,
                     params = SendComponent.Params(
-                        userWalletId = route.userWalletId,
+                        userWalletId = route.portfolioId.userWalletId, // todo account portfolioId param,
                         currency = route.currency,
                         transactionId = route.transactionId,
                         amount = route.amount,
@@ -459,7 +462,7 @@ internal class ChildFactory @Inject constructor(
                         initialCurrency = route.initialCurrency,
                         selectedCurrency = route.selectedCurrency,
                         source = ChooseManagedTokensComponent.Source.valueOf(route.source.name),
-                        showSendViaSwapNotification = route.showSendViaSwapNotification,
+                        shouldShowSendViaSwapNotification = route.shouldShowSendViaSwapNotification,
                         analyticsCategoryName = route.analyticsCategoryName,
                     ),
                     componentFactory = chooseManagedTokensComponentFactory,
@@ -590,17 +593,30 @@ internal class ChildFactory @Inject constructor(
             is AppRoute.TangemPayDetails -> {
                 createComponentChild(
                     context = context,
-                    params = TangemPayDetailsComponent.Params(userWalletId = route.userWalletId),
+                    params = TangemPayDetailsComponent.Params(
+                        customerWalletAddress = route.customerWalletAddress,
+                        cardNumberEnd = route.cardNumberEnd,
+                    ),
                     componentFactory = tangemPayDetailsComponentFactory,
                 )
             }
             is AppRoute.TangemPayOnboarding -> {
                 createComponentChild(
                     context = context,
-                    params = TangemPayOnboardingComponent.Params(route.deeplink),
+                    params = when (val mode = route.mode) {
+                        is AppRoute.TangemPayOnboarding.Mode.ContinueOnboarding -> ContinueOnboarding
+                        is AppRoute.TangemPayOnboarding.Mode.Deeplink -> Deeplink(deeplink = mode.deeplink)
+                    },
                     componentFactory = tangemPayOnboardingComponentFactory,
                 )
             }
+            is AppRoute.Kyc -> {
+                createComponentChild(
+                    context = context,
+                    params = KycComponent.Params,
+                    componentFactory = kycComponentFactory,
+                )
+            }
             is AppRoute.YieldSupplyPromo -> {
                 createComponentChild(
                     context = context,
diff --git a/build.gradle.kts b/build.gradle.kts
index 5d73b767fa..3648de0c58 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,16 @@ subprojects {
         testLogging {
             exceptionFormat = TestExceptionFormat.FULL
             showStandardStreams = true
+
+            afterSuite(KotlinClosure2<TestDescriptor, TestResult, Unit>({ desc, result ->
+                if (desc.parent == null) { // will match the outermost suite
+                    val output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)"
+                    val startItem = "| "
+                    val endItem = " |"
+                    val repeatLength = startItem.length + output.length + endItem.length
+                    println("\n" + "-".repeat(repeatLength) + "\n" + startItem + output + endItem + "\n" + "-".repeat(repeatLength))
+                }
+            }))
         }
     }
 }
diff --git a/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt b/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt
index e81718555d..6be3254217 100644
--- a/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt
+++ b/common/google/src/main/java/com/tangem/google/GoogleServicesHelper.kt
@@ -78,8 +78,8 @@ object GoogleServicesHelper {
         return suspendCoroutine<Result<Boolean>> { continuation ->
             task.addOnCompleteListener { completedTask ->
                 try {
-                    val result = completedTask.getResult(ApiException::class.java)
-                    continuation.resume(Result.success(result))
+                    val isGooglePayAvailable = completedTask.getResult(ApiException::class.java)
+                    continuation.resume(Result.success(isGooglePayAvailable))
                 } catch (exception: ApiException) {
                     continuation.resume(Result.failure(exception))
                 }
diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
index 716edd6750..d4566f6a58 100644
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt
@@ -1,5 +1,8 @@
+@file:Suppress("NullableToStringCall")
+
 package com.tangem.common.routing
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import com.tangem.common.routing.bundle.RouteBundleParams
 import com.tangem.common.routing.bundle.bundle
@@ -8,6 +11,7 @@ import com.tangem.core.decompose.navigation.Route
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.feedback.models.WalletMetaInfo
 import com.tangem.domain.markets.TokenMarketParams
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.scan.ScanResponse
@@ -16,6 +20,7 @@ import com.tangem.domain.nft.models.NFTAsset
 import com.tangem.domain.onramp.model.OnrampSource
 import kotlinx.serialization.Serializable
 
+@SuppressLint("UnsafeOptInUsageError")
 @Serializable
 sealed class AppRoute(val path: String) : Route {
 
@@ -46,25 +51,50 @@ sealed class AppRoute(val path: String) : Route {
 
     @Serializable
     data class CurrencyDetails(
-        val userWalletId: UserWalletId,
+        val portfolioId: PortfolioId,
         val currency: CryptoCurrency,
-    ) : AppRoute(path = "/currency_details/${userWalletId.stringValue}/${currency.id.value}")
+    ) : AppRoute(path = "/currency_details/${portfolioId.stringValue}/${currency.id.value}") {
+        companion object {
+            operator fun invoke(userWalletId: UserWalletId, currency: CryptoCurrency) = CurrencyDetails(
+                portfolioId = PortfolioId(userWalletId),
+                currency = currency,
+            )
+        }
+    }
 
     @Serializable
     data class Send(
-        val userWalletId: UserWalletId,
+        val portfolioId: PortfolioId,
         val currency: CryptoCurrency,
         val transactionId: String? = null,
         val amount: String? = null,
         val tag: String? = null,
         val destinationAddress: String? = null,
     ) : AppRoute(
-        path = "/send/${userWalletId.stringValue}/${currency.id.value}?" +
+        path = "/send/${portfolioId.stringValue}/${currency.id.value}?" +
             "&$transactionId" +
             "&$amount" +
             "&$tag" +
             "&$destinationAddress",
-    )
+    ) {
+        companion object {
+            operator fun invoke(
+                userWalletId: UserWalletId,
+                currency: CryptoCurrency,
+                transactionId: String? = null,
+                amount: String? = null,
+                tag: String? = null,
+                destinationAddress: String? = null,
+            ) = Send(
+                portfolioId = PortfolioId(userWalletId),
+                currency = currency,
+                transactionId = transactionId,
+                amount = amount,
+                tag = tag,
+                destinationAddress = destinationAddress,
+            )
+        }
+    }
 
     @Serializable
     data class Details(
@@ -132,7 +162,7 @@ sealed class AppRoute(val path: String) : Route {
         val initialCurrency: CryptoCurrency,
         val selectedCurrency: CryptoCurrency?,
         val source: Source,
-        val showSendViaSwapNotification: Boolean,
+        val shouldShowSendViaSwapNotification: Boolean,
         val analyticsCategoryName: String,
     ) : AppRoute(path = "/$source/choose_managed_tokens/$userWalletId/${initialCurrency.id.value}") {
         enum class Source {
@@ -169,26 +199,51 @@ sealed class AppRoute(val path: String) : Route {
     data class Swap(
         val currencyFrom: CryptoCurrency,
         val currencyTo: CryptoCurrency? = null,
-        val userWalletId: UserWalletId,
+        val portfolioId: PortfolioId,
         val isInitialReverseOrder: Boolean = false,
         val screenSource: String,
     ) : AppRoute(
         path = "/swap" +
             "/${currencyFrom.id.value}" +
             "/${currencyTo?.id?.value}" +
-            "/${userWalletId.stringValue}" +
+            "/${portfolioId.stringValue}" +
             "/$isInitialReverseOrder",
-    )
+    ) {
+        companion object {
+            operator fun invoke(
+                userWalletId: UserWalletId,
+                currencyFrom: CryptoCurrency,
+                currencyTo: CryptoCurrency? = null,
+                isInitialReverseOrder: Boolean = false,
+                screenSource: String,
+            ) = Swap(
+                portfolioId = PortfolioId(userWalletId),
+                currencyFrom = currencyFrom,
+                currencyTo = currencyTo,
+                isInitialReverseOrder = isInitialReverseOrder,
+                screenSource = screenSource,
+            )
+        }
+    }
 
     @Serializable
     data object AppCurrencySelector : AppRoute(path = "/app_currency_selector")
 
     @Serializable
     data class Staking(
-        val userWalletId: UserWalletId,
+        val portfolioId: PortfolioId,
         val cryptoCurrencyId: CryptoCurrency.ID,
         val yieldId: String,
-    ) : AppRoute(path = "/staking/${userWalletId.stringValue}/${cryptoCurrencyId.value}/$yieldId")
+    ) : AppRoute(path = "/staking/${portfolioId.stringValue}/${cryptoCurrencyId.value}/$yieldId") {
+        companion object {
+            operator fun invoke(userWalletId: UserWalletId, cryptoCurrencyId: CryptoCurrency.ID, yieldId: String) =
+                Staking(
+                    portfolioId = PortfolioId(userWalletId),
+                    cryptoCurrencyId = cryptoCurrencyId,
+                    yieldId = yieldId,
+                )
+        }
+    }
 
     @Serializable
     data class PushNotification(
@@ -218,9 +273,9 @@ sealed class AppRoute(val path: String) : Route {
     data class MarketsTokenDetails(
         val token: TokenMarketParams,
         val appCurrency: AppCurrency,
-        val showPortfolio: Boolean,
+        val shouldShowPortfolio: Boolean,
         val analyticsParams: AnalyticsParams? = null,
-    ) : AppRoute(path = "/markets_token_details/${token.id}/$showPortfolio") {
+    ) : AppRoute(path = "/markets_token_details/${token.id}/$shouldShowPortfolio") {
 
         @Serializable
         data class AnalyticsParams(
@@ -232,11 +287,25 @@ sealed class AppRoute(val path: String) : Route {
     @Serializable
     data class Onramp(
         val source: OnrampSource,
-        val userWalletId: UserWalletId,
+        val portfolioId: PortfolioId,
         val currency: CryptoCurrency,
-        val launchSepa: Boolean = false,
-    ) : AppRoute(path = "/onramp/${userWalletId.stringValue}/${currency.symbol}"), RouteBundleParams {
+        val shouldLaunchSepa: Boolean = false,
+    ) : AppRoute(path = "/onramp/${portfolioId.stringValue}/${currency.symbol}"), RouteBundleParams {
         override fun getBundle(): Bundle = bundle(serializer())
+
+        companion object {
+            operator fun invoke(
+                source: OnrampSource,
+                userWalletId: UserWalletId,
+                currency: CryptoCurrency,
+                launchSepa: Boolean = false,
+            ) = Onramp(
+                source = source,
+                portfolioId = PortfolioId(userWalletId),
+                currency = currency,
+                shouldLaunchSepa = launchSepa,
+            )
+        }
     }
 
     @Serializable
@@ -372,12 +441,30 @@ sealed class AppRoute(val path: String) : Route {
     ) : AppRoute(path = "/archived_account/${userWalletId.stringValue}")
 
     @Serializable
-    data class TangemPayDetails(val userWalletId: UserWalletId) : AppRoute(path = "/tangem_pay_details")
+    data class TangemPayDetails(
+        val customerWalletAddress: String,
+        val cardNumberEnd: String,
+    ) : AppRoute(path = "/tangem_pay_details")
 
     @Serializable
     data class TangemPayOnboarding(
-        val deeplink: String,
-    ) : AppRoute(path = "/tangem_pay_onboarding/$deeplink")
+        val mode: Mode,
+    ) : AppRoute(path = "/tangem_pay_onboarding/$mode") {
+
+        @Serializable
+        sealed class Mode {
+            @Serializable
+            data class Deeplink(
+                val deeplink: String,
+            ) : Mode()
+
+            @Serializable
+            object ContinueOnboarding : Mode()
+        }
+    }
+
+    @Serializable
+    data object Kyc : AppRoute(path = "/kyc")
 
     @Serializable
     data class YieldSupplyPromo(
diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/bundle/BundleDecoder.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/bundle/BundleDecoder.kt
index 6a51004489..d10f5bc298 100644
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/bundle/BundleDecoder.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/bundle/BundleDecoder.kt
@@ -9,6 +9,7 @@ import kotlinx.serialization.encoding.CompositeDecoder
 import kotlinx.serialization.modules.SerializersModule
 
 @ExperimentalSerializationApi
+@Suppress("NullableToStringCall")
 internal class BundleDecoder(
     private val bundle: Bundle,
     private val elementsCount: Int = -1,
diff --git a/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldBalanceWrapperDTOFactory.kt b/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldBalanceWrapperDTOFactory.kt
index bb2343344e..b204ba985a 100644
--- a/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldBalanceWrapperDTOFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldBalanceWrapperDTOFactory.kt
@@ -28,7 +28,7 @@ object MockYieldBalanceWrapperDTOFactory {
                     amount = BigDecimal.ONE,
                     date = null,
                     pricePerShare = BigDecimal.ZERO,
-                    pendingActions = listOf(),
+                    pendingActions = emptyList(),
                     pendingActionConstraints = null,
                     tokenDTO = TokenDTO(
                         name = "The-Open-Network",
diff --git a/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldDTOFactory.kt b/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldDTOFactory.kt
index c58ff8edc0..52d77fa3a1 100644
--- a/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldDTOFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/data/staking/MockYieldDTOFactory.kt
@@ -30,13 +30,13 @@ object MockYieldDTOFactory {
                 logoURI = null,
                 isPoints = null,
             ),
-            tokens = listOf(),
+            tokens = emptyList(),
             args = YieldDTO.ArgsDTO(
                 enter = YieldDTO.ArgsDTO.Enter(
                     addresses = YieldDTO.ArgsDTO.Enter.Addresses(
                         address = AddressArgumentDTO(required = false),
                     ),
-                    args = mapOf(),
+                    args = emptyMap(),
                 ),
                 exit = null,
             ),
@@ -69,7 +69,7 @@ object MockYieldDTOFactory {
                     logoURI = null,
                     isPoints = null,
                 ),
-                tokensDTO = listOf(),
+                tokensDTO = emptyList(),
                 type = "type",
                 rewardSchedule = YieldDTO.MetadataDTO.RewardScheduleDTO.DAY,
                 cooldownPeriod = null,
@@ -81,7 +81,7 @@ object MockYieldDTOFactory {
                 revshare = YieldDTO.MetadataDTO.EnabledDTO(enabled = true),
                 fee = YieldDTO.MetadataDTO.EnabledDTO(enabled = true),
             ),
-            validators = listOf(),
+            validators = emptyList(),
             isAvailable = true,
         )
     }
diff --git a/common/test/src/main/java/com/tangem/common/test/domain/card/MockScanResponseFactory.kt b/common/test/src/main/java/com/tangem/common/test/domain/card/MockScanResponseFactory.kt
index 53527291ff..0b04f1cf91 100644
--- a/common/test/src/main/java/com/tangem/common/test/domain/card/MockScanResponseFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/domain/card/MockScanResponseFactory.kt
@@ -63,7 +63,7 @@ object MockScanResponseFactory {
                     isResettingUserCodesAllowed = false,
                     isLinkedTerminalEnabled = false,
                     isBackupAllowed = cardConfig is MultiWalletCardConfig,
-                    supportedEncryptionModes = listOf(),
+                    supportedEncryptionModes = emptyList(),
                     isFilesAllowed = true,
                     isHDWalletAllowed = cardConfig is MultiWalletCardConfig,
                     isKeysImportAllowed = true,
@@ -72,7 +72,7 @@ object MockScanResponseFactory {
                 linkedTerminalStatus = CardDTO.LinkedTerminalStatus.Current,
                 isAccessCodeSet = false,
                 isPasscodeSet = null,
-                supportedCurves = listOf(),
+                supportedCurves = emptyList(),
                 wallets = cardConfig.mandatoryCurves.map {
                     CardDTO.Wallet(
                         CardWallet(
@@ -85,7 +85,7 @@ object MockScanResponseFactory {
                             index = 0,
                             isImported = true,
                             hasBackup = true,
-                            derivedKeys = mapOf(),
+                            derivedKeys = emptyMap(),
                         ),
                     )
                 },
diff --git a/common/test/src/main/java/com/tangem/common/test/domain/network/MockNetworkStatusFactory.kt b/common/test/src/main/java/com/tangem/common/test/domain/network/MockNetworkStatusFactory.kt
index 99a612b847..41f76b4cb7 100644
--- a/common/test/src/main/java/com/tangem/common/test/domain/network/MockNetworkStatusFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/domain/network/MockNetworkStatusFactory.kt
@@ -21,19 +21,20 @@ object MockNetworkStatusFactory {
     ): NetworkStatus {
         return NetworkStatus(
             network = network,
-            value = NetworkStatus.Verified(
-                address = NetworkAddress.Single(
-                    defaultAddress = NetworkAddress.Address(
-                        value = "0x1",
-                        type = NetworkAddress.Address.Type.Primary,
+            value = transform(
+                NetworkStatus.Verified(
+                    address = NetworkAddress.Single(
+                        defaultAddress = NetworkAddress.Address(
+                            value = "0x1",
+                            type = NetworkAddress.Address.Type.Primary,
+                        ),
                     ),
+                    amounts = emptyMap(),
+                    pendingTransactions = emptyMap(),
+                    yieldSupplyStatuses = emptyMap(),
+                    source = source,
                 ),
-                amounts = mapOf(),
-                pendingTransactions = mapOf(),
-                yieldSupplyStatuses = mapOf(),
-                source = source,
-            )
-                .let(transform),
+            ),
         )
     }
 
diff --git a/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt b/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
index c56e3718ef..d5f73cbee0 100644
--- a/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/domain/token/MockCryptoCurrencyFactory.kt
@@ -8,12 +8,12 @@ import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.common.test.domain.card.MockScanResponseFactory
 import com.tangem.common.test.domain.wallet.MockUserWalletFactory
 import com.tangem.data.common.currency.CryptoCurrencyFactory
-import com.tangem.domain.wallets.derivations.DerivationStyleProvider
-import com.tangem.domain.wallets.derivations.derivationStyleProvider
 import com.tangem.domain.card.configs.GenericCardConfig
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.wallets.derivations.DerivationStyleProvider
+import com.tangem.domain.wallets.derivations.derivationStyleProvider
 
 /**
 [REDACTED_AUTHOR]
@@ -110,7 +110,7 @@ class MockCryptoCurrencyFactory(private val userWallet: UserWallet.Cold = defaul
         )
     }
 
-    fun createToken(blockchain: Blockchain): CryptoCurrency {
+    fun createToken(blockchain: Blockchain): CryptoCurrency.Token {
         return factory.createToken(
             sdkToken = Token(
                 name = "NEVER-MIND",
diff --git a/common/test/src/main/java/com/tangem/common/test/domain/wallet/MockUserWalletFactory.kt b/common/test/src/main/java/com/tangem/common/test/domain/wallet/MockUserWalletFactory.kt
index a216096699..4afe1d94aa 100644
--- a/common/test/src/main/java/com/tangem/common/test/domain/wallet/MockUserWalletFactory.kt
+++ b/common/test/src/main/java/com/tangem/common/test/domain/wallet/MockUserWalletFactory.kt
@@ -37,7 +37,7 @@ object MockUserWalletFactory {
         return UserWallet.Cold(
             name = "NODL",
             walletId = UserWalletId("011"),
-            cardsInWallet = setOf(),
+            cardsInWallet = emptySet(),
             isMultiCurrency = false,
             scanResponse = MockScanResponseFactory.create(
                 cardConfig = GenericCardConfig(maxWalletCount = 2),
diff --git a/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt b/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
index 67cd37711b..b341dd3243 100644
--- a/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
+++ b/common/test/src/main/java/com/tangem/common/test/utils/TruthExt.kt
@@ -1,16 +1,18 @@
 package com.tangem.common.test.utils
 
 import arrow.core.Either
+import arrow.core.None
+import arrow.core.Option
 import com.google.common.truth.Truth
 
 fun <B> assertEither(actual: Either<Throwable, B>, expected: Either<Throwable, B>) {
     actual
         .onRight { Truth.assertThat(actual).isEqualTo(expected) }
-        .onLeft {
-            val expectedError = expected.leftOrNull() ?: error("Actual is Either.Left: $it")
+        .onLeft { throwable ->
+            val expectedError = expected.leftOrNull() ?: error("Actual is Either.Left: $throwable")
 
-            Truth.assertThat(it).isInstanceOf(expectedError::class.java)
-            Truth.assertThat(it).hasMessageThat().isEqualTo(expectedError.message)
+            Truth.assertThat(throwable).isInstanceOf(expectedError::class.java)
+            Truth.assertThat(throwable).hasMessageThat().isEqualTo(expectedError.message)
         }
 }
 
@@ -22,11 +24,24 @@ fun assertEitherRight(actual: Either<Throwable, Unit>) {
         }
 }
 
+@Suppress("NullableToStringCall")
 fun <B> assertEitherLeft(actual: Either<Throwable, B>, expected: Throwable) {
     actual
         .onRight { error("Actual is Either.Right: $it") }
-        .onLeft {
-            Truth.assertThat(it::class.java).isEqualTo(expected::class.java)
-            Truth.assertThat(it).hasMessageThat().isEqualTo(expected.message)
+        .onLeft { throwable ->
+            Truth.assertThat(throwable::class.java).isEqualTo(expected::class.java)
+            Truth.assertThat(throwable).hasMessageThat().isEqualTo(expected.message)
+        }
+}
+
+fun <B> assertNone(actual: Option<B>) {
+    Truth.assertThat(actual).isEqualTo(None)
+}
+
+fun <B> assertSome(actual: Option<B>, expected: B) {
+    actual
+        .onNone { error("Actual is None") }
+        .onSome {
+            Truth.assertThat(it).isEqualTo(expected)
         }
 }
\ No newline at end of file
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChart.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChart.kt
index 992380b05e..52f967ed67 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChart.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChart.kt
@@ -90,7 +90,7 @@ fun MarketChart(
         backgroundLineColor = state.chartColor.copy(alpha = backgroundColorAlpha),
         secondLineColor = splitChartSegmentColor,
         backgroundSecondLineColor = splitChartSegmentColor.copy(alpha = backgroundSplitChartSegmentColorAlpha),
-        secondColorOnTheRightSide = state.markerHighlightRightSide.not(),
+        secondColorOnTheRightSide = state.shouldMarkerHighlightRightSide.not(),
         markerFraction = state.markerFraction,
         axisValueOverrider = AxisValueOverrider.fixed(),
         canvasHeight = chartHeight,
@@ -114,10 +114,10 @@ fun MarketChart(
 
     CartesianChartHost(
         modifier = modifier
-            .onGloballyPositioned {
-                canvasWidth = it.size.width
-                chartHeight = if (it.size.height != 0) {
-                    it.size.height - bottomAxisHeight
+            .onGloballyPositioned { layoutCoordinates ->
+                canvasWidth = layoutCoordinates.size.width
+                chartHeight = if (layoutCoordinates.size.height != 0) {
+                    layoutCoordinates.size.height - bottomAxisHeight
                 } else {
                     0
                 }
@@ -126,7 +126,7 @@ fun MarketChart(
             .drawBehind {
                 state.markerFraction
                 state.chartColor
-                state.markerHighlightRightSide
+                state.shouldMarkerHighlightRightSide
             },
         chart = chart,
         modelProducer = state.modelProducer,
@@ -269,7 +269,7 @@ private fun rememberChartAxisGuidelineComponent(color: Color): LineComponent {
 
 // region Preview
 
-@Suppress("LongMethod")
+@Suppress("LongMethod", "NullableToStringCall")
 @Preview(showBackground = true, widthDp = 360)
 @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
@@ -283,7 +283,7 @@ private fun MarketChartPreview(
         MarketChartDataProducer.build {
             chartLook = MarketChartLook(
                 type = MarketChartLook.Type.Growing,
-                markerHighlightRightSide = true,
+                shouldMarkerHighlightRightSide = true,
             )
         }
     }
@@ -294,8 +294,8 @@ private fun MarketChartPreview(
                 x = x.toImmutableList(),
                 y = y.toImmutableList(),
             )
-            updateLook {
-                it.copy(
+            updateLook { marketChartLook ->
+                marketChartLook.copy(
                     xAxisFormatter = { value ->
                         value.toLong().toTimeFormat(DateTimeFormatters.dateMMMdd)
                     },
@@ -311,7 +311,6 @@ private fun MarketChartPreview(
     }
 
     val coroutineScope = rememberCoroutineScope()
-    val look by dataProducer.lookState.collectAsState()
 
     TangemThemePreview {
         val growingColor = TangemTheme.colors.icon.accent
@@ -323,8 +322,8 @@ private fun MarketChartPreview(
             onMarkerShown = { x, y ->
                 markerPoint = Pair(x, y)
             },
-            colorMapper = {
-                when (it) {
+            colorMapper = { type ->
+                when (type) {
                     MarketChartLook.Type.Growing -> growingColor
                     MarketChartLook.Type.Falling -> fallingColor
                     MarketChartLook.Type.Neutral -> neutralColor
@@ -355,7 +354,7 @@ private fun MarketChartPreview(
                 onClick = {
                     dataProducer.runTransaction {
                         updateLook {
-                            it.copy(markerHighlightRightSide = !it.markerHighlightRightSide)
+                            it.copy(shouldMarkerHighlightRightSide = !it.shouldMarkerHighlightRightSide)
                         }
                     }
                 },
@@ -368,10 +367,10 @@ private fun MarketChartPreview(
                 onClick = {
                     coroutineScope.launch {
                         dataProducer.runTransactionSuspend {
-                            updateData {
+                            updateData { data ->
                                 MarketChartData.Data(
-                                    x = it.x,
-                                    y = it.y.reversed().toImmutableList(),
+                                    x = data.x,
+                                    y = data.y.reversed().toImmutableList(),
                                 )
                             }
                         }
@@ -384,9 +383,9 @@ private fun MarketChartPreview(
             Button(
                 onClick = {
                     dataProducer.runTransaction {
-                        updateLook {
-                            it.copy(
-                                type = when (it.type) {
+                        updateLook { look ->
+                            look.copy(
+                                type = when (look.type) {
                                     MarketChartLook.Type.Growing -> MarketChartLook.Type.Falling
                                     MarketChartLook.Type.Falling -> MarketChartLook.Type.Neutral
                                     MarketChartLook.Type.Neutral -> MarketChartLook.Type.Growing
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChartMini.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChartMini.kt
index 2e62078f0f..6c564e49e5 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChartMini.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/MarketChartMini.kt
@@ -104,10 +104,10 @@ private fun PreviewColumn() {
 
     TangemThemePreview {
         LazyColumn {
-            items(100) {
+            items(100) { i ->
                 MarketChartMini(
                     rawData = data,
-                    type = if (it % 3 == 0) MarketChartLook.Type.Growing else MarketChartLook.Type.Falling,
+                    type = if (i % 3 == 0) MarketChartLook.Type.Growing else MarketChartLook.Type.Falling,
                 )
             }
         }
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/downsample/LTThreeBuckets.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/downsample/LTThreeBuckets.kt
index 21578b9cc1..88325af11c 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/downsample/LTThreeBuckets.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/downsample/LTThreeBuckets.kt
@@ -51,10 +51,10 @@ object LTThreeBuckets {
         val yRes = ArrayList<Double>(points.size)
         val indexesRes = ArrayList<Int>(points.size)
 
-        results.fastForEach {
-            xRes.add(it.x)
-            yRes.add(it.y)
-            indexesRes.add(it.originalIndex!!)
+        results.fastForEach { result ->
+            xRes.add(result.x)
+            yRes.add(result.y)
+            indexesRes.add(requireNotNull(result.originalIndex))
         }
 
         return Result(
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/ChartMarker.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/ChartMarker.kt
index 5ef509c92b..19ed6e31d3 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/ChartMarker.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/ChartMarker.kt
@@ -62,12 +62,7 @@ internal fun rememberTangemChartMarker(color: Color): CartesianMarker {
             },
             indicatorSizeDp = INDICATOR_SIZE_DP,
             guideline = guideline,
-            valueFormatter = object : CartesianMarkerValueFormatter {
-                override fun format(
-                    context: CartesianDrawContext,
-                    targets: List<CartesianMarker.Target>,
-                ): CharSequence = ""
-            },
+            valueFormatter = CartesianMarkerValueFormatter { _, _ -> "" },
         ) {
             override fun updateInsets(
                 context: CartesianMeasureContext,
@@ -76,7 +71,12 @@ internal fun rememberTangemChartMarker(color: Color): CartesianMarker {
                 insets: Insets,
             ) {
                 with(context) {
-                    super.updateInsets(context, horizontalDimensions, model, insets)
+                    super.updateInsets(
+                        context = context,
+                        horizontalDimensions = horizontalDimensions,
+                        model = model,
+                        insets = insets,
+                    )
                     val baseShadowInsetDp =
                         CLIPPING_FREE_SHADOW_RADIUS_MULTIPLIER * LABEL_BACKGROUND_SHADOW_RADIUS_DP
                     val topInset = (baseShadowInsetDp - LABEL_BACKGROUND_SHADOW_DY_DP).pixels
@@ -90,11 +90,11 @@ internal fun rememberTangemChartMarker(color: Color): CartesianMarker {
                 cacheStore
                     .getOrSet(keyNamespace, indicator, outColor) { indicator.invoke(outColor) }
                     .draw(
-                        this,
-                        x - halfIndicatorSize,
-                        y - halfIndicatorSize,
-                        x + halfIndicatorSize,
-                        y + halfIndicatorSize,
+                        context = this,
+                        left = x - halfIndicatorSize,
+                        top = y - halfIndicatorSize,
+                        right = x + halfIndicatorSize,
+                        bottom = y + halfIndicatorSize,
                     )
             }
         }
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/MarketChartLayer.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/MarketChartLayer.kt
index a01ceb3d22..c869560ccd 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/MarketChartLayer.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/layer/MarketChartLayer.kt
@@ -64,7 +64,7 @@ internal fun rememberMarketChartLayer(
     val backgroundColorLineGradient = persistentListOf(backgroundLineColor, Color.Transparent)
     val backgroundSecondLineColorGradient = persistentListOf(backgroundSecondLineColor, Color.Transparent)
 
-    val markerSet = markerFraction != null
+    val isMarkerSet = markerFraction != null
 
     return rememberLayer(
         fractionValue = markerFraction ?: 0f,
@@ -75,17 +75,17 @@ internal fun rememberMarketChartLayer(
         } else {
             lineColor
         },
-        backLineColor = if (markerSet && !secondColorOnTheRightSide) {
+        backLineColor = if (isMarkerSet && !secondColorOnTheRightSide) {
             backgroundSecondLineColorGradient
         } else {
             backgroundColorLineGradient
         },
         lineColorRight = when {
-            markerSet && secondColorOnTheRightSide -> secondLineColor
+            isMarkerSet && secondColorOnTheRightSide -> secondLineColor
             else -> lineColor
         },
         backLineColorRight = when {
-            markerSet && secondColorOnTheRightSide -> backgroundSecondLineColorGradient
+            isMarkerSet && secondColorOnTheRightSide -> backgroundSecondLineColorGradient
             else -> backgroundColorLineGradient
         },
     )
@@ -148,7 +148,7 @@ private fun LayerChartPreview(
     val y = previewData.second.map { it.toFloat() }
     val x = List(y.size) { it.toFloat() }
     val model = CartesianChartModel(LineCartesianLayerModel.build { series(x, y) })
-    var lineColor by remember {
+    val lineColor by remember {
         mutableStateOf(Color.Blue)
     }
 
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartDataProducer.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartDataProducer.kt
index 86f5ef5dd6..74adf8e118 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartDataProducer.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartDataProducer.kt
@@ -85,7 +85,7 @@ class TransactionSuspend(
 class MarketChartDataProducer private constructor(
     initialData: MarketChartData,
     initialLook: MarketChartLook,
-    val pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(needToFormatAxis = true),
+    val pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = true),
     private val dispatcher: CoroutineDispatcher = Dispatchers.Default,
 ) {
     internal val dataState = MutableStateFlow(initialData)
@@ -166,7 +166,7 @@ class MarketChartDataProducer private constructor(
          * @return A MarketChartDataProducer.
          */
         suspend fun buildSuspend(
-            pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(needToFormatAxis = true),
+            pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = true),
             dispatcher: CoroutineDispatcher = Dispatchers.Default,
             block: TransactionSuspend.() -> Unit,
         ): MarketChartDataProducer {
@@ -191,7 +191,7 @@ class MarketChartDataProducer private constructor(
          * @return A MarketChartDataProducer.
          */
         fun build(
-            pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(needToFormatAxis = true),
+            pointsValuesConverter: PointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = true),
             dispatcher: CoroutineDispatcher = Dispatchers.Default,
             block: Transaction.() -> Unit,
         ): MarketChartDataProducer {
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartLook.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartLook.kt
index 72c608da53..2b7599b033 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartLook.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartLook.kt
@@ -9,14 +9,14 @@ import com.tangem.common.ui.charts.state.formatter.AxisLabelFormatter
  * and formatters for x and y axis.
  *
  * @property type The type of the chart, can be either Growing or Falling.
- * @property markerHighlightRightSide A boolean indicating whether the marker highlights the right side of the chart.
+ * @property shouldMarkerHighlightRightSide A boolean indicating whether the marker highlights the right side of the chart.
  * @property xAxisFormatter A formatter for the x-axis labels.
  * @property yAxisFormatter A formatter for the y-axis labels.
  */
 @Immutable
 data class MarketChartLook(
     val type: Type = Type.Growing,
-    val markerHighlightRightSide: Boolean = true,
+    val shouldMarkerHighlightRightSide: Boolean = true,
     val xAxisFormatter: AxisLabelFormatter = AxisLabelFormatter { it.toString() },
     val yAxisFormatter: AxisLabelFormatter = AxisLabelFormatter { it.toString() },
 ) {
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartState.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartState.kt
index e031fc1a27..62c312b4b4 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartState.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/MarketChartState.kt
@@ -20,8 +20,8 @@ import java.math.BigDecimal
 fun rememberMarketChartState(
     dataProducer: MarketChartDataProducer = remember { MarketChartDataProducer.build {} },
     colorMapper: (MarketChartLook.Type) -> Color = remember {
-        {
-            when (it) {
+        { type ->
+            when (type) {
                 MarketChartLook.Type.Growing -> Color.Green
                 MarketChartLook.Type.Falling -> Color.Red
                 MarketChartLook.Type.Neutral -> Color.Gray
@@ -33,7 +33,12 @@ fun rememberMarketChartState(
     val lookState = dataProducer.lookState.collectAsState()
 
     val state = remember(dataProducer, lookState, colorMapper, onMarkerShown) {
-        MarketChartState(dataProducer, lookState, colorMapper, onMarkerShown)
+        MarketChartState(
+            dataProducer = dataProducer,
+            lookState = lookState,
+            colorMapper = colorMapper,
+            markerCallback = onMarkerShown,
+        )
     }
 
     return state
@@ -61,8 +66,8 @@ class MarketChartState internal constructor(
         colorMapper(lookState.value.type)
     }
 
-    internal val markerHighlightRightSide by derivedStateOf {
-        lookState.value.markerHighlightRightSide
+    internal val shouldMarkerHighlightRightSide by derivedStateOf {
+        lookState.value.shouldMarkerHighlightRightSide
     }
 
     internal val xValueFormatter = CartesianValueFormatter { value, _, _ ->
diff --git a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/converter/PriceAndTimePointValuesConverter.kt b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/converter/PriceAndTimePointValuesConverter.kt
index e51a8f72a6..3ea25b6abf 100644
--- a/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/converter/PriceAndTimePointValuesConverter.kt
+++ b/common/ui-charts/src/main/kotlin/com/tangem/common/ui/charts/state/converter/PriceAndTimePointValuesConverter.kt
@@ -8,7 +8,7 @@ import java.math.BigDecimal
 
 @Suppress("MagicNumber")
 class PriceAndTimePointValuesConverter(
-    private val needToFormatAxis: Boolean,
+    private val shouldFormatAxis: Boolean,
 ) : PointValuesConverter {
 
     private data class MinMaxCache(
@@ -18,7 +18,12 @@ class PriceAndTimePointValuesConverter(
         val maxY: BigDecimal,
     )
 
-    private var minMaxCache = MinMaxCache(BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO)
+    private var minMaxCache = MinMaxCache(
+        minX = BigDecimal.ZERO,
+        maxX = BigDecimal.ZERO,
+        minY = BigDecimal.ZERO,
+        maxY = BigDecimal.ZERO,
+    )
     private val formatYValuesCache = mutableMapOf<Double, BigDecimal>()
     private val formatXValuesCache = mutableMapOf<Double, BigDecimal>()
 
@@ -37,15 +42,14 @@ class PriceAndTimePointValuesConverter(
         val normX = data.x.normalizeTime(min = cache.minX, max = cache.maxX)
 
         return if (normX.size > MAX_POINTS) {
-            LTThreeBuckets
+            val downsampled = LTThreeBuckets
                 .downsample(normX, normY, MAX_POINTS - 2)
-                .let {
-                    MarketChartRawData(
-                        originalIndexes = it.originalIndexes.toImmutableList(),
-                        x = it.x.toImmutableList(),
-                        y = it.y.toImmutableList(),
-                    )
-                }
+
+            MarketChartRawData(
+                originalIndexes = downsampled.originalIndexes.toImmutableList(),
+                x = downsampled.x.toImmutableList(),
+                y = downsampled.y.toImmutableList(),
+            )
         } else {
             MarketChartRawData(
                 x = normX.toImmutableList(),
@@ -55,8 +59,8 @@ class PriceAndTimePointValuesConverter(
     }
 
     override fun prepareRawXForFormat(rawX: Double, data: MarketChartData.Data): BigDecimal {
-        if (!needToFormatAxis) return BigDecimal.ZERO
-        if (formatXValuesCache.containsKey(rawX)) return formatXValuesCache[rawX]!!
+        if (!shouldFormatAxis) return BigDecimal.ZERO
+        if (formatXValuesCache.containsKey(rawX)) return requireNotNull(formatXValuesCache[rawX])
 
         val result = (rawX * MINUTE).toBigDecimal()
 
@@ -65,8 +69,8 @@ class PriceAndTimePointValuesConverter(
     }
 
     override fun prepareRawYForFormat(rawY: Double, data: MarketChartData.Data): BigDecimal {
-        if (!needToFormatAxis) return BigDecimal.ZERO
-        if (formatYValuesCache.containsKey(rawY)) return formatYValuesCache[rawY]!!
+        if (!shouldFormatAxis) return BigDecimal.ZERO
+        if (formatYValuesCache.containsKey(rawY)) return requireNotNull(formatYValuesCache[rawY])
 
         val min = minMaxCache.minY
         val max = minMaxCache.maxY
diff --git a/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt
new file mode 100644
index 0000000000..276468c38c
--- /dev/null
+++ b/common/ui/src/main/java/com/tangem/common/ui/account/AccountPortfolioItemUMConverter.kt
@@ -0,0 +1,85 @@
+package com.tangem.common.ui.account
+
+import com.tangem.common.ui.R
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
+import com.tangem.core.ui.extensions.pluralReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.utils.converter.Converter
+
+class AccountPortfolioItemUMConverter(
+    private val onClick: (AccountId) -> Unit,
+    private val appCurrency: AppCurrency? = null,
+    private val accountBalance: TotalFiatBalance? = null,
+    private val isBalanceHidden: Boolean = false,
+    private val endIcon: UserWalletItemUM.EndIcon = UserWalletItemUM.EndIcon.None,
+) : Converter<Account, UserWalletItemUM> {
+
+    override fun convert(value: Account): UserWalletItemUM {
+        return with(value) {
+            UserWalletItemUM(
+                id = UserWalletId(value.accountId.value),
+                name = value.accountName.toUM().value,
+                information = getInfo(value),
+                balance = getBalanceInfo(),
+                isEnabled = true,
+                endIcon = endIcon,
+                onClick = { onClick(value.accountId) },
+                imageState = getImageState(value),
+                label = null,
+            )
+        }
+    }
+
+    private fun getInfo(account: Account): UserWalletItemUM.Information.Loaded = when (account) {
+        is Account.CryptoPortfolio -> {
+            val text = pluralReference(
+                R.plurals.common_tokens_count,
+                count = account.tokensCount,
+                formatArgs = wrappedList(account.tokensCount),
+            )
+            UserWalletItemUM.Information.Loaded(text)
+        }
+    }
+
+    private fun getImageState(account: Account) = when (account) {
+        is Account.CryptoPortfolio -> UserWalletItemUM.ImageState.Account(
+            name = account.accountName.toUM().value,
+            icon = account.icon.toUM(),
+        )
+    }
+
+    private fun getBalanceInfo(): UserWalletItemUM.Balance {
+        return when {
+            isBalanceHidden -> UserWalletItemUM.Balance.Hidden
+            accountBalance == null -> UserWalletItemUM.Balance.Loading
+            else -> {
+                when (accountBalance) {
+                    is TotalFiatBalance.Loading -> UserWalletItemUM.Balance.Loading
+                    is TotalFiatBalance.Failed -> UserWalletItemUM.Balance.Failed
+                    is TotalFiatBalance.Loaded -> {
+                        if (appCurrency != null) {
+                            val formattedAmount = accountBalance.amount.format {
+                                fiat(appCurrency.code, appCurrency.symbol)
+                            }
+
+                            UserWalletItemUM.Balance.Loaded(
+                                value = formattedAmount,
+                                isFlickering = accountBalance.source == StatusSource.CACHE,
+                            )
+                        } else {
+                            UserWalletItemUM.Balance.Failed
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt
index 823ad1ce3d..fdd122631d 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/AmountScreenContent.kt
@@ -1,6 +1,7 @@
 package com.tangem.common.ui.amountScreen
 
 import android.content.res.Configuration
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.runtime.Composable
@@ -8,13 +9,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountScreenClickIntentsStub
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
 import com.tangem.common.ui.amountScreen.ui.amountField
 import com.tangem.common.ui.amountScreen.ui.amountFieldV2
 import com.tangem.common.ui.amountScreen.ui.buttons
-import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 
 /**
@@ -29,15 +30,13 @@ fun AmountScreenContent(
     isBalanceHidden: Boolean,
     clickIntents: AmountScreenClickIntents,
     modifier: Modifier = Modifier,
+    extraContent: (@Composable () -> Unit)? = null,
 ) {
     // Do not put fillMaxSize() in here
     LazyColumn(
         modifier = modifier
-            .padding(
-                start = TangemTheme.dimens.spacing16,
-                end = TangemTheme.dimens.spacing16,
-                bottom = TangemTheme.dimens.spacing16,
-            ),
+            .padding(horizontal = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
     ) {
         if (amountState.isRedesignEnabled) {
             amountFieldV2(
@@ -47,6 +46,11 @@ fun AmountScreenContent(
                 onCurrencyChange = clickIntents::onCurrencyChangeClick,
                 onMaxAmountClick = clickIntents::onMaxValueClick,
             )
+            if (extraContent != null) {
+                item("EXTRA_CONTENT_KEY") {
+                    extraContent()
+                }
+            }
         } else if (amountState is AmountState.Data) {
             amountField(
                 amountState = amountState,
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceByTransformer.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceByTransformer.kt
index 244ea5b4c0..f96fa69bd0 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceByTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceByTransformer.kt
@@ -53,7 +53,7 @@ class AmountReduceByTransformer(
 
         val checkValue = if (amountTextField.isFiatValue) fiatValue else cryptoValue
         val isExceedBalance = checkValue.checkExceedBalance(maxEnterAmount, amountTextField)
-        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } ?: false
+        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } == true
         val isZero = if (amountTextField.isFiatValue) {
             decimalFiatValue.isNullOrZero()
         } else {
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceToTransformer.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceToTransformer.kt
index cb91187d95..0afd5d8bc5 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceToTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountReduceToTransformer.kt
@@ -52,7 +52,7 @@ class AmountReduceToTransformer(
 
         val checkValue = if (amountTextField.isFiatValue) fiatValue else cryptoValue
         val isExceedBalance = checkValue.checkExceedBalance(maxEnterAmount, amountTextField)
-        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } ?: false
+        val isLessThanMinimumIfProvided = minimumTransactionAmount?.amount?.let { decimalCryptoValue < it } == true
         val isZero = if (amountTextField.isFiatValue) decimalFiatValue.isNullOrZero() else value.isNullOrZero()
         val isCheckFailed = isExceedBalance || isLessThanMinimumIfProvided
         return prevState.copy(
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt
index c3b284e828..36f37a67ab 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/AmountStateConverter.kt
@@ -52,7 +52,7 @@ class AmountStateConverter(
         val status = cryptoCurrencyStatusProvider()
         val fiat = maxEnterAmount.fiatAmount.format { fiat(appCurrency.code, appCurrency.symbol) }
         val crypto = maxEnterAmount.amount.format { crypto(status.currency) }
-        val noFeeRate = status.value.fiatRate.isNullOrZero()
+        val hasNoFeeRate = status.value.fiatRate.isNullOrZero()
 
         return AmountState.Data(
             title = value.title,
@@ -69,7 +69,7 @@ class AmountStateConverter(
                     title = stringReference(status.currency.symbol),
                     iconState = iconStateConverter.convertCustom(
                         value = status,
-                        forceGrayscale = noFeeRate,
+                        forceGrayscale = hasNoFeeRate,
                         showCustomTokenBadge = false,
                     ),
                     isFiat = false,
@@ -80,7 +80,7 @@ class AmountStateConverter(
                     isFiat = true,
                 ),
             ),
-            isSegmentedButtonsEnabled = !noFeeRate,
+            isSegmentedButtonsEnabled = !hasNoFeeRate,
             selectedButton = 0,
             isRedesignEnabled = false,
         )
@@ -104,7 +104,6 @@ class AmountStateConverterV2(
     private val cryptoCurrencyStatus: CryptoCurrencyStatus,
     private val maxEnterAmount: EnterAmountBoundary,
     private val iconStateConverter: CryptoCurrencyToIconStateConverter,
-    private val isRedesignEnabled: Boolean,
     private val isBalanceHidden: Boolean,
 ) : Converter<AmountParameters, AmountState> {
 
@@ -122,23 +121,16 @@ class AmountStateConverterV2(
         val noFeeRate = cryptoCurrencyStatus.value.fiatRate.isNullOrZero()
 
         if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
-            return AmountState.Empty(
-                isRedesignEnabled = isRedesignEnabled,
-            )
+            return AmountState.Empty(isRedesignEnabled = true)
         }
 
         return AmountState.Data(
             title = value.title,
-            availableBalance = if (isRedesignEnabled) {
-                combinedReference(
-                    stringReference(crypto),
-                    stringReference(" $DOT "),
-                    stringReference(fiat),
-                ).orMaskWithStars(isBalanceHidden)
-            } else {
-                resourceReference(R.string.common_crypto_fiat_format, wrappedList(crypto, fiat))
-                    .orMaskWithStars(isBalanceHidden)
-            },
+            availableBalance = combinedReference(
+                stringReference(crypto),
+                stringReference(" $DOT "),
+                stringReference(fiat),
+            ).orMaskWithStars(isBalanceHidden),
             availableBalanceCrypto = stringReference(crypto).orMaskWithStars(isBalanceHidden),
             availableBalanceFiat = if (isBalanceHidden) {
                 TextReference.EMPTY
@@ -171,7 +163,7 @@ class AmountStateConverterV2(
             ),
             isSegmentedButtonsEnabled = !noFeeRate,
             selectedButton = 0,
-            isRedesignEnabled = isRedesignEnabled,
+            isRedesignEnabled = true,
         )
     }
 }
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountBoundaryUpdateTransformer.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountBoundaryUpdateTransformer.kt
index 90204d2c9f..53bdef9c57 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountBoundaryUpdateTransformer.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/converters/field/AmountBoundaryUpdateTransformer.kt
@@ -1,6 +1,5 @@
 package com.tangem.common.ui.amountScreen.converters.field
 
-import com.tangem.common.ui.R
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary
 import com.tangem.core.ui.extensions.*
@@ -18,13 +17,12 @@ import com.tangem.utils.transformer.Transformer
  * @property cryptoCurrencyStatus current cryptocurrency status
  * @property maxEnterAmount new maximum enter amount boundary
  * @property appCurrency current app currency
- * @property isRedesignEnabled whether redesign mode is enabled
+ * @property isBalanceHidden whether balance is hidden
  */
 class AmountBoundaryUpdateTransformer(
     private val cryptoCurrencyStatus: CryptoCurrencyStatus,
     private val maxEnterAmount: EnterAmountBoundary,
     private val appCurrency: AppCurrency,
-    private val isRedesignEnabled: Boolean,
     private val isBalanceHidden: Boolean,
 ) : Transformer<AmountState> {
 
@@ -34,15 +32,11 @@ class AmountBoundaryUpdateTransformer(
         val fiat = maxEnterAmount.fiatAmount.format { fiat(appCurrency.code, appCurrency.symbol) }
         val crypto = maxEnterAmount.amount.format { crypto(cryptoCurrencyStatus.currency) }
 
-        val availableBalance = if (isRedesignEnabled) {
-            combinedReference(
-                stringReference(crypto),
-                stringReference(" $DOT "),
-                stringReference(fiat),
-            )
-        } else {
-            resourceReference(R.string.common_crypto_fiat_format, wrappedList(crypto, fiat))
-        }
+        val availableBalance = combinedReference(
+            stringReference(crypto),
+            stringReference(" $DOT "),
+            stringReference(fiat),
+        )
 
         return prevState.copy(
             availableBalance = availableBalance.orMaskWithStars(isBalanceHidden),
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
index 8e21c12dd9..62fe6dc051 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlock.kt
@@ -20,21 +20,24 @@ import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
 import com.tangem.core.ui.components.ResizableText
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
-import com.tangem.core.ui.format.bigdecimal.anyDecimals
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.BaseAmountBlockTestTags
-import java.math.BigDecimal
 
 @Composable
 fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDisabled: Boolean, onClick: () -> Unit) {
     if (amountState !is AmountState.Data) return
     val amount = amountState.amountTextField
 
-    val cryptoAmount = formatWithSymbol(amount.value, amount.cryptoAmount.currencySymbol)
+    val cryptoAmount = amount.cryptoAmount.value.format {
+        crypto(
+            symbol = amount.cryptoAmount.currencySymbol,
+            decimals = amount.cryptoAmount.decimals,
+        )
+    }
     val fiatAmount = amount.fiatAmount.value.format {
         fiat(
             fiatCurrencySymbol = amount.fiatAmount.currencySymbol,
@@ -81,9 +84,6 @@ fun AmountBlock(amountState: AmountState, isClickDisabled: Boolean, isEditingDis
     }
 }
 
-fun formatWithSymbol(amount: String, symbol: String) =
-    BigDecimal.ZERO.format { crypto(symbol, 0).anyDecimals() }.replace("0", amount)
-
 // region Preview
 @Preview
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
index a3cfeca883..374ea3289c 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountBlockV2.kt
@@ -77,7 +77,7 @@ fun AmountBlockV2(
     )
 }
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "LongMethod")
 @Composable
 private fun AmountBlockV2(
     title: TextReference,
@@ -97,7 +97,10 @@ private fun AmountBlockV2(
             .clip(TangemTheme.shapes.roundedCornersXMedium)
             .background(TangemTheme.colors.background.action)
             .conditional(onClick != null) {
-                clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick!!)
+                clickable(
+                    enabled = !isClickDisabled && !isEditingDisabled,
+                    onClick = requireNotNull(onClick),
+                )
             }
             .padding(TangemTheme.dimens.spacing16),
     ) {
@@ -121,7 +124,9 @@ private fun AmountBlockV2(
         ) {
             Column(
                 verticalArrangement = Arrangement.spacedBy(4.dp),
-                modifier = Modifier.padding(top = 8.dp).weight(1f),
+                modifier = Modifier
+                    .padding(top = 8.dp)
+                    .weight(1f),
             ) {
                 ResizableText(
                     text = firstAmount,
diff --git a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountButtons.kt b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountButtons.kt
index 6263c12b93..64d1c8f25c 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountButtons.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/amountScreen/ui/AmountButtons.kt
@@ -38,9 +38,7 @@ internal fun LazyListScope.buttons(
         key = AMOUNT_BUTTONS_KEY,
     ) {
         val hapticFeedback = LocalHapticFeedback.current
-        Row(
-            modifier = Modifier.padding(top = TangemTheme.dimens.spacing12),
-        ) {
+        Row {
             if (segmentedButtonConfig.isNotEmpty()) {
                 SegmentedButtons(
                     modifier = Modifier
diff --git a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
index 617f1dda94..4b4ca2eb11 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt
@@ -17,7 +17,9 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.IntSize
@@ -26,8 +28,8 @@ import com.tangem.common.ui.R
 import com.tangem.common.ui.bottomsheet.permission.state.*
 import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
-import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.components.containers.FooterContainer
 import com.tangem.core.ui.components.inputrow.InputRowDefault
 import com.tangem.core.ui.extensions.*
@@ -88,12 +90,12 @@ private fun GiveTxPermissionBottomSheetContent(content: GiveTxPermissionBottomSh
         PrimaryButtonIconEnd(
             text = stringResourceSafe(id = R.string.common_approve),
             iconResId = content.walletInteractionIcon,
-            showProgress = data.approveButton.loading,
+            showProgress = data.approveButton.isLoading,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = TangemTheme.dimens.spacing16),
             onClick = data.approveButton.onClick,
-            enabled = data.approveButton.enabled,
+            enabled = data.approveButton.isEnabled,
         )
 
         SpacerH12()
@@ -114,7 +116,22 @@ private fun GiveTxPermissionBottomSheetContent(content: GiveTxPermissionBottomSh
 @Composable
 private fun ApprovalBottomSheetInfo(data: GiveTxPermissionState.ReadyForRequest) {
     FooterContainer(
-        footer = resourceReference(R.string.give_permission_policy_type_footer),
+        footer = annotatedReference {
+            append(stringResourceSafe(R.string.swap_approve_description))
+            append(" ")
+            withLink(
+                link = LinkAnnotation.Clickable(
+                    tag = "APPROVE_TAG",
+                    linkInteractionListener = { data.onOpenLearnMoreAboutApproveClick() },
+                ),
+                block = {
+                    appendColored(
+                        text = stringResourceSafe(R.string.common_learn_more),
+                        color = TangemTheme.colors.text.accent,
+                    )
+                },
+            )
+        },
         modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
     ) {
         AmountItem(
@@ -205,10 +222,8 @@ private fun AmountItem(
                 isExpanded = isExpandSelector,
                 onDismiss = { isExpandSelector = false },
                 onItemClick = { approveType ->
-                    onChangeApproveType.let {
-                        isExpandSelector = false
-                        onChangeApproveType.invoke(approveType)
-                    }
+                    isExpandSelector = false
+                    onChangeApproveType.invoke(approveType)
                 },
                 items = approveItems,
                 selectedType = approveType,
@@ -318,6 +333,7 @@ private val previewData = GiveTxPermissionBottomSheetConfig(
         subtitle = resourceReference(R.string.give_permission_staking_subtitle, wrappedList("1")),
         dialogText = resourceReference(R.string.give_permission_staking_footer),
         footerText = resourceReference(R.string.swap_give_permission_fee_footer),
+        onOpenLearnMoreAboutApproveClick = {},
     ),
     walletInteractionIcon = R.drawable.ic_tangem_24,
     onCancel = {},
diff --git a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/state/GiveTxPermissionState.kt b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/state/GiveTxPermissionState.kt
index 402c43b957..bcf8f4064e 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/state/GiveTxPermissionState.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/state/GiveTxPermissionState.kt
@@ -26,6 +26,7 @@ sealed class GiveTxPermissionState {
         val approveButton: ApprovePermissionButton,
         val cancelButton: CancelPermissionButton,
         val onChangeApproveType: ((ApproveType) -> Unit)? = null,
+        val onOpenLearnMoreAboutApproveClick: () -> Unit,
     ) : GiveTxPermissionState()
 
     fun GiveTxPermissionState.getApproveTypeOrNull(): ApproveType? {
@@ -39,8 +40,8 @@ enum class ApproveType(val text: TextReference) {
 }
 
 data class ApprovePermissionButton(
-    val enabled: Boolean,
-    val loading: Boolean = false,
+    val isEnabled: Boolean,
+    val isLoading: Boolean = false,
     val onClick: () -> Unit,
 )
 
diff --git a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/receive/TokenReceiveBottomSheet.kt b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/receive/TokenReceiveBottomSheet.kt
index 35cbf7f906..9093a606aa 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/receive/TokenReceiveBottomSheet.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/receive/TokenReceiveBottomSheet.kt
@@ -105,9 +105,9 @@ private fun Info(
             )
         }
 
-        notifications.fastForEach {
-            key(it.hashCode()) {
-                Notification(config = it)
+        notifications.fastForEach { notificationConfig ->
+            key(notificationConfig.hashCode()) {
+                Notification(config = notificationConfig)
             }
         }
     }
diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt
index 6fcb02cc30..b49384c027 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/state/ExpressStatusUM.kt
@@ -50,5 +50,4 @@ enum class ExpressStatusItemState {
     Done,
     Warning,
     Error,
-    ;
 }
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt
index 496559367f..a52403de79 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsBlock.kt
@@ -116,7 +116,7 @@ fun NavigationPrimaryButton(primaryButton: NavigationButton?, modifier: Modifier
                     }
                     button.onClick()
                 },
-                showProgress = button.showProgress,
+                showProgress = button.shouldShowProgress,
                 colors = color,
                 textStyle = TangemTheme.typography.subtitle1,
                 icon = icon,
@@ -232,7 +232,7 @@ private fun rememberNavigationButton(button: NavigationButton?): MutableState<Na
         button?.iconRes,
         button?.isIconVisible,
         button?.isEnabled,
-        button?.showProgress,
+        button?.shouldShowProgress,
         button?.textReference,
     ) { mutableStateOf(button) }
 }
diff --git a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt
index 772c493cdf..59bab529ed 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/NavigationButtonsState.kt
@@ -16,22 +16,22 @@ sealed class NavigationButtonsState {
 }
 
 /**
- * @property textReference      text
- * @property iconRes            icon resource id
- * @property isSecondary        should set secondary color scheme
- * @property isIconVisible      determines whether icon is visible
- * @property showProgress       indicates progress state of button
- * @property isEnabled          enabled
- * @property isDimmed           determines whether the button content will be dimmed.
+ * @property textReference          text
+ * @property iconRes                icon resource id
+ * @property isSecondary            should set secondary color scheme
+ * @property isIconVisible          determines whether icon is visible
+ * @property shouldShowProgress     indicates progress state of button
+ * @property isEnabled              enabled
+ * @property isDimmed               determines whether the button content will be dimmed.
  * This property will be ignored if [isEnabled] is `false`.
- * @property onClick            lambda be invoked when action component is clicked
+ * @property onClick                lambda be invoked when action component is clicked
  */
 data class NavigationButton(
     val textReference: TextReference,
     @DrawableRes val iconRes: Int? = null,
     val isSecondary: Boolean = false,
     val isIconVisible: Boolean = false,
-    val showProgress: Boolean = false,
+    val shouldShowProgress: Boolean = false,
     val isEnabled: Boolean = true,
     val isDimmed: Boolean = false,
     val isHapticClick: Boolean = false,
diff --git a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt
index c409bb5b95..76ebce30a8 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/navigationButtons/preview/NavigationButtonsPreview.kt
@@ -13,7 +13,7 @@ internal object NavigationButtonsPreview {
         iconRes = R.drawable.ic_tangem_24,
         isSecondary = true,
         isIconVisible = true,
-        showProgress = false,
+        shouldShowProgress = false,
         isEnabled = true,
         onClick = {},
     ) to NavigationButton(
@@ -21,7 +21,7 @@ internal object NavigationButtonsPreview {
         iconRes = R.drawable.ic_tangem_24,
         isSecondary = true,
         isIconVisible = true,
-        showProgress = false,
+        shouldShowProgress = false,
         isEnabled = true,
         onClick = {},
     )
@@ -31,7 +31,7 @@ internal object NavigationButtonsPreview {
         iconRes = R.drawable.ic_back_24,
         isSecondary = true,
         isIconVisible = true,
-        showProgress = false,
+        shouldShowProgress = false,
         isEnabled = true,
         onClick = {},
     )
@@ -40,7 +40,7 @@ internal object NavigationButtonsPreview {
         textReference = resourceReference(R.string.common_close),
         isSecondary = false,
         isIconVisible = false,
-        showProgress = false,
+        shouldShowProgress = false,
         isEnabled = true,
         onClick = {},
     )
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationId.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationId.kt
index 4b770200d0..2cc28a8b18 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationId.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationId.kt
@@ -8,4 +8,5 @@ package com.tangem.common.ui.notifications
  */
 enum class NotificationId(val key: String) {
     SendViaSwapTokenSelectorNotification("SendViaSwapTokenSelectorNotificationKey"),
+    EnablePushesReminderNotification("EnablePushesReminderNotification"),
 }
\ No newline at end of file
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
index 1d4ff127d6..7a8229120e 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
@@ -84,7 +84,7 @@ sealed class NotificationUM(val config: NotificationConfig) {
             val feeName: String,
             val feeSymbol: String,
             val networkName: String,
-            val mergeFeeNetworkName: Boolean = false,
+            val shouldMergeFeeNetworkName: Boolean = false,
             val onClick: (() -> Unit)? = null,
         ) : Error(
             title = resourceReference(
@@ -101,7 +101,7 @@ sealed class NotificationUM(val config: NotificationConfig) {
                     text = resourceReference(
                         R.string.common_buy_currency,
                         wrappedList(
-                            if (mergeFeeNetworkName) {
+                            if (shouldMergeFeeNetworkName) {
                                 "$currencyName ($feeSymbol)"
                             } else {
                                 feeName
@@ -148,13 +148,17 @@ sealed class NotificationUM(val config: NotificationConfig) {
             },
         )
 
-        data class ExistentialDeposit(val deposit: String, val onConfirmClick: () -> Unit) : Error(
+        data class ExistentialDeposit(
+            val deposit: String,
+            val onConfirmClick: () -> Unit,
+            val isActionable: Boolean,
+        ) : Error(
             title = resourceReference(R.string.send_notification_existential_deposit_title),
             subtitle = resourceReference(R.string.send_notification_existential_deposit_text, wrappedList(deposit)),
             buttonState = NotificationConfig.ButtonsState.PrimaryButtonConfig(
                 text = resourceReference(R.string.send_notification_leave_button, wrappedList(deposit)),
                 onClick = onConfirmClick,
-            ),
+            ).takeIf { isActionable },
         )
 
         data class ReserveAmount(val amount: String) : Error(
@@ -265,6 +269,11 @@ sealed class NotificationUM(val config: NotificationConfig) {
             title = resourceReference(id = R.string.selling_insufficient_balance_alert_title),
             subtitle = resourceReference(id = R.string.selling_insufficient_balance_alert_message),
         )
+
+        data class YieldSupplyIsActive(val tokenName: String) : Warning(
+            title = resourceReference(id = R.string.yield_module_balance_info_sheet_title, wrappedList(tokenName)),
+            subtitle = resourceReference(id = R.string.yield_module_balance_info_sheet_subtitle),
+        )
     }
 
     open class Info(
diff --git a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
index c06f560367..87e98e25c4 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationsFactory.kt
@@ -62,7 +62,7 @@ object NotificationsFactory {
                     currencyName = tokenStatus.currency.name,
                     feeName = coinStatus.currency.name,
                     feeSymbol = coinStatus.currency.symbol,
-                    mergeFeeNetworkName = false,
+                    shouldMergeFeeNetworkName = false,
                     onClick = {
                         onClick(coinStatus.currency)
                     },
@@ -206,6 +206,7 @@ object NotificationsFactory {
                             NotificationUM.Error.ExistentialDeposit::class.java,
                         )
                     },
+                    isActionable = balance > existentialDeposit,
                 ),
             )
         }
@@ -302,7 +303,7 @@ object NotificationsFactory {
                         currencyName = cryptoCurrencyStatus.currency.name,
                         feeName = cryptoCurrencyWarning.coinCurrency.name,
                         feeSymbol = cryptoCurrencyWarning.coinCurrency.symbol,
-                        mergeFeeNetworkName = shouldMergeFeeNetworkName,
+                        shouldMergeFeeNetworkName = shouldMergeFeeNetworkName,
                         onClick = {
                             onClick(cryptoCurrencyWarning.coinCurrency)
                         },
@@ -319,9 +320,9 @@ object NotificationsFactory {
                         feeName = cryptoCurrencyWarning.feeCurrencyName,
                         feeSymbol = cryptoCurrencyWarning.feeCurrencySymbol,
                         networkName = cryptoCurrencyWarning.networkName,
-                        mergeFeeNetworkName = shouldMergeFeeNetworkName,
+                        shouldMergeFeeNetworkName = shouldMergeFeeNetworkName,
                         onClick = {
-                            currency?.let {
+                            if (currency != null) {
                                 onClick(currency)
                             }
                         },
@@ -380,20 +381,22 @@ object NotificationsFactory {
                 add(NotificationUM.Cardano.InsufficientBalanceToTransferToken(sendingCurrency.name))
             }
             BlockchainSdkError.Cardano.InsufficientRemainingBalanceToWithdrawTokens -> {
-                when (sendingCurrency) {
-                    is CryptoCurrency.Coin -> NotificationUM.Cardano.InsufficientBalanceToTransferCoin
-                    is CryptoCurrency.Token -> {
-                        NotificationUM.Cardano.InsufficientBalanceToTransferToken(sendingCurrency.name)
-                    }
-                }.let(::add)
+                add(
+                    when (sendingCurrency) {
+                        is CryptoCurrency.Coin -> NotificationUM.Cardano.InsufficientBalanceToTransferCoin
+                        is CryptoCurrency.Token -> {
+                            NotificationUM.Cardano.InsufficientBalanceToTransferToken(sendingCurrency.name)
+                        }
+                    },
+                )
             }
             BlockchainSdkError.Cardano.InsufficientRemainingBalance,
             BlockchainSdkError.Cardano.InsufficientSendingAdaAmount,
             -> {
-                dustValue?.let {
+                dustValue?.let { value ->
                     add(
                         NotificationUM.Error.MinimumAmountError(
-                            amount = it.format { crypto(sendingCurrency) },
+                            amount = value.format { crypto(sendingCurrency) },
                         ),
                     )
                 }
diff --git a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
index 9c80a6a1b7..0d23288ee3 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenItemStateConverter.kt
@@ -3,6 +3,7 @@ package com.tangem.common.ui.tokens
 import com.tangem.common.ui.R
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter
 import com.tangem.core.ui.components.token.state.TokenItemState
@@ -217,17 +218,27 @@ class TokenItemStateConverter(
                         text = status.getFormattedFiatAmount(appCurrency = appCurrency),
                         isFlickering = status.value.isFlickering(),
                         icons = buildList {
-                            if (!status.getStakedBalance().isZero()) {
+                            if (status.value.yieldSupplyStatus?.isActive == true &&
+                                status.value.yieldSupplyStatus?.isAllowedToSpend == false) {
                                 TokenItemState.FiatAmountState.Content.IconUM(
-                                    iconRes = R.drawable.ic_staking_24,
-                                    useAccentColor = true,
+                                    iconRes = R.drawable.ic_alert_triangle_20,
+                                    tint = IconTint.Warning,
                                 ).let(::add)
                             }
+                            if (!status.getStakedBalance().isZero()) {
+                                add(
+                                    TokenItemState.FiatAmountState.Content.IconUM(
+                                        iconRes = R.drawable.ic_staking_24,
+                                        tint = IconTint.Accent,
+                                    ),
+                                )
+                            }
                             if (status.value.sources.total == StatusSource.ONLY_CACHE) {
-                                TokenItemState.FiatAmountState.Content.IconUM(
-                                    iconRes = R.drawable.ic_error_sync_24,
-                                    useAccentColor = false,
-                                ).let(::add)
+                                add(
+                                    TokenItemState.FiatAmountState.Content.IconUM(
+                                        iconRes = R.drawable.ic_error_sync_24,
+                                    ),
+                                )
                             }
                         }.toImmutableList(),
                     )
diff --git a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenPriceText.kt b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenPriceText.kt
index 6a337dae15..b470546536 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenPriceText.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/tokens/TokenPriceText.kt
@@ -23,11 +23,11 @@ fun TokenPriceText(price: String, modifier: Modifier = Modifier, priceChangeType
     val generalColor = TangemTheme.colors.text.primary1
 
     val color = remember(generalColor) { Animatable(generalColor) }
-    var animationSkipped by remember { mutableStateOf(false) }
+    var isAnimationSkipped by remember { mutableStateOf(false) }
 
     LaunchedEffect(price) {
-        if (animationSkipped.not()) {
-            animationSkipped = true
+        if (isAnimationSkipped.not()) {
+            isAnimationSkipped = true
             return@LaunchedEffect
         }
 
diff --git a/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt b/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
index ad44dcf7dd..fedba7d453 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/userwallet/UserWalletItem.kt
@@ -28,9 +28,12 @@ import androidx.compose.ui.unit.dp
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import com.tangem.common.ui.R
+import com.tangem.common.ui.account.AccountIcon
+import com.tangem.common.ui.account.AccountIconPreviewData
 import com.tangem.common.ui.userwallet.state.UserWalletItemUM
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.TextShimmer
+import com.tangem.core.ui.components.account.AccountIconSize
 import com.tangem.core.ui.components.block.BlockCard
 import com.tangem.core.ui.components.block.TangemBlockCardColors
 import com.tangem.core.ui.components.label.Label
@@ -198,7 +201,7 @@ private fun BalanceContent(balance: UserWalletItemUM.Balance, modifier: Modifier
     }
 }
 
-@Suppress("MagicNumber")
+@Suppress("MagicNumber", "LongMethod")
 @Composable
 fun CardImage(imageState: UserWalletItemUM.ImageState, modifier: Modifier = Modifier) {
     val imageModifier = modifier
@@ -264,6 +267,11 @@ fun CardImage(imageState: UserWalletItemUM.ImageState, modifier: Modifier = Modi
                 )
             }
         }
+        is UserWalletItemUM.ImageState.Account -> AccountIcon(
+            name = imageState.name,
+            icon = imageState.icon,
+            size = AccountIconSize.Default,
+        )
     }
 }
 
@@ -426,6 +434,18 @@ private class UserWalletItemUMPreviewProvider : PreviewParameterProvider<UserWal
                 isEnabled = true,
                 onClick = {},
             ),
+            UserWalletItemUM(
+                id = UserWalletId("user_wallet_4".encodeToByteArray()),
+                name = stringReference("Main account"),
+                information = getInformation(cardCount = 3),
+                balance = UserWalletItemUM.Balance.NotShowing,
+                imageState = UserWalletItemUM.ImageState.Account(
+                    name = stringReference("Main account"),
+                    icon = AccountIconPreviewData.randomAccountIcon(),
+                ),
+                isEnabled = true,
+                onClick = {},
+            ),
         )
 
     private fun getInformation(cardCount: Int): UserWalletItemUM.Information.Loaded {
diff --git a/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt b/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
index b31b4d5ddb..ba418cea6b 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/userwallet/state/UserWalletItemUM.kt
@@ -1,5 +1,6 @@
 package com.tangem.common.ui.userwallet.state
 
+import com.tangem.common.ui.account.CryptoPortfolioIconUM
 import com.tangem.core.ui.components.artwork.ArtworkUM
 import com.tangem.core.ui.components.label.entity.LabelUM
 import com.tangem.core.ui.extensions.TextReference
@@ -60,6 +61,11 @@ data class UserWalletItemUM(
 
         data object MobileWallet : ImageState()
 
+        data class Account(
+            val name: TextReference,
+            val icon: CryptoPortfolioIconUM,
+        ) : ImageState()
+
         data class Image(
             val artwork: ArtworkUM,
         ) : ImageState()
diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
index 6a91513972..6e009f84bc 100644
--- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
+++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json
@@ -23,26 +23,14 @@
         "name": "USEDESK_ENABLED",
         "version": "undefined"
     },
-    {
-        "name": "SEND_VIA_SWAP_ENABLED",
-        "version": "5.28.0"
-    },
     {
         "name": "SWAP_REDESIGN_ENABLED",
         "version": "undefined"
     },
-    {
-        "name": "SEND_REDESIGN_ENABLED",
-        "version": "5.28.0"
-    },
     {
         "name": "HOT_WALLET_ENABLED",
         "version": "undefined"
     },
-    {
-        "name": "NFT_SEND_REDESIGN_ENABLED",
-        "version": "5.28.0"
-    },
     {
         "name": "TANGEM_PAY_ENABLED",
         "version": "undefined"
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
index 84dd090158..79d78151b7 100644
--- a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
@@ -21,7 +21,7 @@ internal class DevFeatureTogglesManager(
     private val featureTogglesLocalStorage: LocalTogglesStorage,
 ) : MutableFeatureTogglesManager {
 
-    private var fileFeatureTogglesMap: Map<String, Boolean> = getFileFeatureToggles()
+    private val fileFeatureTogglesMap: Map<String, Boolean> = getFileFeatureToggles()
     private var featureTogglesMap: MutableMap<String, Boolean> by Delegates.notNull()
 
     init {
diff --git a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
index 105ca52d15..4b21df5542 100644
--- a/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
+++ b/core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
@@ -23,14 +23,14 @@ internal class DefaultVersionProvider @Inject constructor(
 
     private fun getVersionName(): String {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            context.packageManager
-                .getPackageInfo(
-                    context.packageName,
-                    PackageManager.PackageInfoFlags.of(0),
-                )
-                .versionName!!
+            requireNotNull(
+                context
+                    .packageManager
+                    .getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(0))
+                    .versionName,
+            )
         } else {
-            context.packageManager.getPackageInfo(context.packageName, 0).versionName!!
+            requireNotNull(context.packageManager.getPackageInfo(context.packageName, 0).versionName)
         }
     }
 
diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
index 323153c119..88c906000b 100644
--- a/core/datasource/build.gradle.kts
+++ b/core/datasource/build.gradle.kts
@@ -40,6 +40,7 @@ dependencies {
     implementation(projects.domain.models)
     implementation(projects.domain.nft.models)
     implementation(projects.domain.walletConnect.models)
+    implementation(projects.domain.yieldSupply.models)
 
     /** Tangem libraries */
     implementation(tangemDeps.blockchain)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/BlockAidApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/BlockAidApi.kt
index cdb6ec04e3..4444d0b604 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/BlockAidApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/BlockAidApi.kt
@@ -1,9 +1,11 @@
 package com.tangem.datasource.api.common.blockaid
 
 import com.tangem.datasource.api.common.blockaid.models.request.DomainScanRequest
+import com.tangem.datasource.api.common.blockaid.models.request.EvmTransactionBulkScanRequest
 import com.tangem.datasource.api.common.blockaid.models.request.EvmTransactionScanRequest
 import com.tangem.datasource.api.common.blockaid.models.request.SolanaTransactionScanRequest
 import com.tangem.datasource.api.common.blockaid.models.response.DomainScanResponse
+import com.tangem.datasource.api.common.blockaid.models.response.GasEstimationResponse
 import com.tangem.datasource.api.common.blockaid.models.response.SolanaTransactionResponse
 import com.tangem.datasource.api.common.blockaid.models.response.TransactionScanResponse
 import retrofit2.http.Body
@@ -19,4 +21,7 @@ interface BlockAidApi {
 
     @POST("solana/message/scan")
     suspend fun scanSolanaMessage(@Body request: SolanaTransactionScanRequest): SolanaTransactionResponse
+
+    @POST("evm/transaction-bulk/scan")
+    suspend fun scanEvmTransactionBulk(@Body request: EvmTransactionBulkScanRequest): List<GasEstimationResponse>
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/BlockAidScanOptions.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/BlockAidScanOptions.kt
new file mode 100644
index 0000000000..630910b832
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/BlockAidScanOptions.kt
@@ -0,0 +1,7 @@
+package com.tangem.datasource.api.common.blockaid.models.request
+
+enum class BlockAidScanOptions(val value: String) {
+    Simulation("simulation"),
+    Validation("validation"),
+    GasEstimation("gas_estimation"),
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/EvmTransactionScanRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/EvmTransactionScanRequest.kt
index f0d853d793..e6cd7b0f0d 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/EvmTransactionScanRequest.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/request/EvmTransactionScanRequest.kt
@@ -14,9 +14,26 @@ data class EvmTransactionScanRequest(
     @Json(name = "metadata") val metadata: TransactionMetadata,
 )
 
+@JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
+data class EvmTransactionBulkScanRequest(
+    @Json(name = "chain") val chain: String,
+    @Json(name = "options") val options: List<String>,
+    @Json(name = "metadata") val metadata: TransactionMetadata,
+    @Json(name = "data") val data: List<Data>,
+    @Json(name = "aggregated") val aggregated: Boolean = false,
+)
+
 @JsonClass(generateAdapter = true)
 data class RpcData(
     @Json(name = "jsonrpc") val jsonrpc: String = "2.0",
     @Json(name = "method") val method: String,
     @Json(name = "params") val params: List<Map<String, String>>,
+)
+
+@JsonClass(generateAdapter = true)
+data class Data(
+    @Json(name = "from") val from: String,
+    @Json(name = "to") val to: String,
+    @Json(name = "data") val data: String,
 )
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/response/GasEstimationResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/response/GasEstimationResponse.kt
new file mode 100644
index 0000000000..4f4e622045
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/blockaid/models/response/GasEstimationResponse.kt
@@ -0,0 +1,14 @@
+package com.tangem.datasource.api.common.blockaid.models.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class GasEstimationResponse(
+    @Json(name = "gas_estimation") val gasEstimation: GasEstimationItem,
+)
+
+@JsonClass(generateAdapter = true)
+data class GasEstimationItem(
+    @Json(name = "estimate") val estimate: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
index 58df8bc70a..cac3e4c967 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt
@@ -26,6 +26,7 @@ sealed class ApiConfig {
         StakeKit,
         TangemPay,
         BlockAid,
+        YieldSupply,
     }
 
     private fun initializeId(): ID {
@@ -35,6 +36,7 @@ sealed class ApiConfig {
             is StakeKit -> ID.StakeKit
             is TangemPay -> ID.TangemPay
             is BlockAid -> ID.BlockAid
+            is YieldSupply -> ID.YieldSupply
         }
     }
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt
index 8d2f1f19e2..4a8e1db349 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/TangemTech.kt
@@ -2,12 +2,15 @@ package com.tangem.datasource.api.common.config
 
 import com.tangem.datasource.BuildConfig
 import com.tangem.datasource.api.common.AuthProvider
+import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
 import com.tangem.datasource.utils.RequestHeader
+import com.tangem.utils.ProviderSuspend
 import com.tangem.utils.info.AppInfoProvider
 import com.tangem.utils.version.AppVersionProvider
 
 /** TangemTech [ApiConfig] */
 internal class TangemTech(
+    private val environmentConfigStorage: EnvironmentConfigStorage,
     private val appVersionProvider: AppVersionProvider,
     private val authProvider: AuthProvider,
     private val appInfoProvider: AppInfoProvider,
@@ -38,29 +41,41 @@ internal class TangemTech(
     private fun createDevEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
         environment = ApiEnvironment.DEV,
         baseUrl = "[REDACTED_ENV_URL]",
-        headers = createHeaders(),
+        headers = createHeaders(ApiEnvironment.DEV),
     )
 
     private fun createStageEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
         environment = ApiEnvironment.STAGE,
         baseUrl = "[REDACTED_ENV_URL]",
-        headers = createHeaders(),
+        headers = createHeaders(ApiEnvironment.STAGE),
     )
 
     private fun createMockedEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
         environment = ApiEnvironment.MOCK,
         baseUrl = "[REDACTED_ENV_URL]",
-        headers = createHeaders(),
+        headers = createHeaders(ApiEnvironment.MOCK),
     )
 
     private fun createProdEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
         environment = ApiEnvironment.PROD,
         baseUrl = "https://api.tangem.org/",
-        headers = createHeaders(),
+        headers = createHeaders(ApiEnvironment.PROD),
     )
 
-    private fun createHeaders() = buildMap {
+    private fun createHeaders(apiEnvironment: ApiEnvironment) = buildMap {
+        put(key = "api-key", value = ProviderSuspend { getApiKey(apiEnvironment) })
         putAll(from = RequestHeader.AppVersionPlatformHeaders(appVersionProvider, appInfoProvider).values)
         putAll(from = RequestHeader.AuthenticationHeader(authProvider).values)
     }
+
+    private fun getApiKey(apiEnvironment: ApiEnvironment): String {
+        return when (apiEnvironment) {
+            ApiEnvironment.MOCK,
+            ApiEnvironment.DEV,
+            ApiEnvironment.DEV_2,
+            -> environmentConfigStorage.getConfigSync().tangemApiKeyDev
+            ApiEnvironment.STAGE -> environmentConfigStorage.getConfigSync().tangemApiKeyStage
+            ApiEnvironment.PROD -> environmentConfigStorage.getConfigSync().tangemApiKey
+        } ?: error("No tangem tech api config provided")
+    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/YieldSupply.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/YieldSupply.kt
new file mode 100644
index 0000000000..0665ec199b
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/YieldSupply.kt
@@ -0,0 +1,72 @@
+package com.tangem.datasource.api.common.config
+
+import com.tangem.datasource.BuildConfig
+import com.tangem.datasource.api.common.AuthProvider
+import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
+import com.tangem.datasource.utils.RequestHeader
+import com.tangem.utils.ProviderSuspend
+import com.tangem.utils.info.AppInfoProvider
+import com.tangem.utils.version.AppVersionProvider
+
+/** YieldSupply [ApiConfig] */
+internal class YieldSupply(
+    private val environmentConfigStorage: EnvironmentConfigStorage,
+    private val appVersionProvider: AppVersionProvider,
+    private val authProvider: AuthProvider,
+    private val appInfoProvider: AppInfoProvider,
+) : ApiConfig() {
+
+    override val defaultEnvironment: ApiEnvironment = getInitialEnvironment()
+
+    override val environmentConfigs = listOf(
+        createDevEnvironment(),
+        createStageEnvironment(),
+        createMockedEnvironment(),
+        createProdEnvironment(),
+    )
+
+    private fun getInitialEnvironment(): ApiEnvironment {
+        return when (BuildConfig.BUILD_TYPE) {
+            MOCKED_BUILD_TYPE,
+            -> ApiEnvironment.MOCK
+            DEBUG_BUILD_TYPE,
+            INTERNAL_BUILD_TYPE,
+            EXTERNAL_BUILD_TYPE,
+            RELEASE_BUILD_TYPE,
+            -> ApiEnvironment.PROD
+            else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]")
+        }
+    }
+
+    private fun createDevEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
+        environment = ApiEnvironment.DEV,
+        baseUrl = "[REDACTED_ENV_URL]",
+        headers = createHeaders(),
+    )
+
+    private fun createStageEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
+        environment = ApiEnvironment.STAGE,
+        baseUrl = "[REDACTED_ENV_URL]",
+        headers = createHeaders(),
+    )
+
+    private fun createMockedEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
+        environment = ApiEnvironment.MOCK,
+        baseUrl = "[REDACTED_ENV_URL]",
+        headers = createHeaders(),
+    )
+
+    private fun createProdEnvironment(): ApiEnvironmentConfig = ApiEnvironmentConfig(
+        environment = ApiEnvironment.PROD,
+        baseUrl = "https://yield.tangem.org/",
+        headers = createHeaders(),
+    )
+
+    private fun createHeaders() = buildMap {
+        put(key = "api-key", value = ProviderSuspend {
+            environmentConfigStorage.getConfigSync().yieldModuleApiKey.orEmpty()
+        })
+        putAll(from = RequestHeader.AppVersionPlatformHeaders(appVersionProvider, appInfoProvider).values)
+        putAll(from = RequestHeader.AuthenticationHeader(authProvider).values)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ApiConfigsManager.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ApiConfigsManager.kt
index a111d2b2a0..6cf3d1953e 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ApiConfigsManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ApiConfigsManager.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.StateFlow
 interface ApiConfigsManager {
 
     /** Flag that determines whether the manager is initialized */
-    val isInitialized: StateFlow<Boolean>
+    val initializedState: StateFlow<Boolean>
 
     /** Initialize resources */
     fun initialize()
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/DevApiConfigsManager.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/DevApiConfigsManager.kt
index f0de0bfdda..3bbd41372d 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/DevApiConfigsManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/DevApiConfigsManager.kt
@@ -26,27 +26,27 @@ internal class DevApiConfigsManager(
 ) : MutableApiConfigsManager() {
 
     override val configs: StateFlow<Map<ApiConfig, ApiEnvironment>>
-    field = MutableStateFlow(value = getInitialConfigs())
+        field = MutableStateFlow(value = getInitialConfigs())
 
-    override val isInitialized: StateFlow<Boolean>
-    field = MutableStateFlow(value = false)
+    override val initializedState: StateFlow<Boolean>
+        field = MutableStateFlow(value = false)
 
     override fun initialize() {
-        isInitialized.value = false
+        initializedState.value = false
 
         appPreferencesStore.getObjectMap<ApiEnvironment>(PreferencesKeys.apiConfigsEnvironmentKey)
             .distinctUntilChanged()
             .onEach { savedEnvironments ->
                 val apiConfigs = configs.value
 
-                configs.value = apiConfigs.mapValues {
-                    val (config, currentEnvironment) = it
+                configs.value = apiConfigs.mapValues { entry ->
+                    val (config, currentEnvironment) = entry
 
                     savedEnvironments[config.id.name] ?: currentEnvironment
                 }
 
-                if (!isInitialized.value) {
-                    isInitialized.value = true
+                if (!initializedState.value) {
+                    initializedState.value = true
                 }
 
                 notifyListeners(apiConfigs = apiConfigs, savedEnvironments = savedEnvironments)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MockApiConfigsManager.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MockApiConfigsManager.kt
index 5df19d76e6..10318bb1d7 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MockApiConfigsManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MockApiConfigsManager.kt
@@ -22,9 +22,9 @@ internal class MockApiConfigsManager(
 ) : MutableApiConfigsManager() {
 
     override val configs: StateFlow<Map<ApiConfig, ApiEnvironment>>
-    field = MutableStateFlow(value = getInitialConfigs())
+        field = MutableStateFlow(value = getInitialConfigs())
 
-    override val isInitialized: StateFlow<Boolean> = MutableStateFlow(value = true)
+    override val initializedState: StateFlow<Boolean> = MutableStateFlow(value = true)
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + dispatchers.default)
 
@@ -63,7 +63,7 @@ internal class MockApiConfigsManager(
         super.addListener(listener)
 
         configs
-            .map { it.entries.firstOrNull { it.key.id == listener.id } }
+            .map { map -> map.entries.firstOrNull { it.key.id == listener.id } }
             .filterNotNull()
             .onEach { (apiConfig, currentEnvironment) ->
                 listener.onChange(
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MutableApiConfigsManager.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MutableApiConfigsManager.kt
index cdd9a6b0a2..d0998c8395 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MutableApiConfigsManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/MutableApiConfigsManager.kt
@@ -20,7 +20,7 @@ abstract class MutableApiConfigsManager : ApiConfigsManager {
      * These listeners are notified whenever an environment change occurs.
      */
     protected val registerListeners: Set<ApiConfigEnvChangeListener>
-    field = mutableSetOf<ApiConfigEnvChangeListener>()
+        field = mutableSetOf<ApiConfigEnvChangeListener>()
 
     /** Change api environment [environment] by [id] */
     abstract suspend fun changeEnvironment(id: String, environment: ApiEnvironment)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManager.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManager.kt
index 8b77808141..0c6bf3942c 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManager.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManager.kt
@@ -15,7 +15,7 @@ internal class ProdApiConfigsManager(
     private val apiConfigs: ApiConfigs,
 ) : ApiConfigsManager {
 
-    override val isInitialized: StateFlow<Boolean> = MutableStateFlow(value = true)
+    override val initializedState: StateFlow<Boolean> = MutableStateFlow(value = true)
 
     override fun initialize() = Unit
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt
index f63826874b..1028e2916f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseError.kt
@@ -72,14 +72,14 @@ sealed class ApiResponseError : Exception() {
 
     /** Represents a network error, typically when there's no connectivity. */
     @Suppress("UnusedPrivateMember")
-    data object NetworkException : ApiResponseError() {
-        private fun readResolve(): Any = NetworkException
+    class NetworkException : ApiResponseError() {
+        private fun readResolve(): Any = NetworkException()
     }
 
     /** Represents a timeout error, typically when the server takes too long to respond. */
     @Suppress("UnusedPrivateMember")
-    data object TimeoutException : ApiResponseError() {
-        private fun readResolve(): Any = TimeoutException
+    class TimeoutException : ApiResponseError() {
+        private fun readResolve(): Any = TimeoutException()
     }
 
     /**
@@ -87,5 +87,5 @@ sealed class ApiResponseError : Exception() {
      *
      * @property cause The exception that caused this error.
      */
-    data class UnknownException(override val cause: Throwable) : ApiResponseError()
+    class UnknownException(override val cause: Throwable) : ApiResponseError()
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseHeaders.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseHeaders.kt
index 52464501c9..024c982621 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseHeaders.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ApiResponseHeaders.kt
@@ -1,3 +1,3 @@
 package com.tangem.datasource.api.common.response
 
-const val IF_NONE_MATCH_HEADER = "IfNoneMatch"
\ No newline at end of file
+const val ETAG_HEADER = "etag"
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt
index a8272de6f1..68ad795052 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/response/ResponseExt.kt
@@ -58,10 +58,10 @@ internal fun Throwable.toApiError(): ApiResponseError = when (this) {
     is ConnectException,
     is UnknownHostException,
     is SSLHandshakeException,
-    -> ApiResponseError.NetworkException
+    -> ApiResponseError.NetworkException()
     is TimeoutException,
     is TimeoutCancellationException,
     is SocketTimeoutException,
-    -> ApiResponseError.TimeoutException
+    -> ApiResponseError.TimeoutException()
     else -> ApiResponseError.UnknownException(cause = this)
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
index 69e5ccb9a0..39d1864819 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/Asset.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class Asset(
     @Json(name = "contractAddress")
     val contractAddress: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
index e18e222fd9..0fb1f95598 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/markets/models/response/TokenMarketInfoResponse.kt
@@ -56,6 +56,7 @@ data class TokenMarketInfoResponse(
     )
 
     @JsonClass(generateAdapter = true)
+    @Suppress("BooleanPropertyNaming")
     data class Network(
         @Json(name = "network_id")
         val networkId: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCountryDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCountryDTO.kt
index e7f660a3f4..362fb5dcb4 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCountryDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/model/OnrampCountryDTO.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class OnrampCountryDTO(
     @Json(name = "name")
     val name: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt
index b753ffc387..7622d4f825 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/TangemPayApi.kt
@@ -7,8 +7,11 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
 
+private const val TX_HISTORY_PAGING_DEFAULT_LIMIT = 20
+
 @Suppress("TooManyFunctions")
 interface TangemPayApi {
 
@@ -107,6 +110,13 @@ interface TangemPayApi {
         @Query("offset") offset: Int,
     ): ApiResponse<VisaTxHistoryResponse>
 
+    @GET("v1/customer/transactions")
+    suspend fun getTangemPayTxHistory(
+        @Header("Authorization") authHeader: String,
+        @Query("cursor") cursor: String?,
+        @Query("limit") limit: Int = TX_HISTORY_PAGING_DEFAULT_LIMIT,
+    ): ApiResponse<TangemPayTxHistoryResponse>
+
     @GET("v1/customer/kyc")
     suspend fun getKycAccess(@Header("Authorization") authHeader: String): ApiResponse<KycAccessInfoResponse>
 
@@ -115,4 +125,25 @@ interface TangemPayApi {
 
     @POST("v1/deeplink/validate")
     suspend fun validateDeeplink(@Body body: DeeplinkValidityRequest): ApiResponse<DeeplinkValidityResponse>
+
+    @GET("v1/order/{order_id}")
+    suspend fun getOrder(
+        @Header("Authorization") authHeader: String,
+        @Path("order_id") orderId: String,
+    ): ApiResponse<OrderResponse>
+
+    @POST("v1/order")
+    suspend fun createOrder(
+        @Header("Authorization") authHeader: String,
+        @Body body: OrderRequest,
+    ): ApiResponse<OrderResponse>
+
+    @GET("v1/customer/balance")
+    suspend fun getCardBalance(@Header("Authorization") authHeader: String): ApiResponse<CardBalanceResponse>
+
+    @POST("v1/customer/card/details")
+    suspend fun revealCardDetails(
+        @Header("Authorization") authHeader: String,
+        @Body body: CardDetailsRequest,
+    ): ApiResponse<CardDetailsResponse>
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/CardDetailsRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/CardDetailsRequest.kt
new file mode 100644
index 0000000000..98a3baa730
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/CardDetailsRequest.kt
@@ -0,0 +1,9 @@
+package com.tangem.datasource.api.pay.models.request
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class CardDetailsRequest(
+    @Json(name = "session_id") val sessionId: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/OrderRequest.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/OrderRequest.kt
new file mode 100644
index 0000000000..73725d5782
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/request/OrderRequest.kt
@@ -0,0 +1,9 @@
+package com.tangem.datasource.api.pay.models.request
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class OrderRequest(
+    @Json(name = "wallet_address") val walletAddress: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardBalanceResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardBalanceResponse.kt
new file mode 100644
index 0000000000..c37d3931b3
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardBalanceResponse.kt
@@ -0,0 +1,20 @@
+package com.tangem.datasource.api.pay.models.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
+
+data class CardBalanceResponse(
+    @Json(name = "result") val result: Result?,
+    @Json(name = "error") val error: String?,
+) {
+    @JsonClass(generateAdapter = true)
+    data class Result(
+        @Json(name = "currency") val currency: String,
+        @Json(name = "available_balance") val availableBalance: BigDecimal,
+        @Json(name = "credit_limit") val creditLimit: BigDecimal,
+        @Json(name = "pending_charges") val pendingCharges: BigDecimal,
+        @Json(name = "posted_charges") val postedCharges: BigDecimal,
+        @Json(name = "balance_due") val balanceDue: BigDecimal,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardDetailsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardDetailsResponse.kt
new file mode 100644
index 0000000000..978baa11f9
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CardDetailsResponse.kt
@@ -0,0 +1,28 @@
+package com.tangem.datasource.api.pay.models.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+data class CardDetailsResponse(
+    @Json(name = "result") val result: Result?,
+    @Json(name = "error") val error: String?,
+) {
+    @JsonClass(generateAdapter = true)
+    data class Result(
+        @Json(name = "token") val token: String,
+        @Json(name = "expiration_month") val expirationMonth: String,
+        @Json(name = "expiration_year") val expirationYear: String,
+        @Json(name = "emboss_name") val embossName: String,
+        @Json(name = "card_type") val cardType: String,
+        @Json(name = "card_status") val cardStatus: String,
+        @Json(name = "card_number_end") val cardNumberEnd: String,
+        @Json(name = "pan") val pan: Secret,
+        @Json(name = "cvv") val cvv: Secret,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Secret(
+        @Json(name = "secret") val secret: String,
+        @Json(name = "iv") val iv: String,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CustomerMeResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CustomerMeResponse.kt
index 6c60787d46..24b58f4b95 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CustomerMeResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/CustomerMeResponse.kt
@@ -2,6 +2,7 @@ package com.tangem.datasource.api.pay.models.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
 
 @JsonClass(generateAdapter = true)
 data class CustomerMeResponse(
@@ -16,6 +17,8 @@ data class CustomerMeResponse(
         @Json(name = "product_instance") val productInstance: ProductInstance?,
         @Json(name = "payment_account") val paymentAccount: PaymentAccount?,
         @Json(name = "kyc") val kyc: Kyc?,
+        @Json(name = "card") val card: Card?,
+        @Json(name = "balance") val balance: Balance?,
     )
 
     @JsonClass(generateAdapter = true)
@@ -45,4 +48,25 @@ data class CustomerMeResponse(
         @Json(name = "review_answer") val reviewAnswer: String,
         @Json(name = "created_at") val createdAt: String,
     )
+
+    @JsonClass(generateAdapter = true)
+    data class Card(
+        @Json(name = "token") val token: String,
+        @Json(name = "expiration_month") val expirationMonth: Int,
+        @Json(name = "expiration_year") val expirationYear: Int,
+        @Json(name = "emboss_name") val embossName: String,
+        @Json(name = "card_type") val cardType: String,
+        @Json(name = "card_status") val cardStatus: String,
+        @Json(name = "card_number_end") val cardNumberEnd: String,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Balance(
+        @Json(name = "currency") val currency: String,
+        @Json(name = "available_balance") val availableBalance: BigDecimal,
+        @Json(name = "credit_limit") val creditLimit: BigDecimal,
+        @Json(name = "pending_charges") val pendingCharges: BigDecimal,
+        @Json(name = "posted_charges") val postedCharges: BigDecimal,
+        @Json(name = "balance_due") val balanceDue: BigDecimal,
+    )
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/OrderResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/OrderResponse.kt
new file mode 100644
index 0000000000..e75134b059
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/OrderResponse.kt
@@ -0,0 +1,33 @@
+package com.tangem.datasource.api.pay.models.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class OrderResponse(
+    @Json(name = "result") val result: Result?,
+    @Json(name = "error") val error: String?,
+) {
+    @JsonClass(generateAdapter = true)
+    data class Result(
+        @Json(name = "id") val id: String,
+        @Json(name = "customer_id") val customerId: String?,
+        @Json(name = "type") val type: String?,
+        @Json(name = "status") val status: String,
+        @Json(name = "step") val step: String?,
+        @Json(name = "data") val data: Data,
+        @Json(name = "step_change_code") val stepChangeCode: Int?,
+        @Json(name = "created_at") val createdAt: String?,
+        @Json(name = "updated_at") val updatedAt: String?,
+    ) {
+        @JsonClass(generateAdapter = true)
+        data class Data(
+            @Json(name = "type") val type: String?,
+            @Json(name = "specification_name") val specificationName: String?,
+            @Json(name = "customer_wallet_address") val customerWalletAddress: String,
+            @Json(name = "emboss_name") val embossName: String?,
+            @Json(name = "product_instance_id") val productInstanceId: String?,
+            @Json(name = "payment_account_id") val paymentAccountId: String?,
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt
new file mode 100644
index 0000000000..30fedbe52a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt
@@ -0,0 +1,84 @@
+package com.tangem.datasource.api.pay.models.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.joda.time.DateTime
+import java.math.BigDecimal
+
+@JsonClass(generateAdapter = true)
+data class TangemPayTxHistoryResponse(
+    @Json(name = "error") val error: String?,
+    @Json(name = "result") val result: Result,
+) {
+    @JsonClass(generateAdapter = true)
+    data class Result(
+        @Json(name = "transactions") val transactions: List<Transaction>,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Transaction(
+        @Json(name = "id") val id: String, // UUID (used as cursor for pagination)
+        @Json(name = "type") val type: String, // "SPEND", "COLLATERAL", "PAYMENT", "FEE"
+        @Json(name = "spend") val spend: Spend? = null,
+        @Json(name = "collateral") val collateral: Collateral? = null,
+        @Json(name = "payment") val payment: Payment? = null,
+        @Json(name = "fee") val fee: Fee? = null,
+    )
+
+    @JsonClass(generateAdapter = true)
+    @Suppress("BooleanPropertyNaming")
+    data class Spend(
+        @Json(name = "amount") val amount: BigDecimal,
+        @Json(name = "currency") val currency: String,
+        @Json(name = "local_amount") val localAmount: BigDecimal? = null,
+        @Json(name = "local_currency") val localCurrency: String? = null,
+        @Json(name = "authorized_amount") val authorizedAmount: BigDecimal? = null,
+        @Json(name = "authorization_method") val authorizationMethod: String? = null,
+        @Json(name = "memo") val memo: String? = null,
+        @Json(name = "receipt") val receipt: Boolean,
+        @Json(name = "merchant_name") val merchantName: String,
+        @Json(name = "merchant_category") val merchantCategory: String,
+        @Json(name = "merchant_category_code") val merchantCategoryCode: String,
+        @Json(name = "merchant_id") val merchantId: String? = null,
+        @Json(name = "enriched_merchant_icon") val enrichedMerchantIcon: String? = null,
+        @Json(name = "enriched_merchant_name") val enrichedMerchantName: String? = null,
+        @Json(name = "enriched_merchant_category") val enrichedMerchantCategory: String? = null,
+        @Json(name = "card_id") val cardId: String? = null,
+        @Json(name = "card_type") val cardType: String? = null,
+        @Json(name = "status") val status: String,
+        @Json(name = "declined_reason") val declinedReason: String? = null,
+        @Json(name = "authorized_at") val authorizedAt: DateTime,
+        @Json(name = "posted_at") val postedAt: DateTime?,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Collateral(
+        @Json(name = "amount") val amount: BigDecimal,
+        @Json(name = "currency") val currency: String,
+        @Json(name = "memo") val memo: String? = null,
+        @Json(name = "chain_id") val chainId: Long,
+        @Json(name = "wallet_address") val walletAddress: String,
+        @Json(name = "transaction_hash") val transactionHash: String,
+        @Json(name = "posted_at") val postedAt: DateTime?,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Payment(
+        @Json(name = "amount") val amount: BigDecimal,
+        @Json(name = "currency") val currency: String,
+        @Json(name = "memo") val memo: String? = null,
+        @Json(name = "chain_id") val chainId: Long? = null,
+        @Json(name = "wallet_address") val walletAddress: String? = null,
+        @Json(name = "transaction_hash") val transactionHash: String? = null,
+        @Json(name = "status") val status: String,
+        @Json(name = "posted_at") val postedAt: DateTime,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class Fee(
+        @Json(name = "amount") val amount: BigDecimal,
+        @Json(name = "currency") val currency: String,
+        @Json(name = "description") val description: String? = null,
+        @Json(name = "posted_at") val postedAt: DateTime,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt
index c7ab58a7fd..37beafb9cd 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt
@@ -36,6 +36,7 @@ data class ActionRequestBody(
 )
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class ActionRequestBodyArgs(
     @Json(name = "amount")
     val amount: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ConstructTransactionRequestBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ConstructTransactionRequestBody.kt
index 55290861d3..d35f86ac9c 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ConstructTransactionRequestBody.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ConstructTransactionRequestBody.kt
@@ -5,6 +5,7 @@ import com.squareup.moshi.JsonClass
 import java.math.BigDecimal
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class ConstructTransactionRequestBody(
     @Json(name = "gasArgs")
     val gasArgs: GasArgs? = null,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/AddressArgumentDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/AddressArgumentDTO.kt
index 6138444c45..eee4f3b4b1 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/AddressArgumentDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/AddressArgumentDTO.kt
@@ -5,6 +5,7 @@ import com.squareup.moshi.JsonClass
 import java.math.BigDecimal
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class AddressArgumentDTO(
     @Json(name = "required")
     val required: Boolean,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldBalanceWrapperDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldBalanceWrapperDTO.kt
index 121730cdcf..27c8cb9b84 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldBalanceWrapperDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldBalanceWrapperDTO.kt
@@ -1,3 +1,5 @@
+@file:Suppress("BooleanPropertyNaming")
+
 package com.tangem.datasource.api.stakekit.models.response.model
 
 import com.squareup.moshi.Json
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldDTO.kt
index b58c058063..be0fb0cf91 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/response/model/YieldDTO.kt
@@ -1,3 +1,5 @@
+@file:Suppress("BooleanPropertyNaming")
+
 package com.tangem.datasource.api.stakekit.models.response.model
 
 import com.squareup.moshi.Json
@@ -198,6 +200,7 @@ data class YieldDTO(
     enum class RewardTypeDTO {
         @Json(name = "apy")
         APY, // compound rate
+
         @Json(name = "apr")
         APR, // simple rate,
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/YieldSupplyApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/YieldSupplyApi.kt
new file mode 100644
index 0000000000..20aae40e90
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/YieldSupplyApi.kt
@@ -0,0 +1,43 @@
+package com.tangem.datasource.api.tangemTech
+
+import com.tangem.datasource.api.common.response.ApiResponse
+import com.tangem.datasource.api.tangemTech.models.YieldMarketsResponse
+import com.tangem.datasource.api.tangemTech.models.YieldModuleStatusResponse
+import com.tangem.datasource.api.tangemTech.models.YieldSupplyChangeTokenStatusBody
+import com.tangem.datasource.api.tangemTech.models.YieldTokenStatusResponse
+import com.tangem.datasource.api.tangemTech.models.YieldTokenChartResponse
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface YieldSupplyApi {
+
+    @GET("api/v1/yield/markets")
+    suspend fun getYieldMarkets(@Query("chainId") chainId: Int? = null): ApiResponse<YieldMarketsResponse>
+
+    @GET("api/v1/yield/token/{chainId}/{tokenAddress}")
+    suspend fun getYieldTokenStatus(
+        @Path("chainId") chainId: Int,
+        @Path("tokenAddress") tokenAddress: String,
+    ): ApiResponse<YieldTokenStatusResponse>
+
+    @GET("api/v1/yield/token/{chainId}/{tokenAddress}/chart")
+    suspend fun getYieldTokenChart(
+        @Path("chainId") chainId: Int,
+        @Path("tokenAddress") tokenAddress: String,
+        @Query("window") window: String? = null,
+        @Query("bucketSizeDays") bucketSizeDays: Int? = null,
+    ): ApiResponse<YieldTokenChartResponse>
+
+    @POST("api/v1/module/activate")
+    suspend fun activateYieldModule(
+        @Body body: YieldSupplyChangeTokenStatusBody,
+    ): ApiResponse<YieldModuleStatusResponse>
+
+    @POST("api/v1/module/deactivate")
+    suspend fun deactivateYieldModule(
+        @Body body: YieldSupplyChangeTokenStatusBody,
+    ): ApiResponse<YieldModuleStatusResponse>
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt
index de48c2a17a..1fe7409183 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CoinsResponse.kt
@@ -1,3 +1,5 @@
+@file:Suppress("BooleanPropertyNaming")
+
 package com.tangem.datasource.api.tangemTech.models
 
 import com.squareup.moshi.Json
@@ -12,12 +14,13 @@ data class CoinsResponse(
 ) {
 
     @JsonClass(generateAdapter = true)
+    @Suppress("BooleanPropertyNaming")
     data class Coin(
         @Json(name = "id") val id: String,
         @Json(name = "name") val name: String,
         @Json(name = "symbol") val symbol: String,
         @Json(name = "active") val active: Boolean,
-        @Json(name = "networks") val networks: List<Network> = listOf(),
+        @Json(name = "networks") val networks: List<Network> = emptyList(),
     ) {
 
         @JsonClass(generateAdapter = true)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CreateUserNetworkAccountResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CreateUserNetworkAccountResponse.kt
index 829b71dd62..50e345b73e 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CreateUserNetworkAccountResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/CreateUserNetworkAccountResponse.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class CreateUserNetworkAccountResponse(
     @Json(name = "status") val status: Boolean,
     @Json(name = "data") val data: AccountCreated,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/SeedPhraseNotificationDTO.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/SeedPhraseNotificationDTO.kt
index 3184e87ead..3ef25cc80f 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/SeedPhraseNotificationDTO.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/SeedPhraseNotificationDTO.kt
@@ -24,7 +24,5 @@ data class SeedPhraseNotificationDTO(val status: Status) {
 
         @Json(name = "accepted")
         ACCEPTED,
-
-        ;
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt
index 8e1dec299f..c5f172e68c 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/UserTokensResponse.kt
@@ -5,6 +5,7 @@ import com.squareup.moshi.JsonClass
 import com.tangem.common.extensions.calculateHashCode
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class UserTokensResponse(
     @Json(name = "version") val version: Int = 0,
     @Json(name = "group") val group: GroupType,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletBody.kt
index 6ad3704bfb..806199d729 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletBody.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletBody.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class WalletBody(
     @Json(name = "notifyStatus") val notifyStatus: Boolean? = null,
     @Json(name = "name") val name: String? = null,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletResponse.kt
index 63263f0a1d..148577e46e 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/WalletResponse.kt
@@ -4,6 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
+@Suppress("BooleanPropertyNaming")
 data class WalletResponse(
     @Json(name = "notifyStatus") val notifyStatus: Boolean,
     @Json(name = "id") val id: String,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldMarketsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldMarketsResponse.kt
new file mode 100644
index 0000000000..ac62a8c655
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldMarketsResponse.kt
@@ -0,0 +1,22 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
+
+@JsonClass(generateAdapter = true)
+data class YieldMarketsResponse(
+    @Json(name = "tokens") val marketDtos: List<MarketDto>,
+    @Json(name = "lastUpdatedAt") val lastUpdated: String,
+) {
+
+    @JsonClass(generateAdapter = true)
+    data class MarketDto(
+        @Json(name = "tokenAddress") val tokenAddress: String? = null,
+        @Json(name = "tokenSymbol") val tokenSymbol: String? = null,
+        @Json(name = "tokenName") val tokenName: String? = null,
+        @Json(name = "apy") val apy: BigDecimal,
+        @Json(name = "isActive") val isActive: Boolean,
+        @Json(name = "chainId") val chainId: Int? = null,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldModuleStatusResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldModuleStatusResponse.kt
new file mode 100644
index 0000000000..b12bfa05c1
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldModuleStatusResponse.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class YieldModuleStatusResponse(
+    @Json(name = "tokenAddress") val tokenAddress: String,
+    @Json(name = "chainId") val chainId: Int,
+    @Json(name = "isActive") val isActive: Boolean,
+    @Json(name = "activatedAt") val activatedAt: String?,
+    @Json(name = "deactivatedAt") val deactivatedAt: String?,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyChangeTokenStatusBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyChangeTokenStatusBody.kt
new file mode 100644
index 0000000000..68db0ea530
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldSupplyChangeTokenStatusBody.kt
@@ -0,0 +1,10 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class YieldSupplyChangeTokenStatusBody(
+    @Json(name = "tokenAddress") val tokenAddress: String,
+    @Json(name = "chainId") val chainId: Int,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenChartResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenChartResponse.kt
new file mode 100644
index 0000000000..0b0a01a5a4
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenChartResponse.kt
@@ -0,0 +1,22 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
+
+@JsonClass(generateAdapter = true)
+data class YieldTokenChartResponse(
+    @Json(name = "underlying") val underlying: String,
+    @Json(name = "market") val market: String,
+    @Json(name = "bucketSizeDays") val bucketSizeDays: Int,
+    @Json(name = "period") val period: String,
+    @Json(name = "data") val data: List<DataPoint>,
+    @Json(name = "avr") val averageApy: BigDecimal,
+) {
+
+    @JsonClass(generateAdapter = true)
+    data class DataPoint(
+        @Json(name = "bucketIndex") val bucketIndex: Int,
+        @Json(name = "avgApy") val avgApy: BigDecimal,
+    )
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenStatusResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenStatusResponse.kt
new file mode 100644
index 0000000000..6788fc5292
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/models/YieldTokenStatusResponse.kt
@@ -0,0 +1,17 @@
+package com.tangem.datasource.api.tangemTech.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.math.BigDecimal
+
+@JsonClass(generateAdapter = true)
+data class YieldTokenStatusResponse(
+    @Json(name = "tokenAddress") val tokenAddress: String? = null,
+    @Json(name = "tokenSymbol") val tokenSymbol: String? = null,
+    @Json(name = "tokenName") val tokenName: String? = null,
+    @Json(name = "apy") val apy: BigDecimal? = null,
+    @Json(name = "isActive") val isActive: Boolean? = null,
+    @Json(name = "chainId") val chainId: Int? = null,
+    @Json(name = "maxFeeNative") val maxFeeNative: String? = null,
+    @Json(name = "maxFeeUSD") val maxFeeUSD: String? = null,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/asset/loader/AssetLoader.kt b/core/datasource/src/main/java/com/tangem/datasource/asset/loader/AssetLoader.kt
index 3f47419a51..2bab1747cf 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/asset/loader/AssetLoader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/asset/loader/AssetLoader.kt
@@ -39,8 +39,8 @@ class AssetLoader @Inject constructor(
                 if (parsedConfig == null) Timber.e(IllegalStateException("Parsed config [$fileName] is null"))
                 parsedConfig
             },
-            onFailure = {
-                Timber.e(it, "Failed to load config [$fileName] from assets")
+            onFailure = { throwable ->
+                Timber.e(throwable, "Failed to load config [$fileName] from assets")
                 null
             },
         )
@@ -59,8 +59,8 @@ class AssetLoader @Inject constructor(
                 if (parsedConfig == null) Timber.e(IllegalStateException("Parsed config [$fileName] is null"))
                 parsedConfig.orEmpty()
             },
-            onFailure = {
-                Timber.e(it, "Failed to load config [$fileName] from assets")
+            onFailure = { throwable ->
+                Timber.e(throwable, "Failed to load config [$fileName] from assets")
                 emptyList()
             },
         )
@@ -79,8 +79,8 @@ class AssetLoader @Inject constructor(
                 if (parsedConfig == null) Timber.e(IllegalStateException("Parsed config [$fileName] is null"))
                 parsedConfig.orEmpty()
             },
-            onFailure = {
-                Timber.e(it, "Failed to load config [$fileName] from assets")
+            onFailure = { throwable ->
+                Timber.e(throwable, "Failed to load config [$fileName] from assets")
                 emptyMap()
             },
         )
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
index f977ce542b..57c3c53a26 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/ApiConfigsModule.kt
@@ -42,10 +42,26 @@ internal object ApiConfigsModule {
     @Provides
     @IntoSet
     fun provideTangemTechConfig(
+        environmentConfigStorage: EnvironmentConfigStorage,
         appVersionProvider: AppVersionProvider,
         authProvider: AuthProvider,
         appInfoProvider: AppInfoProvider,
     ): ApiConfig = TangemTech(
+        environmentConfigStorage = environmentConfigStorage,
+        appVersionProvider = appVersionProvider,
+        authProvider = authProvider,
+        appInfoProvider = appInfoProvider,
+    )
+
+    @Provides
+    @IntoSet
+    fun provideYieldSupplyConfig(
+        environmentConfigStorage: EnvironmentConfigStorage,
+        appVersionProvider: AppVersionProvider,
+        authProvider: AuthProvider,
+        appInfoProvider: AppInfoProvider,
+    ): ApiConfig = YieldSupply(
+        environmentConfigStorage = environmentConfigStorage,
         appVersionProvider = appVersionProvider,
         authProvider = authProvider,
         appInfoProvider = appInfoProvider,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
index 6c8dc4b626..9a0bed416c 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -15,6 +15,7 @@ import com.tangem.datasource.api.onramp.OnrampApi
 import com.tangem.datasource.api.pay.TangemPayApi
 import com.tangem.datasource.api.stakekit.StakeKitApi
 import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.api.tangemTech.YieldSupplyApi
 import com.tangem.datasource.di.utils.RetrofitApiBuilder
 import com.tangem.datasource.di.utils.RetrofitApiBuilder.Timeouts
 import com.tangem.datasource.local.preferences.AppPreferencesStore
@@ -88,6 +89,15 @@ internal object NetworkModule {
         )
     }
 
+    @Provides
+    @Singleton
+    fun provideYieldSupplyApi(retrofitApiBuilder: RetrofitApiBuilder): YieldSupplyApi {
+        return retrofitApiBuilder.build(
+            apiConfigId = ApiConfig.ID.YieldSupply,
+            applyTimeoutAnnotations = true,
+        )
+    }
+
     @Provides
     @Singleton
     fun provideTangemTechMarketsApi(retrofitApiBuilder: RetrofitApiBuilder): TangemTechMarketsApi {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt
index aa6dd40222..283ea6c473 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/TxHistoryItemsStoreModule.kt
@@ -3,6 +3,8 @@ package com.tangem.datasource.di
 import com.tangem.datasource.local.datastore.RuntimeDataStore
 import com.tangem.datasource.local.txhistory.DefaultTxHistoryItemsStore
 import com.tangem.datasource.local.txhistory.TxHistoryItemsStore
+import com.tangem.datasource.local.visa.DefaultTangemPayTxHistoryItemsStore
+import com.tangem.datasource.local.visa.TangemPayTxHistoryItemsStore
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,4 +22,12 @@ internal object TxHistoryItemsStoreModule {
             dataStore = RuntimeDataStore(),
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideTangemPayTxHistoryItemsStore(): TangemPayTxHistoryItemsStore {
+        return DefaultTangemPayTxHistoryItemsStore(
+            dataStore = RuntimeDataStore(),
+        )
+    }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/YieldSupplyModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/YieldSupplyModule.kt
new file mode 100644
index 0000000000..8b174ebbc1
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/YieldSupplyModule.kt
@@ -0,0 +1,45 @@
+package com.tangem.datasource.di
+
+import android.content.Context
+import androidx.datastore.core.DataStoreFactory
+import androidx.datastore.dataStoreFile
+import com.squareup.moshi.Moshi
+import com.tangem.datasource.local.yieldsupply.DefaultYieldMarketsStore
+import com.tangem.datasource.local.yieldsupply.YieldMarketsStore
+import com.tangem.datasource.utils.MoshiDataStoreSerializer
+import com.tangem.datasource.utils.listTypes
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object YieldSupplyModule {
+
+    @Provides
+    @Singleton
+    fun provideYieldMarketsStore(
+        @NetworkMoshi moshi: Moshi,
+        @ApplicationContext context: Context,
+        dispatchers: CoroutineDispatcherProvider,
+    ): YieldMarketsStore {
+        return DefaultYieldMarketsStore(
+            persistenceStore = DataStoreFactory.create(
+                serializer = MoshiDataStoreSerializer(
+                    moshi = moshi,
+                    types = listTypes<YieldMarketToken>(),
+                    defaultValue = emptyList(),
+                ),
+                produceFile = { context.dataStoreFile(fileName = "yield_markets_cache") },
+                scope = CoroutineScope(context = dispatchers.io + SupervisorJob()),
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt b/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
index aa2adc0817..b952dc4b5b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/utils/RetrofitApiBuilder.kt
@@ -192,6 +192,7 @@ internal class RetrofitApiBuilder @Inject constructor(
         }
     }
 
+    @Suppress("UseEmptyCounterpart")
     private companion object {
 
         val excludedApiForLogging: Set<ApiConfig.ID> = setOf(
diff --git a/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt
index d5460278ba..11192e7af9 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/exchangeservice/swap/DefaultExpressServiceLoader.kt
@@ -72,15 +72,16 @@ internal class DefaultExpressServiceLoader @Inject constructor(
         return flow { getInitializationStatusInternal(userWalletId).collect { emit(it) } }
     }
 
+    @Suppress("SuspendFunWithFlowReturnType")
     private suspend fun getInitializationStatusInternal(userWalletId: UserWalletId): InitializationStatusFlow {
-        val initializationStatus = initializationStatuses.value.get(key = userWalletId)
+        val initializationStatus = initializationStatuses.value[userWalletId]
         if (initializationStatus != null) return initializationStatus
 
         val cached = expressAssetsStore.getSyncOrNull(userWalletId)
         val default: InitializationStatusFlow = MutableStateFlow(value = cached?.lceContent() ?: lceLoading())
 
-        initializationStatuses.update {
-            it.toMutableMap().apply {
+        initializationStatuses.update { statuses ->
+            statuses.toMutableMap().apply {
                 put(key = userWalletId, value = default)
             }
         }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultAvailableAppCurrenciesStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultAvailableAppCurrenciesStore.kt
index 6ee08097c5..01cc7edd09 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultAvailableAppCurrenciesStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/appcurrency/implementation/DefaultAvailableAppCurrenciesStore.kt
@@ -16,10 +16,10 @@ internal class DefaultAvailableAppCurrenciesStore(
 
     override suspend fun store(response: CurrenciesResponse) {
         val currencies = response.currencies
-            .map {
-                it.copy(
-                    iconSmallUrl = response.imageHost?.plus(IMAGE_SMALL)?.format(it.id),
-                    iconMediumUrl = response.imageHost?.plus(IMAGE_MEDIUM)?.format(it.id),
+            .map { currency ->
+                currency.copy(
+                    iconSmallUrl = response.imageHost?.plus(IMAGE_SMALL)?.format(currency.id),
+                    iconMediumUrl = response.imageHost?.plus(IMAGE_MEDIUM)?.format(currency.id),
                 )
             }
             .associateBy(CurrenciesResponse.Currency::code)
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt
index 5f44b31c6e..384af56181 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/EnvironmentConfig.kt
@@ -17,4 +17,8 @@ data class EnvironmentConfig(
     val devExpress: ExpressModel? = null,
     val stakeKitApiKey: String? = null,
     val blockAidApiKey: String? = null,
+    val tangemApiKey: String? = null,
+    val tangemApiKeyDev: String? = null,
+    val tangemApiKeyStage: String? = null,
+    val yieldModuleApiKey: String? = null,
 )
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt
index a70611411d..cf52beb064 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/converter/EnvironmentConfigConverter.kt
@@ -26,6 +26,10 @@ internal object EnvironmentConfigConverter : Converter<EnvironmentConfigModel, E
             devExpress = value.devExpress,
             stakeKitApiKey = value.stakeKitApiKey,
             blockAidApiKey = value.blockaidApiKey,
+            tangemApiKey = value.tangemApiKey,
+            tangemApiKeyDev = value.tangemApiKeyDev,
+            tangemApiKeyStage = value.tangemApiKeyStage,
+            yieldModuleApiKey = value.yieldModuleApiKey,
         )
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/models/EnvironmentConfigModel.kt b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/models/EnvironmentConfigModel.kt
index 5413eb0ed5..6455258918 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/models/EnvironmentConfigModel.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/config/environment/models/EnvironmentConfigModel.kt
@@ -40,6 +40,9 @@ class EnvironmentConfigModel(
     @Json(name = "moralisApiKey") val moralisApiKey: String?,
     @Json(name = "nftScanApiKey") val nftScanApiKey: String?,
     @Json(name = "blockaidApiKey") val blockaidApiKey: String?,
+    @Json(name = "tangemApiKey") val tangemApiKey: String?,
+    @Json(name = "tangemApiKeyDev") val tangemApiKeyDev: String?,
+    @Json(name = "tangemApiKeyStage") val tangemApiKeyStage: String?,
     @Json(name = "etherscanApiKey") val etherScanApiKey: String?,
     @Json(name = "yieldModuleApiKey") val yieldModuleApiKey: String?,
     @Json(name = "blinkApiKey") val blinkApiKey: String?,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt
index 8ebb7bd198..6ab96a3930 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkAssetConverter.kt
@@ -26,22 +26,22 @@ object NFTSdkAssetConverter : TwoWayConverter<Pair<Network, SdkNFTAsset>, NFTAss
             amount = asset.amount,
             decimals = asset.decimals,
             salePrice = salePrice,
-            rarity = asset.rarity?.let {
+            rarity = asset.rarity?.let { rarity ->
                 NFTAsset.Rarity(
-                    rank = it.rank,
-                    label = it.label,
+                    rank = rarity.rank,
+                    label = rarity.label,
                 )
             },
-            media = asset.media?.let {
+            media = asset.media?.let { media ->
                 NFTAsset.Media(
-                    animationUrl = it.animationUrl,
-                    imageUrl = it.imageUrl,
+                    animationUrl = media.animationUrl,
+                    imageUrl = media.imageUrl,
                 )
             },
-            traits = asset.traits.map {
+            traits = asset.traits.map { trait ->
                 NFTAsset.Trait(
-                    name = it.name,
-                    value = it.value,
+                    name = trait.name,
+                    value = trait.value,
                 )
             },
             source = StatusSource.CACHE,
@@ -65,22 +65,22 @@ object NFTSdkAssetConverter : TwoWayConverter<Pair<Network, SdkNFTAsset>, NFTAss
             amount = value.amount,
             decimals = value.decimals,
             salePrice = salePrice,
-            rarity = value.rarity?.let {
+            rarity = value.rarity?.let { rarity ->
                 SdkNFTAsset.Rarity(
-                    rank = it.rank,
-                    label = it.label,
+                    rank = rarity.rank,
+                    label = rarity.label,
                 )
             },
-            media = value.media?.let {
+            media = value.media?.let { media ->
                 SdkNFTAsset.Media(
-                    animationUrl = it.animationUrl,
-                    imageUrl = it.imageUrl,
+                    animationUrl = media.animationUrl,
+                    imageUrl = media.imageUrl,
                 )
             },
-            traits = value.traits.map {
+            traits = value.traits.map { trait ->
                 SdkNFTAsset.Trait(
-                    name = it.name,
-                    value = it.value,
+                    name = trait.name,
+                    value = trait.value,
                 )
             },
         )
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkCollectionConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkCollectionConverter.kt
index 0d21a6dd56..cd5fc2cb60 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkCollectionConverter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/nft/converter/NFTSdkCollectionConverter.kt
@@ -32,12 +32,12 @@ class NFTSdkCollectionConverter(
                 .filter {
                     it.id !is NFTAsset.Identifier.Unknown
                 }
-                .let {
-                    if (it.isEmpty()) {
+                .let { items ->
+                    if (items.isEmpty()) {
                         NFTCollection.Assets.Empty
                     } else {
                         NFTCollection.Assets.Value(
-                            items = it,
+                            items = items,
                             source = StatusSource.CACHE,
                         )
                     }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesDataStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesDataStore.kt
index daa20726ae..e91af36e84 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesDataStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesDataStore.kt
@@ -50,8 +50,8 @@ internal object PreferencesDataStore {
 
     private fun createCorruptionHandler(): ReplaceFileCorruptionHandler<Preferences> {
         return ReplaceFileCorruptionHandler(
-            produceNewData = {
-                Timber.w(it)
+            produceNewData = { corruptionException ->
+                Timber.w(corruptionException)
                 emptyPreferences()
             },
         )
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
index 63fbdfebf8..90230d2f23 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
@@ -129,6 +129,8 @@ object PreferencesKeys {
 
     val WALLETS_NFT_ENABLED_STATES_KEY by lazy { stringPreferencesKey(name = "walletsNftEnabledStates") }
 
+    val YIELD_SUPPLY_WARNINGS_STATES_KEY by lazy { stringPreferencesKey(name = "yieldSupplyWarningsStates") }
+
     // region Notifications
     val NOTIFICATIONS_APPLICATION_ID_KEY by lazy { stringPreferencesKey(name = "notificationsApplicationId") }
 
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
index 647ff92c89..523eb486aa 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
@@ -14,9 +14,9 @@ inline fun <reified T> AppPreferencesStore.getObject(key: Preferences.Key<String
         val adapter = moshi.adapter(T::class.java)
         emitAll(
             data.map { preferences ->
-                preferences[key]?.let {
+                preferences[key]?.let { value ->
                     try {
-                        adapter.fromJson(it)
+                        adapter.fromJson(value)
                     } catch (e: JsonDataException) {
                         null
                     }
@@ -37,9 +37,9 @@ inline fun <reified T> AppPreferencesStore.getObject(key: Preferences.Key<String
     return flow {
         val adapter = moshi.adapter(T::class.java)
         emitAll(
-            data.map {
+            data.map { prefs ->
                 try {
-                    it[key]?.let(adapter::fromJson) ?: default
+                    prefs[key]?.let(adapter::fromJson) ?: default
                 } catch (e: JsonDataException) {
                     default
                 }
@@ -59,9 +59,9 @@ suspend inline fun <reified T> AppPreferencesStore.getObjectSyncOrNull(key: Pref
         val adapter = moshi.adapter(T::class.java) // TODO: Support parameterized types
         data.firstOrNull()
             ?.get(key)
-            ?.let {
+            ?.let { value ->
                 try {
-                    adapter.fromJson(it)
+                    adapter.fromJson(value)
                 } catch (e: JsonDataException) {
                     null
                 }
@@ -76,9 +76,9 @@ suspend inline fun <reified T> AppPreferencesStore.getObjectSyncOrDefault(
     val adapter = moshi.adapter(T::class.java)
     data.firstOrNull()
         ?.get(key)
-        ?.let {
+        ?.let { value ->
             try {
-                adapter.fromJson(it)
+                adapter.fromJson(value)
             } catch (e: JsonDataException) {
                 default
             }
@@ -159,7 +159,7 @@ inline fun <reified V> AppPreferencesStore.getObjectMap(key: Preferences.Key<Str
         val adapter = moshi.adapter<Map<String, V>>(type)
 
         emitAll(
-            data.map { it[key]?.let(adapter::fromJson) ?: emptyMap() },
+            data.map { it[key]?.let(adapter::fromJson).orEmpty() },
         )
     }
 }
@@ -180,7 +180,7 @@ inline fun <reified T> AppPreferencesStore.getObjectSet(key: Preferences.Key<Str
         val adapter = moshi.adapter<Set<T>>(Types.newParameterizedType(Set::class.java, T::class.java))
         emitAll(
             data.map {
-                it[key]?.let(adapter::fromJson) ?: emptySet()
+                it[key]?.let(adapter::fromJson).orEmpty()
             },
         )
     }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/swap/DefaultSwapBestRateAnimationStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/swap/DefaultSwapBestRateAnimationStore.kt
index 4f207731c1..0c25e70a48 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/swap/DefaultSwapBestRateAnimationStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/swap/DefaultSwapBestRateAnimationStore.kt
@@ -12,10 +12,10 @@ internal class DefaultSwapBestRateAnimationStore(
      * If true, reset flag to false
      */
     override suspend fun getSyncOrNull(): Boolean {
-        val value = dataStore.getSyncOrNull() ?: true
-        if (value) {
+        val shouldShowBestRateAnimation = dataStore.getSyncOrNull() != false
+        if (shouldShowBestRateAnimation) {
             dataStore.store(false)
         }
-        return value
+        return shouldShowBestRateAnimation
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultExpressAssetsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultExpressAssetsStore.kt
index bc7e276e66..ea2d0c573b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultExpressAssetsStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultExpressAssetsStore.kt
@@ -42,8 +42,8 @@ internal class DefaultExpressAssetsStore(
                 runtimeStore.store(userWalletId.stringValue, item)
             }
             launch {
-                persistenceStore.updateData {
-                    it.toMutableMap().apply {
+                persistenceStore.updateData { assetsByWalletId ->
+                    assetsByWalletId.toMutableMap().apply {
                         put(userWalletId.stringValue, item)
                     }
                 }
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultTokenReceiveWarningActionStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultTokenReceiveWarningActionStore.kt
index 8be4bb214a..cdfb3f69bc 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultTokenReceiveWarningActionStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/DefaultTokenReceiveWarningActionStore.kt
@@ -8,7 +8,7 @@ internal class DefaultTokenReceiveWarningActionStore(
 ) : TokenReceiveWarningActionStore {
 
     override suspend fun getSync(): Set<String> {
-        return persistenceStore.data.firstOrNull() ?: emptySet()
+        return persistenceStore.data.firstOrNull().orEmpty()
     }
 
     override suspend fun store(symbol: String) {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/token/converter/PendingActionConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/token/converter/PendingActionConverter.kt
index 161bc9885c..b590036c5b 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/token/converter/PendingActionConverter.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/token/converter/PendingActionConverter.kt
@@ -12,26 +12,26 @@ internal object PendingActionConverter : Converter<BalanceDTO.PendingAction, Pen
             passthrough = value.passthrough,
             args = with(value.args) {
                 PendingAction.PendingActionArgs(
-                    amount = this?.amount?.let {
+                    amount = this?.amount?.let { amount ->
                         PendingAction.PendingActionArgs.Amount(
-                            required = it.required,
-                            minimum = it.minimum,
-                            maximum = it.maximum,
+                            required = amount.required,
+                            minimum = amount.minimum,
+                            maximum = amount.maximum,
                         )
                     },
-                    duration = this?.duration?.let {
+                    duration = this?.duration?.let { duration ->
                         PendingAction.PendingActionArgs.Duration(
-                            required = it.required,
-                            minimum = it.minimum,
-                            maximum = it.maximum,
+                            required = duration.required,
+                            minimum = duration.minimum,
+                            maximum = duration.maximum,
                         )
                     },
                     validatorAddress = this?.validatorAddress?.required,
                     validatorAddresses = this?.validatorAddresses?.required,
-                    tronResource = this?.tronResource?.let {
+                    tronResource = this?.tronResource?.let { tronResource ->
                         PendingAction.PendingActionArgs.TronResource(
-                            required = it.required,
-                            options = it.options,
+                            required = tronResource.required,
+                            options = tronResource.options,
                         )
                     },
                     signatureVerification = this?.signatureVerification?.required,
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/visa/DefaultTangemPayTxHistoryItemsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/visa/DefaultTangemPayTxHistoryItemsStore.kt
new file mode 100644
index 0000000000..fd01586877
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/visa/DefaultTangemPayTxHistoryItemsStore.kt
@@ -0,0 +1,23 @@
+package com.tangem.datasource.local.visa
+
+import com.tangem.datasource.local.datastore.core.StringKeyDataStore
+import com.tangem.datasource.local.datastore.core.StringKeyDataStoreDecorator
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+
+internal class DefaultTangemPayTxHistoryItemsStore(
+    dataStore: StringKeyDataStore<Map<String, List<TangemPayTxHistoryItem>>>,
+) : TangemPayTxHistoryItemsStore,
+    StringKeyDataStoreDecorator<String, Map<String, List<TangemPayTxHistoryItem>>>(dataStore) {
+    override fun provideStringKey(key: String): String = key
+
+    override suspend fun getSyncOrNull(key: String, cursor: String): List<TangemPayTxHistoryItem>? {
+        val storedValue = getSyncOrNull(key)
+        return storedValue?.get(cursor)
+    }
+
+    override suspend fun store(key: String, cursor: String, value: List<TangemPayTxHistoryItem>) {
+        val oldValue = getSyncOrNull(key).orEmpty()
+        val newValue = oldValue.toMutableMap().apply { put(cursor, value) }
+        store(key, newValue)
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayStorage.kt b/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayStorage.kt
index b988222b09..1ed58f2220 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayStorage.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayStorage.kt
@@ -8,9 +8,9 @@ interface TangemPayStorage {
 
     suspend fun getAuthTokens(customerWalletAddress: String): VisaAuthTokens?
 
-    suspend fun storeCustomerWalletAddress(customerWalletAddress: String)
+    suspend fun storeOrderId(customerWalletAddress: String, orderId: String)
 
-    suspend fun getCustomerWalletAddress(): String?
+    suspend fun getOrderId(customerWalletAddress: String): String?
 
     suspend fun clear(customerWalletAddress: String)
 }
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayTxHistoryItemsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayTxHistoryItemsStore.kt
new file mode 100644
index 0000000000..e18be41c5a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/visa/TangemPayTxHistoryItemsStore.kt
@@ -0,0 +1,12 @@
+package com.tangem.datasource.local.visa
+
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+
+interface TangemPayTxHistoryItemsStore {
+
+    suspend fun getSyncOrNull(key: String, cursor: String): List<TangemPayTxHistoryItem>?
+
+    suspend fun remove(key: String)
+
+    suspend fun store(key: String, cursor: String, value: List<TangemPayTxHistoryItem>)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
index 351836e331..3dc700f5ba 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/walletmanager/DefaultWalletManagersStore.kt
@@ -28,14 +28,14 @@ internal class DefaultWalletManagersStore(
     ): WalletManager? {
         val walletManagers = getSyncOrNull(userWalletId)
 
-        return walletManagers?.singleOrNull {
-            it.wallet.blockchain == blockchain &&
-                it.wallet.publicKey.derivationPath?.rawPath == derivationPath
+        return walletManagers?.singleOrNull { walletManager ->
+            walletManager.wallet.blockchain == blockchain &&
+                walletManager.wallet.publicKey.derivationPath?.rawPath == derivationPath
         }
     }
 
     override suspend fun getAllSync(userWalletId: UserWalletId): List<WalletManager> {
-        return getSyncOrNull(userWalletId) ?: emptyList()
+        return getSyncOrNull(userWalletId).orEmpty()
     }
 
     override suspend fun store(userWalletId: UserWalletId, walletManager: WalletManager) {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/DefaultYieldMarketsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/DefaultYieldMarketsStore.kt
new file mode 100644
index 0000000000..b282890523
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/DefaultYieldMarketsStore.kt
@@ -0,0 +1,21 @@
+package com.tangem.datasource.local.yieldsupply
+
+import androidx.datastore.core.DataStore
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+
+internal class DefaultYieldMarketsStore(
+    private val persistenceStore: DataStore<List<YieldMarketToken>>,
+) : YieldMarketsStore {
+
+    override fun get(): Flow<List<YieldMarketToken>> = persistenceStore.data
+
+    override suspend fun getSyncOrNull(): List<YieldMarketToken>? {
+        return persistenceStore.data.firstOrNull()
+    }
+
+    override suspend fun store(items: List<YieldMarketToken>) {
+        persistenceStore.updateData { _ -> items }
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/YieldMarketsStore.kt b/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/YieldMarketsStore.kt
new file mode 100644
index 0000000000..c78c131d7a
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/local/yieldsupply/YieldMarketsStore.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.local.yieldsupply
+
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import kotlinx.coroutines.flow.Flow
+
+interface YieldMarketsStore {
+
+    fun get(): Flow<List<YieldMarketToken>>
+
+    suspend fun getSyncOrNull(): List<YieldMarketToken>?
+
+    suspend fun store(items: List<YieldMarketToken>)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
index eb040fb1e4..eb7727aea3 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/HttpClientExt.kt
@@ -20,9 +20,9 @@ internal fun OkHttpClient.Builder.addHeaders(
         Interceptor { chain ->
             val request = chain.request().newBuilder().apply {
                 runBlocking {
-                    requestHeaders.forEach {
-                        val value = it.value.invoke()
-                        if (value.isNotBlank()) addHeader(name = it.key, value = value)
+                    requestHeaders.forEach { header ->
+                        val value = header.value.invoke()
+                        if (value.isNotBlank()) addHeader(name = header.key, value = value)
                     }
                 }
             }.build()
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/NetworkLogsSaveInterceptor.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/NetworkLogsSaveInterceptor.kt
index c53422bc3f..58b21f35dd 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/NetworkLogsSaveInterceptor.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/NetworkLogsSaveInterceptor.kt
@@ -101,7 +101,7 @@ class NetworkLogsSaveInterceptor(
 
     private fun logResponseMessage(response: Response, startNs: Long) {
         val responseHeaders = response.headers
-        val responseBody = response.body!!
+        val responseBody = requireNotNull(response.body)
         val contentLength = responseBody.contentLength()
 
         val message = if (!response.promisesBody()) {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
index 9375434e78..9e6b000399 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt
@@ -46,8 +46,8 @@ sealed class RequestHeader(vararg pairs: Pair<String, ProviderSuspend<String>>)
     fun String.checkHeaderValueOrEmpty(): String {
         for (i in this.indices) {
             val c = this[i]
-            val charCondition = c == '\t' || c in '\u0020'..'\u007e'
-            if (!charCondition) {
+            val isChar = c == '\t' || c in '\u0020'..'\u007e'
+            if (!isChar) {
                 return ""
             }
         }
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
index 651e704cdc..53392207a9 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/ApiConfigTest.kt
@@ -37,8 +37,17 @@ class ApiConfigTest {
                         appInfoProvider = mockk(),
                     )
                 }
+                ApiConfig.ID.YieldSupply -> {
+                    YieldSupply(
+                        environmentConfigStorage = mockk(),
+                        appVersionProvider = mockk(),
+                        authProvider = mockk(),
+                        appInfoProvider = mockk(),
+                    )
+                }
                 ApiConfig.ID.TangemTech -> {
                     TangemTech(
+                        environmentConfigStorage = mockk(),
                         appVersionProvider = mockk(),
                         authProvider = mockk(),
                         appInfoProvider = mockk(),
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/MockEnvironmentConfigStorage.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/MockEnvironmentConfigStorage.kt
index 016b5cda80..840ce4bcd1 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/MockEnvironmentConfigStorage.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/MockEnvironmentConfigStorage.kt
@@ -16,6 +16,10 @@ internal class MockEnvironmentConfigStorage : EnvironmentConfigStorage {
         express = ExpressModel(apiKey = EXPRESS_API_KEY, signVerifierPublicKey = "vocibus"),
         devExpress = ExpressModel(apiKey = EXPRESS_DEV_API_KEY, signVerifierPublicKey = "pellentesque"),
         blockAidApiKey = BLOCK_AID_API_KEY,
+        tangemApiKey = TANGEM_API_KEY,
+        tangemApiKeyDev = TANGEM_API_KEY_DEV,
+        tangemApiKeyStage = TANGEM_API_KEY_STAGE,
+        yieldModuleApiKey = YIELD_MODULE_KEY,
     )
 
     override suspend fun initialize() = environmentConfig
@@ -26,5 +30,9 @@ internal class MockEnvironmentConfigStorage : EnvironmentConfigStorage {
         const val EXPRESS_API_KEY = "express_api_key"
         const val EXPRESS_DEV_API_KEY = "express_dev_api_key"
         const val BLOCK_AID_API_KEY = "block_aid_api_key"
+        const val TANGEM_API_KEY = "tangem_api_key"
+        const val TANGEM_API_KEY_DEV = "tangem_api_key_dev"
+        const val TANGEM_API_KEY_STAGE = "tangem_api_key_stage"
+        const val YIELD_MODULE_KEY = "yield_module_api_key"
     }
 }
\ No newline at end of file
diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
index 61d25e29b1..cb64ca1ea5 100644
--- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
+++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt
@@ -84,8 +84,17 @@ internal class ProdApiConfigsManagerTest {
                         appInfoProvider = appInfoProvider,
                     )
                 }
+                ApiConfig.ID.YieldSupply -> {
+                    YieldSupply(
+                        environmentConfigStorage = environmentConfigStorage,
+                        appVersionProvider = appVersionProvider,
+                        authProvider = appAuthProvider,
+                        appInfoProvider = appInfoProvider,
+                    )
+                }
                 ApiConfig.ID.TangemTech -> {
                     TangemTech(
+                        environmentConfigStorage = environmentConfigStorage,
                         appVersionProvider = appVersionProvider,
                         authProvider = appAuthProvider,
                         appInfoProvider = appInfoProvider,
@@ -101,6 +110,7 @@ internal class ProdApiConfigsManagerTest {
     private fun provideTestModels() = ApiConfig.ID.entries.map {
         when (it) {
             ApiConfig.ID.Express -> createExpressModel()
+            ApiConfig.ID.YieldSupply -> createYieldSupplyModel()
             ApiConfig.ID.TangemTech -> createTangemTechModel()
             ApiConfig.ID.StakeKit -> createStakeKitModel()
             ApiConfig.ID.TangemPay -> createTangemPayModel()
@@ -165,6 +175,30 @@ internal class ProdApiConfigsManagerTest {
                 environment = ApiEnvironment.PROD,
                 baseUrl = "https://api.tangem.org/",
                 headers = mapOf(
+                    "api-key" to ProviderSuspend { MockEnvironmentConfigStorage.TANGEM_API_KEY },
+                    "card_id" to ProviderSuspend { APP_CARD_ID },
+                    "card_public_key" to ProviderSuspend { APP_CARD_PUBLIC_KEY },
+                    "version" to ProviderSuspend { VERSION_NAME },
+                    "platform" to ProviderSuspend { "android" },
+                    "system_version" to ProviderSuspend { "Android 16" },
+                    "language" to ProviderSuspend { Locale.getDefault().language.checkHeaderValueOrEmpty() },
+                    "timezone" to ProviderSuspend {
+                        TimeZone.getDefault().getDisplayName(false, TimeZone.SHORT).checkHeaderValueOrEmpty()
+                    },
+                    "device" to ProviderSuspend { "${Build.MANUFACTURER} ${Build.MODEL}".checkHeaderValueOrEmpty() },
+                ),
+            ),
+        )
+    }
+
+    private fun createYieldSupplyModel(): TestModel {
+        return TestModel(
+            id = ApiConfig.ID.YieldSupply,
+            expected = ApiEnvironmentConfig(
+                environment = ApiEnvironment.PROD,
+                baseUrl = "https://yield.tangem.org/",
+                headers = mapOf(
+                    "api-key" to ProviderSuspend { MockEnvironmentConfigStorage.YIELD_MODULE_KEY },
                     "card_id" to ProviderSuspend { APP_CARD_ID },
                     "card_public_key" to ProviderSuspend { APP_CARD_PUBLIC_KEY },
                     "version" to ProviderSuspend { VERSION_NAME },
@@ -242,6 +276,6 @@ internal class ProdApiConfigsManagerTest {
         const val EXPRESS_SESSION_ID = "express_session_id"
         const val STAKE_KIT_API_KEY = "stake_kit_api_key"
         const val APP_CARD_ID = "app_card_id"
-        const val APP_CARD_PUBLIC_KEY = "app_public_key"
+        const val APP_CARD_PUBLIC_KEY = "Bearer app_public_key"
     }
 }
\ No newline at end of file
diff --git a/core/decompose/src/main/kotlin/com/tangem/core/decompose/model/ModelEntryPoint.kt b/core/decompose/src/main/kotlin/com/tangem/core/decompose/model/ModelEntryPoint.kt
index 329556fff3..1a8330193d 100644
--- a/core/decompose/src/main/kotlin/com/tangem/core/decompose/model/ModelEntryPoint.kt
+++ b/core/decompose/src/main/kotlin/com/tangem/core/decompose/model/ModelEntryPoint.kt
@@ -37,6 +37,7 @@ inline fun <reified M : Model> AppComponentContext.getOrCreateModel(): M = getOr
  * @param params The parameters to store in the [ParamsContainer],
 
  */
+@Suppress("NullableToStringCall")
 inline fun <reified M : Model, reified P : Any> AppComponentContext.getOrCreateModel(
     params: P?,
     messageSender: UiMessageSender? = null,
diff --git a/core/pagination/src/main/java/com/tangem/pagination/fetcher/CursorBatchFetcher.kt b/core/pagination/src/main/java/com/tangem/pagination/fetcher/CursorBatchFetcher.kt
new file mode 100644
index 0000000000..e41f84d55d
--- /dev/null
+++ b/core/pagination/src/main/java/com/tangem/pagination/fetcher/CursorBatchFetcher.kt
@@ -0,0 +1,92 @@
+package com.tangem.pagination.fetcher
+
+import com.tangem.pagination.BatchFetchResult
+import com.tangem.pagination.exception.EndOfPaginationException
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * First page: cursor = null
+ * Next pages: cursor = cursorFromItem(lastItemOfPreviousPage)
+ */
+class CursorBatchFetcher<TRequestParams : Any, TItem : Any>(
+    private val prefetchDistance: Int,
+    private val batchSize: Int,
+    private val subFetcher: SubFetcher<TRequestParams, TItem>,
+    private val cursorFromItem: (TItem) -> String,
+) : BatchFetcher<TRequestParams, List<TItem>> {
+
+    data class Request<TRequestParams>(
+        val limit: Int,
+        val cursor: String?,
+        val params: TRequestParams,
+    )
+
+    fun interface SubFetcher<TRequestParams : Any, TItem : Any> {
+        suspend fun fetch(
+            request: Request<TRequestParams>,
+            lastResult: BatchFetchResult<List<TItem>>?,
+            isFirstBatchFetching: Boolean,
+        ): BatchFetchResult<List<TItem>>
+    }
+
+    private val lastRequest = MutableStateFlow<Request<TRequestParams>?>(null)
+
+    override suspend fun fetchFirst(requestParams: TRequestParams): BatchFetchResult<List<TItem>> {
+        val request = Request(
+            cursor = null,
+            limit = prefetchDistance,
+            params = requestParams,
+        )
+
+        val result = runCatching {
+            subFetcher.fetch(request = request, lastResult = null, isFirstBatchFetching = true)
+        }.getOrElse {
+            currentCoroutineContext().ensureActive()
+            return BatchFetchResult.Error(it)
+        }
+
+        lastRequest.value = request
+        return result
+    }
+
+    override suspend fun fetchNext(
+        overrideRequestParams: TRequestParams?,
+        lastResult: BatchFetchResult<List<TItem>>,
+    ): BatchFetchResult<List<TItem>> {
+        val lastRequest = requireNotNull(lastRequest.value) { "fetchFirst() must be called before fetchNext()" }
+
+        if (lastResult is BatchFetchResult.Success && lastResult.last && overrideRequestParams == null) {
+            return BatchFetchResult.Error(EndOfPaginationException())
+        }
+
+        val nextReq: Request<TRequestParams> =
+            if (lastResult is BatchFetchResult.Success<List<TItem>>) {
+                val items = lastResult.data
+                if (items.isEmpty()) {
+                    return BatchFetchResult.Error(EndOfPaginationException())
+                }
+
+                val nextCursor = cursorFromItem(items.last())
+
+                Request(
+                    cursor = nextCursor,
+                    limit = batchSize,
+                    params = overrideRequestParams ?: lastRequest.params,
+                )
+            } else {
+                lastRequest.copy(limit = batchSize, params = overrideRequestParams ?: lastRequest.params)
+            }
+
+        val result = runCatching {
+            subFetcher.fetch(request = nextReq, lastResult = lastResult, isFirstBatchFetching = false)
+        }.getOrElse {
+            currentCoroutineContext().ensureActive()
+            return BatchFetchResult.Error(it)
+        }
+
+        this.lastRequest.value = nextReq
+        return result
+    }
+}
\ No newline at end of file
diff --git a/core/res/src/main/java/com/tangem/core/res/Resources.kt b/core/res/src/main/java/com/tangem/core/res/Resources.kt
index aea235e3ae..3964c5c093 100644
--- a/core/res/src/main/java/com/tangem/core/res/Resources.kt
+++ b/core/res/src/main/java/com/tangem/core/res/Resources.kt
@@ -25,11 +25,16 @@ fun Resources.getStringSafe(@StringRes id: Int): String {
  */
 fun Resources.getStringSafe(@StringRes id: Int, vararg formatArgs: Any): String {
     return runCatching { getString(id, *formatArgs) }
-        .recoverCatching {
+        .recoverCatching { throwable ->
             // If something goes wrong, returns the resource without arguments
             val string = getString(id)
 
-            reportIssue(it, resources = this, id, *formatArgs)
+            reportIssue(
+                throwable = throwable,
+                resources = this,
+                id = id,
+                formatArgs = formatArgs,
+            )
 
             string
         }
@@ -60,8 +65,13 @@ fun Resources.getPluralStringSafe(@PluralsRes id: Int, count: Int, vararg format
 }
 
 private fun Result<String>.getOrResourceName(resources: Resources, id: Int, vararg formatArgs: Any): String {
-    return getOrElse {
-        reportIssue(it, resources, id, formatArgs)
+    return getOrElse { throwable ->
+        reportIssue(
+            throwable = throwable,
+            resources = resources,
+            id = id,
+            formatArgs = formatArgs,
+        )
 
         // If something still goes wrong, returns the resource name
         resources.getResourceEntryName(id)
diff --git a/core/res/src/main/res/values-ja/strings.xml b/core/res/src/main/res/values-ja/strings.xml
index 97d1117305..4a69572db8 100644
--- a/core/res/src/main/res/values-ja/strings.xml
+++ b/core/res/src/main/res/values-ja/strings.xml
@@ -1688,7 +1688,6 @@
   <string name="yield_module_approve_sheet_title">承認を確定する</string>
   <string name="yield_module_balance_info_sheet_subtitle">資産残高に関するテキスト [プレースホルダー]</string>
   <string name="yield_module_balance_info_sheet_title">あなたの%sはAaveに預けられています</string>
-  <string name="yield_module_chart_loading_error">チャートを読み込めません・・</string>
   <string name="yield_module_deposit_error_notification_title">受け取った金額%1$s %2$sはAaveに入金されませんでした。</string>
   <string name="yield_module_earn_badge">%1$s%% を獲得</string>
   <string name="yield_module_earn_sheet_available_title">利用可能</string>
@@ -1706,7 +1705,6 @@
   <string name="yield_module_fee_policy_sheet_max_fee_title">最大手数料</string>
   <string name="yield_module_fee_policy_sheet_title">手数料ポリシー</string>
   <string name="yield_module_high_fee_error">ネットワーク手数料が現在高すぎます。設定した上限を下回るまで待機しています。</string>
-  <string name="yield_module_historical_returns">過去のリターン</string>
   <string name="yield_module_main_view_approve_notification_description">ここに説明を入力してください。1〜3行が理想的です。[プレースホルダー]</string>
   <string name="yield_module_main_view_approve_notification_title">トークン承認が必要</string>
   <string name="yield_module_network_fee_unreachable_notification_description">ネットワーク接続を確認してください</string>
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
index a6650d1da4..50216b2d4c 100644
--- a/core/res/src/main/res/values/strings.xml
+++ b/core/res/src/main/res/values/strings.xml
@@ -1780,7 +1780,6 @@
   <string name="yield_module_earn_sheet_total_earnings_title">Total earnings</string>
   <string name="yield_module_earn_sheet_transfers_title">Transfers to Aave</string>
   <string name="yield_module_explore_sheet_explore_aave_button_title">Explore Aave</string>
-  <string name="yield_module_explore_sheet_title">Your %s is deposited in Aave </string>
   <string name="yield_module_fee_policy_sheet_current_fee_note">This is the current supply fee on %s. The live cost will be shown on the Receive Screen.</string>
   <string name="yield_module_fee_policy_sheet_current_fee_title">Current fee</string>
   <string name="yield_module_fee_policy_sheet_description">All future %s top-ups will be supplied to Aave automatically, with the transaction fee deducted.</string>
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/BottomFade.kt b/core/ui/src/main/java/com/tangem/core/ui/components/BottomFade.kt
index fbb4ae896b..25342ebfdc 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/BottomFade.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/BottomFade.kt
@@ -7,6 +7,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.res.TangemTheme
 
 /**
@@ -30,4 +32,30 @@ fun BottomFade(modifier: Modifier = Modifier, backgroundColor: Color = TangemThe
                 ),
             ),
     )
+}
+
+/**
+ * A composable that draws a fade effect. Used on screens with a list of repeating
+ * elements and floating button at the bottom of the screen.
+ */
+@Composable
+fun Fade(
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = TangemTheme.colors.background.secondary,
+    height: Dp = 40.dp,
+) {
+    Box(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(height)
+            .background(
+                brush = Brush.verticalGradient(
+                    endY = 100f,
+                    colors = listOf(
+                        Color.Transparent,
+                        backgroundColor,
+                    ),
+                ),
+            ),
+    )
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
index 27c758f8b7..c5807f7912 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
@@ -68,9 +68,9 @@ fun CardWithIcon(
 internal fun IconWithTitleAndDescription(
     title: String,
     description: String?,
+    iconBackground: Color = TangemTheme.colors.background.secondary,
     icon: @Composable () -> Unit,
     additionalContent: @Composable () -> Unit = {},
-    iconBackground: Color = TangemTheme.colors.background.secondary,
 ) {
     Row(
         modifier = Modifier
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/DialogFullScreen.kt b/core/ui/src/main/java/com/tangem/core/ui/components/DialogFullScreen.kt
new file mode 100644
index 0000000000..6f70db0ba1
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/DialogFullScreen.kt
@@ -0,0 +1,94 @@
+package com.tangem.core.ui.components
+
+import android.app.Activity
+import android.content.Context
+import android.content.ContextWrapper
+import android.os.Build
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.window.DialogWindowProvider
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.tangem.core.ui.res.LocalIsInDarkTheme
+
+@Composable
+fun DialogFullScreen(
+    onDismissRequest: () -> Unit,
+    properties: DialogProperties = DialogProperties(),
+    content: @Composable () -> Unit,
+) {
+    Dialog(
+        onDismissRequest = onDismissRequest,
+        properties = DialogProperties(
+            dismissOnBackPress = properties.dismissOnBackPress,
+            dismissOnClickOutside = properties.dismissOnClickOutside,
+            securePolicy = properties.securePolicy,
+            usePlatformDefaultWidth = true, // must be true as a part of work around
+            decorFitsSystemWindows = false,
+        ),
+        content = {
+            val activityWindow = getActivityWindow()
+            val dialogWindow = getDialogWindow()
+            val parentView = LocalView.current.parent as View
+            SideEffect {
+                if (activityWindow != null && dialogWindow != null) {
+                    val attributes = WindowManager.LayoutParams().apply {
+                        copyFrom(activityWindow.attributes)
+                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+                            softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+                        } else {
+                            flags = WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+                        }
+                        type = dialogWindow.attributes.type
+                    }
+
+                    dialogWindow.attributes = attributes
+                    parentView.layoutParams =
+                        FrameLayout.LayoutParams(
+                            activityWindow.decorView.width,
+                            activityWindow.decorView.height,
+                        )
+                }
+            }
+
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+                val systemUiController = rememberSystemUiController(getActivityWindow())
+                val dialogSystemUiController = rememberSystemUiController(getDialogWindow())
+
+                SideEffect {
+                    systemUiController.setSystemBarsColor(color = Color.Transparent)
+                    dialogSystemUiController.setSystemBarsColor(color = Color.Transparent)
+                }
+            }
+
+            SystemBarsIconsDisposable(darkIcons = LocalIsInDarkTheme.current.not())
+
+            Surface(modifier = Modifier.fillMaxSize(), color = Color.Transparent) {
+                content()
+            }
+        },
+    )
+}
+
+// Window utils
+@Composable
+private fun getDialogWindow(): Window? = (LocalView.current.parent as? DialogWindowProvider)?.window
+
+@Composable
+private fun getActivityWindow(): Window? = LocalView.current.context.getActivityWindow()
+
+private tailrec fun Context.getActivityWindow(): Window? = when (this) {
+    is Activity -> window
+    is ContextWrapper -> baseContext.getActivityWindow()
+    else -> null
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
index b8955c8b80..f9baae94a7 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Dialogs.kt
@@ -178,14 +178,14 @@ fun SelectorDialog(
  * Dialog button params
  *
  * @param title Button text. If not provided default values will be used
- * @param warning If true then button text will be in theme warning color
- * @param enabled If false button will be disabled
+ * @param isWarning If true then button text will be in theme warning color
+ * @param isEnabled If false button will be disabled
  * @param onClick Button click callback
  */
 data class DialogButtonUM(
     val title: String? = null,
-    val warning: Boolean = false,
-    val enabled: Boolean = true,
+    val isWarning: Boolean = false,
+    val isEnabled: Boolean = true,
     val onClick: () -> Unit,
 )
 
@@ -196,7 +196,7 @@ data class AdditionalTextInputDialogUM(
     val label: String? = null,
     val placeholder: String? = null,
     val caption: String? = null,
-    val enabled: Boolean = true,
+    val isEnabled: Boolean = true,
     val isError: Boolean = false,
     val errorText: String? = null,
 )
@@ -276,7 +276,7 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
                     onValueChange = type.onValueChange,
                     isError = type.params.isError,
                     errorText = type.params.errorText,
-                    isEnabled = type.params.enabled,
+                    isEnabled = type.params.isEnabled,
                     placeholder = type.params.placeholder,
                 )
             }
@@ -289,7 +289,7 @@ private fun DialogContent(type: DialogType, modifier: Modifier = Modifier) {
                     label = type.params.label,
                     placeholder = type.params.placeholder,
                     caption = type.params.caption,
-                    enabled = type.params.enabled,
+                    enabled = type.params.isEnabled,
                     isError = type.params.isError,
                     onValueChange = { newValue ->
                         type.onValueChange(newValue)
@@ -324,15 +324,15 @@ private fun DialogButtons(
         if (dismissButton != null) {
             DialogButton(
                 text = dismissButton.title ?: stringResourceSafe(id = R.string.common_cancel),
-                warning = dismissButton.warning,
-                enabled = dismissButton.enabled,
+                warning = dismissButton.isWarning,
+                enabled = dismissButton.isEnabled,
                 onClick = dismissButton.onClick,
             )
         }
         DialogButton(
             text = confirmButton.title ?: stringResourceSafe(id = R.string.common_ok),
-            warning = confirmButton.warning,
-            enabled = confirmButton.enabled,
+            warning = confirmButton.isWarning,
+            enabled = confirmButton.isEnabled,
             onClick = confirmButton.onClick,
         )
     }
@@ -487,7 +487,7 @@ private fun WarningBasicDialogSample(modifier: Modifier = Modifier) {
             message = "All protected passwords will be deleted from the secure storage, you must enter the wallet " +
                 "password to work with the app",
             title = "Attention",
-            confirmButton = DialogButtonUM(warning = true) {},
+            confirmButton = DialogButtonUM(isWarning = true) {},
             dismissButton = DialogButtonUM {},
             onDismissDialog = {},
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/FadeModifier.kt b/core/ui/src/main/java/com/tangem/core/ui/components/FadeModifier.kt
index 03d9ba11c0..50eaa752d7 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/FadeModifier.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/FadeModifier.kt
@@ -29,10 +29,10 @@ fun Modifier.edgeFade(
     require(value = size > 0.dp) {
         "Size must be greater than '0'"
     }
-    val animatedSize = animationSpec?.let {
+    val animatedSize = animationSpec?.let { spec ->
         animateDpAsState(
             targetValue = if (isVisible) size else 0.dp,
-            animationSpec = it,
+            animationSpec = spec,
             label = "Edge fade width",
         )
     }
@@ -75,7 +75,7 @@ fun Modifier.bottomFade(
 )
 
 enum class FadePosition {
-    TOP, BOTTOM, LEFT, RIGHT;
+    TOP, BOTTOM, LEFT, RIGHT
 }
 
 @Stable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Flicker.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Flicker.kt
index 8ed1c1cbaf..c16743c928 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Flicker.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Flicker.kt
@@ -29,22 +29,22 @@ fun Modifier.flicker(
     targetTextAlpha: Float = 0.4f,
     animationDurationMillis: Int = 1500,
 ): Modifier = composed {
-    var alphaChange by remember { mutableStateOf(false) }
+    var shouldAlphaChange by remember { mutableStateOf(false) }
 
     val alpha: Float by animateFloatAsState(
-        targetValue = if (alphaChange) targetTextAlpha else 1f,
+        targetValue = if (shouldAlphaChange) targetTextAlpha else 1f,
         animationSpec = tween(
             durationMillis = animationDurationMillis,
             easing = CubicBezierEasing(a = 0.45f, b = 0.0f, c = 0.55f, d = 1.0f),
         ),
         finishedListener = {
-            alphaChange = it == 1f && isFlickering
+            shouldAlphaChange = it == 1f && isFlickering
         },
     )
 
     LaunchedEffect(isFlickering) {
         if (isFlickering) {
-            alphaChange = true
+            shouldAlphaChange = true
         }
     }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt b/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt
index fff3c42836..480c909897 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/FullScreen.kt
@@ -33,7 +33,7 @@ fun FullScreen(
 
     val fullScreenLayout = remember {
         FullScreenLayout(
-            notTouchable = notTouchable,
+            isNotTouchable = notTouchable,
             focusable = focusable,
             composeView = view,
             onBackClick = onBackClick,
@@ -53,7 +53,7 @@ fun FullScreen(
 
 @SuppressLint("ViewConstructor", "ClickableViewAccessibility")
 private class FullScreenLayout(
-    private val notTouchable: Boolean,
+    private val isNotTouchable: Boolean,
     private val focusable: Boolean,
     private val composeView: View,
     private val onBackClick: () -> Unit,
@@ -68,10 +68,10 @@ private class FullScreenLayout(
     override var shouldCreateCompositionOnAttachedToWindow: Boolean = false
         private set
 
-    private var viewShowing = false
+    private var isViewShowing = false
 
     init {
-        if (notTouchable) {
+        if (isNotTouchable) {
             setOnTouchListener { _, _ -> false }
         }
 
@@ -110,19 +110,19 @@ private class FullScreenLayout(
     }
 
     fun show() {
-        if (viewShowing) dismiss()
+        if (isViewShowing) dismiss()
         windowManager.addView(this, params)
 
         if (focusable.not()) {
             params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
         }
 
-        if (notTouchable) {
+        if (isNotTouchable) {
             params.flags = params.flags or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
         }
 
         windowManager.updateViewLayout(this, params)
-        viewShowing = true
+        isViewShowing = true
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -139,10 +139,10 @@ private class FullScreenLayout(
     }
 
     fun dismiss() {
-        if (!viewShowing) return
+        if (!isViewShowing) return
         disposeComposition()
         windowManager.removeViewImmediate(this)
-        viewShowing = false
+        isViewShowing = false
     }
 
     fun dispose() {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
index 74029fd218..f0755a270b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Keyboard.kt
@@ -38,12 +38,12 @@ fun keyboardAsState(): State<Keyboard> {
     val keyboardState = remember { mutableStateOf(keyboardStateInternal) }
 
     LaunchedEffect(keyboardStateInternal) {
-        val falsePositive = Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q &&
+        val isFalsePositive = Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q &&
             keyboardStateInternal is Keyboard.Opened &&
             keyboardStateInternal.height < 50.dp
         // FIX android <=10 devices can randomly send ime paddings,
         // which leads to a false positive keyboard opening ([REDACTED_TASK_KEY])
-        if (falsePositive) return@LaunchedEffect
+        if (isFalsePositive) return@LaunchedEffect
 
         keyboardState.value = keyboardStateInternal
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
index f5d84c141b..8fc62476fd 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ResizableText.kt
@@ -45,8 +45,8 @@ fun ResizableText(
         overflow = overflow,
         softWrap = false,
         maxLines = maxLines,
-        onTextLayout = {
-            if (it.hasVisualOverflow) {
+        onTextLayout = { textLayoutResult ->
+            if (textLayoutResult.hasVisualOverflow) {
                 val nextFontSizeValue = fontSizeValue.floatValue - fontSizeRange.step.value
                 if (nextFontSizeValue <= fontSizeRange.min.value) {
                     fontSizeValue.floatValue = fontSizeRange.min.value
@@ -84,12 +84,12 @@ fun ResizableText(
     reduceFactor: Double = 0.9,
 ) {
     var fontSize by remember { mutableStateOf(style.fontSize) }
-    var readyToDraw by remember { mutableStateOf(value = false) }
+    var isReadyToDraw by remember { mutableStateOf(value = false) }
 
     Text(
         modifier = modifier
             .drawWithContent {
-                if (readyToDraw) drawContent()
+                if (isReadyToDraw) drawContent()
             }
             .wrapContentHeight(),
         text = text,
@@ -106,7 +106,7 @@ fun ResizableText(
 
                 if (minFontSize != TextUnit.Unspecified && reducedFontSize <= minFontSize) {
                     fontSize = minFontSize
-                    readyToDraw = true
+                    isReadyToDraw = true
                 } else {
                     fontSize = reducedFontSize
                 }
@@ -115,7 +115,7 @@ fun ResizableText(
             if (result.hasVisualOverflow) {
                 reduceFontSize()
             } else {
-                readyToDraw = true
+                isReadyToDraw = true
             }
         },
     )
@@ -150,8 +150,8 @@ fun ResizableText(
         overflow = overflow,
         softWrap = false,
         maxLines = maxLines,
-        onTextLayout = {
-            if (it.hasVisualOverflow) {
+        onTextLayout = { result ->
+            if (result.hasVisualOverflow) {
                 val nextFontSizeValue = fontSizeValue.value - fontSizeRange.step.value
                 if (nextFontSizeValue <= fontSizeRange.min.value) {
                     onFontSizeChange(fontSizeRange.min.value)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/SettingsRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/SettingsRow.kt
index b49c5737ad..f3bfb8028b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/SettingsRow.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/SettingsRow.kt
@@ -66,7 +66,7 @@ fun SimpleSettingsRow(
                 visible = !subtitle.isNullOrEmpty(),
             ) {
                 Text(
-                    text = subtitle ?: "",
+                    text = subtitle.orEmpty(),
                     style = TangemTheme.typography.body2,
                     color = rowColors.subtitleColor(enabled = enabled).value,
                 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
index e613aa253a..7b9220c9ad 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Shimmers.kt
@@ -169,17 +169,17 @@ private val TangemShimmerColors: List<Color>
 
         return buildList {
             if (isInDarkTheme) {
-                TangemColorPalette.Dark3.let(::add)
-                TangemColorPalette.Dark4.let(::add)
-                TangemColorPalette.Dark6.let(::add)
-                TangemColorPalette.Dark4.let(::add)
-                TangemColorPalette.Dark3.let(::add)
+                add(TangemColorPalette.Dark3)
+                add(TangemColorPalette.Dark4)
+                add(TangemColorPalette.Dark6)
+                add(TangemColorPalette.Dark4)
+                add(TangemColorPalette.Dark3)
             } else {
-                TangemColorPalette.Light2.let(::add)
-                TangemColorPalette.Light1.let(::add)
-                TangemColorPalette.White.let(::add)
-                TangemColorPalette.Light1.let(::add)
-                TangemColorPalette.Light2.let(::add)
+                add(TangemColorPalette.Light2)
+                add(TangemColorPalette.Light1)
+                add(TangemColorPalette.White)
+                add(TangemColorPalette.Light1)
+                add(TangemColorPalette.Light2)
             }
         }
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
index 2c8c37e80b..9479ec1992 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -148,8 +148,8 @@ private fun TangemTextField(
                         text = label,
                         style = TangemTheme.typography.caption2,
                         color = colors.labelColor(
-                            enabled = enabled,
-                            error = isError,
+                            isEnabled = enabled,
+                            isError = isError,
                             interactionSource = interactionSource,
                         ).value,
                     )
@@ -174,7 +174,7 @@ private fun TangemTextField(
                         null
                     },
                 )
-                if (iconRes != null) {
+                iconRes?.let { resId ->
                     IconButton(
                         modifier = Modifier.size(32.dp),
                         onClick = onClear,
@@ -182,7 +182,7 @@ private fun TangemTextField(
                     ) {
                         Icon(
                             modifier = Modifier.size(24.dp),
-                            painter = painterResource(id = iconRes!!),
+                            painter = painterResource(id = resId),
                             tint = colors.trailingIconColor(enabled = enabled, isError = isError).value,
                             contentDescription = "Clear input",
                         )
@@ -259,8 +259,8 @@ private fun TangemTextFieldWithIcon(
                         text = label,
                         style = TangemTheme.typography.caption2,
                         color = colors.labelColor(
-                            enabled = enabled,
-                            error = isError,
+                            isEnabled = enabled,
+                            isError = isError,
                             interactionSource = interactionSource,
                         ).value,
                     )
@@ -399,19 +399,19 @@ fun TextFieldColors.trailingIconColor(enabled: Boolean, isError: Boolean): State
 
 @Composable
 fun TextFieldColors.indicatorColor(
-    enabled: Boolean,
+    isEnabled: Boolean,
     isError: Boolean,
     interactionSource: InteractionSource,
 ): State<Color> {
-    val focused by interactionSource.collectIsFocusedAsState()
+    val isFocused by interactionSource.collectIsFocusedAsState()
 
     val targetValue = when {
-        !enabled -> disabledIndicatorColor
+        !isEnabled -> disabledIndicatorColor
         isError -> errorIndicatorColor
-        focused -> focusedIndicatorColor
+        isFocused -> focusedIndicatorColor
         else -> unfocusedIndicatorColor
     }
-    return if (enabled) {
+    return if (isEnabled) {
         animateColorAsState(
             targetValue = targetValue,
             animationSpec = tween(durationMillis = 120),
@@ -428,13 +428,17 @@ fun TextFieldColors.placeholderColor(enabled: Boolean): State<Color> {
 }
 
 @Composable
-fun TextFieldColors.labelColor(enabled: Boolean, error: Boolean, interactionSource: InteractionSource): State<Color> {
-    val focused by interactionSource.collectIsFocusedAsState()
+fun TextFieldColors.labelColor(
+    isEnabled: Boolean,
+    isError: Boolean,
+    interactionSource: InteractionSource,
+): State<Color> {
+    val isFocused by interactionSource.collectIsFocusedAsState()
 
     val targetValue = when {
-        !enabled -> disabledLabelColor
-        error -> errorLabelColor
-        focused -> focusedLabelColor
+        !isEnabled -> disabledLabelColor
+        isError -> errorLabelColor
+        isFocused -> focusedLabelColor
         else -> unfocusedLabelColor
     }
     return rememberUpdatedState(targetValue)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
index b9c76c147c..f6f4dd18c0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithSearch.kt
@@ -146,7 +146,7 @@ private fun SubtitleView(subtitle: String, icon: Painter?) {
         horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        icon?.let {
+        icon?.let { icon ->
             Image(
                 painter = icon,
                 contentDescription = null,
@@ -202,9 +202,9 @@ private fun ExpandedSearchView(
         }
         TextField(
             value = textFieldValue,
-            onValueChange = {
-                textFieldValue = it
-                onSearchChange(it.text)
+            onValueChange = { value ->
+                textFieldValue = value
+                onSearchChange(value.text)
             },
             singleLine = true,
             modifier = Modifier
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/TopAppBarButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/TopAppBarButton.kt
index 467b3ee036..e95fb67f45 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/TopAppBarButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/TopAppBarButton.kt
@@ -21,7 +21,7 @@ fun TopAppBarButton(button: TopAppBarButtonUM, tint: Color, modifier: Modifier =
     when (button) {
         is TopAppBarButtonUM.Icon -> {
             IconButton(
-                enabled = button.enabled,
+                enabled = button.isEnabled,
                 modifier = modifier.size(TangemTheme.dimens.size32),
                 onClick = button.onClicked,
             ) {
@@ -36,7 +36,7 @@ fun TopAppBarButton(button: TopAppBarButtonUM, tint: Color, modifier: Modifier =
         is TopAppBarButtonUM.Text -> {
             Text(
                 modifier = modifier
-                    .conditional(button.enabled) {
+                    .conditional(button.isEnabled) {
                         clickable { button.onClicked() }
                     }
                     .padding(4.dp),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/TopAppBarButtonUM.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/TopAppBarButtonUM.kt
index 3d1549e138..069df6bbca 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/TopAppBarButtonUM.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/TopAppBarButtonUM.kt
@@ -6,20 +6,20 @@ import com.tangem.core.ui.extensions.TextReference
 
 sealed class TopAppBarButtonUM(
     open val onClicked: () -> Unit,
-    open val enabled: Boolean = true,
+    open val isEnabled: Boolean = true,
 ) {
 
     data class Icon(
         @DrawableRes val iconRes: Int,
         override val onClicked: () -> Unit,
-        override val enabled: Boolean = true,
-    ) : TopAppBarButtonUM(onClicked, enabled)
+        override val isEnabled: Boolean = true,
+    ) : TopAppBarButtonUM(onClicked, isEnabled)
 
     data class Text(
         val text: TextReference,
         override val onClicked: () -> Unit,
-        override val enabled: Boolean = true,
-    ) : TopAppBarButtonUM(onClicked, enabled)
+        override val isEnabled: Boolean = true,
+    ) : TopAppBarButtonUM(onClicked, isEnabled)
 
     @Suppress("FunctionName")
     companion object {
@@ -29,19 +29,19 @@ sealed class TopAppBarButtonUM(
         fun Back(enabled: Boolean = true, onBackClicked: () -> Unit) = Icon(
             iconRes = R.drawable.ic_back_24,
             onClicked = onBackClicked,
-            enabled = enabled,
+            isEnabled = enabled,
         )
 
         fun Close(enabled: Boolean = true, onCloseClick: () -> Unit) = Icon(
             iconRes = R.drawable.ic_close_24,
             onClicked = onCloseClick,
-            enabled = enabled,
+            isEnabled = enabled,
         )
 
         fun Text(text: TextReference, onTextClicked: () -> Unit, enabled: Boolean = true) = Text(
             text = text,
             onClicked = onTextClicked,
-            enabled = enabled,
+            isEnabled = enabled,
         )
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlock.kt b/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlock.kt
index e5c28bf0a6..e42d2ad4fc 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlock.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlock.kt
@@ -169,12 +169,12 @@ private fun Preview_Tree() {
             },
             content = {
                 ArrowRowItems(
-                    itemPadding = PaddingValues(vertical = TangemTheme.dimens.spacing4),
                     items = persistentListOf(
                         stringReference("Fist item"),
                         stringReference("Second item"),
                         stringReference("Third item"),
                     ),
+                    itemPadding = PaddingValues(vertical = TangemTheme.dimens.spacing4),
                     rootContent = {
                         PreviewItem(stringReference("Root"))
                     },
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlockContent.kt b/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlockContent.kt
index 423100d2e9..a39c6b7783 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlockContent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/block/information/InformationBlockContent.kt
@@ -16,11 +16,11 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 inline fun <T : Any> InformationBlockContentScope.ListItems(
     items: ImmutableList<T>,
-    itemContent: @Composable BoxScope.(T) -> Unit,
     modifier: Modifier = Modifier,
     itemPadding: PaddingValues = PaddingValues(all = TangemTheme.dimens.spacing0),
     horizontalAlignment: Alignment.Horizontal = Alignment.CenterHorizontally,
     verticalArragement: Arrangement.Vertical = Arrangement.Top,
+    itemContent: @Composable BoxScope.(T) -> Unit,
 ) {
     Column(
         modifier = modifier.fillMaxWidth(),
@@ -42,10 +42,10 @@ inline fun <T : Any> InformationBlockContentScope.ListItems(
 @Composable
 inline fun <T : Any> InformationBlockContentScope.GridItems(
     items: ImmutableList<T>,
-    itemContent: @Composable BoxScope.(T) -> Unit,
     modifier: Modifier = Modifier,
     verticalAlignment: Alignment.Vertical = Alignment.Top,
     horizontalArragement: Arrangement.Horizontal = Arrangement.Start,
+    itemContent: @Composable BoxScope.(T) -> Unit,
 ) {
     val rowItems by remember(items) {
         derivedStateOf {
@@ -81,10 +81,10 @@ inline fun <T : Any> InformationBlockContentScope.GridItems(
 @Composable
 inline fun <T : Any> InformationBlockContentScope.ArrowRowItems(
     items: ImmutableList<T>,
-    rootContent: @Composable BoxScope.() -> Unit,
-    itemContent: @Composable BoxScope.(T) -> Unit,
     modifier: Modifier = Modifier,
     itemPadding: PaddingValues = PaddingValues(all = TangemTheme.dimens.spacing0),
+    rootContent: @Composable BoxScope.() -> Unit,
+    itemContent: @Composable BoxScope.(T) -> Unit,
 ) {
     Column(
         modifier = modifier.fillMaxWidth(),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/internal/ModalBottomSheetWithBackHandling.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/internal/ModalBottomSheetWithBackHandling.kt
index b4df773674..95ce4090db 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/internal/ModalBottomSheetWithBackHandling.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/internal/ModalBottomSheetWithBackHandling.kt
@@ -50,8 +50,11 @@ fun ModalBottomSheetWithBackHandling(
         modifier = modifier
             .focusRequester(requester)
             .focusable()
-            .onPreviewKeyEvent {
-                if (it.key == Key.Back && it.type == KeyEventType.KeyUp && !it.nativeKeyEvent.isCanceled) {
+            .onPreviewKeyEvent { keyEvent ->
+                if (keyEvent.key == Key.Back &&
+                    keyEvent.type == KeyEventType.KeyUp &&
+                    !keyEvent.nativeKeyEvent.isCanceled
+                ) {
                     backPressedDispatcherOwner?.onBackPressedDispatcher?.onBackPressed()
                     return@onPreviewKeyEvent true
                 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt
index 9ecae2ab38..7fd0a2bcb0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt
@@ -84,7 +84,7 @@ internal fun Content(model: MessageBottomSheetUM, modifier: Modifier = Modifier)
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     text = model.primaryAction.text.resolveReference(),
-                    enabled = model.primaryAction.enabled,
+                    enabled = model.primaryAction.isEnabled,
                     onClick = model.primaryAction.onClick,
                 )
             }
@@ -93,7 +93,7 @@ internal fun Content(model: MessageBottomSheetUM, modifier: Modifier = Modifier)
                 SecondaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     text = model.secondaryAction.text.resolveReference(),
-                    enabled = model.secondaryAction.enabled,
+                    enabled = model.secondaryAction.isEnabled,
                     onClick = model.secondaryAction.onClick,
                 )
             }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUM.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUM.kt
index 88a40bd846..c07d11f22a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUM.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetUM.kt
@@ -14,7 +14,7 @@ data class MessageBottomSheetUM(
 
     data class ActionUM(
         val text: TextReference,
-        val enabled: Boolean = true,
+        val isEnabled: Boolean = true,
         val onClick: () -> Unit,
     )
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
index bdb7f5f705..f31c547290 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheetV2.kt
@@ -64,8 +64,8 @@ fun MessageBottomSheetV2(state: MessageBottomSheetUMV2, onDismissRequest: () ->
 @Composable
 fun MessageBottomSheetV2Content(state: MessageBottomSheetUMV2, modifier: Modifier = Modifier) {
     Column(modifier = modifier) {
-        state.elements.fastForEach {
-            when (it) {
+        state.elements.fastForEach { element ->
+            when (element) {
                 is MessageBottomSheetUMV2.InfoBlock -> {
                     ContentContainer(
                         modifier = Modifier
@@ -73,7 +73,7 @@ fun MessageBottomSheetV2Content(state: MessageBottomSheetUMV2, modifier: Modifie
                             .fillMaxWidth()
                             .padding(horizontal = TangemTheme.dimens.spacing16)
                             .padding(bottom = 32.dp),
-                        state = it,
+                        state = element,
                     )
                 }
                 else -> Unit
@@ -94,32 +94,32 @@ private fun ContentContainer(state: MessageBottomSheetUMV2.InfoBlock, modifier:
         state.icon?.let {
             BottomSheetIcon(it)
         }
-        state.title?.let {
+        state.title?.let { title ->
             Text(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = TangemTheme.dimens.spacing24),
-                text = it.resolveReference(),
+                text = title.resolveReference(),
                 style = TangemTheme.typography.h3,
                 color = TangemTheme.colors.text.primary1,
                 textAlign = TextAlign.Center,
             )
         }
-        state.body?.let {
+        state.body?.let { body ->
             Text(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(top = TangemTheme.dimens.spacing8),
-                text = it.resolveReference(),
+                text = body.resolveReference(),
                 style = TangemTheme.typography.body2,
                 color = TangemTheme.colors.text.secondary,
                 textAlign = TextAlign.Center,
             )
         }
-        state.chip?.let {
+        state.chip?.let { chip ->
             BottomSheetChip(
                 modifier = Modifier.padding(top = TangemTheme.dimens.spacing16),
-                chip = it,
+                chip = chip,
             )
         }
     }
@@ -193,16 +193,16 @@ private fun ButtonsContainer(
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
     ) {
         buttons.fastForEach { button ->
-            val icon = button.icon?.let {
+            val icon = button.icon?.let { iconResId ->
                 when (button.iconOrder) {
-                    IconOrder.Start -> TangemButtonIconPosition.Start(it)
-                    IconOrder.End -> TangemButtonIconPosition.End(it)
+                    IconOrder.Start -> TangemButtonIconPosition.Start(iconResId)
+                    IconOrder.End -> TangemButtonIconPosition.End(iconResId)
                 }
             } ?: TangemButtonIconPosition.None
 
             TangemButton(
                 modifier = Modifier.fillMaxWidth(),
-                text = button.text?.resolveReference() ?: "",
+                text = button.text?.resolveReference().orEmpty(),
                 icon = icon,
                 onClick = { button.onClick?.invoke(closeScope) },
                 colors = if (button.isPrimary) {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt
index 196a5f2012..2d29c50afc 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt
@@ -48,10 +48,10 @@ const val MODAL_SHEET_MAX_HEIGHT = 0.8f
 inline fun <reified T : TangemBottomSheetConfigContent> TangemModalBottomSheet(
     config: TangemBottomSheetConfig,
     containerColor: Color = TangemTheme.colors.background.primary,
+    noinline onBack: (() -> Unit)? = null,
     skipPartiallyExpanded: Boolean = true,
     dismissOnClickOutside: Boolean = true,
     scrollableContent: Boolean = true,
-    noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable BoxScope.(T) -> Unit = {},
     crossinline content: @Composable ColumnScope.(T) -> Unit,
 ) {
@@ -95,9 +95,10 @@ inline fun <reified T : TangemBottomSheetConfigContent> DefaultModalBottomSheet(
     var isVisible by remember { mutableStateOf(value = config.isShown) }
     val sheetState = rememberModalBottomSheetState(
         skipPartiallyExpanded = skipPartiallyExpanded,
-        confirmValueChange = {
+        confirmValueChange = { sheetValue ->
             if (!dismissOnClickOutside) {
-                it != SheetValue.Hidden // Ignore transitions to hidden (prevents dismiss on outside click/back press)
+                // Ignore transitions to hidden (prevents dismiss on outside click/back press)
+                sheetValue != SheetValue.Hidden
             } else {
                 true
             }
@@ -202,9 +203,9 @@ inline fun <reified T : TangemBottomSheetConfigContent> BsContent(
 inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheet(
     config: TangemBottomSheetConfig,
     sheetState: SheetState,
+    modifier: Modifier = Modifier,
     noinline onBack: (() -> Unit)? = null,
     noinline bsContent: @Composable ColumnScope.() -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     if (onBack != null) {
         ModalBottomSheetWithBackHandling(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetTitle.kt
index c4f1b6ed48..972fe1ae4b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetTitle.kt
@@ -21,7 +21,7 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.test.WalletConnectDetailsBottomSheetTestTags
+import com.tangem.core.ui.test.BaseBottomSheetTestTags
 
 /**
  * Title component for [TangemModalBottomSheet] with [TangemIconButton] for buttons.
@@ -58,7 +58,7 @@ fun TangemModalBottomSheetTitle(
                     color = TangemTheme.colors.text.primary1,
                     modifier = Modifier
                         .align(Alignment.CenterHorizontally)
-                        .testTag(WalletConnectDetailsBottomSheetTestTags.TITLE),
+                        .testTag(BaseBottomSheetTestTags.TITLE),
                 )
             }
             if (subtitle != null) {
@@ -68,7 +68,7 @@ fun TangemModalBottomSheetTitle(
                     color = TangemTheme.colors.text.tertiary,
                     modifier = Modifier
                         .align(Alignment.CenterHorizontally)
-                        .testTag(WalletConnectDetailsBottomSheetTestTags.DATE),
+                        .testTag(BaseBottomSheetTestTags.SUBTITLE),
                 )
             }
         }
@@ -79,7 +79,7 @@ fun TangemModalBottomSheetTitle(
                 modifier = Modifier
                     .padding(16.dp)
                     .align(Alignment.CenterEnd)
-                    .testTag(WalletConnectDetailsBottomSheetTestTags.CLOSE_BUTTON),
+                    .testTag(BaseBottomSheetTestTags.CLOSE_BUTTON),
             )
         }
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
index 3826cc503f..6506a16d14 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
@@ -143,11 +143,11 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheetWit
     config: TangemBottomSheetConfig,
     sheetState: SheetState,
     containerColor: Color,
+    modifier: Modifier = Modifier,
     noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable BoxScope.(T) -> Unit,
     crossinline content: @Composable (T) -> Unit,
     noinline footer: @Composable (BoxScope.(T) -> Unit)?,
-    modifier: Modifier = Modifier,
 ) {
     val model = config.content as? T ?: return
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt
index 1ecce16ab7..0a9f35bb67 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt
@@ -152,10 +152,10 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicBottomSheet(
     sheetState: SheetState,
     containerColor: Color,
     addBottomInsets: Boolean,
+    modifier: Modifier = Modifier,
     noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable (BoxScope.(T) -> Unit),
     crossinline content: @Composable (ColumnScope.(T) -> Unit),
-    modifier: Modifier = Modifier,
 ) {
     val model = config.content as? T ?: return
 
@@ -163,11 +163,11 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicBottomSheet(
 
     val bsContent: @Composable ColumnScope.() -> Unit = {
         Column(
-            modifier = Modifier.let {
+            modifier = Modifier.let { modifier ->
                 if (addBottomInsets) {
-                    it.padding(bottom = bottomBarHeight)
+                    modifier.padding(bottom = bottomBarHeight)
                 } else {
-                    it
+                    modifier
                 }
             },
         ) {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
index 8f5326a498..fb3874c760 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/HorizontalActionChips.kt
@@ -22,7 +22,7 @@ import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.test.TokenDetailsScreenTestTags
+import com.tangem.core.ui.test.BaseActionButtonsBlockTestTags
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -36,7 +36,7 @@ fun HorizontalActionChips(
     LazyRow(
         modifier = modifier
             .fillMaxWidth()
-            .testTag(TokenDetailsScreenTestTags.HORIZONTAL_ACTION_CHIPS),
+            .testTag(BaseActionButtonsBlockTestTags.HORIZONTAL_ACTION_CHIPS),
         horizontalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing8),
         verticalAlignment = Alignment.CenterVertically,
         contentPadding = contentPadding,
@@ -77,7 +77,7 @@ private class ActionButtonConfigProvider : CollectionPreviewParameterProvider<Ho
                     text = TextReference.Str(value = "Exchange"),
                     iconResId = R.drawable.ic_exchange_vertical_24,
                     onClick = {},
-                    showBadge = true,
+                    shouldShowBadge = true,
                 ),
                 ActionButtonConfig(
                     text = TextReference.Str(value = "Send"),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/SmallButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/SmallButton.kt
index 195fae0923..aeedd6ab92 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/SmallButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/SmallButton.kt
@@ -33,7 +33,7 @@ data class SmallButtonConfig(
     val text: TextReference,
     val onClick: () -> Unit,
     val icon: TangemButtonIconPosition = TangemButtonIconPosition.None,
-    val enabled: Boolean = true,
+    val isEnabled: Boolean = true,
 )
 
 /**
@@ -79,7 +79,7 @@ private fun SmallButton(config: SmallButtonConfig, isPrimary: Boolean, modifier:
                 color = backgroundColor,
                 shape = shape,
             )
-            .clickable(enabled = config.enabled, onClick = config.onClick)
+            .clickable(enabled = config.isEnabled, onClick = config.onClick)
             .padding(
                 paddingValues = when (config.icon) {
                     is TangemButtonIconPosition.None -> PaddingValues(
@@ -103,7 +103,7 @@ private fun SmallButton(config: SmallButtonConfig, isPrimary: Boolean, modifier:
             text = {
                 val textColor by animateColorAsState(
                     targetValue = when {
-                        !config.enabled -> TangemTheme.colors.text.disabled
+                        !config.isEnabled -> TangemTheme.colors.text.disabled
                         isPrimary -> TangemTheme.colors.text.primary2
                         else -> TangemTheme.colors.text.primary1
                     },
@@ -122,7 +122,7 @@ private fun SmallButton(config: SmallButtonConfig, isPrimary: Boolean, modifier:
                 Icon(
                     modifier = Modifier.size(TangemTheme.dimens.size16),
                     painter = painterResource(id = iconResId),
-                    tint = if (config.enabled) {
+                    tint = if (config.isEnabled) {
                         TangemTheme.colors.icon.secondary
                     } else {
                         TangemTheme.colors.icon.inactive
@@ -188,7 +188,7 @@ private fun ButtonsSample() {
             config = config.copy(
                 text = TextReference.Str(value = "Add token"),
                 icon = TangemButtonIconPosition.Start(iconResId = R.drawable.ic_plus_24),
-                enabled = false,
+                isEnabled = false,
             ),
         )
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
index 290b811544..1bbbcd821c 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/ActionButtonConfig.kt
@@ -6,15 +6,14 @@ import com.tangem.core.ui.extensions.TextReference
 /**
  * Action button config
  *
- * @property text      text
- * @property iconResId icon resource id
- * @property onClick   lambda be invoked when action component is clicked
- * @property onLongClick   lambda be invoked when action component is long clicked
- * @property enabled   enabled
- * @property dimContent determines whether the button content will be dimmed. This property will be ignored if [enabled]
- * is `false`.
- * @property isInProgress indicates progress state of button
- * @property showBadge display dot in upper right corner
+ * @property text               text
+ * @property iconResId          icon resource id
+ * @property onClick            lambda be invoked when action component is clicked
+ * @property onLongClick        lambda be invoked when action component is long clicked
+ * @property isEnabled          enabled
+ * @property shouldDimContent   determines whether the button content will be dimmed.  This property will be ignored if [isEnabled] is `false`.
+ * @property isInProgress       indicates progress state of button
+ * @property shouldShowBadge    display dot in upper right corner
  *
 [REDACTED_AUTHOR]
  */
@@ -23,8 +22,8 @@ data class ActionButtonConfig(
     @DrawableRes val iconResId: Int,
     val onClick: () -> Unit,
     val onLongClick: (() -> TextReference?)? = null,
-    val enabled: Boolean = true,
-    val dimContent: Boolean = false,
+    val isEnabled: Boolean = true,
+    val shouldDimContent: Boolean = false,
     val isInProgress: Boolean = false,
-    val showBadge: Boolean = false,
+    val shouldShowBadge: Boolean = false,
 )
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
index a7fa9386f9..8a639e82bf 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/actions/Actions.kt
@@ -34,7 +34,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.core.ui.test.TokenDetailsScreenTestTags
+import com.tangem.core.ui.test.BaseActionButtonsBlockTestTags
 
 /**
  * Rounded action button
@@ -55,11 +55,11 @@ fun RoundedActionButton(
     ActionBaseButton(
         config = config,
         shape = RoundedCornerShape(size = TangemTheme.dimens.radius24),
-        content = {
+        content = { contentModifier ->
             ActionButtonContent(
                 config = config,
-                text = { Text(text = config.text, textColor = it) },
-                modifier = it.padding(
+                text = { color -> Text(text = config.text, textColor = color) },
+                modifier = contentModifier.padding(
                     start = TangemTheme.dimens.spacing16,
                     end = TangemTheme.dimens.spacing24,
                 ),
@@ -100,7 +100,7 @@ fun ActionButton(
                 ),
             )
         },
-        modifier = modifier.testTag(TokenDetailsScreenTestTags.ACTION_BUTTON),
+        modifier = modifier,
         color = color,
         containerColor = containerColor,
     )
@@ -111,14 +111,14 @@ fun ActionButton(
 fun ActionBaseButton(
     config: ActionButtonConfig,
     shape: RoundedCornerShape,
-    content: @Composable (modifier: Modifier) -> Unit,
     modifier: Modifier = Modifier,
     color: Color = TangemTheme.colors.button.secondary,
     containerColor: Color = TangemTheme.colors.background.secondary,
+    content: @Composable (modifier: Modifier) -> Unit,
 ) {
     val context = LocalContext.current
     val backgroundColor by animateColorAsState(
-        targetValue = if (config.enabled) color else TangemTheme.colors.button.disabled,
+        targetValue = if (config.isEnabled) color else TangemTheme.colors.button.disabled,
         label = "Update background color",
     )
 
@@ -128,24 +128,29 @@ fun ActionBaseButton(
             .widthIn(min = 100.dp)
             .drawWithContent {
                 drawContent()
-                if (config.showBadge) {
+                if (config.shouldShowBadge) {
                     drawBadge(containerColor = containerColor)
                 }
             }
             .clip(shape)
             .combinedClickable(
-                enabled = config.enabled,
+                enabled = config.isEnabled,
                 onClick = config.onClick,
                 onLongClick = {
                     val toastReference = config.onLongClick?.invoke()
-                    toastReference?.let {
+                    if (toastReference != null) {
                         Toast
-                            .makeText(context, toastReference.resolveReference(context.resources), Toast.LENGTH_SHORT)
+                            .makeText(
+                                context,
+                                toastReference.resolveReference(context.resources),
+                                Toast.LENGTH_SHORT,
+                            )
                             .show()
                     }
                 },
             )
-            .background(color = backgroundColor),
+            .background(color = backgroundColor)
+            .testTag(BaseActionButtonsBlockTestTags.ACTION_BUTTON),
     ) {
         content(Modifier.align(Alignment.Center))
 
@@ -163,9 +168,9 @@ fun ActionBaseButton(
 @Composable
 fun ActionButtonContent(
     config: ActionButtonConfig,
-    text: @Composable (Color) -> Unit,
     modifier: Modifier = Modifier,
     paddingBetweenIconAndText: Dp = 8.dp,
+    text: @Composable (Color) -> Unit,
 ) {
     Row(
         modifier = modifier
@@ -174,8 +179,8 @@ fun ActionButtonContent(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         val iconTint = when {
-            !config.enabled -> TangemTheme.colors.icon.informative
-            config.dimContent -> TangemTheme.colors.icon.informative
+            !config.isEnabled -> TangemTheme.colors.icon.informative
+            config.shouldDimContent -> TangemTheme.colors.icon.informative
             else -> TangemTheme.colors.icon.primary1
         }
         Icon(
@@ -219,8 +224,8 @@ private fun Loading(backgroundColor: Color, modifier: Modifier = Modifier) {
 @ReadOnlyComposable
 fun getTextColor(config: ActionButtonConfig): Color {
     return when {
-        !config.enabled -> TangemTheme.colors.text.disabled
-        config.dimContent -> TangemTheme.colors.text.tertiary
+        !config.isEnabled -> TangemTheme.colors.text.disabled
+        config.shouldDimContent -> TangemTheme.colors.text.tertiary
         else -> TangemTheme.colors.text.primary1
     }
 }
@@ -248,27 +253,27 @@ private class ActionStateProvider : CollectionPreviewParameterProvider<ActionBut
         ActionButtonConfig(
             text = TextReference.Str(value = "Enabled"),
             iconResId = R.drawable.ic_arrow_up_24,
-            enabled = true,
+            isEnabled = true,
             onClick = {},
-            showBadge = true,
+            shouldShowBadge = true,
         ),
         ActionButtonConfig(
             text = TextReference.Str(value = "Dimmed"),
             iconResId = R.drawable.ic_arrow_up_24,
-            enabled = true,
-            dimContent = true,
+            isEnabled = true,
+            shouldDimContent = true,
             onClick = {},
         ),
         ActionButtonConfig(
             text = TextReference.Str(value = "Disabled"),
             iconResId = R.drawable.ic_arrow_down_24,
-            enabled = false,
+            isEnabled = false,
             onClick = {},
         ),
         ActionButtonConfig(
             text = TextReference.Str(value = "Loading"),
             iconResId = R.drawable.ic_arrow_down_24,
-            enabled = false,
+            isEnabled = false,
             onClick = {},
             isInProgress = true,
         ),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/segmentedbutton/SegmentedButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/segmentedbutton/SegmentedButton.kt
index c4be2dacd0..f04557cc58 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/segmentedbutton/SegmentedButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/segmentedbutton/SegmentedButton.kt
@@ -112,9 +112,9 @@ private fun SegmentedButtonsPreview(
         SegmentedButtons(
             config = config,
             onClick = {},
-        ) {
+        ) { configPreview ->
             Text(
-                text = it.text,
+                text = configPreview.text,
                 modifier = Modifier.padding(TangemTheme.dimens.spacing16),
             )
         }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt
index 9cb8a2f121..665299d7aa 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/buttons/small/TangemIconButton.kt
@@ -52,11 +52,9 @@ fun TangemIconButton(
         modifier = modifier
             .size(24.dp)
             .clip(shape)
+            .clickable(onClick = onClick)
             .background(background)
-            .padding(innerPadding)
-            .clickable(
-                onClick = onClick,
-            ),
+            .padding(innerPadding),
     )
 }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/containers/pullToRefresh/PullToRefreshConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/containers/pullToRefresh/PullToRefreshConfig.kt
index d2fcfad70f..64515c0146 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/containers/pullToRefresh/PullToRefreshConfig.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/containers/pullToRefresh/PullToRefreshConfig.kt
@@ -9,6 +9,7 @@ package com.tangem.core.ui.components.containers.pullToRefresh
 data class PullToRefreshConfig(val isRefreshing: Boolean, val onRefresh: (ShowRefreshState) -> Unit) {
 
     @JvmInline
+    @Suppress("BooleanPropertyNaming")
     value class ShowRefreshState(
         val value: Boolean = true,
     )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/DefaultCurrencyIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/DefaultCurrencyIcon.kt
index bc9b5f2707..630bd4cc12 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/DefaultCurrencyIcon.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/DefaultCurrencyIcon.kt
@@ -24,8 +24,8 @@ internal inline fun DefaultCurrencyIcon(
     size: Dp,
     alpha: Float,
     colorFilter: ColorFilter?,
-    crossinline errorIcon: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    crossinline errorIcon: @Composable () -> Unit,
 ) {
     var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
     var isBackgroundColorDefined by remember { mutableStateOf(false) }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
index 02e42068d6..e8fa3055bf 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/ContentIcon.kt
@@ -113,8 +113,8 @@ private fun TokenIcon(
     url: String?,
     alpha: Float,
     colorFilter: ColorFilter?,
-    errorIcon: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    errorIcon: @Composable () -> Unit,
 ) {
     if (url == null) {
         errorIcon()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
index 04ede1d5ba..bb17dc63b6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt
@@ -127,7 +127,7 @@ private fun BoxScope.ContentIconContainer(
         )
     }
 
-    if (icon.showCustomBadge) {
+    if (icon.shouldShowCustomBadge) {
         CurrencyIconBottomBadge(
             modifier = Modifier.align(Alignment.BottomEnd),
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
index 65107776ea..420e0a839f 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconState.kt
@@ -15,7 +15,7 @@ import com.tangem.core.ui.extensions.TextReference
 sealed class CurrencyIconState {
 
     abstract val isGrayscale: Boolean
-    abstract val showCustomBadge: Boolean
+    abstract val shouldShowCustomBadge: Boolean
     abstract val topBadgeIconResId: Int?
 
     /**
@@ -24,13 +24,13 @@ sealed class CurrencyIconState {
      * @property url The URL where the coin icon can be fetched from. May be `null` if not found.
      * @property fallbackResId The drawable resource ID to be used as a fallback if the URL is not available.
      * @property isGrayscale Specifies whether to show the icon in grayscale.
-     * @property showCustomBadge Specifies whether to show the custom token badge.
+     * @property shouldShowCustomBadge Specifies whether to show the custom token badge.
      */
     data class CoinIcon(
         val url: String?,
         @DrawableRes val fallbackResId: Int,
         override val isGrayscale: Boolean,
-        override val showCustomBadge: Boolean,
+        override val shouldShowCustomBadge: Boolean,
     ) : CurrencyIconState() {
 
         override val topBadgeIconResId: Int? = null
@@ -42,7 +42,7 @@ sealed class CurrencyIconState {
      * @property url The URL where the token icon can be fetched from. May be `null` if not found.
      * @property topBadgeIconResId The drawable resource ID for the network badge. May be `null`.
      * @property isGrayscale Specifies whether to show the icon in grayscale.
-     * @property showCustomBadge Specifies whether to show the custom token badge.
+     * @property shouldShowCustomBadge Specifies whether to show the custom token badge.
      * @property fallbackTint The color to be used for tinting the fallback icon.
      * @property fallbackBackground The background color to be used for the fallback icon.
      */
@@ -50,7 +50,7 @@ sealed class CurrencyIconState {
         val url: String?,
         @DrawableRes override val topBadgeIconResId: Int?,
         override val isGrayscale: Boolean,
-        override val showCustomBadge: Boolean,
+        override val shouldShowCustomBadge: Boolean,
         val fallbackTint: Color,
         val fallbackBackground: Color,
     ) : CurrencyIconState()
@@ -62,14 +62,14 @@ sealed class CurrencyIconState {
      * @property background The background color to be used for the icon.
      * @property topBadgeIconResId The drawable resource ID for the network badge.
      * @property isGrayscale Specifies whether to show the icon in grayscale.
-     * @property showCustomBadge Specifies whether to show the custom token badge.
+     * @property shouldShowCustomBadge Specifies whether to show the custom token badge.
      */
     data class CustomTokenIcon(
         val tint: Color,
         val background: Color,
         @DrawableRes override val topBadgeIconResId: Int,
         override val isGrayscale: Boolean,
-        override val showCustomBadge: Boolean = true,
+        override val shouldShowCustomBadge: Boolean = true,
     ) : CurrencyIconState()
 
     /**
@@ -83,13 +83,13 @@ sealed class CurrencyIconState {
         @DrawableRes val fallbackResId: Int,
     ) : CurrencyIconState() {
         override val isGrayscale: Boolean = false
-        override val showCustomBadge: Boolean = false
+        override val shouldShowCustomBadge: Boolean = false
         override val topBadgeIconResId: Int? = null
     }
 
     @Immutable
     sealed class CryptoPortfolio : CurrencyIconState() {
-        override val showCustomBadge: Boolean = false
+        override val shouldShowCustomBadge: Boolean = false
         override val topBadgeIconResId: Int? = null
         abstract val color: Color
 
@@ -108,13 +108,13 @@ sealed class CurrencyIconState {
 
     data object Loading : CurrencyIconState() {
         override val isGrayscale: Boolean = false
-        override val showCustomBadge: Boolean = false
+        override val shouldShowCustomBadge: Boolean = false
         override val topBadgeIconResId: Int? = null
     }
 
     data object Locked : CurrencyIconState() {
         override val isGrayscale: Boolean = false
-        override val showCustomBadge: Boolean = false
+        override val shouldShowCustomBadge: Boolean = false
         override val topBadgeIconResId: Int? = null
     }
 
@@ -122,27 +122,27 @@ sealed class CurrencyIconState {
         @DrawableRes val resId: Int = R.drawable.ic_empty_64,
     ) : CurrencyIconState() {
         override val isGrayscale: Boolean = true
-        override val showCustomBadge: Boolean = false
+        override val shouldShowCustomBadge: Boolean = false
         override val topBadgeIconResId: Int? = null
     }
 
     fun copySealed(
         isGrayscale: Boolean = this.isGrayscale,
-        showCustomBadge: Boolean = this.showCustomBadge,
+        showCustomBadge: Boolean = this.shouldShowCustomBadge,
         topBadgeIconResId: Int? = this.topBadgeIconResId,
     ): CurrencyIconState = when (this) {
         is CoinIcon -> copy(
             isGrayscale = isGrayscale,
-            showCustomBadge = showCustomBadge,
+            shouldShowCustomBadge = showCustomBadge,
         )
         is CustomTokenIcon -> copy(
             isGrayscale = isGrayscale,
-            showCustomBadge = showCustomBadge,
+            shouldShowCustomBadge = showCustomBadge,
             topBadgeIconResId = topBadgeIconResId ?: this.topBadgeIconResId,
         )
         is TokenIcon -> copy(
             isGrayscale = isGrayscale,
-            showCustomBadge = showCustomBadge,
+            shouldShowCustomBadge = showCustomBadge,
             topBadgeIconResId = topBadgeIconResId,
         )
         is CryptoPortfolio.Icon -> copy(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconStateBuilder.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconStateBuilder.kt
index 1aaed64244..204df382e5 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconStateBuilder.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIconStateBuilder.kt
@@ -28,7 +28,7 @@ object CurrencyIconStateBuilder {
         url = url,
         fallbackResId = fallbackResId,
         isGrayscale = isGrayscale,
-        showCustomBadge = showCustomBadge,
+        shouldShowCustomBadge = showCustomBadge,
     )
 
     private fun createTokenIcon(
@@ -44,7 +44,7 @@ object CurrencyIconStateBuilder {
         isGrayscale = isGrayscale,
         fallbackTint = fallbackTint,
         fallbackBackground = fallbackBackground,
-        showCustomBadge = showCustomBadge,
+        shouldShowCustomBadge = showCustomBadge,
     )
 
     private fun createCustomTokenIcon(
@@ -58,7 +58,7 @@ object CurrencyIconStateBuilder {
         background = background,
         topBadgeIconResId = topBadgeIconResId,
         isGrayscale = isGrayscale,
-        showCustomBadge = showCustomBadge,
+        shouldShowCustomBadge = showCustomBadge,
     )
 
     private fun fromCoin(
@@ -77,8 +77,8 @@ object CurrencyIconStateBuilder {
         isGrayscale: Boolean = false,
         showCustomBadge: Boolean = true,
     ): CurrencyIconState {
-        val grayScale = isGrayscale || token.network.isTestnet
-        val background = token.tryGetBackgroundForTokenIcon(grayScale)
+        val isGrayscaleOrTestnet = isGrayscale || token.network.isTestnet
+        val background = token.tryGetBackgroundForTokenIcon(isGrayscaleOrTestnet)
         val tint = getTintForTokenIcon(background)
 
         return if (token.isCustom && token.iconUrl == null) {
@@ -86,14 +86,14 @@ object CurrencyIconStateBuilder {
                 tint = tint,
                 background = background,
                 topBadgeIconResId = token.networkIconResId,
-                isGrayscale = grayScale,
+                isGrayscale = isGrayscaleOrTestnet,
                 showCustomBadge = showCustomBadge,
             )
         } else {
             createTokenIcon(
                 url = token.iconUrl,
                 topBadgeIconResId = token.networkIconResId,
-                isGrayscale = grayScale,
+                isGrayscale = isGrayscaleOrTestnet,
                 fallbackTint = tint,
                 fallbackBackground = background,
                 showCustomBadge = token.isCustom && showCustomBadge,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/converter/CryptoCurrencyToIconStateConverter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/converter/CryptoCurrencyToIconStateConverter.kt
index 152ff9caf6..c954f883c4 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/converter/CryptoCurrencyToIconStateConverter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/converter/CryptoCurrencyToIconStateConverter.kt
@@ -62,7 +62,7 @@ class CryptoCurrencyToIconStateConverter(
             url = coin.iconUrl,
             fallbackResId = coin.networkIconResId,
             isGrayscale = forceGrayscale || coin.network.isTestnet || isUnreachable || !isAvailable,
-            showCustomBadge = coin.isCustom && showCustomBadge,
+            shouldShowCustomBadge = coin.isCustom && showCustomBadge,
         )
     }
 
@@ -72,8 +72,8 @@ class CryptoCurrencyToIconStateConverter(
         showCustomBadge: Boolean = true,
         forceGrayscale: Boolean = false,
     ): CurrencyIconState {
-        val grayScale = forceGrayscale || token.network.isTestnet || isErrorStatus || !isAvailable
-        val background = token.tryGetBackgroundForTokenIcon(grayScale)
+        val isGrayscale = forceGrayscale || token.network.isTestnet || isErrorStatus || !isAvailable
+        val background = token.tryGetBackgroundForTokenIcon(isGrayscale)
         val tint = getTintForTokenIcon(background)
 
         return if (token.isCustom && token.iconUrl == null) {
@@ -81,17 +81,17 @@ class CryptoCurrencyToIconStateConverter(
                 tint = tint,
                 background = background,
                 topBadgeIconResId = token.networkIconResId,
-                isGrayscale = grayScale,
-                showCustomBadge = showCustomBadge,
+                isGrayscale = isGrayscale,
+                shouldShowCustomBadge = showCustomBadge,
             )
         } else {
             CurrencyIconState.TokenIcon(
                 url = token.iconUrl,
                 topBadgeIconResId = token.networkIconResId,
-                isGrayscale = grayScale,
+                isGrayscale = isGrayscale,
                 fallbackTint = tint,
                 fallbackBackground = background,
-                showCustomBadge = token.isCustom && showCustomBadge, // `true` for tokens with custom derivation
+                shouldShowCustomBadge = token.isCustom && showCustomBadge, // `true` for tokens with custom derivation
             )
         }
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/dropdownmenu/TangemDropdownMenu.kt b/core/ui/src/main/java/com/tangem/core/ui/components/dropdownmenu/TangemDropdownMenu.kt
index d5b7e7ea6d..fa6f78a262 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/dropdownmenu/TangemDropdownMenu.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/dropdownmenu/TangemDropdownMenu.kt
@@ -221,14 +221,19 @@ internal data class DropdownMenuPositionProvider(
         val toTop = anchorBounds.top - contentOffsetY - popupContentSize.height
         val toCenter = anchorBounds.top - popupContentSize.height / 2
         val toDisplayBottom = windowSize.height - popupContentSize.height - verticalMargin
-        val y = sequenceOf(toBottom, toTop, toCenter, toDisplayBottom).firstOrNull {
-            it >= verticalMargin &&
-                it + popupContentSize.height <= windowSize.height - verticalMargin
+        val y = sequenceOf(toBottom, toTop, toCenter, toDisplayBottom).firstOrNull { element ->
+            element >= verticalMargin &&
+                element + popupContentSize.height <= windowSize.height - verticalMargin
         } ?: toTop
 
         onPositionCalculated(
             anchorBounds,
-            IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height),
+            IntRect(
+                left = x,
+                top = y,
+                right = x + popupContentSize.width,
+                bottom = y + popupContentSize.height,
+            ),
         )
         return IntOffset(x, y)
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
index 3ec5ffc54c..0fd7e5f505 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AmountTextField.kt
@@ -75,7 +75,12 @@ fun AmountTextField(
     val decimalFormat = rememberDecimalFormat()
     BoxWithConstraints(modifier = modifier) {
         val fontSize = if (isAutoResize) {
-            resizeFont(visualTransformation, value, textStyle, reduceFactor)
+            resizeFont(
+                visualTransformation = visualTransformation,
+                value = value,
+                textStyle = textStyle,
+                reduceFactor = reduceFactor,
+            )
         } else {
             textStyle.fontSize
         }
@@ -189,24 +194,24 @@ private class AmountTextFieldPreviewProvider : PreviewParameterProvider<AmountTe
             value = "1000000,123123",
             decimals = 3,
             placeholderAlignment = TopStart,
-            showPlaceholder = true,
+            shouldShowPlaceholder = true,
         ),
         AmountTextFieldPreviewData(
             value = "1000000.123123",
             decimals = 6,
             placeholderAlignment = TopStart,
-            showPlaceholder = false,
+            shouldShowPlaceholder = false,
         ),
         AmountTextFieldPreviewData(
             value = null,
             decimals = 2,
-            showPlaceholder = true,
+            shouldShowPlaceholder = true,
             placeholderAlignment = TopCenter,
         ),
         AmountTextFieldPreviewData(
             value = null,
             decimals = 2,
-            showPlaceholder = true,
+            shouldShowPlaceholder = true,
             placeholderAlignment = TopStart,
         ),
     )
@@ -215,7 +220,7 @@ private class AmountTextFieldPreviewProvider : PreviewParameterProvider<AmountTe
 private data class AmountTextFieldPreviewData(
     val value: String? = null,
     val decimals: Int = 2,
-    val showPlaceholder: Boolean,
+    val shouldShowPlaceholder: Boolean,
     val placeholderAlignment: Alignment,
 )
 // endregion
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AutoSizeTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AutoSizeTextField.kt
index 23a4cf2348..80062b4de8 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/AutoSizeTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/AutoSizeTextField.kt
@@ -72,7 +72,12 @@ fun AutoSizeTextField(
 ) {
     BoxWithConstraints(modifier = boxModifier) {
         val fontSize = if (isAutoResize) {
-            resizeFont(visualTransformation, value, textStyle, reduceFactor)
+            resizeFont(
+                visualTransformation = visualTransformation,
+                value = value,
+                textStyle = textStyle,
+                reduceFactor = reduceFactor,
+            )
         } else {
             textStyle.fontSize
         }
@@ -141,7 +146,7 @@ private fun AmountTextFieldPreview(
             textFieldModifier = Modifier.fillMaxWidth(),
             value = text,
             onValueChange = { text = it },
-            centered = data.centered,
+            centered = data.isCentered,
             isAutoResize = data.isAutoResize,
             placeholder = data.placeholder,
         )
@@ -154,43 +159,43 @@ private class AutoSizeTextFieldPreviewProvider : PreviewParameterProvider<AutoSi
             value = "AutoSizeTextField",
             placeholder = stringReference("placeholder"),
             isAutoResize = true,
-            centered = false,
+            isCentered = false,
         ),
         AutoSizeTextFieldPreviewData(
             value = "AutoSizeTextFieldAutoSizeTextFieldAutoSizeTextFieldAutoSizeTextField",
             placeholder = stringReference("placeholder"),
             isAutoResize = true,
-            centered = false,
+            isCentered = false,
         ),
         AutoSizeTextFieldPreviewData(
             value = "AutoSizeTextFieldAutoSizeTextFieldAutoSizeTextFieldAutoSizeTextField",
             placeholder = stringReference("Placeholder"),
             isAutoResize = true,
-            centered = false,
+            isCentered = false,
         ),
         AutoSizeTextFieldPreviewData(
             value = "",
             placeholder = stringReference("Placeholder"),
             isAutoResize = true,
-            centered = false,
+            isCentered = false,
         ),
         AutoSizeTextFieldPreviewData(
             value = "AutoSizeTextField",
             placeholder = stringReference("Placeholder"),
             isAutoResize = false,
-            centered = true,
+            isCentered = true,
         ),
         AutoSizeTextFieldPreviewData(
             value = "AutoSizeTextFieldAutoSizeTextFieldAutoSizeTextFieldAutoSizeTextField",
             placeholder = stringReference("Placeholder"),
             isAutoResize = false,
-            centered = true,
+            isCentered = true,
         ),
         AutoSizeTextFieldPreviewData(
             value = "",
             placeholder = stringReference("Placeholder"),
             isAutoResize = false,
-            centered = true,
+            isCentered = true,
         ),
     )
 }
@@ -199,6 +204,6 @@ private data class AutoSizeTextFieldPreviewData(
     val value: String,
     val placeholder: TextReference,
     val isAutoResize: Boolean,
-    val centered: Boolean,
+    val isCentered: Boolean,
 )
 // endregion
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
index a3226e0b46..c348c0933f 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/PinTextField.kt
@@ -47,9 +47,9 @@ fun PinTextField(
 
     BasicTextField(
         value = textFieldValue,
-        onValueChange = {
-            if (it.text.length <= length) {
-                onValueChange(it.text)
+        onValueChange = { value ->
+            if (value.text.length <= length) {
+                onValueChange(value.text)
             }
         },
         modifier = modifier
@@ -108,9 +108,9 @@ private fun CellDecoration(
         modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(12.dp),
     ) {
-        repeat(length) {
-            val char = if (it < value.length) {
-                if (isPasswordVisual) PASSWORD_VISUAL_CHAR.toString() else value[it].toString()
+        repeat(length) { i ->
+            val char = if (i < value.length) {
+                if (isPasswordVisual) PASSWORD_VISUAL_CHAR.toString() else value[i].toString()
             } else {
                 ""
             }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SearchBar.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SearchBar.kt
index 94f6b64e78..c0390dfda0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SearchBar.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SearchBar.kt
@@ -56,8 +56,8 @@ fun SearchBar(
         modifier = modifier
             .fillMaxWidth()
             .heightIn(min = TangemTheme.dimens.size48)
-            .onFocusChanged {
-                if (it.isFocused) {
+            .onFocusChanged { focusState ->
+                if (focusState.isFocused) {
                     state.onActiveChange(true)
                 } else {
                     state.onActiveChange(false)
@@ -103,11 +103,11 @@ fun SearchBar(
 @OptIn(ExperimentalMaterial3Api::class)
 private fun DecorationBox(
     state: SearchBarUM,
-    innerTextField: @Composable () -> Unit,
     interactionSource: MutableInteractionSource,
     colors: TextFieldColors,
     focusManager: FocusManager,
     keyboardController: SoftwareKeyboardController?,
+    innerTextField: @Composable () -> Unit,
 ) {
     TextFieldDefaults.DecorationBox(
         value = state.query,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleDialogTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleDialogTextField.kt
index 197385d9d9..53cc8c6d5f 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleDialogTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleDialogTextField.kt
@@ -51,10 +51,10 @@ fun SimpleDialogTextField(
                     val strokeWidth = 2f
                     val y = size.height - strokeWidth / 2
                     drawLine(
-                        strokeColor,
-                        Offset(0f, y),
-                        Offset(size.width, y),
-                        strokeWidth,
+                        color = strokeColor,
+                        start = Offset(0f, y),
+                        end = Offset(size.width, y),
+                        strokeWidth = strokeWidth,
                     )
                 },
             decorationBox = { textValue ->
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleTextField.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleTextField.kt
index 1616968df4..db68ddfa92 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleTextField.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/SimpleTextField.kt
@@ -91,10 +91,10 @@ fun SimpleTextField(
         onValueChange = { newTextFieldValueState ->
             textFieldValueState = newTextFieldValueState
 
-            val stringChangedSinceLastInvocation = lastTextValue != newTextFieldValueState.text
+            val isStringChangedSinceLastInvocation = lastTextValue != newTextFieldValueState.text
             lastTextValue = newTextFieldValueState.text
 
-            if (stringChangedSinceLastInvocation) onValueChange(newTextFieldValueState.text)
+            if (isStringChangedSinceLastInvocation) onValueChange(newTextFieldValueState.text)
         },
         textStyle = textStyle,
         cursorBrush = SolidColor(TangemTheme.colors.text.primary1),
@@ -121,21 +121,21 @@ fun SimpleTextField(
 
 @Composable
 private fun SimpleTextPlaceholder(
-    placeholder: TextReference?,
     value: String,
     textStyle: TextStyle,
     centered: Boolean,
-    textValue: @Composable () -> Unit,
+    placeholder: TextReference?,
     color: Color = TangemTheme.colors.text.disabled,
+    textValue: @Composable () -> Unit,
 ) {
     Box(contentAlignment = if (centered) Alignment.Center else Alignment.TopStart) {
         if (value.isBlank() && placeholder != null) {
             AnimatedContent(
                 targetState = placeholder,
                 label = "Placeholder Change Animation",
-            ) {
+            ) { placeholder ->
                 Text(
-                    text = it.resolveReference(),
+                    text = placeholder.resolveReference(),
                     style = textStyle,
                     color = color,
                 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/fields/visualtransformations/AmountVisualTransformation.kt b/core/ui/src/main/java/com/tangem/core/ui/components/fields/visualtransformations/AmountVisualTransformation.kt
index c16ed2e9f5..7dd6ee0767 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/fields/visualtransformations/AmountVisualTransformation.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/fields/visualtransformations/AmountVisualTransformation.kt
@@ -55,7 +55,12 @@ class AmountVisualTransformation(
         val groupingSymbol = decimalFormat.decimalFormatSymbols.groupingSeparator
         return TransformedText(
             text = formattedText,
-            offsetMapping = OffsetMappingImpl(text.text, formattedText, symbol, groupingSymbol),
+            offsetMapping = OffsetMappingImpl(
+                text = text.text,
+                formattedText = formattedText,
+                currencySymbol = symbol,
+                groupingSymbol = groupingSymbol,
+            ),
         )
     }
 
@@ -93,7 +98,7 @@ class AmountVisualTransformation(
         private val text: String,
         private val formattedText: AnnotatedString,
         private val currencySymbol: String?,
-        private val gropingSymbol: Char,
+        private val groupingSymbol: Char,
     ) : OffsetMapping {
         override fun originalToTransformed(offset: Int): Int {
             var noneDigitCount = 0
@@ -101,7 +106,7 @@ class AmountVisualTransformation(
             val symbolOffset = currencySymbol?.let { formattedText.indexOf(it) } ?: -1
             while (i < offset + noneDigitCount) {
                 val char = formattedText.getOrNull(i++)
-                if (char == gropingSymbol) noneDigitCount++
+                if (char == groupingSymbol) noneDigitCount++
                 if (symbolOffset == 0 && char?.isWhitespace() == true) noneDigitCount++
             }
             var transformedOffset = if (symbolOffset == 0 && currencySymbol != null) {
@@ -118,7 +123,7 @@ class AmountVisualTransformation(
         }
 
         override fun transformedToOriginal(offset: Int): Int {
-            val noneDigitCount = formattedText.take(offset).count { it == gropingSymbol }
+            val noneDigitCount = formattedText.take(offset).count { it == groupingSymbol }
             return (offset - noneDigitCount).coerceIn(0, text.length)
         }
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/grid/EnumeratedTwoColumnGrid.kt b/core/ui/src/main/java/com/tangem/core/ui/components/grid/EnumeratedTwoColumnGrid.kt
index f3c88b8cde..8f5aaa9d91 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/grid/EnumeratedTwoColumnGrid.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/grid/EnumeratedTwoColumnGrid.kt
@@ -93,10 +93,10 @@ private inline fun <T> VerticalGrid(
 private fun Preview() {
     TangemThemePreview {
         EnumeratedTwoColumnGrid(
-            items = List(24) {
+            items = List(24) { i ->
                 EnumeratedTwoColumnGridItem(
-                    index = it + 1,
-                    mnemonic = "word${it + 1}",
+                    index = i + 1,
+                    mnemonic = "word${i + 1}",
                 )
             }.toImmutableList(),
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/icons/IconTint.kt b/core/ui/src/main/java/com/tangem/core/ui/components/icons/IconTint.kt
new file mode 100644
index 0000000000..db6a607f67
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/icons/IconTint.kt
@@ -0,0 +1,10 @@
+package com.tangem.core.ui.components.icons
+
+import androidx.compose.runtime.Stable
+
+@Stable
+enum class IconTint {
+    Accent,
+    Warning,
+    Inactive,
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/icons/identicon/Blockies.kt b/core/ui/src/main/java/com/tangem/core/ui/components/icons/identicon/Blockies.kt
index f1ba4a748e..83d46d09e3 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/icons/identicon/Blockies.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/icons/identicon/Blockies.kt
@@ -58,8 +58,8 @@ internal data class Blockies(
     }
 
     private fun dataFromSeed(seed: MutableList<Long>) = MutableList(SIZE * SIZE) { DEFAULT_VALUE_F }.apply {
-        (0 until SIZE).forEach { row ->
-            (0 until HALF_SIZE).forEach { column ->
+        for (row in 0 until SIZE) {
+            for (column in 0 until HALF_SIZE) {
                 val value = floor(nextSeed(seed) * PROBABILITY_COLOR)
                 this[row * SIZE + column] = value
                 this[(row + 1) * SIZE - column - 1] = value
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
index 03201dcd0a..1dea3f423a 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowBestRate.kt
@@ -81,7 +81,7 @@ fun InputRowBestRate(
                 )
             }
             SpacerWMax()
-            onIconClick?.let {
+            if (onIconClick != null) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_chevron_right_24),
                     contentDescription = null,
@@ -144,7 +144,7 @@ private fun InputRowBestRatePreview(
             title = data.title,
             titleExtra = data.titleExtra,
             subtitle = data.subtitle,
-            showTag = data.showTag,
+            showTag = data.shouldShowTag,
             onIconClick = data.iconClick,
             modifier = Modifier
                 .background(TangemTheme.colors.background.action),
@@ -155,7 +155,7 @@ private fun InputRowBestRatePreview(
 private data class InputRowBestRatePreviewData(
     val title: TextReference,
     val titleExtra: TextReference,
-    val showTag: Boolean,
+    val shouldShowTag: Boolean,
     val subtitle: TextReference,
     val iconClick: (() -> Unit)?,
 )
@@ -167,14 +167,14 @@ private class InputRowBestRatePreviewDataProvider : PreviewParameterProvider<Inp
                 title = TextReference.Str("1inch"),
                 titleExtra = TextReference.Str("DEX"),
                 subtitle = TextReference.Str("0,64554846 DAI ≈ 1 MATIC "),
-                showTag = true,
+                shouldShowTag = true,
                 iconClick = {},
             ),
             InputRowBestRatePreviewData(
                 title = TextReference.Str("ChangeNow"),
                 titleExtra = TextReference.Str("CEX"),
                 subtitle = TextReference.Str("0,64554846 DAI ≈ 1 MATIC "),
-                showTag = false,
+                shouldShowTag = false,
                 iconClick = null,
             ),
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowDefault.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowDefault.kt
index 72111e3c58..aae6feeb49 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowDefault.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowDefault.kt
@@ -69,7 +69,7 @@ fun InputRowDefault(
                     .weight(1f)
                     .testTag(BaseBlockTestTags.BLOCK),
             ) {
-                title?.let {
+                title?.let { title ->
                     Text(
                         text = title.resolveReference(),
                         style = TangemTheme.typography.subtitle2,
@@ -86,7 +86,7 @@ fun InputRowDefault(
                     modifier = Modifier.testTag(BaseBlockTestTags.BLOCK_TEXT),
                 )
             }
-            iconRes?.let {
+            iconRes?.let { iconRes ->
                 Icon(
                     painter = painterResource(id = iconRes),
                     contentDescription = null,
@@ -120,7 +120,7 @@ private fun InputRowDefaultPreview(
             title = TextReference.Str(data.title),
             text = TextReference.Str(data.text),
             iconRes = data.iconRes,
-            showDivider = data.showDivider,
+            showDivider = data.shouldShowDivider,
             modifier = Modifier.background(TangemTheme.colors.background.action),
         )
     }
@@ -130,7 +130,7 @@ private data class InputRowDefaultPreviewData(
     val title: String,
     val text: String,
     val iconRes: Int?,
-    val showDivider: Boolean,
+    val shouldShowDivider: Boolean,
 )
 
 private class InputRowDefaultPreviewDataProvider : PreviewParameterProvider<InputRowDefaultPreviewData> {
@@ -140,13 +140,13 @@ private class InputRowDefaultPreviewDataProvider : PreviewParameterProvider<Inpu
                 title = "title",
                 text = "text",
                 iconRes = null,
-                showDivider = true,
+                shouldShowDivider = true,
             ),
             InputRowDefaultPreviewData(
                 title = "title",
                 text = "text",
                 iconRes = R.drawable.ic_chevron_right_24,
-                showDivider = false,
+                shouldShowDivider = false,
             ),
         )
 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
index 596d9f1aa0..96acb30975 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt
@@ -116,7 +116,7 @@ fun InputRowEnter(
                         .padding(top = TangemTheme.dimens.spacing8),
                 )
             }
-            iconRes?.let {
+            iconRes?.let { iconRes ->
                 Icon(
                     painter = painterResource(id = iconRes),
                     contentDescription = null,
@@ -148,7 +148,7 @@ private fun InputRowEnterPreview(
             title = TextReference.Str(data.title),
             text = data.text,
             iconRes = data.iconRes,
-            showDivider = data.showDivider,
+            showDivider = data.shouldShowDivider,
             description = stringReference(""),
             onValueChange = {},
             modifier = Modifier.background(TangemTheme.colors.background.action),
@@ -160,7 +160,7 @@ private data class InputRowEnterPreviewData(
     val title: String,
     val text: String,
     val iconRes: Int?,
-    val showDivider: Boolean,
+    val shouldShowDivider: Boolean,
 )
 
 private class InputRowEnterPreviewDataProvider :
@@ -171,13 +171,13 @@ private class InputRowEnterPreviewDataProvider :
                 title = "title",
                 text = "text",
                 iconRes = null,
-                showDivider = true,
+                shouldShowDivider = true,
             ),
             InputRowEnterPreviewData(
                 title = "title",
                 text = "text",
                 iconRes = R.drawable.ic_chevron_right_24,
-                showDivider = false,
+                shouldShowDivider = false,
             ),
         )
 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
index a3fda95160..885e3531b0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterAmount.kt
@@ -93,7 +93,7 @@ fun InputRowEnterAmount(
                         .padding(top = TangemTheme.dimens.spacing8),
                 )
             }
-            iconRes?.let {
+            iconRes?.let { iconRes ->
                 Icon(
                     painter = painterResource(id = iconRes),
                     contentDescription = null,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
index cde9e9b0dd..b6db7ff219 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfo.kt
@@ -77,9 +77,9 @@ fun InputRowEnterInfo(
                         .padding(top = TangemTheme.dimens.spacing8)
                         .weight(1f),
                 )
-                info?.let {
+                info?.let { info ->
                     Text(
-                        text = it.resolveReference(),
+                        text = info.resolveReference(),
                         style = TangemTheme.typography.body2,
                         color = infoColor,
                         modifier = Modifier
@@ -104,7 +104,7 @@ private fun InputRowEnterInfoPreview(
             title = data.title,
             text = data.text,
             info = data.info,
-            showDivider = data.showDivider,
+            showDivider = data.shouldShowDivider,
             onValueChange = {},
             modifier = Modifier.background(TangemTheme.colors.background.action),
         )
@@ -114,7 +114,7 @@ private fun InputRowEnterInfoPreview(
 private data class InputRowEnterInfoPreviewData(
     val title: TextReference,
     val text: String,
-    val showDivider: Boolean,
+    val shouldShowDivider: Boolean,
     val info: TextReference?,
 )
 
@@ -125,13 +125,13 @@ private class InputRowEnterInfoPreviewDataProvider :
             InputRowEnterInfoPreviewData(
                 title = TextReference.Str("title"),
                 text = "text",
-                showDivider = true,
+                shouldShowDivider = true,
                 info = TextReference.Str("info"),
             ),
             InputRowEnterInfoPreviewData(
                 title = TextReference.Str("title"),
                 text = "text",
-                showDivider = false,
+                shouldShowDivider = false,
                 info = null,
             ),
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
index b129ec948f..cbf84eee89 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt
@@ -97,9 +97,9 @@ fun InputRowEnterInfoAmount(
                         .padding(top = TangemTheme.dimens.spacing8)
                         .weight(1f),
                 )
-                info?.let {
+                info?.let { info ->
                     Text(
-                        text = it.resolveReference(),
+                        text = info.resolveReference(),
                         style = TangemTheme.typography.body2,
                         color = infoColor,
                         modifier = Modifier
@@ -185,9 +185,9 @@ fun InputRowEnterInfoAmountV2(
                         .padding(top = TangemTheme.dimens.spacing8)
                         .weight(1f),
                 )
-                info?.let {
+                info?.let { info ->
                     Text(
-                        text = it.resolveReference(),
+                        text = info.resolveReference(),
                         style = TangemTheme.typography.body2,
                         color = infoColor,
                         modifier = Modifier
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
index 90abca3970..dd8b097ad0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImage.kt
@@ -102,7 +102,7 @@ fun InputRowImage(
                         modifier = Modifier.padding(top = TangemTheme.dimens.spacing2),
                     )
                 }
-                iconRes?.let {
+                iconRes?.let { iconRes ->
                     Icon(
                         painter = painterResource(id = iconRes),
                         contentDescription = null,
@@ -137,7 +137,7 @@ private fun InputRowInputEnterInfoPreview(
             iconRes = data.actionIconRes,
             onIconClick = {},
             showNetworkIcon = false,
-            showDivider = data.showDivider,
+            showDivider = data.shouldShowDivider,
         )
     }
 }
@@ -147,9 +147,9 @@ private data class InputRowImagePreviewData(
     val subtitle: TextReference,
     val caption: TextReference,
     val iconState: CurrencyIconState,
-    val showDivider: Boolean,
+    val shouldShowDivider: Boolean,
     val actionIconRes: Int?,
-    val showNetworkIcon: Boolean = false,
+    val shouldShowNetworkIcon: Boolean = false,
 )
 
 private class InputRowImagePreviewDataProvider :
@@ -162,8 +162,8 @@ private class InputRowImagePreviewDataProvider :
                 caption = TextReference.Str("caption"),
                 iconState = CurrencyIconState.Locked,
                 actionIconRes = null,
-                showDivider = false,
-                showNetworkIcon = false,
+                shouldShowDivider = false,
+                shouldShowNetworkIcon = false,
             ),
             InputRowImagePreviewData(
                 title = TextReference.Str("title"),
@@ -171,8 +171,8 @@ private class InputRowImagePreviewDataProvider :
                 caption = TextReference.Str("caption"),
                 iconState = CurrencyIconState.Locked,
                 actionIconRes = R.drawable.ic_chevron_right_24,
-                showDivider = true,
-                showNetworkIcon = true,
+                shouldShowDivider = true,
+                shouldShowNetworkIcon = true,
             ),
         )
 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageInfo.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageInfo.kt
index c908519e10..b5fbc11286 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageInfo.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageInfo.kt
@@ -115,7 +115,7 @@ fun InputRowImageInfo(
                         color = TangemTheme.colors.text.primary1,
                     )
                 }
-                infoSubtitle?.let {
+                if (infoSubtitle != null) {
                     if (infoSubtitle is TextReference.Annotated) {
                         Text(
                             text = infoSubtitle.resolveAnnotatedReference(),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageSelector.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageSelector.kt
index e94c8d5191..e0cfef7e34 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageSelector.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowImageSelector.kt
@@ -118,7 +118,7 @@ private fun InputRowImageSelectorPreview(
 private data class InputRowImageSelectorPreviewData(
     val subtitle: TextReference,
     val caption: TextReference,
-    val showDivider: Boolean,
+    val shouldShowDivider: Boolean,
     val actionIconRes: Int?,
     val isSelected: Boolean,
 )
@@ -131,14 +131,14 @@ private class InputRowImageSelectorPreviewDataProvider :
                 subtitle = TextReference.Str("subtitle"),
                 caption = TextReference.Str("caption"),
                 actionIconRes = null,
-                showDivider = false,
+                shouldShowDivider = false,
                 isSelected = false,
             ),
             InputRowImageSelectorPreviewData(
                 subtitle = TextReference.Str("subtitle"),
                 caption = TextReference.Str("caption"),
                 actionIconRes = R.drawable.ic_chevron_right_24,
-                showDivider = true,
+                shouldShowDivider = true,
                 isSelected = true,
             ),
         )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
index 759d32590b..323502fc97 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowRecipient.kt
@@ -65,7 +65,6 @@ fun InputRowRecipient(
     onValueChange: (String) -> Unit,
     onPasteClick: (String) -> Unit,
     onQrCodeClick: () -> Unit,
-    isRedesignEnabled: Boolean,
     modifier: Modifier = Modifier,
     singleLine: Boolean = false,
     error: TextReference? = null,
@@ -89,9 +88,9 @@ fun InputRowRecipient(
                 .fillMaxWidth()
                 .padding(TangemTheme.dimens.spacing12),
         ) {
-            AnimatedContent(targetState = titleText, label = "Title Change") {
+            AnimatedContent(targetState = titleText, label = "Title Change") { title ->
                 Text(
-                    text = it.resolveReference(),
+                    text = title.resolveReference(),
                     style = TangemTheme.typography.subtitle2,
                     color = color,
                     modifier = Modifier.testTag(SendAddressScreenTestTags.ADDRESS_TEXT_FIELD_TITLE),
@@ -132,25 +131,15 @@ fun InputRowRecipient(
                     modifier = Modifier
                         .align(CenterEnd),
                 ) {
-                    if (isRedesignEnabled) {
-                        QrButton(
-                            visible = value.isBlank(),
-                            onQrCodeClick = onQrCodeClick,
-                        )
-                    }
+                    QrButton(
+                        visible = value.isBlank(),
+                        onQrCodeClick = onQrCodeClick,
+                    )
                     PasteButton(
                         isPasteButtonVisible = value.isBlank(),
                         onClick = onPasteClick,
-                        backgroundColorEnabled = if (isRedesignEnabled) {
-                            TangemTheme.colors.button.secondary
-                        } else {
-                            TangemTheme.colors.button.primary
-                        },
-                        textColor = if (isRedesignEnabled) {
-                            TangemTheme.colors.text.primary1
-                        } else {
-                            TangemTheme.colors.text.primary2
-                        },
+                        backgroundColorEnabled = TangemTheme.colors.button.secondary,
+                        textColor = TangemTheme.colors.text.primary1,
                         modifier = Modifier.padding(start = TangemTheme.dimens.spacing8),
                     )
                 }
@@ -266,7 +255,6 @@ private fun InputRowRecipientPreview(
             onPasteClick = {},
             onQrCodeClick = {},
             modifier = Modifier.background(TangemTheme.colors.background.primary),
-            isRedesignEnabled = false,
             resolvedAddress = value.resolvedAddress,
         )
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/label/Label.kt b/core/ui/src/main/java/com/tangem/core/ui/components/label/Label.kt
index 86dacb20d6..860dba2c51 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/label/Label.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/label/Label.kt
@@ -5,9 +5,12 @@ import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -82,7 +85,11 @@ fun Label(state: LabelUM, modifier: Modifier = Modifier) {
                     imageVector = ImageVector.vectorResource(wrappedIcon),
                     tint = iconColor,
                     contentDescription = null,
-                    modifier = Modifier.size(16.dp),
+                    modifier = Modifier.size(16.dp).clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = ripple(bounded = false),
+                        onClick = { state.onIconClick?.invoke() },
+                    ),
                 )
             }
         }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/list/InfiniteListHandler.kt b/core/ui/src/main/java/com/tangem/core/ui/components/list/InfiniteListHandler.kt
index 8f5f5ba4b7..a4248c9d93 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/list/InfiniteListHandler.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/list/InfiniteListHandler.kt
@@ -10,7 +10,7 @@ fun InfiniteListHandler(
     buffer: Int = 2,
     triggerLoadMoreCheckOnItemsCountChange: Boolean = false,
 ) {
-    val loadMore by remember(buffer, listState) {
+    val shouldLoadMore by remember(buffer, listState) {
         derivedStateOf {
             val layoutInfo = listState.layoutInfo
             val totalItemsNumber = layoutInfo.totalItemsCount
@@ -21,17 +21,17 @@ fun InfiniteListHandler(
     }
 
     val totalItemsCount by remember(listState) { derivedStateOf { listState.layoutInfo.totalItemsCount } }
-    var emitted by remember(totalItemsCount, buffer, listState) { mutableStateOf(false) }
+    var isEmitted by remember(key1 = totalItemsCount, key2 = buffer, key3 = listState) { mutableStateOf(false) }
 
-    LaunchedEffect(loadMore) {
-        if (loadMore && !emitted) {
-            emitted = onLoadMore()
+    LaunchedEffect(shouldLoadMore) {
+        if (shouldLoadMore && !isEmitted) {
+            isEmitted = onLoadMore()
         }
     }
 
     LaunchedEffect(totalItemsCount) {
-        if (triggerLoadMoreCheckOnItemsCountChange && loadMore && !emitted) {
-            emitted = onLoadMore()
+        if (triggerLoadMoreCheckOnItemsCountChange && shouldLoadMore && !isEmitted) {
+            isEmitted = onLoadMore()
         }
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/CurrencyNotification.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/CurrencyNotification.kt
index e1b4cc4b24..1170828687 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/CurrencyNotification.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/CurrencyNotification.kt
@@ -111,9 +111,21 @@ private fun Preview_Notification() {
                     url = "https://s3.eu-central-1.amazonaws.com/tangem.api/coins/large/usd-coin.png",
                     topBadgeIconResId = R.drawable.ic_polygon_22,
                     isGrayscale = false,
-                    showCustomBadge = false,
-                    fallbackTint = Color(1.0f, 1.0f, 1.0f, 1.0f, ColorSpaces.Srgb),
-                    fallbackBackground = Color(0.23529412f, 0.28627452f, 0.6117647f, 1.0f, ColorSpaces.Srgb),
+                    shouldShowCustomBadge = false,
+                    fallbackTint = Color(
+                        red = 1.0f,
+                        green = 1.0f,
+                        blue = 1.0f,
+                        alpha = 1.0f,
+                        colorSpace = ColorSpaces.Srgb,
+                    ),
+                    fallbackBackground = Color(
+                        red = 0.23529412f,
+                        green = 0.28627452f,
+                        blue = 0.6117647f,
+                        alpha = 1.0f,
+                        colorSpace = ColorSpaces.Srgb,
+                    ),
                 ),
                 buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
                     text = stringReference("Go to token"),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NoteMigrationNotification.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NoteMigrationNotification.kt
index 8bb1793279..fb78dbe2f9 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NoteMigrationNotification.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NoteMigrationNotification.kt
@@ -52,9 +52,9 @@ fun NoteMigrationNotification(config: NotificationConfig, modifier: Modifier = M
             verticalArrangement = Arrangement.spacedBy(10.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            config.title?.let {
+            config.title?.let { title ->
                 Text(
-                    text = it.resolveReference(),
+                    text = title.resolveReference(),
                     color = TangemColorPalette.White,
                     style = TangemTheme.typography.h3,
                 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
index 50f8841ef5..6de247399b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/Notification.kt
@@ -84,7 +84,7 @@ fun Notification(
             titleColor = titleColor,
             subtitle = config.subtitle,
             subtitleColor = subtitleColor,
-            showArrowIcon = isEnabled && config.showArrowIcon,
+            showArrowIcon = isEnabled && config.shouldShowArrowIcon,
         )
     }
 }
@@ -256,6 +256,7 @@ private fun SingleSecondaryButton(config: NotificationButtonsState.SecondaryButt
             modifier = Modifier.fillMaxWidth(),
             iconResId = config.iconResId,
             enabled = isEnabled,
+            showProgress = config.shouldShowProgress,
         )
     } else {
         SecondaryButton(
@@ -264,6 +265,7 @@ private fun SingleSecondaryButton(config: NotificationButtonsState.SecondaryButt
             modifier = Modifier.fillMaxWidth(),
             size = TangemButtonSize.WideAction,
             enabled = isEnabled,
+            showProgress = config.shouldShowProgress,
         )
     }
 }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt
index bd4d9dacef..57338f98b4 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/notifications/NotificationConfig.kt
@@ -26,7 +26,7 @@ data class NotificationConfig(
     val buttonsState: ButtonsState? = null,
     val onClick: (() -> Unit)? = null,
     val onCloseClick: (() -> Unit)? = null,
-    val showArrowIcon: Boolean = onClick != null,
+    val shouldShowArrowIcon: Boolean = onClick != null,
     val iconTint: IconTint = IconTint.Unspecified,
     val iconSize: Dp = 20.dp,
 ) {
@@ -44,6 +44,7 @@ data class NotificationConfig(
             val text: TextReference,
             @DrawableRes val iconResId: Int? = null,
             val onClick: () -> Unit,
+            val shouldShowProgress: Boolean = false,
         ) : ButtonsState()
 
         data class PairButtonsConfig(
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/progressbar/TangemLinearProgressIndicator.kt b/core/ui/src/main/java/com/tangem/core/ui/components/progressbar/TangemLinearProgressIndicator.kt
index e9fddfa79e..3e27fbe865 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/progressbar/TangemLinearProgressIndicator.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/progressbar/TangemLinearProgressIndicator.kt
@@ -57,7 +57,13 @@ fun TangemLinearProgressIndicator(
     ) {
         val strokeWidth = size.height
         drawLinearIndicatorBackground(backgroundColor, strokeWidth, strokeCap)
-        drawLinearIndicator(0f, coercedProgress(), color, strokeWidth, strokeCap)
+        drawLinearIndicator(
+            startFraction = 0f,
+            endFraction = coercedProgress(),
+            color = color,
+            strokeWidth = strokeWidth,
+            strokeCap = strokeCap,
+        )
     }
 }
 
@@ -135,20 +141,20 @@ fun TangemLinearProgressIndicator(
         drawLinearIndicatorBackground(backgroundColor, strokeWidth, strokeCap)
         if (firstLineHead - firstLineTail > 0) {
             drawLinearIndicator(
-                firstLineHead,
-                firstLineTail,
-                color,
-                strokeWidth,
-                strokeCap,
+                startFraction = firstLineHead,
+                endFraction = firstLineTail,
+                color = color,
+                strokeWidth = strokeWidth,
+                strokeCap = strokeCap,
             )
         }
         if ((secondLineHead - secondLineTail) > 0) {
             drawLinearIndicator(
-                secondLineHead,
-                secondLineTail,
-                color,
-                strokeWidth,
-                strokeCap,
+                startFraction = secondLineHead,
+                endFraction = secondLineTail,
+                color = color,
+                strokeWidth = strokeWidth,
+                strokeCap = strokeCap,
             )
         }
     }
@@ -198,7 +204,12 @@ private fun DrawScope.drawLinearIndicator(
     // if there isn't enough space to draw the stroke caps, fall back to StrokeCap.Butt
     if (strokeCap == StrokeCap.Butt || height > width) {
         // Progress line
-        drawLine(color, Offset(barStart, yOffset), Offset(barEnd, yOffset), strokeWidth)
+        drawLine(
+            color = color,
+            start = Offset(barStart, yOffset),
+            end = Offset(barEnd, yOffset),
+            strokeWidth = strokeWidth,
+        )
     } else {
         // need to adjust barStart and barEnd for the stroke caps
         val strokeCapOffset = strokeWidth / 2
@@ -209,18 +220,24 @@ private fun DrawScope.drawLinearIndicator(
         if (abs(endFraction - startFraction) > 0) {
             // Progress line
             drawLine(
-                color,
-                Offset(adjustedBarStart, yOffset),
-                Offset(adjustedBarEnd, yOffset),
-                strokeWidth,
-                strokeCap,
+                color = color,
+                start = Offset(adjustedBarStart, yOffset),
+                end = Offset(adjustedBarEnd, yOffset),
+                strokeWidth = strokeWidth,
+                cap = strokeCap,
             )
         }
     }
 }
 
 private fun DrawScope.drawLinearIndicatorBackground(color: Color, strokeWidth: Float, strokeCap: StrokeCap) =
-    drawLinearIndicator(0f, 1f, color, strokeWidth, strokeCap)
+    drawLinearIndicator(
+        startFraction = 0f,
+        endFraction = 1f,
+        color = color,
+        strokeWidth = strokeWidth,
+        strokeCap = strokeCap,
+    )
 
 // Indeterminate linear indicator transition specs
 // Total duration for one cycle
@@ -238,10 +255,10 @@ private const val FIRST_LINE_TAIL_DELAY = 333
 private const val SECOND_LINE_HEAD_DELAY = 1000
 private const val SECOND_LINE_TAIL_DELAY = 1267
 
-private val FIRST_LINE_HEAD_EASING = CubicBezierEasing(0.2f, 0f, 0.8f, 1f)
-private val FIRST_LINE_TAIL_EASING = CubicBezierEasing(0.4f, 0f, 1f, 1f)
-private val SECOND_LINE_HEAD_EASING = CubicBezierEasing(0f, 0f, 0.65f, 1f)
-private val SECOND_LINE_TAIL_EASING = CubicBezierEasing(0.1f, 0f, 0.45f, 1f)
+private val FIRST_LINE_HEAD_EASING = CubicBezierEasing(a = 0.2f, b = 0f, c = 0.8f, d = 1f)
+private val FIRST_LINE_TAIL_EASING = CubicBezierEasing(a = 0.4f, b = 0f, c = 1f, d = 1f)
+private val SECOND_LINE_HEAD_EASING = CubicBezierEasing(a = 0f, b = 0f, c = 0.65f, d = 1f)
+private val SECOND_LINE_TAIL_EASING = CubicBezierEasing(a = 0.1f, b = 0f, c = 0.45f, d = 1f)
 
 // region Preview
 @Preview(showBackground = true, widthDp = 360)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ActionRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ActionRow.kt
index 2f66450aba..781bc8b851 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ActionRow.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ActionRow.kt
@@ -34,16 +34,16 @@ fun SimpleActionRow(title: String, description: String, modifier: Modifier = Mod
                 .align(Alignment.CenterStart),
             verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
         ) {
-            AnimatedContent(targetState = title, label = "") {
+            AnimatedContent(targetState = title, label = "") { title ->
                 Text(
-                    text = it,
+                    text = title,
                     style = TangemTheme.typography.caption2,
                     color = TangemTheme.colors.text.secondary,
                 )
             }
-            AnimatedContent(targetState = description, label = "") {
+            AnimatedContent(targetState = description, label = "") { description ->
                 Text(
-                    text = it,
+                    text = description,
                     style = TangemTheme.typography.body2,
                     color = TangemTheme.colors.text.primary1,
                 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ArrowRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ArrowRow.kt
index 67ef1ac47d..36d9892d0d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ArrowRow.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ArrowRow.kt
@@ -21,9 +21,9 @@ import com.tangem.core.ui.utils.*
 @Composable
 inline fun ArrowRow(
     isLastItem: Boolean,
-    content: @Composable() (BoxScope.() -> Unit),
     modifier: Modifier = Modifier,
     contentPadding: PaddingValues = PaddingValues(all = TangemTheme.dimens.spacing0),
+    content: @Composable() (BoxScope.() -> Unit),
 ) {
     val density = LocalDensity.current.density
     val defaultRowHeight = TangemTheme.dimens.size0
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt
index df2cdf37a9..d89d6710c1 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/BlockchainRow.kt
@@ -27,7 +27,7 @@ private const val DISABLED_ICON_ALPHA = 0.4f
  * [Figma Component](https://www.figma.com/design/14ISV23YB1yVW1uNVwqrKv/Android?node-id=2737-2800&t=ewlXfWwbDnRhjw4B-4)
  * */
 @Composable
-fun BlockchainRow(model: BlockchainRowUM, action: @Composable BoxScope.() -> Unit, modifier: Modifier = Modifier) {
+fun BlockchainRow(model: BlockchainRowUM, modifier: Modifier = Modifier, action: @Composable BoxScope.() -> Unit) {
     RowContentContainer(
         modifier = modifier
             .heightIn(min = TangemTheme.dimens.size52)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt
index a9020f35ae..3e2074a6ee 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/ChainRow.kt
@@ -37,12 +37,12 @@ fun ChainRow(model: ChainRowUM, modifier: Modifier = Modifier, action: @Composab
             RowText(
                 mainText = model.name,
                 secondText = model.type,
-                subtitle = if (model.showCustom) {
+                subtitle = if (model.shouldShowCustom) {
                     resourceReference(R.string.common_custom)
                 } else {
                     null
                 },
-                isEnabled = model.enabled,
+                isEnabled = model.isEnabled,
                 accentMainText = true,
                 accentSecondText = false,
             )
@@ -53,10 +53,10 @@ fun ChainRow(model: ChainRowUM, modifier: Modifier = Modifier, action: @Composab
 
 @Composable
 inline fun ChainRowContainer(
+    modifier: Modifier = Modifier,
     icon: @Composable BoxScope.() -> Unit,
     text: @Composable BoxScope.() -> Unit,
     action: @Composable BoxScope.() -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     RowContentContainer(
         modifier = modifier
@@ -95,25 +95,25 @@ private class ChainRowParameterProvider : CollectionPreviewParameterProvider<Cha
             name = "Cardano",
             type = "ADA",
             icon = CurrencyIconState.Locked,
-            showCustom = true,
+            shouldShowCustom = true,
         ),
         ChainRowUM(
             name = "Binance",
             type = "BNB",
             icon = CurrencyIconState.Locked,
-            showCustom = false,
+            shouldShowCustom = false,
         ),
         ChainRowUM(
             name = "123456789010111213141516",
             type = "BNB",
             icon = CurrencyIconState.Locked,
-            showCustom = true,
+            shouldShowCustom = true,
         ),
         ChainRowUM(
             name = "123456789010111213141516",
             type = "123456789010111213141516",
             icon = CurrencyIconState.Locked,
-            showCustom = false,
+            shouldShowCustom = false,
         ),
     ),
 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/NetworkTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/NetworkTitle.kt
index 383854fd65..590e93ddb5 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/NetworkTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/NetworkTitle.kt
@@ -29,8 +29,8 @@ import com.tangem.core.ui.res.TangemThemePreview
  */
 @Composable
 fun NetworkTitle(
-    title: @Composable BoxScope.() -> Unit,
     modifier: Modifier = Modifier,
+    title: @Composable BoxScope.() -> Unit,
     action: (@Composable BoxScope.() -> Unit)? = null,
 ) {
     val minHeight = if (action == null) TangemTheme.dimens.size36 else TangemTheme.dimens.size40
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
index f07edb1802..2c55637c6e 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/RowComponents.kt
@@ -13,11 +13,11 @@ import com.tangem.core.ui.res.TangemTheme
 
 @Composable
 inline fun RowContentContainer(
+    modifier: Modifier = Modifier,
+    horizontalArrangement: Arrangement.Horizontal = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
     icon: @Composable BoxScope.() -> Unit,
     text: @Composable BoxScope.() -> Unit,
     action: @Composable BoxScope.() -> Unit,
-    modifier: Modifier = Modifier,
-    horizontalArrangement: Arrangement.Horizontal = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/rows/model/ChainRowUM.kt b/core/ui/src/main/java/com/tangem/core/ui/components/rows/model/ChainRowUM.kt
index 5b5f0ebd21..ff6377967c 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/rows/model/ChainRowUM.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/rows/model/ChainRowUM.kt
@@ -8,6 +8,6 @@ data class ChainRowUM(
     val name: String,
     val type: String,
     val icon: CurrencyIconState,
-    val showCustom: Boolean,
-    val enabled: Boolean = true,
+    val shouldShowCustom: Boolean,
+    val isEnabled: Boolean = true,
 )
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/Showcase.kt b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/Showcase.kt
index 48f79e027f..dfcb542b89 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/Showcase.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/Showcase.kt
@@ -98,9 +98,9 @@ fun ShowcaseButtons(
                     bottom = TangemTheme.dimens.spacing16,
                 ),
         )
-        hint?.let {
+        if (hint != null) {
             Text(
-                text = it.resolveReference(),
+                text = hint.resolveReference(),
                 style = TangemTheme.typography.body2,
                 color = TangemTheme.colors.text.secondary,
                 modifier = Modifier
@@ -122,16 +122,18 @@ fun ShowcaseButtons(
 private fun Showcase_Preview() {
     TangemThemePreview {
         Showcase(
-            headerIconRes = R.drawable.ic_notifications_unread_24,
+            headerIconRes = R.drawable.ic_notification_56,
             headerText = resourceReference(R.string.user_push_notification_agreement_header),
             showcaseItems = persistentListOf(
                 ShowcaseItemModel(
-                    R.drawable.ic_rocket_launch_24,
-                    resourceReference(R.string.user_push_notification_agreement_argument_one),
+                    iconRes = R.drawable.ic_rocket_launch_24,
+                    title = resourceReference(R.string.user_push_notification_agreement_argument_one_title),
+                    subTitle = resourceReference(R.string.user_push_notification_agreement_argument_one_subtitle),
                 ),
                 ShowcaseItemModel(
-                    R.drawable.ic_storefront_24,
-                    resourceReference(R.string.user_push_notification_agreement_argument_two),
+                    iconRes = R.drawable.ic_storefront_24,
+                    title = resourceReference(R.string.user_push_notification_agreement_argument_two_title),
+                    subTitle = resourceReference(R.string.user_push_notification_agreement_argument_two_subtitle),
                 ),
             ),
             primaryButton = ShowcaseButtonModel(resourceReference(R.string.common_allow), {}),
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseContent.kt b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseContent.kt
index 336172a208..c4ff5a39e2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseContent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseContent.kt
@@ -63,7 +63,8 @@ fun ShowcaseContent(
             repeat(showcaseItems.size) { index ->
                 ShowcaseItem(
                     iconRes = showcaseItems[index].iconRes,
-                    text = showcaseItems[index].text,
+                    title = showcaseItems[index].title,
+                    subtitle = showcaseItems[index].subTitle,
                 )
             }
         }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseItem.kt
index 2f098c6720..4fe07dc38e 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/ShowcaseItem.kt
@@ -1,33 +1,47 @@
 package com.tangem.core.ui.components.showcase
 
 import androidx.annotation.DrawableRes
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 
 @Composable
-internal fun ShowcaseItem(@DrawableRes iconRes: Int, text: TextReference) {
-    Row {
+internal fun ShowcaseItem(@DrawableRes iconRes: Int, title: TextReference, subtitle: TextReference) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
         Icon(
             painter = painterResource(id = iconRes),
             contentDescription = null,
             tint = TangemTheme.colors.icon.primary1,
         )
-        Text(
-            text = text.resolveReference(),
-            style = TangemTheme.typography.body2,
-            color = TangemTheme.colors.text.secondary,
+        Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(start = TangemTheme.dimens.spacing20),
-        )
+            verticalArrangement = Arrangement.spacedBy(3.dp),
+        ) {
+            Text(
+                text = title.resolveReference(),
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Text(
+                text = subtitle.resolveReference(),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.secondary,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/model/ShowcaseItemModel.kt b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/model/ShowcaseItemModel.kt
index f9865aab9e..cac2da63c0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/showcase/model/ShowcaseItemModel.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/showcase/model/ShowcaseItemModel.kt
@@ -5,5 +5,6 @@ import com.tangem.core.ui.extensions.TextReference
 
 data class ShowcaseItemModel(
     @DrawableRes val iconRes: Int,
-    val text: TextReference,
+    val title: TextReference,
+    val subTitle: TextReference,
 )
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbar.kt b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbar.kt
index 70cacc3a82..27603516a5 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbar.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbar.kt
@@ -79,6 +79,6 @@ private fun MessageText(text: String) {
 @Composable
 private fun Preview_TangemSnackbar(@PreviewParameter(TangemSnackbarModelProvider::class) model: TangemSnackbarModel) {
     TangemThemePreview {
-        TangemSnackbar(data = model.snackbarData, actionOnNewLine = model.actionOnNewLine)
+        TangemSnackbar(data = model.snackbarData, actionOnNewLine = model.hasActionOnNewLine)
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarHost.kt b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarHost.kt
index 9f9fdabff9..6ad91b3281 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarHost.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarHost.kt
@@ -46,7 +46,7 @@ private fun Preview_TangemSnackbar(@PreviewParameter(TangemSnackbarModelProvider
     TangemThemePreview {
         val snackbarHostState = remember(::SnackbarHostState)
 
-        TangemSnackbarHost(hostState = snackbarHostState, actionOnNewLine = model.actionOnNewLine)
+        TangemSnackbarHost(hostState = snackbarHostState, actionOnNewLine = model.hasActionOnNewLine)
 
         LaunchedEffect(key1 = null) {
             snackbarHostState.showSnackbar(visuals = model.snackbarData.visuals)
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarModelProvider.kt b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarModelProvider.kt
index e2bdbf3ecf..bc6b03f4e6 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarModelProvider.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/snackbar/TangemSnackbarModelProvider.kt
@@ -5,7 +5,7 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarVisuals
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 
-internal data class TangemSnackbarModel(val snackbarData: SnackbarData, val actionOnNewLine: Boolean)
+internal data class TangemSnackbarModel(val snackbarData: SnackbarData, val hasActionOnNewLine: Boolean)
 
 internal class TangemSnackbarModelProvider : CollectionPreviewParameterProvider<TangemSnackbarModel>(
     listOf(
@@ -51,7 +51,7 @@ internal class TangemSnackbarModelProvider : CollectionPreviewParameterProvider<
         ): TangemSnackbarModel {
             return TangemSnackbarModel(
                 snackbarData = createSnackbarData(message, actionLabel),
-                actionOnNewLine = actionOnNewLine,
+                hasActionOnNewLine = actionOnNewLine,
             )
         }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesProgressBar.kt b/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesProgressBar.kt
index f2c504316e..05d61b51f0 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesProgressBar.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesProgressBar.kt
@@ -99,11 +99,11 @@ fun StoriesProgressBar(
                         .clip(RoundedCornerShape(2.dp))
                         .background(TangemColorPalette.White)
                         .fillMaxHeight()
-                        .let {
+                        .let { modifier ->
                             when (index) {
-                                currentStep -> it.fillMaxWidth(progress.value)
-                                in 0..currentStep -> it.fillMaxWidth(fraction = 1f)
-                                else -> it
+                                currentStep -> modifier.fillMaxWidth(progress.value)
+                                in 0..currentStep -> modifier.fillMaxWidth(fraction = 1f)
+                                else -> modifier
                             }
                         },
                 )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesStepStateMachine.kt b/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesStepStateMachine.kt
index e4b1688630..bafee71188 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesStepStateMachine.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/stories/inner/StoriesStepStateMachine.kt
@@ -10,7 +10,7 @@ class StoriesStepStateMachine<T>(
     private val isRepeatable: Boolean,
 ) {
 
-    private var _currentIndex = mutableIntStateOf(FIRST_INDEX)
+    private val _currentIndex = mutableIntStateOf(FIRST_INDEX)
 
     val steps = stories.lastIndex
     val currentIndex: IntState
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
index 9a4585eb59..68212fff41 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/TokenItem.kt
@@ -22,6 +22,7 @@ import com.tangem.core.ui.R
 import com.tangem.core.ui.components.audits.AuditLabelUM
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
+import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.components.token.internal.*
 import com.tangem.core.ui.components.token.state.TokenItemState
@@ -480,7 +481,7 @@ private fun Preview_TokenItem_InLight(@PreviewParameter(TokenItemStateProvider::
 private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenItemState>(
     collection = listOf(
         tokenItemVisibleState.copy(
-            iconState = coinIconState.copy(showCustomBadge = true),
+            iconState = coinIconState.copy(shouldShowCustomBadge = true),
             titleState = TokenItemState.TitleState.Content(
                 text = stringReference(value = "PolygonPolygonPolygonPolygonPolygonPolygon"),
                 hasPending = true,
@@ -488,7 +489,14 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenI
             fiatAmountState = FiatAmountState.Content(
                 text = "3213123123321312312312312312 $",
                 icons = persistentListOf(
-                    FiatAmountState.Content.IconUM(R.drawable.ic_error_sync_24, useAccentColor = false),
+                    FiatAmountState.Content.IconUM(
+                        iconRes = R.drawable.img_attention_20,
+                        tint = IconTint.Warning,
+                    ),
+                    FiatAmountState.Content.IconUM(
+                        iconRes = R.drawable.ic_error_sync_24,
+                        tint = IconTint.Inactive,
+                    ),
                     stakingIcon,
                 ),
                 isFlickering = true,
@@ -534,7 +542,10 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenI
         TokenItemState.Draggable(
             id = UUID.randomUUID().toString(),
             iconState = tokenIconState,
-            titleState = TokenItemState.TitleState.Content(text = stringReference(value = "Polygon")),
+            titleState = TokenItemState.TitleState.Content(
+                text = stringReference(value = "Polygon"),
+                earnApy = stringReference("Earn 5%"),
+            ),
             subtitle2State = TokenItemState.Subtitle2State.TextContent(text = "3 172,14 $"),
         ),
         TokenItemState.Content(
@@ -603,14 +614,14 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenI
 
     companion object {
 
-        val stakingIcon = FiatAmountState.Content.IconUM(R.drawable.ic_staking_24, useAccentColor = true)
+        val stakingIcon = FiatAmountState.Content.IconUM(R.drawable.ic_staking_24, tint = IconTint.Accent)
 
         val coinIconState
             get() = CurrencyIconState.CoinIcon(
                 url = null,
                 fallbackResId = R.drawable.img_polygon_22,
                 isGrayscale = false,
-                showCustomBadge = false,
+                shouldShowCustomBadge = false,
             )
 
         val tokenIconState
@@ -620,7 +631,7 @@ private class TokenItemStateProvider : CollectionPreviewParameterProvider<TokenI
                 fallbackTint = TangemColorPalette.Black,
                 fallbackBackground = TangemColorPalette.Meadow,
                 isGrayscale = false,
-                showCustomBadge = false,
+                shouldShowCustomBadge = false,
             )
 
         private val customTokenIconState
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
index 9016ec1ccf..6b01ffbff7 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenFiatAmount.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
 import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.text.applyBladeBrush
 import com.tangem.core.ui.extensions.orMaskWithStars
 import com.tangem.core.ui.res.TangemTheme
@@ -75,10 +76,10 @@ private fun ContentFiatAmount(
                     Icon(
                         modifier = Modifier.size(12.dp),
                         painter = rememberVectorPainter(image = ImageVector.vectorResource(icon.iconRes)),
-                        tint = if (icon.useAccentColor) {
-                            TangemTheme.colors.icon.accent
-                        } else {
-                            TangemTheme.colors.icon.inactive
+                        tint = when (icon.tint) {
+                            IconTint.Accent -> TangemTheme.colors.icon.accent
+                            IconTint.Warning -> TangemTheme.colors.icon.attention
+                            IconTint.Inactive -> TangemTheme.colors.icon.inactive
                         },
                         contentDescription = null,
                     )
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
index 7f379e09a6..3fadd11e81 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/internal/TokenTitle.kt
@@ -2,7 +2,9 @@ package com.tangem.core.ui.components.token.internal
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -13,8 +15,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.components.token.state.TokenItemState.TitleState as TokenTitleState
@@ -56,6 +60,11 @@ private fun ContentTitle(state: TokenTitleState.Content, modifier: Modifier = Mo
             hasPending = state.hasPending,
             modifier = Modifier.align(alignment = Alignment.CenterVertically),
         )
+
+        YieldSupplyApyLabel(
+            apy = state.earnApy,
+            modifier = Modifier.align(alignment = Alignment.CenterVertically),
+        )
     }
 }
 
@@ -71,6 +80,25 @@ private fun CurrencyNameText(name: String, isAvailable: Boolean, modifier: Modif
     )
 }
 
+@Composable
+private fun YieldSupplyApyLabel(apy: TextReference?, modifier: Modifier = Modifier) {
+    AnimatedVisibility(visible = apy != null, modifier = modifier) {
+        Box(
+            modifier = modifier.background(
+                color = TangemTheme.colors.text.accent.copy(alpha = 0.1f),
+                shape = TangemTheme.shapes.roundedCornersSmall2,
+            ),
+        ) {
+            Text(
+                text = apy?.resolveReference().orEmpty(),
+                style = TangemTheme.typography.caption1,
+                color = TangemTheme.colors.text.accent,
+                modifier = Modifier.padding(horizontal = 4.dp, vertical = 2.dp),
+            )
+        }
+    }
+}
+
 @Composable
 private fun PendingTransactionImage(hasPending: Boolean, modifier: Modifier = Modifier) {
     AnimatedVisibility(visible = hasPending, modifier = modifier) {
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
index be357d5ebf..f86a303999 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/token/state/TokenItemState.kt
@@ -3,6 +3,7 @@ package com.tangem.core.ui.components.token.state
 import androidx.compose.runtime.Immutable
 import com.tangem.core.ui.components.audits.AuditLabelUM
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
+import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.marketprice.PriceChangeType
 import com.tangem.core.ui.extensions.TextReference
 import kotlinx.collections.immutable.ImmutableList
@@ -167,6 +168,7 @@ sealed class TokenItemState {
             val text: TextReference,
             val hasPending: Boolean = false,
             val isAvailable: Boolean = true,
+            val earnApy: TextReference? = null,
         ) : TitleState()
 
         data object Loading : TitleState()
@@ -204,7 +206,7 @@ sealed class TokenItemState {
 
             data class IconUM(
                 val iconRes: Int,
-                val useAccentColor: Boolean,
+                val tint: IconTint = IconTint.Inactive,
             )
         }
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt b/core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt
index 395b09aed0..7a54751d4b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt
@@ -24,9 +24,9 @@ import kotlinx.coroutines.launch
 @Composable
 fun TangemTooltip(
     text: String,
-    content: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
+    content: @Composable (Modifier) -> Unit,
 ) {
     InternalTangemTooltip(
         modifier = modifier,
@@ -46,9 +46,9 @@ fun TangemTooltip(
 @Composable
 fun TangemTooltip(
     text: AnnotatedString,
-    content: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
+    content: @Composable (Modifier) -> Unit,
 ) {
     InternalTangemTooltip(
         modifier = modifier,
@@ -68,10 +68,10 @@ fun TangemTooltip(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun InternalTangemTooltip(
-    tooltipContent: @Composable () -> Unit,
-    content: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
+    tooltipContent: @Composable () -> Unit,
+    content: @Composable (Modifier) -> Unit,
 ) {
     val tooltipState = rememberTooltipState(isPersistent = true)
     val coroutineScope = rememberCoroutineScope()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
index a6d96d536d..dfb6f1339c 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionBlock.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -18,6 +19,7 @@ import com.tangem.core.ui.components.buttons.actions.ActionButton
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.test.EmptyTransactionBlockTestTags
 
 /**
  * Placeholder for transaction's block without content
@@ -31,19 +33,24 @@ fun EmptyTransactionBlock(state: EmptyTransactionsBlockState, modifier: Modifier
         modifier = modifier
             .clip(TangemTheme.shapes.roundedCornersXMedium)
             .background(color = TangemTheme.colors.background.primary)
-            .padding(vertical = TangemTheme.dimens.spacing24),
+            .padding(vertical = TangemTheme.dimens.spacing24)
+            .testTag(EmptyTransactionBlockTestTags.BLOCK),
         verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Icon(
-            modifier = Modifier.size(TangemTheme.dimens.size64),
+            modifier = Modifier
+                .size(TangemTheme.dimens.size64)
+                .testTag(EmptyTransactionBlockTestTags.ICON),
             painter = painterResource(id = state.iconRes),
             tint = TangemTheme.colors.icon.inactive,
             contentDescription = null,
         )
 
         Text(
-            modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing32),
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing32)
+                .testTag(EmptyTransactionBlockTestTags.TEXT),
             textAlign = TextAlign.Center,
             text = state.text.resolveReference(),
             style = TangemTheme.typography.body2,
@@ -51,7 +58,9 @@ fun EmptyTransactionBlock(state: EmptyTransactionsBlockState, modifier: Modifier
         )
 
         Buttons(
-            modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing18),
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing18)
+                .testTag(EmptyTransactionBlockTestTags.EXPLORE_BUTTON),
             state = state.buttonsState,
         )
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
index 8254baa582..53790df155 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/transactions/empty/EmptyTransactionsBlockState.kt
@@ -27,13 +27,13 @@ sealed class EmptyTransactionsBlockState(
                 text = TextReference.Res(R.string.common_reload),
                 iconResId = R.drawable.ic_refresh_24,
                 onClick = onReload,
-                enabled = true,
+                isEnabled = true,
             ),
             secondButtonConfig = ActionButtonConfig(
                 text = TextReference.Res(R.string.common_explore),
                 iconResId = R.drawable.ic_arrow_top_right_24,
                 onClick = onExplore,
-                enabled = true,
+                isEnabled = true,
             ),
         ),
         iconRes = R.drawable.ic_alert_history_64,
@@ -46,7 +46,7 @@ sealed class EmptyTransactionsBlockState(
                 text = TextReference.Res(R.string.common_explore),
                 iconResId = R.drawable.ic_arrow_top_right_24,
                 onClick = onExplore,
-                enabled = true,
+                isEnabled = true,
             ),
         ),
         iconRes = R.drawable.ic_empty_token_64,
@@ -59,7 +59,7 @@ sealed class EmptyTransactionsBlockState(
                 text = TextReference.Res(R.string.common_explore_transaction_history),
                 iconResId = R.drawable.ic_arrow_top_right_24,
                 onClick = onExplore,
-                enabled = true,
+                isEnabled = true,
             ),
         ),
         iconRes = R.drawable.ic_compass_64,
diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
index 6128a71c4a..d6f98918b8 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
@@ -10,13 +10,16 @@ interface ComposableBottomSheetComponent {
 
     @Composable
     fun BottomSheet()
-}
 
-fun getEmptyComposableBottomSheetComponent() = EmptyComposableBottomSheetComponent
+    companion object {
+        val EMPTY = EmptyComposableBottomSheetComponent
+    }
+}
 
 object EmptyComposableBottomSheetComponent : ComposableBottomSheetComponent {
     override fun dismiss() {}
 
     @Composable
-    override fun BottomSheet() {}
+    override fun BottomSheet() {
+    }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
index b242250e28..9e861ebc84 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
@@ -9,9 +9,11 @@ fun interface ComposableContentComponent {
 
     @Composable
     fun Content(modifier: Modifier)
-}
 
-fun getEmptyComposableContentComponent() = EmptyComposableContentComponent
+    companion object {
+        val EMPTY = EmptyComposableContentComponent
+    }
+}
 
 object EmptyComposableContentComponent : ComposableContentComponent {
     @Composable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
index 15a24d2001..f6531b2720 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
@@ -15,9 +15,11 @@ interface ComposableModularContentComponent {
 
     @Composable
     fun Footer()
-}
 
-fun getEmptyComposableModularContentComponent() = EmptyComposableModularContentComponent
+    companion object {
+        val EMPTY = EmptyComposableModularContentComponent
+    }
+}
 
 object EmptyComposableModularContentComponent : ComposableModularContentComponent {
     @Composable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
index 87c7602ba9..e106f177ab 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/BlockchainIcons.kt
@@ -95,6 +95,7 @@ fun getActiveIconRes(blockchainId: String): Int {
         "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22
         "pepecoin", "pepecoin/test" -> R.drawable.img_pepecoin_22
         "hyperliquid", "hyperliquid/test" -> R.drawable.img_hyperliquid_22
+        "quai", "quai/test" -> R.drawable.img_quai_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -188,6 +189,7 @@ fun getActiveIconResByCoinId(coinId: String): Int {
         "vanar-chain", "vanar-chain/test" -> R.drawable.img_vanar_22
         "pepecoin-network", "pepecoin-network/test" -> R.drawable.img_pepecoin_22
         "hyperliquid", "hyperliquid/test" -> R.drawable.img_hyperliquid_22
+        "quai", "quai/test" -> R.drawable.img_quai_22
         else -> R.drawable.ic_alert_24
     }
 }
@@ -284,6 +286,7 @@ fun getGreyedOutIconRes(blockchainId: String): Int {
         "vanar-chain", "vanar-chain/test" -> R.drawable.ic_vanar_22
         "pepecoin", "pepecoin/test" -> R.drawable.ic_pepecoin_22
         "hyperliquid", "hyperliquid/test" -> R.drawable.ic_hyperliquid_22
+        "quai", "quai/test" -> R.drawable.ic_quai_22
         else -> R.drawable.ic_alert_24
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
index f3dfa0709d..9141b2e002 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/extensions/TextReference.kt
@@ -27,15 +27,15 @@ sealed interface TextReference {
     /**
      * Text resource id
      *
-     * @property id            resource id
-     * @property formatArgs    arguments. Impossible to use [kotlinx.collections.immutable.ImmutableList] because
-     *                         [Any] is unstable.
-     * @property decapitalize  whether resolved reference should be decapitalized
+     * @property id                  resource id
+     * @property formatArgs          arguments. Impossible to use [kotlinx.collections.immutable.ImmutableList] because
+     *                               [Any] is unstable.
+     * @property shouldDecapitalize  whether resolved reference should be decapitalized
      */
     data class Res(
         @StringRes val id: Int,
         val formatArgs: WrappedList<Any> = WrappedList(emptyList()),
-        val decapitalize: Boolean = false,
+        val shouldDecapitalize: Boolean = false,
     ) : TextReference
 
     /**
@@ -171,7 +171,7 @@ fun TextReference.resolveReference(): String {
 
             val resolvedReference = stringResourceSafe(id = id, *args)
 
-            if (decapitalize) {
+            if (shouldDecapitalize) {
                 resolvedReference.replaceFirstChar { char -> char.lowercase() }
             } else {
                 resolvedReference
diff --git a/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalCryptoFormat.kt b/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalCryptoFormat.kt
index ef2cf399a6..cae9546835 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalCryptoFormat.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalCryptoFormat.kt
@@ -17,7 +17,7 @@ open class BigDecimalCryptoFormat(
     val symbol: String,
     val decimals: Int,
     val locale: Locale = Locale.getDefault(),
-    val ignoreSymbolPosition: Boolean = false,
+    val shouldIgnoreSymbolPosition: Boolean = false,
 ) : BigDecimalFormat {
 
     override fun invoke(value: BigDecimal): String = defaultAmount()(value)
@@ -56,7 +56,7 @@ fun BigDecimalFormatScope.crypto(
     return BigDecimalCryptoFormat(
         symbol = cryptoCurrency.symbol,
         decimals = cryptoCurrency.decimals,
-        ignoreSymbolPosition = ignoreSymbolPosition,
+        shouldIgnoreSymbolPosition = ignoreSymbolPosition,
         locale = locale,
     )
 }
@@ -64,7 +64,7 @@ fun BigDecimalFormatScope.crypto(
 // == Formatters ==
 
 fun BigDecimalCryptoFormat.defaultAmount() = BigDecimalFormat { value ->
-    if (ignoreSymbolPosition) {
+    if (shouldIgnoreSymbolPosition) {
         val formatter = NumberFormat.getInstance(locale).apply {
             maximumFractionDigits = decimals.coerceAtMost(maximumValue = 8)
             minimumFractionDigits = 2
diff --git a/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalPercentFormat.kt b/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalPercentFormat.kt
index b7019d1d3c..84e5870e68 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalPercentFormat.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/format/bigdecimal/BigDecimalPercentFormat.kt
@@ -6,7 +6,7 @@ import java.text.NumberFormat
 import java.util.Locale
 
 class BigDecimalPercentFormat(
-    val withoutSign: Boolean = true,
+    val isWithoutSign: Boolean = true,
     val locale: Locale = Locale.getDefault(),
 ) : BigDecimalFormat {
     override fun invoke(value: BigDecimal): String = default()(value)
@@ -19,7 +19,7 @@ fun BigDecimalFormatScope.percent(
     locale: Locale = Locale.getDefault(),
 ): BigDecimalPercentFormat {
     return BigDecimalPercentFormat(
-        withoutSign = withoutSign,
+        isWithoutSign = withoutSign,
         locale = locale,
     )
 }
@@ -33,7 +33,7 @@ private fun BigDecimalPercentFormat.default(): BigDecimalFormat = BigDecimalForm
         roundingMode = RoundingMode.HALF_UP
     }
 
-    val valueToFormat = if (withoutSign) value.abs() else value
+    val valueToFormat = if (isWithoutSign) value.abs() else value
 
     formatter.format(valueToFormat)
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessage.kt b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessage.kt
index d2988d0b0c..173b9d2094 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessage.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessage.kt
@@ -9,7 +9,6 @@ import com.tangem.core.ui.components.bottomsheets.message.MessageBottomSheetV2Ds
 import com.tangem.core.ui.components.bottomsheets.message.messageBottomSheetUM
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.message.SnackbarMessage.Duration
 
 /**
  * Event that is used to show a message in the UI.
@@ -88,7 +87,7 @@ data class SnackbarMessage(
  * @param secondAction The second dialog action to perform. Optional, `null` by default.
  * Performing the second action always dismisses the dialog.
  * @param isDismissable If `false` then dialog can not be dismissed by back button click or by outside click.
- * @param dismissOnFirstAction If `true` then dialog is dismissed when first action is performed,
+ * @param shouldDismissOnFirstAction If `true` then dialog is dismissed when first action is performed,
  * ignoring lambda passed to [EventMessageAction.onClick].
  * `true` by default.
  * @param onDismissRequest The action to perform when the dialog is dismissed.
@@ -99,7 +98,7 @@ data class DialogMessage(
     val firstAction: EventMessageAction,
     val secondAction: EventMessageAction? = null,
     val isDismissable: Boolean = true,
-    val dismissOnFirstAction: Boolean = true,
+    val shouldDismissOnFirstAction: Boolean = true,
     val onDismissRequest: () -> Unit = {},
 ) : EventMessage {
 
@@ -138,7 +137,7 @@ data class DialogMessage(
                 message = message,
                 title = title,
                 isDismissable = isDismissable,
-                dismissOnFirstAction = dismissOnFirstAction,
+                shouldDismissOnFirstAction = dismissOnFirstAction,
                 onDismissRequest = onDismissRequest,
                 firstAction = firstActionBuilder(buttonsScope),
                 secondAction = secondActionBuilder?.invoke(buttonsScope),
@@ -214,14 +213,14 @@ fun bottomSheetMessage(init: @MessageBottomSheetV2Dsl MessageBottomSheetUMV2.()
  * Represents an action button in the dialog.
  *
  * @param title The title of the action.
- * @param warning If `true` then the action is highlighted as a warning.
- * @param enabled If `false` then the action is disabled.
+ * @param isWarning If `true` then the action is highlighted as a warning.
+ * @param isEnabled If `false` then the action is disabled.
  * @param onClick The action to perform when the button is clicked.
  * */
 data class EventMessageAction(
     val title: TextReference,
-    val warning: Boolean = false,
-    val enabled: Boolean = true,
+    val isWarning: Boolean = false,
+    val isEnabled: Boolean = true,
     val onClick: () -> Unit,
 ) {
 
diff --git a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt
index 8d23185045..c7e40837a1 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt
@@ -100,7 +100,7 @@ fun EventMessageEffect(
         )
     }
 
-    loadingMessage?.let {
+    if (loadingMessage != null) {
         LoadingDialog()
     }
 }
@@ -140,7 +140,7 @@ private fun MessageBottomSheet(message: BottomSheetMessage, onDismissRequest: ()
             primaryAction = message.firstAction?.let { action ->
                 MessageBottomSheetUM.ActionUM(
                     text = action.title,
-                    enabled = action.enabled,
+                    isEnabled = action.isEnabled,
                     onClick = {
                         action.onClick()
                         onDismissRequest()
@@ -150,7 +150,7 @@ private fun MessageBottomSheet(message: BottomSheetMessage, onDismissRequest: ()
             secondaryAction = message.secondAction?.let { action ->
                 MessageBottomSheetUM.ActionUM(
                     text = action.title,
-                    enabled = action.enabled,
+                    isEnabled = action.isEnabled,
                     onClick = {
                         action.onClick()
                         onDismissRequest()
@@ -172,12 +172,12 @@ private fun MessageDialog(message: DialogMessage, onDismissRequest: () -> Unit)
         confirmButton = message.firstAction.let { action ->
             DialogButtonUM(
                 title = action.title.resolveReference(),
-                warning = action.warning,
-                enabled = action.enabled,
+                isWarning = action.isWarning,
+                isEnabled = action.isEnabled,
                 onClick = {
                     action.onClick()
 
-                    if (message.dismissOnFirstAction) {
+                    if (message.shouldDismissOnFirstAction) {
                         onDismissRequest()
                     }
                 },
@@ -186,8 +186,8 @@ private fun MessageDialog(message: DialogMessage, onDismissRequest: () -> Unit)
         dismissButton = message.secondAction?.let { action ->
             DialogButtonUM(
                 title = action.title.resolveReference(),
-                warning = action.warning,
-                enabled = action.enabled,
+                isWarning = action.isWarning,
+                isEnabled = action.isEnabled,
                 onClick = {
                     action.onClick()
                     onDismissRequest()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/message/dialog/Dialogs.kt b/core/ui/src/main/java/com/tangem/core/ui/message/dialog/Dialogs.kt
index da674fa0d6..08fb5a9e46 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/message/dialog/Dialogs.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/message/dialog/Dialogs.kt
@@ -49,7 +49,7 @@ object Dialogs {
                 title = resourceReference(R.string.common_ok),
                 onClick = {},
             ),
-            dismissOnFirstAction = true,
+            shouldDismissOnFirstAction = true,
             onDismissRequest = onDismiss,
         )
     }
diff --git a/core/ui/src/main/java/com/tangem/core/ui/reordarable/ReorderableItem.kt b/core/ui/src/main/java/com/tangem/core/ui/reordarable/ReorderableItem.kt
index 7df813a2e5..74b76b1479 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/reordarable/ReorderableItem.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/reordarable/ReorderableItem.kt
@@ -25,7 +25,15 @@ inline fun LazyItemScope.ReorderableItem(
     index: Int? = null,
     orientationLocked: Boolean = true,
     content: @Composable BoxScope.(isDragging: Boolean) -> Unit,
-) = ReorderableItem(reorderableState, key, modifier, Modifier.animateItem(), orientationLocked, index, content)
+) = ReorderableItem(
+    state = reorderableState,
+    key = key,
+    modifier = modifier,
+    defaultDraggingModifier = Modifier.animateItem(),
+    orientationLocked = orientationLocked,
+    index = index,
+    content = content,
+)
 
 /**
  * Fixed version of ReorderableItem from reorderable library.
@@ -41,7 +49,15 @@ inline fun LazyGridItemScope.ReorderableItem(
     modifier: Modifier = Modifier,
     index: Int? = null,
     content: @Composable BoxScope.(isDragging: Boolean) -> Unit,
-) = ReorderableItem(reorderableState, key, modifier, Modifier.animateItem(), false, index, content)
+) = ReorderableItem(
+    state = reorderableState,
+    key = key,
+    modifier = modifier,
+    defaultDraggingModifier = Modifier.animateItem(),
+    orientationLocked = false,
+    index = index,
+    content = content,
+)
 
 /**
  * Fixed version of ReorderableItem from reorderable library.
@@ -79,7 +95,8 @@ inline fun ReorderableItem(
                 key == state.dragCancelledAnimation.position?.key
             }
             if (cancel) {
-                Modifier.zIndex(1f)
+                Modifier
+                    .zIndex(1f)
                     .graphicsLayer {
                         translationX = if (!orientationLocked || !state.isVerticalScroll) {
                             state.dragCancelledAnimation.offset.x
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
index 696d1619ee..85baa41281 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
@@ -52,10 +52,10 @@ fun TangemTheme(
 
 @Composable
 fun TangemTheme(
-    isDark: Boolean = false,
     windowSize: WindowSize,
     typography: TangemTypography = TangemTheme.typography,
     dimens: TangemDimens = TangemTheme.dimens,
+    isDark: Boolean = false,
     vibratorHapticManager: VibratorHapticManager? = null,
     eventMessageHandler: EventMessageHandler = remember { EventMessageHandler() },
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
diff --git a/core/ui/src/main/java/com/tangem/core/ui/security/DisableScreenshots.kt b/core/ui/src/main/java/com/tangem/core/ui/security/DisableScreenshots.kt
index 58466d1140..dcb5b64ee2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/security/DisableScreenshots.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/security/DisableScreenshots.kt
@@ -1,11 +1,53 @@
 package com.tangem.core.ui.security
 
+import android.app.Activity
 import android.view.WindowManager
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.platform.LocalContext
 import com.tangem.core.ui.utils.findActivity
-import timber.log.Timber
+
+private val LocalSecureFlagController = staticCompositionLocalOf<SecureFlagController> {
+    error("No SecureFlagController provided")
+}
+
+private class SecureFlagController(private val activity: Activity) {
+    private var count by mutableIntStateOf(0)
+
+    fun enable() {
+        if (count == 0) {
+            activity.window.setFlags(
+                WindowManager.LayoutParams.FLAG_SECURE,
+                WindowManager.LayoutParams.FLAG_SECURE,
+            )
+        }
+        count++
+    }
+
+    fun disable() {
+        count--
+        if (count == 0) {
+            activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        }
+    }
+}
+
+@Composable
+fun ProvideSecureFlagController(content: @Composable () -> Unit) {
+    val activity = LocalContext.current.findActivity()
+    val controller = remember(activity) { SecureFlagController(activity) }
+
+    CompositionLocalProvider(
+        LocalSecureFlagController provides controller,
+        content = content,
+    )
+}
 
 /**
  * Disables screenshots for the current composition.
@@ -14,18 +56,10 @@ import timber.log.Timber
  */
 @Composable
 fun DisableScreenshotsDisposableEffect() {
-    val activity = LocalContext.current.findActivity()
+    val secureFlagController = LocalSecureFlagController.current
 
-    DisposableEffect(activity) {
-        Timber.d("Security mode: enabled")
-        activity.window.setFlags(
-            WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE,
-        )
-
-        onDispose {
-            Timber.d("Security mode: disabled")
-            activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
+    DisposableEffect(secureFlagController) {
+        secureFlagController.enable()
+        onDispose { secureFlagController.disable() }
     }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/BaseActionButtonsBlockTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/BaseActionButtonsBlockTestTags.kt
new file mode 100644
index 0000000000..187a53a936
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/BaseActionButtonsBlockTestTags.kt
@@ -0,0 +1,6 @@
+package com.tangem.core.ui.test
+
+object BaseActionButtonsBlockTestTags {
+    const val HORIZONTAL_ACTION_CHIPS = "BASE_ACTION_BUTTONS_BLOCK_HORIZONTAL_ACTION_CHIPS"
+    const val ACTION_BUTTON = "BASE_ACTION_BUTTONS_BLOCK_ACTION_BUTTON"
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/BaseBottomSheetTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/BaseBottomSheetTestTags.kt
index 2604a7ad0e..d2d4a850de 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/BaseBottomSheetTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/BaseBottomSheetTestTags.kt
@@ -2,4 +2,7 @@ package com.tangem.core.ui.test
 
 object BaseBottomSheetTestTags {
     const val ACTION_TITLE = "BASE_BOTTOM_SHEET_ACTION_TITLE"
+    const val TITLE = "BASE_BOTTOM_SHEET_TITLE"
+    const val SUBTITLE = "BASE_BOTTOM_SHEET_SUBTITLE"
+    const val CLOSE_BUTTON = "BASE_BOTTOM_SHEET_CLOSE_BUTTON"
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/BuyTokenDetailsScreenTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/BuyTokenDetailsScreenTestTags.kt
index 0f045c5da5..0a77a52a74 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/BuyTokenDetailsScreenTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/BuyTokenDetailsScreenTestTags.kt
@@ -5,12 +5,4 @@ object BuyTokenDetailsScreenTestTags {
     const val FIAT_CURRENCY_ICON = "BUY_TOKEN_DETAILS_SCREEN_FIAT_CURRENCY_ICON"
     const val FIAT_AMOUNT_TEXT_FIELD = "BUY_TOKEN_DETAILS_SCREEN_FIAT_AMOUNT_TEXT_FIELD"
     const val TOKEN_AMOUNT = "BUY_TOKEN_DETAILS_SCREEN_TOKEN_AMOUNT"
-
-    const val PROVIDER_LOADING_TITLE = "BUY_TOKEN_DETAILS_SCREEN_PROVIDER_LOADING_TITLE"
-    const val PROVIDER_LOADING_TEXT = "BUY_TOKEN_DETAILS_SCREEN_PROVIDER_LOADING_TITLE"
-
-    const val PROVIDER_TITLE = "BUY_TOKEN_DETAILS_SCREEN_PROVIDER_TITLE"
-    const val PROVIDER_TEXT = "BUY_TOKEN_DETAILS_SCREEN_PROVIDER_TEXT"
-
-    const val TOS_BLOCK = "BUY_TOKEN_DETAILS_SCREEN_TOS_BLOCK"
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/EmptyTransactionBlockTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/EmptyTransactionBlockTestTags.kt
new file mode 100644
index 0000000000..2544f1f036
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/EmptyTransactionBlockTestTags.kt
@@ -0,0 +1,8 @@
+package com.tangem.core.ui.test
+
+object EmptyTransactionBlockTestTags {
+    const val BLOCK = "EMPTY_TRANSACTION_BLOCK"
+    const val ICON = "EMPTY_TRANSACTION_BLOCK_ICON"
+    const val TEXT = "EMPTY_TRANSACTION_BLOCK_TEXT"
+    const val EXPLORE_BUTTON = "EMPTY_TRANSACTION_BLOCK_EXPLORE_BUTTON"
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/MainScreenTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/MainScreenTestTags.kt
index cb1b1e1edf..269fc77316 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/MainScreenTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/MainScreenTestTags.kt
@@ -7,9 +7,9 @@ object MainScreenTestTags {
     const val TOKEN_LIST_ITEM = "MAIN_SCREEN_TOKEN_LIST_ITEM"
     const val WALLET_LIST_ITEM = "MAIN_SCREEN_WALLET_LIST_ITEM"
     const val ORGANIZE_TOKENS_BUTTON = "MAIN_SCREEN_ORGANIZE_TOKENS_BUTTON"
-    const val MULTI_CURRENCY_ACTION_BUTTON = "MAIN_SCREEN_MULTI_CURRENCY_ACTION_BUTTON"
     const val CARD_TITLE = "MAIN_SCREEN_CARD_TITLE"
     const val CARD_IMAGE = "MAIN_SCREEN_CARD_IMAGE"
+    const val DEVICES_COUNT = "MAIN_SCREEN_DEVICES_COUNT"
 
     const val WALLET_BALANCE = "MAIN_SCREEN_WALLET_BALANCE"
     const val TOTAL_BALANCE_MENU_ITEM = "MAIN_SCREEN_TOTAL_BALANCE_MENU_ITEM"
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/OnrampOffersBlockTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/OnrampOffersBlockTestTags.kt
new file mode 100644
index 0000000000..8a7390b1ec
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/OnrampOffersBlockTestTags.kt
@@ -0,0 +1,12 @@
+package com.tangem.core.ui.test
+
+object OnrampOffersBlockTestTags {
+    const val PROVIDER_NAME = "ONRAMP_OFFERS_BLOCK_PROVIDER_TITLE"
+    const val BEST_RATE_ICON = "ONRAMP_OFFERS_BLOCK_BEST_RATE_ICON"
+    const val BEST_RATE_TITLE = "ONRAMP_OFFERS_BLOCK_BEST_RATE_TITLE"
+    const val OFFER_TOKEN_AMOUNT = "ONRAMP_OFFERS_BLOCK_OFFER_TOKEN_AMOUNT"
+    const val TIMING_ICON = "ONRAMP_OFFERS_BLOCK_TIMING_ICON"
+    const val PAY_WITH = "ONRAMP_OFFERS_BLOCK_PAY_WITH"
+    const val PAYMENT_METHOD_ICON = "ONRAMP_OFFERS_BLOCK_PAYMENT_METHOD_ICON"
+    const val TIMING_TEXT = "ONRAMP_OFFERS_BLOCK_TIMING_TEXT"
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/SelectPaymentMethodBottomSheetTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/SelectPaymentMethodBottomSheetTestTags.kt
index ebb601e9a5..037713590b 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/SelectPaymentMethodBottomSheetTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/SelectPaymentMethodBottomSheetTestTags.kt
@@ -1,7 +1,13 @@
 package com.tangem.core.ui.test
 
 object SelectPaymentMethodBottomSheetTestTags {
-
-    const val LAZY_LIST = "SELECT_PAYMENT_METHOD_LAZY_LIST"
-    const val PAYMENT_METHOD_ICON = "PAYMENT_METHOD_NAME"
+    const val PAYMENT_METHOD = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_PAYMENT_METHOD"
+    const val PAYMENT_METHOD_ICON = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_PAYMENT_METHOD_ICON"
+    const val PAYMENT_METHOD_NAME = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_PAYMENT_METHOD_NAME"
+    const val UP_TO_TEXT = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_UP_TO_TEXT"
+    const val TOKEN_AMOUNT = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_TOKEN_AMOUNT"
+    const val BEST_RATE_ICON = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_BEST_RATE_ICON"
+    const val PROVIDER_COUNT_ICON = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_PROVIDER_COUNT_ICON"
+    const val PROVIDER_COUNT_TEXT = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_PROVIDER_COUNT_TEXT"
+    const val TIMING_ICON = "SELECT_PAYMENT_METHOD_BOTTOM_SHEET_TIMING_ICON"
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/StoriesScreenTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/StoriesScreenTestTags.kt
index a1b7576f50..12d500ece7 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/StoriesScreenTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/StoriesScreenTestTags.kt
@@ -6,4 +6,6 @@ object StoriesScreenTestTags {
     const val ORDER_BUTTON = "STORIES_SCREEN_ORDER_BUTTON"
     const val CREATE_NEW_WALLET_BUTTON = "STORIES_SCREEN_CREATE_NEW_WALLET_BUTTON"
     const val ADD_EXISTING_WALLET_BUTTON = "STORIES_SCREEN_ADD_EXISTING_WALLET_BUTTON"
+    const val TITLE = "STORIES_SCREEN_TITLE"
+    const val TEXT = "STORIES_SCREEN_TEXT"
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/TokenDetailsScreenTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/TokenDetailsScreenTestTags.kt
index bcbee0ae13..f9e953824d 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/TokenDetailsScreenTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/TokenDetailsScreenTestTags.kt
@@ -4,8 +4,6 @@ object TokenDetailsScreenTestTags {
     const val SCREEN_CONTAINER = "TOKEN_DETAILS_SCREEN_CONTAINER"
 
     const val TOKEN_TITLE = "TOKEN_DETAILS_SCREEN_TOKEN_TITLE"
-    const val ACTION_BUTTON = "TOKEN_DETAILS_SCREEN_ACTION_BUTTON"
-    const val HORIZONTAL_ACTION_CHIPS = "TOKEN_DETAILS_SCREEN_HORIZONTAL_ACTION_CHIPS"
 
     const val STAKING_BLOCK = "TOKEN_DETAILS_SCREEN_STAKING_BLOCK"
     const val STAKING_AVAILABLE_BLOCK = "TOKEN_DETAILS_SCREEN_STAKING_AVAILABLE_BLOCK"
diff --git a/core/ui/src/main/java/com/tangem/core/ui/test/WalletConnectDetailsBottomSheetTestTags.kt b/core/ui/src/main/java/com/tangem/core/ui/test/WalletConnectDetailsBottomSheetTestTags.kt
index f5f7ad7776..b269554f43 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/test/WalletConnectDetailsBottomSheetTestTags.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/test/WalletConnectDetailsBottomSheetTestTags.kt
@@ -1,9 +1,6 @@
 package com.tangem.core.ui.test
 
 object WalletConnectDetailsBottomSheetTestTags {
-    const val TITLE = "WALLET_CONNECT_DETAILS_BOTTOM_SHEET_TITLE"
-    const val DATE = "WALLET_CONNECT_DETAILS_BOTTOM_SHEET_DATE"
-    const val CLOSE_BUTTON = "WALLET_CONNECT_DETAILS_BOTTOM_CLOSE_BUTTON"
     const val DISCONNECT_BUTTON = "WALLET_CONNECT_DETAILS_BOTTOM_SHEET_DISCONNECT_BUTTON"
     const val WALLET_ICON = "WALLET_CONNECT_DETAILS_BOTTOM_WALLET_ICON"
     const val WALLET_TITLE = "WALLET_CONNECT_DETAILS_BOTTOM_WALLET"
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
index ebce7baf36..c39566e4c2 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/DecimalFormatterExt.kt
@@ -64,9 +64,7 @@ fun DecimalFormat.getValidatedNumberWithFixedDecimals(text: String, decimals: In
         val beforeDecimal = filteredChars.substringBefore(decimalSeparator)
         val afterDecimal = filteredChars.substringAfter(decimalSeparator)
         decimals.getWithIntegerDecimals(beforeDecimal, decimalSeparator, afterDecimal)
-    }
-    // If there is no dot, just take all digits
-    else {
+    } else { // If there is no dot, just take all digits
         filteredChars
     }
 }
@@ -87,9 +85,7 @@ fun DecimalFormat.formatWithThousands(text: String, decimals: Int): String {
             .reversed()
         val afterDecimal = localizedText.substringAfter(decimalSeparator)
         decimals.getWithIntegerDecimals(beforeDecimal, decimalSeparator, afterDecimal)
-    }
-    // If there is no dot, just take all digits
-    else {
+    } else { // If there is no dot, just take all digits
         localizedText.reversed()
             .chunked(TEXT_CHUNK_THOUSAND)
             .joinToString(thousandsSeparator.toString())
@@ -166,15 +162,15 @@ fun String.parseBigDecimalOrNull() = runCatching {
     // We assume there will be only decimal separator, otherwise parsing will fail.
 
     // Step 1. Exclude formatted (100,000.0) except scientific notation (100.000e10)
-    val excludeFormatted = this.count {
+    val shouldExcludeFormatted = this.count {
         !it.isDigit() && !it.equals(SCIENTIFIC_NOTATION, ignoreCase = true)
     } > DECIMAL_SEPARATOR_LIMIT
 
     // Step 2. Exclude wrong scientific notation (100e100e100)
-    val excludeWrongScientific = this.count {
+    val shouldExcludeWrongScientific = this.count {
         it.equals(SCIENTIFIC_NOTATION, ignoreCase = true)
     } > DECIMAL_SEPARATOR_LIMIT
-    if (excludeFormatted || excludeWrongScientific) return null
+    if (shouldExcludeFormatted || shouldExcludeWrongScientific) return null
 
     // An attempt to parse value with POINT decimal separator
     val parsed = this.toBigDecimalOrNull()
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/InputNumberFormatter.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/InputNumberFormatter.kt
index 7873012994..7d1c7e7c2c 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/InputNumberFormatter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/InputNumberFormatter.kt
@@ -44,9 +44,7 @@ class InputNumberFormatter(
             val beforeDecimal = filteredChars.substringBefore(decimalSeparator)
             val afterDecimal = filteredChars.substringAfter(decimalSeparator)
             beforeDecimal + decimalSeparator + afterDecimal.take(decimals)
-        }
-        // If there is no dot, just take all digits
-        else {
+        } else { // If there is no dot, just take all digits
             filteredChars
         }
     }
@@ -62,9 +60,7 @@ class InputNumberFormatter(
                 .reversed()
             val afterDecimal = text.substringAfter(decimalSeparator)
             beforeDecimal + decimalSeparator + afterDecimal.take(decimals)
-        }
-        // If there is no dot, just take all digits
-        else {
+        } else { // If there is no dot, just take all digits
             text.reversed()
                 .chunked(TEXT_CHUNK_THOUSAND)
                 .joinToString(thousandsSeparator.toString())
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/PathUtils.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/PathUtils.kt
index 8ab1fe470b..d3bcf6b876 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/PathUtils.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/PathUtils.kt
@@ -7,4 +7,9 @@ fun Path.lineTo(offset: Offset) = lineTo(offset.x, offset.y)
 
 fun Path.moveTo(offset: Offset) = moveTo(offset.x, offset.y)
 
-fun Path.quadraticBezierTo(control: Offset, end: Offset) = quadraticBezierTo(control.x, control.y, end.x, end.y)
\ No newline at end of file
+fun Path.quadraticBezierTo(control: Offset, end: Offset) = quadraticBezierTo(
+    x1 = control.x,
+    y1 = control.y,
+    x2 = end.x,
+    y2 = end.y,
+)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/PreviewUtils.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/PreviewUtils.kt
index 6cb1f784b9..5fd66d6dae 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/PreviewUtils.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/PreviewUtils.kt
@@ -30,7 +30,7 @@ fun PreviewShimmerContainer(actualContent: @Composable () -> Unit, shimmerConten
         }
         SpacerH4()
 
-        var shimmerVisible by remember { mutableStateOf(true) }
+        var isShimmerVisible by remember { mutableStateOf(true) }
 
         TangemThemePreview {
             Box(
@@ -39,7 +39,7 @@ fun PreviewShimmerContainer(actualContent: @Composable () -> Unit, shimmerConten
                 },
             ) {
                 actualContent()
-                if (shimmerVisible) {
+                if (isShimmerVisible) {
                     shimmerContent()
                 }
             }
@@ -48,7 +48,7 @@ fun PreviewShimmerContainer(actualContent: @Composable () -> Unit, shimmerConten
         LaunchedEffect(Unit) {
             while (true) {
                 delay(timeMillis = 2000)
-                shimmerVisible = !shimmerVisible
+                isShimmerVisible = !isShimmerVisible
             }
         }
     }
diff --git a/core/ui/src/main/res/drawable-hdpi/img_push_reminder.webp b/core/ui/src/main/res/drawable-hdpi/img_push_reminder.webp
new file mode 100644
index 0000000000..47f81ba8f4
Binary files /dev/null and b/core/ui/src/main/res/drawable-hdpi/img_push_reminder.webp differ
diff --git a/core/ui/src/main/res/drawable-mdpi/img_push_reminder.webp b/core/ui/src/main/res/drawable-mdpi/img_push_reminder.webp
new file mode 100644
index 0000000000..1c1df20a6f
Binary files /dev/null and b/core/ui/src/main/res/drawable-mdpi/img_push_reminder.webp differ
diff --git a/core/ui/src/main/res/drawable-xhdpi/img_push_reminder.webp b/core/ui/src/main/res/drawable-xhdpi/img_push_reminder.webp
new file mode 100644
index 0000000000..f30b2ac133
Binary files /dev/null and b/core/ui/src/main/res/drawable-xhdpi/img_push_reminder.webp differ
diff --git a/core/ui/src/main/res/drawable-xxhdpi/img_push_reminder.webp b/core/ui/src/main/res/drawable-xxhdpi/img_push_reminder.webp
new file mode 100644
index 0000000000..274b3305f6
Binary files /dev/null and b/core/ui/src/main/res/drawable-xxhdpi/img_push_reminder.webp differ
diff --git a/core/ui/src/main/res/drawable-xxxhdpi/img_push_reminder.webp b/core/ui/src/main/res/drawable-xxxhdpi/img_push_reminder.webp
new file mode 100644
index 0000000000..fe2d4ec006
Binary files /dev/null and b/core/ui/src/main/res/drawable-xxxhdpi/img_push_reminder.webp differ
diff --git a/core/ui/src/main/res/drawable/ic_attention_12.xml b/core/ui/src/main/res/drawable/ic_attention_12.xml
new file mode 100644
index 0000000000..960069e5dd
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_attention_12.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M5.353,1.622C5.641,1.123 6.362,1.123 6.65,1.622L10.85,8.875C11.139,9.375 10.778,10.001 10.2,10.001H1.802C1.224,10.001 0.864,9.375 1.153,8.875L5.353,1.622ZM5.502,8.002V9.002H6.502V8.002H5.502ZM5.502,4.002V7.002H6.502V4.002H5.502Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_category_24.xml b/core/ui/src/main/res/drawable/ic_category_24.xml
new file mode 100644
index 0000000000..7fd56ce3ed
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_category_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#1E1E1E"
+        android:pathData="M9.554,17.243C9.554,16.461 9.552,15.949 9.513,15.563C9.475,15.193 9.411,15.049 9.356,14.967C9.271,14.839 9.161,14.729 9.033,14.644C8.951,14.589 8.807,14.525 8.438,14.487C8.051,14.448 7.539,14.447 6.757,14.447C5.974,14.447 5.462,14.448 5.075,14.487C4.705,14.525 4.561,14.589 4.479,14.644C4.352,14.729 4.242,14.839 4.157,14.967C4.103,15.049 4.039,15.193 4.001,15.563C3.962,15.949 3.96,16.461 3.96,17.243C3.96,18.026 3.961,18.538 4,18.925C4.038,19.295 4.103,19.439 4.157,19.521C4.242,19.648 4.352,19.757 4.479,19.843C4.561,19.897 4.705,19.961 5.075,19.999C5.462,20.038 5.974,20.04 6.757,20.04C7.539,20.04 8.051,20.038 8.438,19.999C8.807,19.961 8.951,19.897 9.033,19.843C9.161,19.758 9.271,19.648 9.356,19.521C9.411,19.438 9.475,19.294 9.513,18.924C9.552,18.537 9.554,18.025 9.554,17.243ZM20.044,17.243C20.044,16.461 20.042,15.949 20.003,15.563C19.965,15.192 19.901,15.048 19.847,14.966V14.967C19.761,14.839 19.651,14.729 19.523,14.644C19.442,14.589 19.298,14.525 18.928,14.487C18.541,14.448 18.029,14.447 17.246,14.447C16.464,14.447 15.952,14.448 15.565,14.487C15.196,14.525 15.052,14.589 14.97,14.644C14.842,14.729 14.732,14.839 14.646,14.967L14.646,14.966C14.591,15.048 14.528,15.193 14.49,15.563C14.451,15.949 14.449,16.461 14.449,17.243C14.449,18.026 14.451,18.538 14.49,18.925C14.528,19.295 14.592,19.439 14.646,19.521L14.715,19.612C14.788,19.701 14.873,19.779 14.969,19.843C15.051,19.897 15.195,19.961 15.565,19.999C15.952,20.038 16.464,20.04 17.246,20.04C18.029,20.04 18.541,20.038 18.928,19.999C19.298,19.961 19.442,19.897 19.523,19.843C19.651,19.757 19.761,19.648 19.847,19.521C19.901,19.439 19.965,19.295 20.003,18.925C20.042,18.538 20.044,18.026 20.044,17.243ZM9.554,6.757C9.554,5.975 9.552,5.463 9.513,5.076C9.475,4.706 9.411,4.562 9.356,4.479C9.271,4.352 9.161,4.242 9.033,4.157C8.951,4.103 8.807,4.039 8.438,4.001C8.051,3.962 7.539,3.96 6.757,3.96C5.974,3.96 5.462,3.961 5.075,4C4.705,4.038 4.561,4.103 4.479,4.157C4.352,4.242 4.242,4.352 4.157,4.479C4.103,4.561 4.038,4.705 4,5.075C3.961,5.462 3.96,5.974 3.96,6.757C3.96,7.539 3.962,8.051 4.001,8.438C4.039,8.807 4.103,8.951 4.157,9.033C4.242,9.161 4.352,9.271 4.479,9.356C4.562,9.411 4.706,9.475 5.076,9.513C5.463,9.552 5.975,9.554 6.757,9.554C7.539,9.554 8.051,9.552 8.438,9.513C8.807,9.475 8.951,9.411 9.033,9.356C9.161,9.271 9.271,9.161 9.356,9.033C9.411,8.951 9.475,8.807 9.513,8.438C9.552,8.051 9.554,7.539 9.554,6.757ZM20.044,6.757C20.044,5.974 20.042,5.462 20.003,5.075C19.965,4.705 19.901,4.561 19.847,4.479C19.761,4.352 19.651,4.243 19.523,4.157C19.442,4.103 19.298,4.038 18.928,4C18.541,3.961 18.028,3.96 17.246,3.96C16.464,3.96 15.952,3.961 15.565,4C15.195,4.038 15.051,4.103 14.969,4.157C14.873,4.221 14.788,4.299 14.715,4.388L14.646,4.479C14.592,4.561 14.528,4.705 14.49,5.075C14.451,5.462 14.449,5.974 14.449,6.757C14.449,7.539 14.451,8.051 14.49,8.438C14.528,8.807 14.592,8.951 14.646,9.033L14.715,9.126C14.788,9.215 14.874,9.292 14.97,9.356C15.052,9.411 15.196,9.475 15.565,9.513C15.952,9.552 16.464,9.554 17.246,9.554C18.028,9.554 18.541,9.552 18.928,9.513C19.297,9.475 19.441,9.411 19.523,9.356C19.651,9.271 19.761,9.161 19.847,9.033C19.901,8.951 19.965,8.807 20.003,8.438C20.042,8.051 20.044,7.539 20.044,6.757ZM11.554,17.243C11.554,17.984 11.555,18.615 11.503,19.127C11.449,19.656 11.329,20.167 11.019,20.632C10.816,20.934 10.564,21.2 10.273,21.416L10.144,21.506C9.679,21.816 9.169,21.935 8.641,21.989C8.129,22.041 7.498,22.04 6.757,22.04C6.016,22.04 5.385,22.041 4.873,21.989C4.345,21.936 3.834,21.817 3.368,21.506C3.022,21.275 2.725,20.978 2.494,20.632C2.183,20.167 2.064,19.655 2.011,19.127C1.959,18.615 1.96,17.984 1.96,17.243C1.96,16.502 1.959,15.871 2.011,15.359C2.064,14.831 2.183,14.321 2.494,13.856L2.584,13.727C2.8,13.436 3.066,13.184 3.368,12.981V12.981C3.834,12.67 4.345,12.552 4.873,12.498C5.385,12.446 6.016,12.447 6.757,12.447C7.498,12.447 8.129,12.446 8.641,12.498C9.169,12.552 9.679,12.67 10.144,12.981L10.273,13.07C10.564,13.287 10.816,13.553 11.019,13.856C11.329,14.321 11.449,14.831 11.503,15.359C11.555,15.871 11.554,16.502 11.554,17.243ZM22.044,17.243C22.044,17.984 22.045,18.615 21.993,19.127C21.94,19.655 21.821,20.167 21.51,20.632C21.308,20.935 21.054,21.2 20.763,21.416L20.635,21.506C20.169,21.817 19.658,21.936 19.13,21.989C18.618,22.041 17.987,22.04 17.246,22.04C16.506,22.04 15.875,22.041 15.363,21.989C14.835,21.936 14.324,21.817 13.858,21.506H13.857C13.512,21.275 13.215,20.978 12.983,20.632C12.672,20.167 12.554,19.655 12.5,19.127C12.448,18.615 12.449,17.984 12.449,17.243C12.449,16.502 12.448,15.871 12.5,15.359C12.554,14.831 12.673,14.321 12.983,13.856L13.073,13.727C13.29,13.436 13.556,13.183 13.858,12.981C14.324,12.67 14.835,12.552 15.363,12.498C15.875,12.446 16.506,12.447 17.246,12.447C17.987,12.447 18.618,12.446 19.13,12.498C19.658,12.552 20.169,12.67 20.635,12.981V12.981C20.937,13.184 21.203,13.436 21.42,13.727L21.51,13.856L21.617,14.032C21.849,14.449 21.945,14.897 21.992,15.359C22.044,15.871 22.044,16.502 22.044,17.243ZM11.554,6.757C11.554,7.498 11.555,8.129 11.503,8.641C11.456,9.103 11.358,9.551 11.127,9.968L11.019,10.144C10.816,10.447 10.564,10.713 10.273,10.93L10.144,11.019C9.68,11.329 9.169,11.449 8.641,11.503C8.129,11.555 7.498,11.554 6.757,11.554C6.016,11.554 5.385,11.555 4.873,11.503C4.345,11.449 3.833,11.329 3.368,11.019C3.066,10.816 2.8,10.564 2.584,10.273L2.494,10.144C2.184,9.679 2.065,9.169 2.011,8.641C1.959,8.129 1.96,7.498 1.96,6.757C1.96,6.016 1.959,5.385 2.011,4.873C2.064,4.345 2.183,3.834 2.494,3.368C2.725,3.022 3.022,2.725 3.368,2.494C3.834,2.183 4.345,2.064 4.873,2.011C5.385,1.959 6.016,1.96 6.757,1.96C7.498,1.96 8.129,1.959 8.641,2.011C9.169,2.065 9.679,2.184 10.144,2.494L10.273,2.584C10.564,2.8 10.816,3.066 11.019,3.368C11.329,3.833 11.449,4.345 11.503,4.873C11.555,5.385 11.554,6.016 11.554,6.757ZM22.044,6.757C22.044,7.497 22.044,8.128 21.992,8.64C21.945,9.102 21.849,9.551 21.617,9.968L21.51,10.144C21.278,10.491 20.98,10.788 20.635,11.019C20.17,11.329 19.659,11.449 19.131,11.503C18.619,11.555 17.987,11.554 17.246,11.554C16.505,11.554 15.874,11.555 15.362,11.503C14.834,11.449 14.323,11.329 13.858,11.019H13.857C13.555,10.816 13.29,10.564 13.073,10.273L12.983,10.144C12.673,9.679 12.554,9.168 12.5,8.64C12.448,8.128 12.449,7.497 12.449,6.757C12.449,6.016 12.448,5.385 12.5,4.873C12.554,4.345 12.672,3.834 12.983,3.368C13.215,3.022 13.512,2.725 13.857,2.494H13.858C14.324,2.183 14.835,2.064 15.363,2.011C15.875,1.959 16.506,1.96 17.246,1.96C17.987,1.96 18.618,1.959 19.13,2.011C19.658,2.064 20.169,2.183 20.635,2.494C20.981,2.725 21.278,3.022 21.51,3.368C21.821,3.834 21.94,4.345 21.993,4.873C22.045,5.385 22.044,6.016 22.044,6.757Z" />
+
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_notification_56.xml b/core/ui/src/main/res/drawable/ic_notification_56.xml
new file mode 100644
index 0000000000..69a6c39afb
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_notification_56.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="56dp"
+    android:height="56dp"
+    android:viewportWidth="56"
+    android:viewportHeight="56">
+  <path
+      android:pathData="M10.289,26.72C10.784,17.3 18.567,9.917 28,9.917C37.433,9.917 45.216,17.3 45.711,26.72C45.733,27.123 45.748,27.508 45.764,27.879L45.764,27.88C45.815,29.143 45.86,30.243 46.089,31.298C46.363,32.557 46.869,33.548 47.898,34.32C49.694,35.666 50.75,37.779 50.75,40.023C50.75,43.246 48.213,46.083 44.8,46.083H11.2C7.787,46.083 5.25,43.246 5.25,40.023C5.25,37.779 6.306,35.666 8.102,34.32C9.131,33.548 9.637,32.557 9.911,31.298C10.14,30.243 10.185,29.143 10.236,27.88L10.236,27.88C10.252,27.508 10.267,27.123 10.289,26.72Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M24.567,3.207C25.605,2.527 26.873,2.333 28,2.333C29.127,2.333 30.395,2.527 31.433,3.207C32.586,3.961 33.25,5.182 33.25,6.708C33.25,8.099 32.706,9.552 31.879,10.665C31.065,11.76 29.73,12.833 28,12.833C26.27,12.833 24.935,11.76 24.121,10.665C23.294,9.552 22.75,8.099 22.75,6.708C22.75,5.182 23.414,3.961 24.567,3.207Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,42C22.288,42 23.333,43.045 23.333,44.333C23.333,46.911 25.423,49 28,49C30.577,49 32.667,46.911 32.667,44.333C32.667,43.045 33.711,42 35,42C36.289,42 37.333,43.045 37.333,44.333C37.333,49.488 33.154,53.667 28,53.667C22.845,53.667 18.667,49.488 18.667,44.333C18.667,43.045 19.711,42 21,42Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_notification_square_24.xml b/core/ui/src/main/res/drawable/ic_notification_square_24.xml
new file mode 100644
index 0000000000..0a8e4b2db8
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_notification_square_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M14.75,5.75C14.75,3.541 16.541,1.75 18.75,1.75C20.959,1.75 22.75,3.541 22.75,5.75C22.75,7.959 20.959,9.75 18.75,9.75C16.541,9.75 14.75,7.959 14.75,5.75Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12.663,2.75C13.279,2.75 13.587,2.75 13.707,2.914C13.827,3.078 13.72,3.412 13.508,4.08C13.34,4.607 13.25,5.168 13.25,5.75C13.25,8.788 15.712,11.25 18.75,11.25C19.339,11.25 19.907,11.157 20.44,10.985C21.091,10.775 21.418,10.671 21.582,10.79C21.746,10.91 21.747,11.209 21.749,11.809C21.75,12.172 21.75,12.55 21.75,12.942V13.058C21.75,15.248 21.75,16.968 21.569,18.312C21.384,19.688 20.997,20.781 20.139,21.639C19.281,22.497 18.188,22.884 16.812,23.069C15.468,23.25 13.748,23.25 11.558,23.25H11.442C9.252,23.25 7.532,23.25 6.188,23.069C4.812,22.884 3.72,22.497 2.861,21.639C2.003,20.781 1.616,19.688 1.431,18.312C1.25,16.968 1.25,15.248 1.25,13.058V12.942C1.25,10.752 1.25,9.032 1.431,7.688C1.616,6.312 2.003,5.22 2.861,4.361C3.72,3.503 4.812,3.116 6.188,2.931C7.532,2.75 9.252,2.75 11.442,2.75H12.663ZM7,15.75C6.586,15.75 6.25,16.086 6.25,16.5C6.25,16.914 6.586,17.25 7,17.25H15C15.414,17.25 15.75,16.914 15.75,16.5C15.75,16.086 15.414,15.75 15,15.75H7ZM7,10.75C6.586,10.75 6.25,11.086 6.25,11.5C6.25,11.914 6.586,12.25 7,12.25H11C11.414,12.25 11.75,11.914 11.75,11.5C11.75,11.086 11.414,10.75 11,10.75H7Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_percent_24.xml b/core/ui/src/main/res/drawable/ic_percent_24.xml
new file mode 100644
index 0000000000..241b3ba85c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_percent_24.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#1E1E1E"
+        android:fillType="evenOdd"
+        android:pathData="M16.895,12.784C19.159,12.784 20.994,14.625 20.994,16.896C20.994,19.167 19.159,21.008 16.895,21.008C14.631,21.008 12.796,19.167 12.796,16.896C12.796,14.625 14.631,12.784 16.895,12.784ZM16.895,14.534C15.594,14.534 14.54,15.592 14.54,16.896C14.54,18.201 15.594,19.259 16.895,19.259C18.195,19.259 19.25,18.201 19.25,16.896C19.25,15.592 18.195,14.534 16.895,14.534Z" />
+
+    <path
+        android:fillColor="#1E1E1E"
+        android:pathData="M18.507,3.859C18.907,3.457 19.557,3.457 19.957,3.859C20.358,4.261 20.358,4.912 19.957,5.314L5.412,19.906C5.012,20.308 4.362,20.308 3.962,19.906C3.561,19.504 3.561,18.852 3.962,18.451L18.507,3.859Z" />
+
+    <path
+        android:fillColor="#1E1E1E"
+        android:fillType="evenOdd"
+        android:pathData="M7.092,3.008C9.356,3.008 11.191,4.849 11.191,7.12C11.191,9.391 9.356,11.232 7.092,11.232C4.829,11.232 2.994,9.391 2.994,7.12C2.994,4.849 4.829,3.008 7.092,3.008ZM7.092,4.758C5.792,4.758 4.738,5.816 4.738,7.12C4.738,8.425 5.792,9.483 7.092,9.483C8.393,9.483 9.447,8.425 9.447,7.12C9.447,5.816 8.393,4.758 7.092,4.758Z" />
+
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_promo_kyc_36.xml b/core/ui/src/main/res/drawable/ic_promo_kyc_36.xml
new file mode 100644
index 0000000000..54962fbcae
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_promo_kyc_36.xml
@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#0099FF"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M17.758,21.123C18.172,21.12 18.51,21.453 18.514,21.867C18.517,22.281 18.184,22.619 17.771,22.623C16.646,22.633 15.542,23.074 14.779,23.887C14.496,24.189 14.021,24.203 13.719,23.92C13.417,23.636 13.402,23.161 13.686,22.859C14.756,21.719 16.265,21.136 17.758,21.123ZM18.982,17.373C18.982,16.671 18.425,16.123 17.764,16.123C17.102,16.123 16.546,16.672 16.546,17.373C16.546,18.075 17.102,18.623 17.764,18.623C18.425,18.623 18.982,18.075 18.982,17.373ZM20.482,17.373C20.482,18.881 19.276,20.123 17.764,20.123C16.251,20.123 15.046,18.881 15.046,17.373C15.046,15.866 16.251,14.623 17.764,14.623C19.276,14.623 20.482,15.866 20.482,17.373Z"
+      android:fillColor="#0099FF"/>
+  <path
+      android:pathData="M8.482,20.742V16.006C8.482,14.465 8.481,13.23 8.618,12.262C8.759,11.268 9.06,10.447 9.742,9.801C10.346,9.229 11.088,8.946 11.974,8.799C12.841,8.655 13.915,8.63 15.229,8.625C15.644,8.624 15.981,8.958 15.982,9.372C15.984,9.786 15.649,10.123 15.235,10.125C13.905,10.13 12.95,10.157 12.22,10.278C11.508,10.397 11.086,10.594 10.773,10.89C10.431,11.215 10.219,11.661 10.104,12.473C9.985,13.311 9.982,14.421 9.982,16.006V20.742C9.982,22.328 9.985,23.437 10.104,24.275C10.219,25.087 10.431,25.534 10.773,25.858C11.122,26.189 11.61,26.397 12.486,26.509C13.381,26.623 14.562,26.624 16.232,26.624H18.232C18.647,26.624 18.982,26.96 18.982,27.374C18.982,27.788 18.647,28.124 18.232,28.124H16.232C14.603,28.124 13.308,28.125 12.297,27.996C11.268,27.865 10.418,27.588 9.742,26.947C9.06,26.301 8.759,25.48 8.618,24.486C8.481,23.519 8.482,22.283 8.482,20.742ZM25.482,16.874V16.006C25.482,14.421 25.48,13.311 25.361,12.473C25.246,11.661 25.034,11.215 24.691,10.89C24.379,10.594 23.956,10.397 23.245,10.278C22.515,10.157 21.56,10.13 20.229,10.125C19.815,10.123 19.481,9.786 19.482,9.372C19.484,8.958 19.821,8.624 20.235,8.625C21.549,8.63 22.624,8.655 23.491,8.799C24.377,8.946 25.119,9.229 25.723,9.801C26.405,10.447 26.706,11.268 26.847,12.262C26.984,13.23 26.982,14.465 26.982,16.006V16.874C26.982,17.288 26.647,17.624 26.232,17.624C25.818,17.624 25.483,17.288 25.482,16.874Z"
+      android:fillColor="#0099FF"/>
+  <path
+      android:pathData="M17.733,6.623C18.164,6.623 18.503,6.618 18.81,6.689C19.473,6.841 20.057,7.255 20.383,7.855C20.536,8.136 20.606,8.466 20.691,8.836L20.774,9.195C20.856,9.547 20.931,9.869 20.964,10.138C20.998,10.417 21,10.74 20.854,11.062C20.704,11.391 20.455,11.659 20.153,11.843C19.867,12.016 19.558,12.073 19.27,12.099C18.986,12.124 18.634,12.123 18.231,12.123H17.235C16.831,12.123 16.48,12.124 16.195,12.099C15.907,12.073 15.598,12.016 15.313,11.843C15.01,11.659 14.761,11.391 14.611,11.062C14.465,10.74 14.467,10.417 14.501,10.138C14.534,9.869 14.609,9.547 14.691,9.195L14.774,8.836C14.859,8.466 14.929,8.136 15.082,7.855C15.408,7.255 15.992,6.841 16.655,6.689C16.962,6.618 17.301,6.623 17.733,6.623ZM17.733,8.123C17.223,8.123 17.092,8.128 16.992,8.15C16.71,8.215 16.503,8.382 16.399,8.571C16.368,8.629 16.342,8.714 16.236,9.174L16.153,9.534C16.064,9.918 16.011,10.148 15.99,10.318C15.981,10.391 15.982,10.432 15.983,10.45C16.002,10.486 16.035,10.527 16.091,10.562C16.092,10.562 16.095,10.563 16.098,10.564C16.104,10.567 16.115,10.571 16.133,10.575C16.17,10.585 16.23,10.596 16.326,10.605C16.53,10.622 16.804,10.623 17.235,10.623H18.231C18.661,10.623 18.935,10.622 19.139,10.605C19.235,10.596 19.295,10.585 19.332,10.575C19.35,10.571 19.361,10.567 19.367,10.564C19.37,10.563 19.372,10.562 19.373,10.562C19.429,10.528 19.462,10.486 19.481,10.45C19.482,10.432 19.484,10.392 19.475,10.318C19.454,10.148 19.401,9.918 19.313,9.534L19.23,9.174C19.123,8.714 19.097,8.629 19.066,8.571C18.962,8.382 18.755,8.215 18.473,8.15C18.373,8.128 18.242,8.123 17.733,8.123Z"
+      android:fillColor="#0099FF"/>
+  <path
+      android:pathData="M27.483,23.373C27.483,21.578 26.028,20.123 24.233,20.123C22.438,20.123 20.983,21.578 20.983,23.373C20.983,25.168 22.438,26.623 24.233,26.623C26.028,26.623 27.483,25.168 27.483,23.373ZM22.572,24.493H22.574L22.575,24.494C22.202,24.316 22.045,23.868 22.223,23.494C22.401,23.121 22.848,22.963 23.222,23.141L23.224,23.142L23.227,23.143C23.228,23.143 23.23,23.145 23.232,23.146C23.235,23.147 23.24,23.149 23.244,23.151C23.253,23.156 23.265,23.162 23.278,23.169C23.303,23.183 23.337,23.202 23.376,23.226C23.451,23.272 23.549,23.338 23.658,23.426C23.669,23.409 23.68,23.393 23.691,23.376C24.021,22.875 24.552,22.178 25.21,21.824C25.575,21.628 26.03,21.764 26.227,22.129C26.423,22.494 26.286,22.948 25.921,23.145C25.618,23.308 25.26,23.722 24.942,24.203C24.795,24.427 24.673,24.637 24.589,24.791C24.547,24.868 24.515,24.93 24.493,24.972C24.483,24.993 24.475,25.009 24.47,25.019C24.467,25.024 24.466,25.027 24.465,25.029C24.345,25.279 24.097,25.444 23.82,25.456C23.544,25.468 23.282,25.326 23.142,25.087C23.005,24.855 22.847,24.698 22.729,24.603C22.67,24.555 22.622,24.523 22.593,24.505L22.572,24.493ZM28.983,23.373C28.983,25.997 26.856,28.123 24.233,28.123C21.609,28.123 19.483,25.997 19.483,23.373C19.483,20.75 21.609,18.623 24.233,18.623C26.856,18.623 28.983,20.75 28.983,23.373Z"
+      android:fillColor="#0099FF"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_quai_22.xml b/core/ui/src/main/res/drawable/ic_quai_22.xml
new file mode 100644
index 0000000000..6e21cfe61c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_quai_22.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18.857143dp"
+    android:height="22dp"
+    android:viewportWidth="12"
+    android:viewportHeight="14">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6,0.493C3.014,0.493 0.594,2.914 0.594,5.899C0.594,8.885 3.014,11.306 6,11.306C6.529,11.306 7.04,11.228 7.523,11.086L6.467,9.255C5.162,9.437 3.817,8.832 3.117,7.62C2.197,6.026 2.743,3.987 4.338,3.066C5.932,2.146 7.971,2.692 8.892,4.286C9.591,5.498 9.443,6.966 8.632,8.005L9.693,9.844C10.746,8.857 11.406,7.456 11.406,5.899C11.406,2.914 8.986,0.493 6,0.493Z" />
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M7.523,11.086L8.922,13.507L11.087,12.257L9.693,9.844C9.085,10.414 8.345,10.845 7.523,11.086Z" />
+
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_stars_24.xml b/core/ui/src/main/res/drawable/ic_stars_24.xml
new file mode 100644
index 0000000000..41a21a8f25
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_stars_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <path
+      android:pathData="M12,2.75C12.414,2.75 12.75,3.086 12.75,3.5C12.75,5.506 13.761,7.575 15.343,9.157C16.925,10.739 18.994,11.75 21,11.75C21.414,11.75 21.75,12.086 21.75,12.5C21.75,12.914 21.414,13.25 21,13.25C18.994,13.25 16.925,14.261 15.343,15.843C13.761,17.425 12.75,19.494 12.75,21.5C12.75,21.914 12.414,22.25 12,22.25C11.586,22.25 11.25,21.914 11.25,21.5C11.25,19.494 10.239,17.425 8.657,15.843C7.075,14.261 5.006,13.25 3,13.25C2.586,13.25 2.25,12.914 2.25,12.5C2.25,12.086 2.586,11.75 3,11.75C5.006,11.75 7.075,10.739 8.657,9.157C10.239,7.575 11.25,5.506 11.25,3.5C11.25,3.086 11.586,2.75 12,2.75Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M19.25,1.75C19.463,1.75 19.648,1.898 19.695,2.106L19.93,3.146C20.09,3.856 20.644,4.41 21.354,4.57L22.394,4.805C22.602,4.852 22.75,5.037 22.75,5.25C22.75,5.463 22.602,5.648 22.394,5.695L21.354,5.93C20.644,6.09 20.09,6.644 19.93,7.354L19.695,8.394C19.648,8.602 19.463,8.75 19.25,8.75C19.037,8.75 18.852,8.602 18.805,8.394L18.57,7.354C18.41,6.644 17.856,6.09 17.146,5.93L16.106,5.695C15.898,5.648 15.75,5.463 15.75,5.25C15.75,5.037 15.898,4.852 16.106,4.805L17.146,4.57C17.856,4.41 18.41,3.856 18.57,3.146L18.805,2.106C18.852,1.898 19.037,1.75 19.25,1.75Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4.75,16.25C4.963,16.25 5.148,16.398 5.195,16.606L5.43,17.646C5.59,18.356 6.144,18.91 6.854,19.07L7.894,19.305C8.102,19.352 8.25,19.537 8.25,19.75C8.25,19.963 8.102,20.148 7.894,20.195L6.854,20.43C6.144,20.59 5.59,21.144 5.43,21.854L5.195,22.894C5.148,23.102 4.963,23.25 4.75,23.25C4.537,23.25 4.352,23.102 4.305,22.894L4.07,21.854C3.91,21.144 3.356,20.59 2.646,20.43L1.606,20.195C1.398,20.148 1.25,19.963 1.25,19.75C1.25,19.537 1.398,19.352 1.606,19.305L2.646,19.07C3.356,18.91 3.91,18.356 4.07,17.646L4.305,16.606C4.352,16.398 4.537,16.25 4.75,16.25Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_tangem_pay_promo_card_36.xml b/core/ui/src/main/res/drawable/ic_tangem_pay_promo_card_36.xml
new file mode 100644
index 0000000000..4fc9a9cf1c
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_tangem_pay_promo_card_36.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
+      android:strokeAlpha="0.1"
+      android:fillColor="#0099FF"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M9,10L27,10A3,3 0,0 1,30 13L30,23A3,3 0,0 1,27 26L9,26A3,3 0,0 1,6 23L6,13A3,3 0,0 1,9 10z"
+      android:fillColor="#0099FF"/>
+  <path
+      android:pathData="M13.051,20.582H11.502L10.34,16.5C10.285,16.312 10.167,16.146 9.995,16.068C9.565,15.871 9.092,15.715 8.575,15.636V15.479H11.071C11.415,15.479 11.674,15.715 11.717,15.989L12.32,18.933L13.868,15.479H15.375L13.051,20.582ZM16.235,20.58H14.771L15.976,15.477H17.44L16.235,20.58ZM19.335,16.891C19.378,16.616 19.636,16.459 19.938,16.459C20.412,16.419 20.927,16.498 21.358,16.694L21.617,15.595C21.186,15.438 20.712,15.359 20.282,15.359C18.862,15.359 17.829,16.066 17.829,17.047C17.829,17.794 18.561,18.185 19.077,18.422C19.636,18.657 19.852,18.814 19.809,19.049C19.809,19.403 19.378,19.56 18.948,19.56C18.432,19.56 17.915,19.442 17.442,19.246L17.184,20.345C17.7,20.541 18.259,20.62 18.776,20.62C20.368,20.659 21.358,19.952 21.358,18.892C21.358,17.558 19.335,17.479 19.335,16.891ZM26.48,20.58L25.318,15.477H24.07C23.811,15.477 23.553,15.634 23.467,15.869L21.315,20.58H22.822L23.122,19.834H24.973L25.146,20.58H26.48ZM24.283,16.852L24.713,18.775H23.508L24.283,16.852Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_quai_22.xml b/core/ui/src/main/res/drawable/img_quai_22.xml
new file mode 100644
index 0000000000..59e964b66b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_quai_22.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <group>
+    <clip-path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"/>
+    <path
+        android:pathData="M11,0L11,0A11,11 0,0 1,22 11L22,11A11,11 0,0 1,11 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M0,0h22v22h-22z"
+        android:fillColor="#E20101"/>
+    <path
+        android:pathData="M11,5.493C8.014,5.493 5.594,7.914 5.594,10.899C5.594,13.885 8.014,16.306 11,16.306C11.529,16.306 12.04,16.228 12.523,16.086L11.467,14.255C10.162,14.437 8.817,13.832 8.117,12.62C7.197,11.026 7.743,8.987 9.338,8.066C10.932,7.146 12.971,7.692 13.892,9.286C14.591,10.498 14.443,11.966 13.632,13.005L14.693,14.844C15.746,13.857 16.406,12.456 16.406,10.899C16.406,7.914 13.986,5.493 11,5.493Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M12.523,16.086L13.922,18.507L16.087,17.257L14.693,14.844C14.085,15.414 13.345,15.845 12.523,16.086Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_tangem_pay_card_main_36.xml b/core/ui/src/main/res/drawable/img_tangem_pay_card_main_36.xml
new file mode 100644
index 0000000000..1b23c9f415
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_tangem_pay_card_main_36.xml
@@ -0,0 +1,50 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <group>
+    <clip-path
+        android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"/>
+  </group>
+  <group>
+    <clip-path
+        android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"/>
+    <path
+        android:pathData="M0,31.5l0,-31.5l36,-0l0,31.5z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M18,9l0,-4.5l18,-0l0,4.5z"
+        android:fillColor="#DD2033"/>
+    <path
+        android:pathData="M18,18l0,-4.5l18,-0l0,4.5z"
+        android:fillColor="#DD2033"/>
+    <path
+        android:pathData="M0,27l0,-4.5l36,-0l0,4.5z"
+        android:fillColor="#DD2033"/>
+    <path
+        android:pathData="M0,36l0,-4.5l36,-0l0,4.5z"
+        android:fillColor="#DD2033"/>
+    <path
+        android:pathData="M0,18l0,-18l18,-0l0,18z"
+        android:fillColor="#004692"/>
+    <path
+        android:pathData="M14.2,11L13.306,13.023L11.2,13.292L12.753,14.811L12.346,17L14.2,15.75L16.054,17L15.647,14.811L17.2,13.292L15.094,13.023L14.2,11Z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M14.2,-1L13.306,1.023L11.2,1.292L12.753,2.811L12.346,5L14.2,3.75L16.054,5L15.647,2.811L17.2,1.292L15.094,1.023L14.2,-1Z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M10.2,5L9.306,7.023L7.2,7.292L8.753,8.811L8.346,11L10.2,9.75L12.054,11L11.647,8.811L13.2,7.292L11.094,7.023L10.2,5Z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M5.7,11L4.806,13.023L2.7,13.292L4.253,14.811L3.846,17L5.7,15.75L7.554,17L7.147,14.811L8.7,13.292L6.594,13.023L5.7,11Z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M5.7,-1L4.806,1.023L2.7,1.292L4.253,2.811L3.846,5L5.7,3.75L7.554,5L7.147,2.811L8.7,1.292L6.594,1.023L5.7,-1Z"
+        android:fillColor="#F5F7F8"/>
+    <path
+        android:pathData="M1.7,5L0.806,7.023L-1.3,7.292L0.253,8.811L-0.154,11L1.7,9.75L3.554,11L3.147,8.811L4.7,7.292L2.594,7.023L1.7,5Z"
+        android:fillColor="#F5F7F8"/>
+  </group>
+</vector>
diff --git a/core/ui/src/main/res/drawable/img_visa_label_26_16.xml b/core/ui/src/main/res/drawable/img_visa_label_26_16.xml
new file mode 100644
index 0000000000..c5859a2fda
--- /dev/null
+++ b/core/ui/src/main/res/drawable/img_visa_label_26_16.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="26dp"
+    android:height="16dp"
+    android:viewportWidth="26"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M3,0L23,0A3,3 0,0 1,26 3L26,13A3,3 0,0 1,23 16L3,16A3,3 0,0 1,0 13L0,3A3,3 0,0 1,3 0z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#474E71"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M7.521,11.139H5.788L4.488,6.193C4.427,5.966 4.296,5.765 4.103,5.67C3.622,5.431 3.093,5.242 2.515,5.146V4.956H5.306C5.692,4.956 5.981,5.242 6.029,5.574L6.703,9.142L8.435,4.956H10.12L7.521,11.139ZM11.082,11.139H9.445L10.793,4.956H12.429L11.082,11.139ZM14.549,6.668C14.597,6.335 14.886,6.145 15.223,6.145C15.753,6.097 16.33,6.192 16.811,6.43L17.1,5.099C16.619,4.908 16.089,4.813 15.608,4.813C14.02,4.813 12.864,5.669 12.864,6.858C12.864,7.762 13.683,8.237 14.261,8.523C14.886,8.808 15.127,8.998 15.078,9.284C15.078,9.712 14.597,9.902 14.116,9.902C13.538,9.902 12.96,9.759 12.431,9.521L12.142,10.853C12.72,11.091 13.345,11.186 13.924,11.186C15.705,11.233 16.811,10.378 16.811,9.093C16.811,7.476 14.549,7.381 14.549,6.668ZM22.54,11.139L21.241,4.956H19.845C19.556,4.956 19.267,5.146 19.171,5.431L16.764,11.139H18.449L18.785,10.236H20.855L21.048,11.139H22.54ZM20.083,6.621L20.564,8.951H19.216L20.083,6.621Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/core/utils/src/main/java/com/tangem/utils/TangemBlogUrlBuilder.kt b/core/utils/src/main/java/com/tangem/utils/TangemBlogUrlBuilder.kt
new file mode 100644
index 0000000000..576a078921
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/TangemBlogUrlBuilder.kt
@@ -0,0 +1,23 @@
+package com.tangem.utils
+
+import java.util.Locale
+
+object TangemBlogUrlBuilder {
+
+    private const val RU_LOCALE = "ru"
+    private const val EN_LOCALE = "en"
+
+    private const val TANGEM_MAIN = "https://tangem.com/"
+
+    val FEE_BLOG_LINK: String
+        get(): String {
+            val locale = if (Locale.getDefault().language == RU_LOCALE) RU_LOCALE else EN_LOCALE
+            return buildString {
+                append(TANGEM_MAIN)
+                append(locale)
+                append("/blog/post/what-is-a-transaction-fee-and-why-do-we-need-it/")
+            }
+        }
+
+    const val RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP = "https://tangem.com/en/blog/post/give-revoke-permission/"
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/Collection.kt b/core/utils/src/main/java/com/tangem/utils/extensions/Collection.kt
index 6ab240ea41..2a9271dc93 100644
--- a/core/utils/src/main/java/com/tangem/utils/extensions/Collection.kt
+++ b/core/utils/src/main/java/com/tangem/utils/extensions/Collection.kt
@@ -20,7 +20,22 @@ fun <T> Collection<T>.copy(): Collection<T> {
     return this.map { it }
 }
 
-inline fun <T> List<T>.indexOfFirstOrNull(predicate: (T) -> Boolean): Int? {
-    val index = indexOfFirst(predicate)
-    return if (index == -1) null else index
+/**
+ * Adds an element to the mutable list if the specified condition is true.
+ *
+ * @param condition The condition to evaluate.
+ * @param create A lambda function that creates the element to be added.
+ */
+inline fun <T> MutableCollection<T>.addIf(condition: Boolean, create: () -> T) {
+    addIf(condition = condition, element = create())
+}
+
+/**
+ * Adds an element to the mutable list if the specified condition is true.
+ *
+ * @param condition The condition to evaluate.
+ * @param element The element to be added.
+ */
+fun <T> MutableCollection<T>.addIf(condition: Boolean, element: T) {
+    if (condition) this.add(element)
 }
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/extensions/List.kt b/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
index cad9f1fada..a47b33dee3 100644
--- a/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
+++ b/core/utils/src/main/java/com/tangem/utils/extensions/List.kt
@@ -72,4 +72,9 @@ fun <T> List<T>.filterIf(condition: Boolean, predicate: (T) -> Boolean): List<T>
     } else {
         this
     }
+}
+
+inline fun <T> List<T>.indexOfFirstOrNull(predicate: (T) -> Boolean): Int? {
+    val index = indexOfFirst(predicate)
+    return if (index == -1) null else index
 }
\ No newline at end of file
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/di/AccountDataModule.kt b/data/account/src/main/kotlin/com/tangem/data/account/di/AccountDataModule.kt
index df7c1a3919..198b1291fd 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/di/AccountDataModule.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/di/AccountDataModule.kt
@@ -7,13 +7,16 @@ import com.tangem.data.account.fetcher.DefaultWalletAccountsFetcher
 import com.tangem.data.account.repository.DefaultAccountsCRUDRepository
 import com.tangem.data.account.store.AccountsResponseStoreFactory
 import com.tangem.data.account.store.ArchivedAccountsStoreFactory
+import com.tangem.data.account.tokens.DefaultMainAccountTokensMigration
 import com.tangem.data.common.account.WalletAccountsFetcher
 import com.tangem.data.common.account.WalletAccountsSaver
 import com.tangem.data.common.cache.etag.ETagsStore
+import com.tangem.data.common.currency.UserTokensSaver
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.local.userwallet.UserWalletsStore
 import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
 import com.tangem.domain.account.repository.AccountsCRUDRepository
+import com.tangem.domain.account.tokens.MainAccountTokensMigration
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -61,4 +64,16 @@ internal object AccountDataModule {
     @Provides
     @Singleton
     fun provideWalletAccountsSaver(impl: DefaultWalletAccountsFetcher): WalletAccountsSaver = impl
+
+    @Provides
+    @Singleton
+    fun provideMainAccountTokensMigration(
+        accountsResponseStoreFactory: AccountsResponseStoreFactory,
+        userTokensSaver: UserTokensSaver,
+    ): MainAccountTokensMigration {
+        return DefaultMainAccountTokensMigration(
+            accountsResponseStoreFactory = accountsResponseStoreFactory,
+            userTokensSaver = userTokensSaver,
+        )
+    }
 }
\ No newline at end of file
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultMultiAccountListFetcher.kt b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultMultiAccountListFetcher.kt
index ada7843d5c..2be1ac75dc 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultMultiAccountListFetcher.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultMultiAccountListFetcher.kt
@@ -11,6 +11,7 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
 
 /**
  * Implementation of [MultiAccountListFetcher]
@@ -20,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap
  *
 [REDACTED_AUTHOR]
  */
-internal class DefaultMultiAccountListFetcher(
+internal class DefaultMultiAccountListFetcher @Inject constructor(
     private val singleAccountListFetcher: SingleAccountListFetcher,
     private val userWalletsStore: UserWalletsStore,
 ) : MultiAccountListFetcher {
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultSingleAccountListFetcher.kt b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultSingleAccountListFetcher.kt
index b10047e2ec..44d745e817 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultSingleAccountListFetcher.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultSingleAccountListFetcher.kt
@@ -3,6 +3,7 @@ package com.tangem.data.account.fetcher
 import arrow.core.Either
 import com.tangem.data.common.account.WalletAccountsFetcher
 import com.tangem.domain.account.fetcher.SingleAccountListFetcher
+import javax.inject.Inject
 
 /**
  * Implementation of [SingleAccountListFetcher]
@@ -11,7 +12,7 @@ import com.tangem.domain.account.fetcher.SingleAccountListFetcher
  *
 [REDACTED_AUTHOR]
  */
-internal class DefaultSingleAccountListFetcher(
+internal class DefaultSingleAccountListFetcher @Inject constructor(
     private val walletAccountsFetcher: WalletAccountsFetcher,
 ) : SingleAccountListFetcher {
 
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcher.kt b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcher.kt
index 17bc75d8ff..4fcfd53598 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcher.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcher.kt
@@ -11,7 +11,7 @@ import com.tangem.data.common.cache.etag.ETagsStore
 import com.tangem.data.common.currency.UserTokensSaver
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError.HttpException.Code
-import com.tangem.datasource.api.common.response.IF_NONE_MATCH_HEADER
+import com.tangem.datasource.api.common.response.ETAG_HEADER
 import com.tangem.datasource.api.common.response.isNetworkError
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse
@@ -86,7 +86,11 @@ internal class DefaultWalletAccountsFetcher @Inject constructor(
                     tangemTechApi.saveWalletAccounts(
                         walletId = userWalletId.stringValue,
                         eTag = eTag,
-                        body = body,
+                        body = body.copy(
+                            accounts = body.accounts.map {
+                                it.copy(tokens = null, totalTokens = null, totalNetworks = null)
+                            },
+                        ),
                     )
                 }
 
@@ -122,10 +126,10 @@ internal class DefaultWalletAccountsFetcher @Inject constructor(
 
                 responseBody
             },
-            onError = {
+            onError = { throwable ->
                 // pushWalletAccounts and storeWalletAccounts help to avoid cyclic dependency
                 fetchWalletAccountsErrorHandler.handle(
-                    error = it,
+                    error = throwable,
                     userWalletId = userWalletId,
                     savedAccountsResponse = savedAccountsResponse,
                     pushWalletAccounts = ::push,
@@ -140,7 +144,7 @@ internal class DefaultWalletAccountsFetcher @Inject constructor(
     private suspend fun assignTokens(userWalletId: UserWalletId, accountsResponse: GetWalletAccountsResponse) {
         val accountsResponseWithTokens = accountsResponse.assignTokens(userWalletId)
 
-        pushAndStore(userWalletId = userWalletId, response = accountsResponseWithTokens)
+        store(userWalletId = userWalletId, response = accountsResponseWithTokens)
 
         userTokensSaver.push(
             userWalletId = userWalletId,
@@ -153,7 +157,7 @@ internal class DefaultWalletAccountsFetcher @Inject constructor(
     }
 
     private suspend fun saveETag(userWalletId: UserWalletId, apiResponse: ApiResponse<*>) {
-        val eTag = apiResponse.headers[IF_NONE_MATCH_HEADER]?.firstOrNull()
+        val eTag = apiResponse.headers[ETAG_HEADER]?.firstOrNull()
 
         if (eTag != null) {
             eTagsStore.store(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts, value = eTag)
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt b/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt
index 1f8f47d3c9..765d6afcc1 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/producer/WalletAccountListFlowFactory.kt
@@ -50,7 +50,7 @@ internal class WalletAccountListFlowFactory @Inject constructor(
         val currencies = if (isSingleWalletWithToken) {
             cardCryptoCurrencyFactory.createCurrenciesForSingleCurrencyCardWithToken(userWallet = userWallet).toSet()
         } else {
-            cardCryptoCurrencyFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet = userWallet).let(::setOf)
+            setOf(cardCryptoCurrencyFactory.createPrimaryCurrencyForSingleCurrencyCard(userWallet = userWallet))
         }
 
         return AccountList.empty(userWallet = userWallet, cryptoCurrencies = currencies)
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/store/AccountsResponseStoreFactory.kt b/data/account/src/main/kotlin/com/tangem/data/account/store/AccountsResponseStoreFactory.kt
index a8ffea4d37..df3f05aaa0 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/store/AccountsResponseStoreFactory.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/store/AccountsResponseStoreFactory.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
+import javax.inject.Singleton
 
 typealias AccountsResponseStore = DataStore<GetWalletAccountsResponse?>
 
@@ -30,6 +31,7 @@ typealias AccountsResponseStore = DataStore<GetWalletAccountsResponse?>
  *
 [REDACTED_AUTHOR]
  */
+@Singleton
 internal class AccountsResponseStoreFactory @Inject constructor(
     @ApplicationContext private val context: Context,
     @NetworkMoshi private val moshi: Moshi,
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/tokens/DefaultMainAccountTokensMigration.kt b/data/account/src/main/kotlin/com/tangem/data/account/tokens/DefaultMainAccountTokensMigration.kt
new file mode 100644
index 0000000000..90a1de9362
--- /dev/null
+++ b/data/account/src/main/kotlin/com/tangem/data/account/tokens/DefaultMainAccountTokensMigration.kt
@@ -0,0 +1,147 @@
+package com.tangem.data.account.tokens
+
+import arrow.core.Either
+import arrow.core.raise.Raise
+import arrow.core.raise.either
+import arrow.core.raise.ensureNotNull
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.fromNetworkId
+import com.tangem.data.account.store.AccountsResponseStoreFactory
+import com.tangem.data.account.utils.assignTokens
+import com.tangem.data.account.utils.toUserTokensResponse
+import com.tangem.data.common.currency.UserTokensSaver
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse
+import com.tangem.datasource.api.tangemTech.models.account.WalletAccountDTO
+import com.tangem.datasource.utils.getSyncOrNull
+import com.tangem.domain.account.tokens.MainAccountTokensMigration
+import com.tangem.domain.models.account.DerivationIndex
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.lib.crypto.derivation.AccountNodeRecognizer
+import timber.log.Timber
+
+/**
+ * Implementation of [MainAccountTokensMigration] for migrating tokens associated with a main account.
+ * The migration process involves transferring unassigned tokens from the main account to a selected account.
+ *
+ * @property accountsResponseStoreFactory Factory for creating stores to access cached account responses.
+ * @property userTokensSaver Saver for updating user tokens in persistent storage.
+ *
+[REDACTED_AUTHOR]
+ */
+internal class DefaultMainAccountTokensMigration(
+    private val accountsResponseStoreFactory: AccountsResponseStoreFactory,
+    private val userTokensSaver: UserTokensSaver,
+) : MainAccountTokensMigration {
+
+    override suspend fun migrate(
+        userWalletId: UserWalletId,
+        derivationIndex: DerivationIndex,
+    ): Either<Throwable, Unit> = either {
+        if (derivationIndex == DerivationIndex.Main) {
+            Timber.i("Migration skipped: derivation index is Main")
+            return@either
+        }
+
+        val store = accountsResponseStoreFactory.create(userWalletId)
+
+        val response = store.getSyncOrNull()
+
+        ensureNotNull(response) {
+            val exception = IllegalStateException("No cached accounts response found")
+            Timber.e(exception)
+            exception
+        }
+
+        val mainAccount = findAccount(response = response, derivationIndex = DerivationIndex.Main)
+        val selectedAccount = findAccount(response = response, derivationIndex = derivationIndex)
+
+        val unassignedTokens = mainAccount.findUnassignedTokens(derivationIndex)
+
+        if (unassignedTokens == null) {
+            Timber.i("No unassigned tokens found for migration")
+            return@either
+        }
+
+        val updatedResponse = response.copy(
+            accounts = response.accounts.map { account ->
+                when (account.id) {
+                    mainAccount.id -> {
+                        account.copy(tokens = account.tokens.orEmpty() - unassignedTokens)
+                    }
+                    selectedAccount.id -> {
+                        selectedAccount.assignTokens(userWalletId, unassignedTokens)
+                    }
+                    else -> account
+                }
+            },
+        )
+
+        userTokensSaver.push(
+            userWalletId = userWalletId,
+            response = updatedResponse.toUserTokensResponse(),
+            onFailSend = {
+                // TODO: save failed state to retry later
+                //  [REDACTED_JIRA]
+                val exception = IllegalStateException("Failed to push updated tokens after migration")
+                Timber.e(exception)
+                raise(exception)
+            },
+        )
+    }
+
+    private fun Raise<Throwable>.findAccount(
+        response: GetWalletAccountsResponse,
+        derivationIndex: DerivationIndex,
+    ): WalletAccountDTO {
+        val account = response.accounts.firstOrNull { it.derivationIndex == derivationIndex.value }
+
+        return ensureNotNull(account) {
+            val exception = IllegalStateException("No account found with derivation index: $derivationIndex")
+            Timber.e(exception)
+            exception
+        }
+    }
+
+    private fun WalletAccountDTO.findUnassignedTokens(
+        derivationIndex: DerivationIndex,
+    ): List<UserTokensResponse.Token>? {
+        val tokens = this.tokens
+
+        if (tokens.isNullOrEmpty()) return tokens
+
+        return tokens
+            .filterByDerivationIndex(derivationIndex)
+            .map { it.copy(accountId = null) }
+            .toNonEmptyListOrNull()
+    }
+
+    private fun List<UserTokensResponse.Token>.filterByDerivationIndex(
+        derivationIndex: DerivationIndex,
+    ): List<UserTokensResponse.Token> {
+        return filter { savedToken ->
+            val blockchain = Blockchain.fromNetworkId(networkId = savedToken.networkId)
+            if (blockchain == null) {
+                Timber.e("Token has unknown networkId: $savedToken")
+                return@filter false
+            }
+
+            val derivationPathValue = savedToken.derivationPath
+            if (derivationPathValue == null) {
+                Timber.e("Token has no derivation path: $savedToken")
+                return@filter false
+            }
+
+            val accountNodeRecognizer = AccountNodeRecognizer(blockchain)
+            val accountNodeValue = accountNodeRecognizer.recognize(derivationPathValue)
+
+            if (accountNodeValue == null) {
+                Timber.e("Token has unrecognized derivation path: $savedToken")
+                return@filter false
+            }
+
+            accountNodeValue == derivationIndex.value.toLong()
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/account/src/main/kotlin/com/tangem/data/account/utils/GetWalletAccountsResponseExt.kt b/data/account/src/main/kotlin/com/tangem/data/account/utils/GetWalletAccountsResponseExt.kt
index caace442d6..ee6c308a81 100644
--- a/data/account/src/main/kotlin/com/tangem/data/account/utils/GetWalletAccountsResponseExt.kt
+++ b/data/account/src/main/kotlin/com/tangem/data/account/utils/GetWalletAccountsResponseExt.kt
@@ -54,4 +54,14 @@ internal fun List<WalletAccountDTO>.assignTokens(
             tokens = enrichedTokens[accountDTO.id].orEmpty(),
         )
     }
+}
+
+internal fun WalletAccountDTO.assignTokens(
+    userWalletId: UserWalletId,
+    tokens: List<UserTokensResponse.Token>,
+): WalletAccountDTO {
+    val enrichedTokens = UserTokensResponseAccountIdEnricher(userWalletId, tokens)
+        .filter { it.accountId == this.id }
+
+    return copy(tokens = enrichedTokens)
 }
\ No newline at end of file
diff --git a/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt b/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
index d90aa7727c..ac012e76fb 100644
--- a/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/fetcher/DefaultWalletAccountsFetcherTest.kt
@@ -2,18 +2,18 @@ package com.tangem.data.account.fetcher
 
 import com.google.common.truth.Truth
 import com.tangem.data.account.converter.createGetWalletAccountsResponse
+import com.tangem.data.account.converter.createWalletAccountDTO
 import com.tangem.data.account.store.AccountsResponseStore
 import com.tangem.data.account.store.AccountsResponseStoreFactory
 import com.tangem.data.common.cache.etag.ETagsStore
 import com.tangem.data.common.currency.UserTokensSaver
 import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
-import com.tangem.datasource.api.common.response.IF_NONE_MATCH_HEADER
+import com.tangem.datasource.api.common.response.ETAG_HEADER
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
 import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse
 import com.tangem.datasource.api.tangemTech.models.account.SaveWalletAccountsResponse
-import com.tangem.datasource.api.tangemTech.models.account.WalletAccountDTO
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
 import io.mockk.*
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.*
 /**
 [REDACTED_AUTHOR]
  */
+@Suppress("Unchecked_Cast", "UnusedFlow")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class DefaultWalletAccountsFetcherTest {
 
@@ -78,14 +79,17 @@ class DefaultWalletAccountsFetcherTest {
             val savedAccountsResponse = null
             val unassignedToken = createToken(accountId = null)
 
+            val accounts = listOf(createWalletAccountDTO(userWalletId = userWalletId, tokens = null))
             val accountsResponse = createGetWalletAccountsResponse(
                 userWalletId = userWalletId,
                 unassignedTokens = listOf(unassignedToken),
             )
+                .copy(accounts = accounts)
+
             val newETag = "newEtag"
             val apiResponse = ApiResponse.Success(
                 data = accountsResponse,
-                headers = mapOf(IF_NONE_MATCH_HEADER to listOf(newETag)),
+                headers = mapOf(ETAG_HEADER to listOf(newETag)),
             )
 
             accountsResponseStoreFlow.value = savedAccountsResponse
@@ -124,12 +128,6 @@ class DefaultWalletAccountsFetcherTest {
                 eTagsStore.store(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts, value = newETag)
                 accountsResponseStoreFactory.create(userWalletId = userWalletId)
                 accountsResponseStore.updateData(any())
-                eTagsStore.getSyncOrNull(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts)
-                tangemTechApi.saveWalletAccounts(
-                    walletId = userWalletId.stringValue,
-                    eTag = eTag,
-                    body = SaveWalletAccountsResponse(updatedAccountsResponse.accounts),
-                )
                 accountsResponseStoreFactory.create(userWalletId = userWalletId)
                 accountsResponseStore.updateData(any())
             }
@@ -156,7 +154,7 @@ class DefaultWalletAccountsFetcherTest {
             val newETag = "newEtag"
             val apiResponse = ApiResponse.Success(
                 data = accountsResponse,
-                headers = mapOf(IF_NONE_MATCH_HEADER to listOf(newETag)),
+                headers = mapOf(ETAG_HEADER to listOf(newETag)),
             )
 
             accountsResponseStoreFlow.value = savedAccountsResponse
@@ -199,7 +197,7 @@ class DefaultWalletAccountsFetcherTest {
         fun `fetch should call error handler when getWalletAccounts returns error`() = runTest {
             // Arrange
             val savedAccountsResponse = null
-            val apiError = ApiResponse.Error(ApiResponseError.NetworkException)
+            val apiError = ApiResponse.Error(ApiResponseError.NetworkException())
 
             accountsResponseStoreFlow.value = savedAccountsResponse
 
@@ -232,87 +230,6 @@ class DefaultWalletAccountsFetcherTest {
                 userTokensSaver.push(userWalletId = any(), response = any())
             }
         }
-
-        @Test
-        fun `push should throw error when saveWalletAccounts returns PRECONDITION_FAILED`() = runTest {
-            // Arrange
-            val savedAccountsResponse = null
-            val unassignedToken = createToken(accountId = null)
-
-            val accountsResponse = createGetWalletAccountsResponse(
-                userWalletId = userWalletId,
-                unassignedTokens = listOf(unassignedToken),
-            )
-
-            val newETag = "newEtag"
-            val apiResponse = ApiResponse.Success(
-                data = accountsResponse,
-                headers = mapOf(IF_NONE_MATCH_HEADER to listOf(newETag)),
-            )
-
-            val apiError = ApiResponseError.HttpException(
-                code = ApiResponseError.HttpException.Code.PRECONDITION_FAILED,
-                message = null,
-                errorBody = null,
-            )
-            val saveApiResponse = ApiResponse.Error(apiError)
-
-            accountsResponseStoreFlow.value = savedAccountsResponse
-
-            val accountId = "957B88B12730E646E0F33D3618B77DFA579E8231E3C59C7104BE7165611C8027"
-            val updatedAccountsResponse = accountsResponse.copy(
-                accounts = accountsResponse.accounts.map {
-                    it.copy(tokens = listOf(unassignedToken.copy(accountId = accountId)))
-                },
-                unassignedTokens = emptyList(),
-            )
-
-            coEvery {
-                tangemTechApi.getWalletAccounts(walletId = userWalletId.stringValue, eTag = eTag)
-            } returns apiResponse
-
-            coEvery { accountsResponseStore.updateData(any()) } returns accountsResponse
-
-            coEvery {
-                tangemTechApi.saveWalletAccounts(
-                    walletId = userWalletId.stringValue,
-                    eTag = eTag,
-                    body = SaveWalletAccountsResponse(updatedAccountsResponse.accounts),
-                )
-            } returns saveApiResponse as ApiResponse<Unit>
-
-            // Act
-            val actual = runCatching { fetcher.fetch(userWalletId) }.exceptionOrNull()!!
-
-            // Assert
-            Truth.assertThat(actual).isEqualTo(apiError)
-
-            coVerifyOrder {
-                accountsResponseStoreFactory.create(userWalletId = userWalletId)
-                accountsResponseStore.data
-                eTagsStore.getSyncOrNull(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts)
-                tangemTechApi.getWalletAccounts(walletId = userWalletId.stringValue, eTag = eTag)
-                eTagsStore.store(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts, value = newETag)
-                accountsResponseStoreFactory.create(userWalletId = userWalletId)
-                accountsResponseStore.updateData(any())
-                eTagsStore.getSyncOrNull(userWalletId = userWalletId, key = ETagsStore.Key.WalletAccounts)
-                tangemTechApi.saveWalletAccounts(
-                    walletId = userWalletId.stringValue,
-                    eTag = eTag,
-                    body = SaveWalletAccountsResponse(updatedAccountsResponse.accounts),
-                )
-            }
-
-            coVerify(inverse = true) {
-                fetchWalletAccountsErrorHandler.handle(
-                    error = any(),
-                    userWalletId = any(),
-                    savedAccountsResponse = any(),
-                    pushWalletAccounts = any(),
-                    storeWalletAccounts = any(),
-                )
-            }
-        }
     }
 
     @Nested
@@ -343,9 +260,7 @@ class DefaultWalletAccountsFetcherTest {
         @Test
         fun `push should call saveWalletAccounts with correct params`() = runTest {
             // Arrange
-            val accounts = listOf(
-                mockk<WalletAccountDTO>(),
-            )
+            val accounts = listOf(createWalletAccountDTO(userWalletId = userWalletId, tokens = null))
             val response = SaveWalletAccountsResponse(accounts)
 
             coEvery {
@@ -373,7 +288,7 @@ class DefaultWalletAccountsFetcherTest {
         fun `push should throw error when saveWalletAccounts returns PRECONDITION_FAILED`() = runTest {
             // Arrange
             val accounts = listOf(
-                mockk<WalletAccountDTO>(),
+                createWalletAccountDTO(userWalletId = userWalletId, tokens = null),
             )
             val response = SaveWalletAccountsResponse(accounts)
             val apiError = ApiResponseError.HttpException(
@@ -405,10 +320,8 @@ class DefaultWalletAccountsFetcherTest {
         @Test
         fun `pushAndStore should call push and store with correct params`() = runTest {
             // Arrange
-            listOf(
-                mockk<WalletAccountDTO>(),
-            )
-            val response = createGetWalletAccountsResponse(userWalletId)
+            val accounts = listOf(createWalletAccountDTO(userWalletId = userWalletId, tokens = null))
+            val response = createGetWalletAccountsResponse(userWalletId).copy(accounts = accounts)
 
             coEvery {
                 tangemTechApi.saveWalletAccounts(
diff --git a/data/account/src/test/java/com/tangem/data/account/fetcher/FetchWalletAccountsErrorHandlerTest.kt b/data/account/src/test/java/com/tangem/data/account/fetcher/FetchWalletAccountsErrorHandlerTest.kt
index 532b33975b..422c9a7b8a 100644
--- a/data/account/src/test/java/com/tangem/data/account/fetcher/FetchWalletAccountsErrorHandlerTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/fetcher/FetchWalletAccountsErrorHandlerTest.kt
@@ -158,7 +158,7 @@ class FetchWalletAccountsErrorHandlerTest {
     @Test
     fun `uses default accounts when savedAccountsResponse is null`() = runTest {
         // Arrange
-        val error = ApiResponseError.TimeoutException
+        val error = ApiResponseError.TimeoutException()
 
         val accounts = AccountList.empty(userWallet).accounts
             .filterIsInstance<Account.CryptoPortfolio>()
diff --git a/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt b/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt
index c94ef86564..6e13e22dad 100644
--- a/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt
+++ b/data/account/src/test/java/com/tangem/data/account/producer/WalletAccountListFlowFactoryTest.kt
@@ -48,8 +48,13 @@ class WalletAccountListFlowFactoryTest {
 
     @AfterEach
     fun tearDownEach() {
-        clearMocks(accountListConverter)
-
+        clearMocks(
+            accountsResponseStoreFactory,
+            accountsResponseStore,
+            accountListConverterFactory,
+            accountListConverter,
+            cardCryptoCurrencyFactory,
+        )
         accountsResponseStoreFlow.value = null
     }
 
diff --git a/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt b/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
new file mode 100644
index 0000000000..37c3d84862
--- /dev/null
+++ b/data/account/src/test/java/com/tangem/data/account/token/DefaultMainAccountTokensMigrationTest.kt
@@ -0,0 +1,226 @@
+package com.tangem.data.account.token
+
+import com.tangem.common.test.utils.assertEitherLeft
+import com.tangem.common.test.utils.assertEitherRight
+import com.tangem.data.account.converter.createGetWalletAccountsResponse
+import com.tangem.data.account.converter.createWalletAccountDTO
+import com.tangem.data.account.store.AccountsResponseStore
+import com.tangem.data.account.store.AccountsResponseStoreFactory
+import com.tangem.data.account.tokens.DefaultMainAccountTokensMigration
+import com.tangem.data.account.utils.toUserTokensResponse
+import com.tangem.data.common.currency.UserTokensSaver
+import com.tangem.datasource.api.tangemTech.models.UserTokensResponse
+import com.tangem.datasource.api.tangemTech.models.account.GetWalletAccountsResponse
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.DerivationIndex
+import com.tangem.domain.models.wallet.UserWalletId
+import io.mockk.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@Suppress("UnusedFlow")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class DefaultMainAccountTokensMigrationTest {
+
+    private val accountsResponseStoreFactory = mockk<AccountsResponseStoreFactory>()
+    private val accountsResponseStore = mockk<AccountsResponseStore>()
+    private val accountsResponseStoreFlow = MutableStateFlow<GetWalletAccountsResponse?>(value = null)
+
+    private val userTokensSaver = mockk<UserTokensSaver>(relaxed = true)
+    private val migration = DefaultMainAccountTokensMigration(
+        accountsResponseStoreFactory = accountsResponseStoreFactory,
+        userTokensSaver = userTokensSaver,
+    )
+
+    private val userWalletId = UserWalletId("011")
+    private val derivationIndex = DerivationIndex(1).getOrNull()!!
+
+    @BeforeEach
+    fun setupAll() {
+        every { accountsResponseStoreFactory.create(userWalletId) } returns accountsResponseStore
+        every { accountsResponseStore.data } returns accountsResponseStoreFlow
+    }
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(accountsResponseStoreFactory, accountsResponseStore, userTokensSaver)
+        accountsResponseStoreFlow.value = null
+    }
+
+    @Test
+    fun `migrate skips when derivation index is Main`() = runTest {
+        // Act
+        val actual = migration.migrate(userWalletId, DerivationIndex.Main)
+
+        // Assert
+        assertEitherRight(actual)
+
+        coVerify(inverse = true) {
+            accountsResponseStoreFactory.create(any())
+            accountsResponseStore.data
+            userTokensSaver.push(userWalletId = any(), response = any(), onFailSend = any())
+        }
+    }
+
+    @Test
+    fun `migrate fails when no cached accounts response`() = runTest {
+        // Act
+        val actual = migration.migrate(userWalletId, derivationIndex)
+
+        // Assert
+        val expected = IllegalStateException("No cached accounts response found")
+        assertEitherLeft(actual, expected)
+
+        coVerifySequence {
+            accountsResponseStoreFactory.create(userWalletId)
+            accountsResponseStore.data
+        }
+
+        coVerify(inverse = true) {
+            userTokensSaver.push(userWalletId = any(), response = any(), onFailSend = any())
+        }
+    }
+
+    @Test
+    fun `migrate fails when selected account DTO not found`() = runTest {
+        // Arrange
+        val response = createGetWalletAccountsResponse(
+            userWalletId = userWalletId,
+            tokens = listOf(
+                createBitcoin(accountIndex = DerivationIndex.Main.value),
+            ),
+        )
+
+        accountsResponseStoreFlow.value = response
+
+        // Act
+        val actual = migration.migrate(userWalletId, derivationIndex)
+
+        // Assert
+        val expected = IllegalStateException("No account found with derivation index: $derivationIndex")
+        assertEitherLeft(actual, expected)
+
+        coVerifySequence {
+            accountsResponseStoreFactory.create(userWalletId)
+            accountsResponseStore.data
+        }
+
+        coVerify(inverse = true) {
+            userTokensSaver.push(userWalletId = any(), response = any(), onFailSend = any())
+        }
+    }
+
+    @Test
+    fun `migrate skips when no unassigned tokens`() = runTest {
+        // Arrange
+        val response = createGetWalletAccountsResponse(
+            userWalletId = userWalletId,
+            tokens = listOf(
+                createBitcoin(accountIndex = DerivationIndex.Main.value),
+            ),
+        )
+
+        val selectedAccount = createWalletAccountDTO(
+            userWalletId = userWalletId,
+            accountId = AccountId.forCryptoPortfolio(userWalletId, derivationIndex).value,
+            derivationIndex = derivationIndex.value,
+            tokens = emptyList(),
+        )
+
+        accountsResponseStoreFlow.value = response.copy(accounts = response.accounts + selectedAccount)
+
+        // Act
+        val actual = migration.migrate(userWalletId, derivationIndex)
+
+        // Assert
+        assertEitherRight(actual)
+
+        coVerifySequence {
+            accountsResponseStoreFactory.create(userWalletId)
+            accountsResponseStore.data
+        }
+
+        coVerify(inverse = true) {
+            userTokensSaver.push(userWalletId = any(), response = any(), onFailSend = any())
+        }
+    }
+
+    @Test
+    fun `migrate updates tokens for selected account`() = runTest {
+        // Arrange
+        val unassignedToken = createBitcoin(accountIndex = 1)
+
+        val mainAccount = createWalletAccountDTO(
+            userWalletId = userWalletId,
+            accountId = AccountId.forCryptoPortfolio(userWalletId, DerivationIndex.Main).value,
+            derivationIndex = DerivationIndex.Main.value,
+            tokens = listOf(
+                createBitcoin(accountIndex = 0),
+                unassignedToken,
+            ),
+        )
+
+        val selectedAccount = createWalletAccountDTO(
+            userWalletId = userWalletId,
+            accountId = AccountId.forCryptoPortfolio(userWalletId, derivationIndex).value,
+            derivationIndex = derivationIndex.value,
+            tokens = emptyList(),
+        )
+
+        val response = GetWalletAccountsResponse(
+            wallet = GetWalletAccountsResponse.Wallet(
+                group = UserTokensResponse.GroupType.NONE,
+                sort = UserTokensResponse.SortType.MANUAL,
+                totalAccounts = 2,
+            ),
+            accounts = listOf(mainAccount, selectedAccount),
+            unassignedTokens = emptyList(),
+        )
+
+        accountsResponseStoreFlow.value = response
+
+        // Act
+        val actual = migration.migrate(userWalletId, derivationIndex)
+
+        // Assert
+        assertEitherRight(actual)
+
+        val migratedResponse = response.copy(
+            accounts = listOf(
+                mainAccount.copy(tokens = mainAccount.tokens!! - unassignedToken),
+                selectedAccount.copy(tokens = listOf(unassignedToken)),
+            ),
+        )
+
+        coVerifySequence {
+            accountsResponseStoreFactory.create(userWalletId)
+            accountsResponseStore.data
+            userTokensSaver.push(
+                userWalletId = userWalletId,
+                response = migratedResponse.toUserTokensResponse(),
+                onFailSend = any(),
+            )
+        }
+    }
+
+    private fun createBitcoin(accountIndex: Int): UserTokensResponse.Token {
+        return UserTokensResponse.Token(
+            id = "ne",
+            accountId = AccountId.forCryptoPortfolio(
+                userWalletId = userWalletId,
+                derivationIndex = DerivationIndex(accountIndex).getOrNull()!!,
+            ).value,
+            networkId = "bitcoin",
+            derivationPath = "m/44'/60'/$accountIndex'/0/0",
+            name = "Phil Hinton",
+            symbol = "graeci",
+            decimals = 6487,
+            contractAddress = "vim",
+            addresses = listOf(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/analytics/src/main/kotlin/com/tangem/data/analytics/DefaultAnalyticsRepository.kt b/data/analytics/src/main/kotlin/com/tangem/data/analytics/DefaultAnalyticsRepository.kt
index db1f57f029..e11b00a841 100644
--- a/data/analytics/src/main/kotlin/com/tangem/data/analytics/DefaultAnalyticsRepository.kt
+++ b/data/analytics/src/main/kotlin/com/tangem/data/analytics/DefaultAnalyticsRepository.kt
@@ -37,14 +37,14 @@ internal class DefaultAnalyticsRepository(
     }
 
     override suspend fun setWalletBalanceState(userWalletId: UserWalletId, balanceState: WalletBalanceState) {
-        appPreferencesStore.editData {
-            val walletsBalanceState = it.getObjectMap<WalletBalanceState>(
+        appPreferencesStore.editData { preferences ->
+            val walletsBalanceState = preferences.getObjectMap<WalletBalanceState>(
                 key = PreferencesKeys.WALLETS_BALANCES_STATES_KEY,
             )
             val updatedWalletsBalanceState = walletsBalanceState
                 .plus(pair = userWalletId.stringValue to balanceState)
 
-            it.setObjectMap(PreferencesKeys.WALLETS_BALANCES_STATES_KEY, updatedWalletsBalanceState)
+            preferences.setObjectMap(PreferencesKeys.WALLETS_BALANCES_STATES_KEY, updatedWalletsBalanceState)
         }
     }
 }
\ No newline at end of file
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt
index 9a4c8de638..f69cc30dd9 100644
--- a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/DefaultDeviceFlipDetector.kt
@@ -20,8 +20,8 @@ class DefaultDeviceFlipDetector @Inject constructor(
 ) : DeviceFlipDetector, DefaultLifecycleObserver {
 
     private val sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
-    private var gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY)
-    private var isResumedState = AtomicBoolean(false)
+    private val gravitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY)
+    private val isResumedState = AtomicBoolean(false)
 
     override fun onPause(owner: LifecycleOwner) {
         isResumedState.set(false)
diff --git a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt
index b535797121..292a209dc4 100644
--- a/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt
+++ b/data/balance-hiding/src/main/java/com/tangem/data/balancehiding/FlipListener.kt
@@ -17,9 +17,9 @@ internal class FlipListener(private val action: () -> Unit) : SensorEventListene
     }
 
     override fun onSensorChanged(event: SensorEvent?) {
-        event?.let {
+        if (event != null) {
             val currentTime = SystemClock.elapsedRealtime()
-            val zAxisValue = it.values[2]
+            val zAxisValue = event.values[2]
 
             if (zAxisValue < zAxisThreshold && !isScreenDown) {
                 isScreenDown = true
diff --git a/data/blockaid/build.gradle.kts b/data/blockaid/build.gradle.kts
index 344e76b061..8c28cf6afc 100644
--- a/data/blockaid/build.gradle.kts
+++ b/data/blockaid/build.gradle.kts
@@ -12,6 +12,7 @@ android {
 dependencies {
     /* Project - Domain */
     implementation(projects.data.common)
+    implementation(projects.domain.models)
     implementation(projects.domain.blockaid)
     implementation(projects.domain.blockaid.models)
 
@@ -20,6 +21,7 @@ dependencies {
 
     /* Project - Core */
     implementation(projects.core.utils)
+    implementation(projects.libs.blockchainSdk)
 
     /* DI */
     implementation(deps.hilt.core)
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidEvmScanTransactionConverter.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidEvmScanTransactionConverter.kt
new file mode 100644
index 0000000000..c167aa064e
--- /dev/null
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidEvmScanTransactionConverter.kt
@@ -0,0 +1,32 @@
+package com.tangem.data.blockaid
+
+import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.datasource.api.common.blockaid.models.request.BlockAidScanOptions
+import com.tangem.datasource.api.common.blockaid.models.request.Data
+import com.tangem.datasource.api.common.blockaid.models.request.EvmTransactionBulkScanRequest
+import com.tangem.datasource.api.common.blockaid.models.response.TransactionMetadata
+import com.tangem.utils.converter.Converter
+import com.tangem.blockchain.common.TransactionData as SDKTransactionData
+
+internal class BlockAidEvmScanTransactionConverter(
+    private val blockchain: Blockchain,
+) : Converter<List<SDKTransactionData.Uncompiled>, EvmTransactionBulkScanRequest> {
+
+    @Suppress("NullableToStringCall")
+    override fun convert(value: List<SDKTransactionData.Uncompiled>): EvmTransactionBulkScanRequest {
+        return EvmTransactionBulkScanRequest(
+            chain = blockchain.getChainId().toString(),
+            options = listOf(BlockAidScanOptions.GasEstimation.value),
+            metadata = TransactionMetadata(domain = "https://tangem.com"),
+            data = value.map { transactionData ->
+                Data(
+                    from = transactionData.sourceAddress,
+                    to = transactionData.destinationAddress,
+                    data = (transactionData.extras as? EthereumTransactionExtras)?.callData?.dataHex.orEmpty(),
+                )
+            },
+            aggregated = false,
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidMapper.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidMapper.kt
index 5334f1e066..b361fc3a86 100644
--- a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidMapper.kt
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidMapper.kt
@@ -169,7 +169,7 @@ internal object BlockAidMapper {
         val tokenInfo = TokenInfo(
             chainId = exposure.asset.chainId,
             logoUrl = exposure.asset.logoUrl,
-            symbol = exposure.asset.symbol ?: "",
+            symbol = exposure.asset.symbol.orEmpty(),
             decimals = exposure.asset.decimals ?: 0,
         )
         return exposure.spenders.flatMap { (_, spender) ->
@@ -188,8 +188,8 @@ internal object BlockAidMapper {
     private fun mapApproveNftTransaction(exposure: Exposure): ApproveInfo.NonFungibleToken {
         return ApproveInfo.NonFungibleToken(
             name = exposure.asset.name.orEmpty(),
-            logoUrl = exposure.spenders.values.firstOrNull()?.exposure?.firstOrNull()?.logoUrl
-                ?: exposure.asset.logoUrl,
+            logoUrl = exposure.spenders.values.firstOrNull()
+                ?.exposure?.firstOrNull()?.logoUrl ?: exposure.asset.logoUrl,
         )
     }
 
@@ -201,7 +201,7 @@ internal object BlockAidMapper {
             val token = TokenInfo(
                 chainId = diff.asset.chainId,
                 logoUrl = diff.asset.logoUrl,
-                symbol = diff.asset.symbol ?: "",
+                symbol = diff.asset.symbol.orEmpty(),
                 decimals = diff.asset.decimals ?: 0,
             )
             diff.outTransfer.orEmpty().forEach { transfer ->
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidRepository.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidRepository.kt
index 57e8db2559..0ce7a6aeea 100644
--- a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidRepository.kt
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/BlockAidRepository.kt
@@ -3,11 +3,19 @@ package com.tangem.data.blockaid
 import com.domain.blockaid.models.dapp.CheckDAppResult
 import com.domain.blockaid.models.dapp.DAppData
 import com.domain.blockaid.models.transaction.CheckTransactionResult
+import com.domain.blockaid.models.transaction.GasEstimationResult
 import com.domain.blockaid.models.transaction.TransactionData
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.blockchain.common.TransactionData as SDKTransactionData
 
 interface BlockAidRepository {
 
     suspend fun verifyDAppDomain(data: DAppData): CheckDAppResult
 
     suspend fun verifyTransaction(data: TransactionData): CheckTransactionResult
+
+    suspend fun getGasEstimation(
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<SDKTransactionData.Uncompiled>,
+    ): GasEstimationResult
 }
\ No newline at end of file
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidGasEstimate.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidGasEstimate.kt
new file mode 100644
index 0000000000..8b8e87189f
--- /dev/null
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidGasEstimate.kt
@@ -0,0 +1,19 @@
+package com.tangem.data.blockaid
+
+import arrow.core.Either
+import com.domain.blockaid.models.transaction.GasEstimationResult
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.domain.blockaid.BlockAidGasEstimate
+import com.tangem.domain.models.currency.CryptoCurrency
+import javax.inject.Inject
+
+class DefaultBlockAidGasEstimate @Inject constructor(
+    private val repository: BlockAidRepository,
+) : BlockAidGasEstimate {
+    override suspend fun getGasEstimation(
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<TransactionData.Uncompiled>,
+    ): Either<Throwable, GasEstimationResult> = Either.catch {
+        repository.getGasEstimation(cryptoCurrency = cryptoCurrency, transactionDataList = transactionDataList)
+    }
+}
\ No newline at end of file
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidRepository.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidRepository.kt
index 985e8d7e2e..59cf796d98 100644
--- a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidRepository.kt
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/DefaultBlockAidRepository.kt
@@ -3,12 +3,18 @@ package com.tangem.data.blockaid
 import com.domain.blockaid.models.dapp.CheckDAppResult
 import com.domain.blockaid.models.dapp.DAppData
 import com.domain.blockaid.models.transaction.CheckTransactionResult
+import com.domain.blockaid.models.transaction.GasEstimationResult
 import com.domain.blockaid.models.transaction.TransactionData
 import com.domain.blockaid.models.transaction.TransactionParams
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.toBlockchain
+import com.tangem.data.blockaid.converters.GasEstimationResponseConverter
 import com.tangem.datasource.api.common.blockaid.BlockAidApi
 import com.tangem.datasource.api.common.blockaid.models.request.DomainScanRequest
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
+import com.tangem.blockchain.common.TransactionData as SDKTransactionData
 
 internal class DefaultBlockAidRepository(
     private val api: BlockAidApi,
@@ -30,6 +36,17 @@ internal class DefaultBlockAidRepository(
         }
     }
 
+    override suspend fun getGasEstimation(
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<SDKTransactionData.Uncompiled>,
+    ): GasEstimationResult {
+        val blockchain = cryptoCurrency.network.toBlockchain()
+        return when {
+            blockchain.isEvm() -> scanEvmTransactionBulk(blockchain, transactionDataList)
+            else -> error("Gas estimation with BlockAid not supported by ${blockchain.fullName}")
+        }
+    }
+
     private suspend fun scanEvmTransaction(data: TransactionData): CheckTransactionResult =
         withContext(dispatchers.io) {
             val response = api.scanJsonRpc(mapper.mapToEvmRequest(data))
@@ -41,4 +58,15 @@ internal class DefaultBlockAidRepository(
             val response = api.scanSolanaMessage(mapper.mapToSolanaRequest(data))
             mapper.mapToDomain(response)
         }
+
+    private suspend fun scanEvmTransactionBulk(
+        blockchain: Blockchain,
+        transactionDataList: List<SDKTransactionData.Uncompiled>,
+    ): GasEstimationResult = withContext(dispatchers.io) {
+        val response = api.scanEvmTransactionBulk(
+            BlockAidEvmScanTransactionConverter(blockchain).convert(transactionDataList),
+        )
+
+        GasEstimationResponseConverter.convert(response)
+    }
 }
\ No newline at end of file
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/converters/GasEstimationResponseConverter.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/converters/GasEstimationResponseConverter.kt
new file mode 100644
index 0000000000..51a9e25b75
--- /dev/null
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/converters/GasEstimationResponseConverter.kt
@@ -0,0 +1,14 @@
+package com.tangem.data.blockaid.converters
+
+import com.domain.blockaid.models.transaction.GasEstimationResult
+import com.tangem.blockchain.extensions.hexToBigInteger
+import com.tangem.datasource.api.common.blockaid.models.response.GasEstimationResponse
+import com.tangem.utils.converter.Converter
+
+internal object GasEstimationResponseConverter : Converter<List<GasEstimationResponse>, GasEstimationResult> {
+    override fun convert(value: List<GasEstimationResponse>): GasEstimationResult {
+        return GasEstimationResult(
+            estimatedGasList = value.map { it.gasEstimation.estimate.hexToBigInteger() },
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/di/BlockAidDataModule.kt b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/di/BlockAidDataModule.kt
index 1efc366513..c61a853d1d 100644
--- a/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/di/BlockAidDataModule.kt
+++ b/data/blockaid/src/main/kotlin/com/tangem/data/blockaid/di/BlockAidDataModule.kt
@@ -1,6 +1,8 @@
 package com.tangem.data.blockaid.di
 
+import com.tangem.data.blockaid.DefaultBlockAidGasEstimate
 import com.tangem.data.blockaid.DefaultBlockAidVerifier
+import com.tangem.domain.blockaid.BlockAidGasEstimate
 import com.tangem.domain.blockaid.BlockAidVerifier
 import dagger.Binds
 import dagger.Module
@@ -15,4 +17,8 @@ interface BlockAidDataModule {
     @Binds
     @Singleton
     fun bindVerifier(verifier: DefaultBlockAidVerifier): BlockAidVerifier
+
+    @Binds
+    @Singleton
+    fun bindBlockAidGasEstimate(gasEstimate: DefaultBlockAidGasEstimate): BlockAidGasEstimate
 }
\ No newline at end of file
diff --git a/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt b/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
index 5241c8562b..db200bd7e9 100644
--- a/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
+++ b/data/card/src/main/java/com/tangem/data/card/DefaultCardRepository.kt
@@ -20,7 +20,7 @@ internal class DefaultCardRepository(
     override fun wasCardScanned(cardId: String): Flow<Boolean> {
         return appPreferencesStore.getObjectList<UsedCardInfo>(key = PreferencesKeys.USED_CARDS_INFO_KEY)
             .map { savedCards ->
-                savedCards?.any { it.cardId == cardId } ?: false
+                savedCards?.any { it.cardId == cardId } == true
             }
     }
 
@@ -63,11 +63,11 @@ internal class DefaultCardRepository(
     }
 
     override suspend fun isActivationStarted(cardId: String): Boolean {
-        return getUsedCardSync(cardId)?.isActivationStarted ?: false
+        return getUsedCardSync(cardId)?.isActivationStarted == true
     }
 
     override suspend fun isActivationFinished(cardId: String): Boolean {
-        return getUsedCardSync(cardId)?.isActivationFinished ?: false
+        return getUsedCardSync(cardId)?.isActivationFinished == true
     }
 
     override suspend fun isActivationInProgress(cardId: String): Boolean {
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt b/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt
index 3334a3c339..bda26c7b94 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/api/ApiResponseRaise.kt
@@ -47,7 +47,7 @@ suspend inline fun <T> safeApiCallWithTimeout(
 ): T = safeApiCall(
     call = {
         withTimeoutOrNull(timeoutMillis) { call() }
-            ?: raise(ApiResponseError.TimeoutException)
+            ?: raise(ApiResponseError.TimeoutException())
     },
     onError = onError,
 )
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/DefaultETagsStore.kt b/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/DefaultETagsStore.kt
index 5c8a9b2dc1..90921f262e 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/DefaultETagsStore.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/DefaultETagsStore.kt
@@ -34,6 +34,11 @@ internal class DefaultETagsStore(
         appPreferencesStore.store(key = key, value = value)
     }
 
+    override suspend fun clear(userWalletId: UserWalletId, key: ETagsStore.Key) {
+        val key = getAccountsETagKey(userWalletId = userWalletId, key = key)
+        appPreferencesStore.editData { it.remove(key) }
+    }
+
     private fun getAccountsETagKey(userWalletId: UserWalletId, key: ETagsStore.Key): Preferences.Key<String> {
         return stringPreferencesKey(name = "etag_${key}_${userWalletId.stringValue}")
     }
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/ETagsStore.kt b/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/ETagsStore.kt
index 430e9a0290..a1cff7234f 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/ETagsStore.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/cache/etag/ETagsStore.kt
@@ -25,10 +25,17 @@ interface ETagsStore {
      */
     suspend fun store(userWalletId: UserWalletId, key: Key, value: String)
 
+    /**
+     * Clears the stored ETag value for the specified wallet and key
+     *
+     * @param userWalletId identifier of the user wallet
+     * @param key          the key for which to get the ETag value
+     */
+    suspend fun clear(userWalletId: UserWalletId, key: Key)
+
     /** Enumeration of possible keys for storing ETag values */
     enum class Key {
         WalletAccounts,
         UserTokens,
-        ;
     }
 }
\ No newline at end of file
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt
index 9a57b58ea2..c7aff7add9 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/network/NetworkFactory.kt
@@ -325,6 +325,7 @@ class NetworkFactory @Inject constructor(
             Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet,
             Blockchain.Pepecoin, Blockchain.PepecoinTestnet,
             Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet,
+            Blockchain.Quai, Blockchain.QuaiTestnet,
             -> Network.TransactionExtrasType.NONE
             // endregion
         }
diff --git a/data/common/src/main/kotlin/com/tangem/data/common/quote/QuotesFetcher.kt b/data/common/src/main/kotlin/com/tangem/data/common/quote/QuotesFetcher.kt
index 4f1e8b92ce..bc89150de8 100644
--- a/data/common/src/main/kotlin/com/tangem/data/common/quote/QuotesFetcher.kt
+++ b/data/common/src/main/kotlin/com/tangem/data/common/quote/QuotesFetcher.kt
@@ -47,7 +47,6 @@ interface QuotesFetcher {
             value = setOf(PRICE, PRICE_CHANGE_24H, PRICE_CHANGE_1W, PRICE_CHANGE_30D).combine(),
         ),
         LAST_UPDATED_AT(value = "lastUpdatedAt"),
-        ;
     }
 
     sealed interface Error {
diff --git a/data/common/src/test/kotlin/com/tangem/data/common/quote/DefaultQuotesFetcherTest.kt b/data/common/src/test/kotlin/com/tangem/data/common/quote/DefaultQuotesFetcherTest.kt
index b179f463e6..0569178c46 100644
--- a/data/common/src/test/kotlin/com/tangem/data/common/quote/DefaultQuotesFetcherTest.kt
+++ b/data/common/src/test/kotlin/com/tangem/data/common/quote/DefaultQuotesFetcherTest.kt
@@ -440,5 +440,42 @@ internal class DefaultQuotesFetcherTest {
         }
     }
 
+    @Test
+    fun `fetch successfully if not all quotes are fetched`() = runTest {
+        // Arrange
+        val apiQuote = MockQuoteResponseFactory.createSinglePrice(BigDecimal.ONE)
+        val apiResponse = ApiResponse.Success(
+            data = QuotesResponse(quotes = mapOf("ethereum" to apiQuote)),
+        )
+
+        coEvery {
+            tangemTechApi.getQuotes(currencyId = "usd", coinIds = "ethereum,bitcoin", fields = "price")
+        } returns apiResponse
+
+        // Act
+        val actual = fetcher.fetch(
+            fiatCurrencyId = "usd",
+            currenciesIds = setOf("ethereum", "bitcoin"),
+            fields = setOf(Field.PRICE),
+        )
+
+        // Assert
+        val expected = QuotesResponse(
+            quotes = mapOf(
+                "ethereum" to apiQuote,
+                "bitcoin" to QuotesResponse.Quote.EMPTY,
+            ),
+        ).right()
+        Truth.assertThat(actual).isEqualTo(expected)
+
+        coVerify(exactly = 1) {
+            tangemTechApi.getQuotes(
+                currencyId = "usd",
+                coinIds = "ethereum,bitcoin",
+                fields = "price",
+            )
+        }
+    }
+
     private fun Iterable<QuoteMetadata>?.toResponseQuotes() = this!!.associate { it.cryptoCurrencyId to it.value }
 }
\ No newline at end of file
diff --git a/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt b/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt
index 54cb04d95b..10bb463509 100644
--- a/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/DefaultFeedbackRepository.kt
@@ -7,7 +7,7 @@ import com.tangem.data.feedback.converters.BlockchainInfoConverter
 import com.tangem.data.feedback.converters.WalletMetaInfoConverter
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.walletmanager.WalletManagersStore
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.models.*
 import com.tangem.domain.feedback.repository.FeedbackRepository
 import com.tangem.domain.models.scan.ScanResponse
diff --git a/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt b/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt
index 067feab7a8..63f1b43180 100644
--- a/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt
+++ b/data/feedback/src/main/java/com/tangem/data/feedback/di/FeedbackModule.kt
@@ -6,7 +6,7 @@ import com.tangem.data.feedback.DefaultFeedbackFeatureToggles
 import com.tangem.data.feedback.DefaultFeedbackRepository
 import com.tangem.datasource.local.logs.AppLogsStore
 import com.tangem.datasource.local.walletmanager.WalletManagersStore
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.repository.FeedbackFeatureToggles
 import com.tangem.domain.feedback.repository.FeedbackRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
diff --git a/data/notifications/src/main/java/com/tangem/data/notifications/DefaultNotificationsRepository.kt b/data/notifications/src/main/java/com/tangem/data/notifications/DefaultNotificationsRepository.kt
index d386676472..28d912b189 100644
--- a/data/notifications/src/main/java/com/tangem/data/notifications/DefaultNotificationsRepository.kt
+++ b/data/notifications/src/main/java/com/tangem/data/notifications/DefaultNotificationsRepository.kt
@@ -2,11 +2,13 @@ package com.tangem.data.notifications
 
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.get
 import com.tangem.datasource.local.preferences.utils.getObjectMapSync
 import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
 import com.tangem.datasource.local.preferences.utils.getSyncOrNull
 import com.tangem.datasource.local.preferences.utils.store
 import com.tangem.domain.notifications.repository.NotificationsRepository
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class DefaultNotificationsRepository @Inject constructor(
@@ -17,6 +19,10 @@ class DefaultNotificationsRepository @Inject constructor(
         return appPreferencesStore.getSyncOrDefault(PreferencesKeys.getShouldShowNotificationKey(key), true)
     }
 
+    override fun getShouldShowNotification(key: String): Flow<Boolean> {
+        return appPreferencesStore.get(PreferencesKeys.getShouldShowNotificationKey(key), true)
+    }
+
     override suspend fun setShouldShowNotifications(key: String, value: Boolean) {
         appPreferencesStore.store(PreferencesKeys.getShouldShowNotificationKey(key), value)
     }
@@ -61,10 +67,12 @@ class DefaultNotificationsRepository @Inject constructor(
         }
 
     override suspend fun setNotificationsWasEnabledAutomatically(userWalletId: String) {
-        appPreferencesStore.editData {
-            it.setObjectMap(
+        appPreferencesStore.editData { preferences ->
+            preferences.setObjectMap(
                 key = PreferencesKeys.NOTIFICATIONS_AUTOMATICALLY_ENABLED_STATES_KEY,
-                value = it.getObjectMap<Boolean>(PreferencesKeys.NOTIFICATIONS_AUTOMATICALLY_ENABLED_STATES_KEY)
+                value = preferences.getObjectMap<Boolean>(
+                    PreferencesKeys.NOTIFICATIONS_AUTOMATICALLY_ENABLED_STATES_KEY,
+                )
                     .plus(userWalletId to true),
             )
         }
diff --git a/data/notifications/src/main/java/com/tangem/data/notifications/DefaultPushNotificationsRepository.kt b/data/notifications/src/main/java/com/tangem/data/notifications/DefaultPushNotificationsRepository.kt
index b881aff0c5..f01830c332 100644
--- a/data/notifications/src/main/java/com/tangem/data/notifications/DefaultPushNotificationsRepository.kt
+++ b/data/notifications/src/main/java/com/tangem/data/notifications/DefaultPushNotificationsRepository.kt
@@ -23,7 +23,7 @@ internal class DefaultPushNotificationsRepository @Inject constructor(
 ) : PushNotificationsRepository {
 
     override suspend fun createApplicationId(pushToken: String?): ApplicationId = withContext(dispatchers.io) {
-        tangemTechApi.createApplicationId(
+        val appId = tangemTechApi.createApplicationId(
             NotificationApplicationCreateBody(
                 platform = appInfoProvider.platform.lowercase(),
                 device = appInfoProvider.device,
@@ -33,7 +33,9 @@ internal class DefaultPushNotificationsRepository @Inject constructor(
                 version = appInfoProvider.appVersion,
                 pushToken = pushToken,
             ),
-        ).getOrThrow().appId.let(::ApplicationId)
+        ).getOrThrow().appId
+
+        ApplicationId(appId)
     }
 
     override suspend fun saveApplicationId(appId: ApplicationId) {
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt
index 486ba69104..fe654114a6 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/legacy/MercuryoBlockchainMapping.kt
@@ -159,5 +159,6 @@ public val Blockchain.mercuryoNetwork: String?
             Blockchain.KaspaTestnet -> null
             Blockchain.Pepecoin, Blockchain.PepecoinTestnet -> null
             Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> null
+            Blockchain.Quai, Blockchain.QuaiTestnet -> null
         }
     }
\ No newline at end of file
diff --git a/data/qr-scanning/src/main/java/com/tangem/data/qrscanning/repository/DefaultQrScanningEventsRepository.kt b/data/qr-scanning/src/main/java/com/tangem/data/qrscanning/repository/DefaultQrScanningEventsRepository.kt
index 99ad446932..c5573994ce 100644
--- a/data/qr-scanning/src/main/java/com/tangem/data/qrscanning/repository/DefaultQrScanningEventsRepository.kt
+++ b/data/qr-scanning/src/main/java/com/tangem/data/qrscanning/repository/DefaultQrScanningEventsRepository.kt
@@ -50,16 +50,16 @@ internal class DefaultQrScanningEventsRepository : QrScanningEventsRepository {
         val result = QrResult(address = address)
 
         extractParameters(withoutSchema)
-            .forEach {
-                when (it.key) {
+            .forEach { entry ->
+                when (entry.key) {
                     Parameter.Amount -> {
                         // According to BIP-0021, the value is specified in decimals. No conversion needed
-                        result.amount = it.value.parseBigDecimalOrNull()
+                        result.amount = entry.value.parseBigDecimalOrNull()
                     }
                     Parameter.Message,
                     Parameter.Memo,
                     -> {
-                        result.memo = URLDecoder.decode(it.value, "UTF-8")
+                        result.memo = URLDecoder.decode(entry.value, "UTF-8")
                     }
                     Parameter.Address -> {
                         // If 'address' parameter is exists, then currency must be TOKEN.
@@ -70,7 +70,7 @@ internal class DefaultQrScanningEventsRepository : QrScanningEventsRepository {
                         // matches the contract address of the token.
                         // Otherwise, the scanned string is likely malformed, and we stop the entire parsing routin
                         if (tokenCurrency.contractAddress.equals(address, ignoreCase = true)) {
-                            result.address = it.value
+                            result.address = entry.value
                         } else {
                             return QrResult()
                         }
@@ -80,7 +80,7 @@ internal class DefaultQrScanningEventsRepository : QrScanningEventsRepository {
                     -> {
                         // Extra convert parses scientific notation to decimal
                         // This is necessary to be able comparing BigDecimal values
-                        result.amount = it.value.parseBigDecimalOrNull()
+                        result.amount = entry.value.parseBigDecimalOrNull()
                             ?.toPlainString()?.toBigDecimalOrNull()
                             ?.divide(BigDecimal.TEN.pow(cryptoCurrency.decimals))
                     }
diff --git a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
index 16d16ee6b0..958da45528 100644
--- a/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
+++ b/data/quotes/src/test/java/com/tangem/data/quotes/multi/DefaultMultiQuoteStatusFetcherTest.kt
@@ -161,7 +161,7 @@ internal class DefaultMultiQuoteStatusFetcherTest {
         val params = MultiQuoteStatusFetcher.Params(currenciesIds = currenciesIds, appCurrencyId = null)
 
         val currenciesIds = setOf("BTC", "ETH")
-        val error = QuotesFetcher.Error.ApiOperationError(ApiResponseError.NetworkException)
+        val error = QuotesFetcher.Error.ApiOperationError(ApiResponseError.NetworkException())
 
         coEvery { appCurrencyResponseStore.getSyncOrNull() } returns usdAppCurrency
 
@@ -173,7 +173,9 @@ internal class DefaultMultiQuoteStatusFetcherTest {
         val actual = fetcher(params)
 
         // Assert
-        val expected = IllegalStateException("Cause: ApiOperationError(apiError=NetworkException)").left()
+        val expected = IllegalStateException(
+            "Cause: ApiOperationError(apiError=com.tangem.datasource.api.common.response.ApiResponseError\$NetworkException)",
+        ).left()
         assertEither(actual, expected)
 
         coVerifyOrder {
@@ -215,50 +217,6 @@ internal class DefaultMultiQuoteStatusFetcherTest {
         }
     }
 
-    @Test
-    fun `fetch successfully if not all quotes are fetched`() = runTest {
-        // Arrange
-        val params = MultiQuoteStatusFetcher.Params(currenciesIds = currenciesIds, appCurrencyId = null)
-
-        coEvery { appCurrencyResponseStore.getSyncOrNull() } returns usdAppCurrency
-
-        val currenciesIds = setOf("BTC", "ETH")
-        val response = QuotesResponse(
-            quotes = mapOf(
-                "BTC" to MockQuoteResponseFactory.createSinglePrice(value = BigDecimal.ONE),
-            ),
-        )
-
-        coEvery {
-            quotesFetcher.fetch(fiatCurrencyId = "usd", currenciesIds = currenciesIds, fields = fields)
-        } returns response.right()
-
-        // Act
-        val actual = fetcher(params)
-
-        // Assert
-        val expected = Unit.right()
-        Truth.assertThat(actual).isEqualTo(expected)
-
-        val storedQuotes = QuotesResponse(
-            quotes = mapOf(
-                "BTC" to MockQuoteResponseFactory.createSinglePrice(value = BigDecimal.ONE),
-                "ETH" to QuotesResponse.Quote.EMPTY,
-            ),
-        )
-
-        coVerifyOrder {
-            quotesStore.setSourceAsCache(currenciesIds = params.currenciesIds)
-            appCurrencyResponseStore.getSyncOrNull()
-            quotesFetcher.fetch(fiatCurrencyId = "usd", currenciesIds = currenciesIds, fields = fields)
-            quotesStore.store(values = storedQuotes.quotes)
-        }
-
-        coVerify(inverse = true) {
-            quotesStore.setSourceAsOnlyCache(currenciesIds = any())
-        }
-    }
-
     private companion object {
 
         val currenciesIds = setOf(
diff --git a/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt b/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt
index 78e99623f1..c8942fa6e5 100644
--- a/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt
+++ b/data/settings/src/main/java/com/tangem/data/settings/DefaultAppRatingRepository.kt
@@ -30,13 +30,22 @@ internal class DefaultAppRatingRepository(
     override fun isReadyToShow(): Flow<Boolean> {
         // TODO: [REDACTED_JIRA]
         return combine(
-            appPreferencesStore.get(key = PreferencesKeys.USER_WAS_INTERACT_WITH_RATING_KEY, default = false),
-            appPreferencesStore.get(
+            flow = appPreferencesStore.get(
+                key = PreferencesKeys.USER_WAS_INTERACT_WITH_RATING_KEY,
+                default = false,
+            ),
+            flow2 = appPreferencesStore.get(
                 key = PreferencesKeys.SHOW_RATING_DIALOG_AT_LAUNCH_COUNT_KEY,
                 default = FIRST_SHOWING_COUNT,
             ),
-            appPreferencesStore.get(key = PreferencesKeys.APP_LAUNCH_COUNT_KEY, default = DEFAULT_APP_LAUNCH_COUNT),
-            appPreferencesStore.get(key = PreferencesKeys.FUNDS_FOUND_DATE_KEY, default = FUNDS_FOUND_DATE_UNDEFINED),
+            flow3 = appPreferencesStore.get(
+                key = PreferencesKeys.APP_LAUNCH_COUNT_KEY,
+                default = DEFAULT_APP_LAUNCH_COUNT,
+            ),
+            flow4 = appPreferencesStore.get(
+                key = PreferencesKeys.FUNDS_FOUND_DATE_KEY,
+                default = FUNDS_FOUND_DATE_UNDEFINED,
+            ),
         ) { isInteracting, ratingShowingCount, appLaunchCount, fundsFoundDate ->
             if (!isInteracting) {
                 val diff = Calendar.getInstance().timeInMillis - fundsFoundDate
diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
index 0dad5046fe..5230a94938 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt
@@ -164,7 +164,11 @@ internal class DefaultStakingRepository(
             val yield = getYield(cryptoCurrencyId, symbol)
 
             StakingEntryInfo(
-                apr = requireNotNull(yield.preferredValidators.maxByOrNull { it.apr.orZero() }?.apr),
+                rewardInfo = requireNotNull(
+                    yield
+                        .preferredValidators
+                        .maxByOrNull { it.rewardInfo?.rate.orZero() }?.rewardInfo,
+                ),
                 rewardSchedule = yield.metadata.rewardSchedule,
                 tokenSymbol = yield.token.symbol,
             )
diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt
index 60fe5f9e3b..cc663e792b 100644
--- a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt
+++ b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt
@@ -10,7 +10,9 @@ import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.model.stakekit.Yield.Metadata.RewardSchedule
 import com.tangem.domain.staking.model.stakekit.Yield.Validator.ValidatorStatus
 import com.tangem.utils.converter.Converter
+import com.tangem.utils.extensions.orZero
 import kotlinx.collections.immutable.toImmutableList
+import java.math.RoundingMode
 
 internal object YieldConverter : Converter<YieldDTO, Yield> {
 
@@ -21,7 +23,10 @@ internal object YieldConverter : Converter<YieldDTO, Yield> {
 
     private val PARTNERS_NAMES = listOf("Meria")
 
+    private const val DIVIDE_SCALE = 8
+
     override fun convert(value: YieldDTO): Yield {
+        val rewardType = convertRewardType(value.rewardType.asMandatory("rewardType"))
         return Yield(
             id = value.id.asMandatory("id"),
             token = YieldTokenConverter.convert(value.token.asMandatory("token")),
@@ -30,14 +35,14 @@ internal object YieldConverter : Converter<YieldDTO, Yield> {
             status = convertStatus(value.status.asMandatory("status")),
             apy = value.apy.asMandatory("apy"),
             rewardRate = value.rewardRate.asMandatory("rewardRate"),
-            rewardType = convertRewardType(value.rewardType.asMandatory("rewardType")),
+            rewardType = rewardType,
             metadata = convertMetadata(value.metadata.asMandatory("metadata")),
             validators = value.validators.asMandatory("validators")
                 .asSequence()
                 .distinctBy { it.address }
                 .filter { it.status == ValidatorStatusDTO.ACTIVE }
-                .map { convertValidator(it) }
-                .sortedByDescending { it.apr }
+                .map { convertValidator(validatorDTO = it, rewardType = rewardType) }
+                .sortedByDescending { it.rewardInfo?.rate?.orZero() }
                 .sortedByDescending { it.isStrategicPartner }
                 .toImmutableList(),
             isAvailable = value.isAvailable.asMandatory("isAvailable"),
@@ -119,15 +124,16 @@ internal object YieldConverter : Converter<YieldDTO, Yield> {
         )
     }
 
-    private fun convertValidator(validatorDTO: YieldDTO.ValidatorDTO): Yield.Validator {
+    private fun convertValidator(validatorDTO: YieldDTO.ValidatorDTO, rewardType: Yield.RewardType): Yield.Validator {
         val address = validatorDTO.address.asMandatory("address")
+
         return Yield.Validator(
             address = address,
             status = convertValidatorStatus(validatorDTO.status.asMandatory("status")),
             name = validatorDTO.name.asMandatory("name"),
             image = validatorDTO.image,
             website = validatorDTO.website,
-            apr = validatorDTO.apr,
+            rewardInfo = createRewardInfo(validatorDTO, rewardType),
             commission = validatorDTO.commission,
             stakedBalance = validatorDTO.stakedBalance,
             votingPower = validatorDTO.votingPower,
@@ -136,6 +142,32 @@ internal object YieldConverter : Converter<YieldDTO, Yield> {
         )
     }
 
+    private fun createRewardInfo(validatorDTO: YieldDTO.ValidatorDTO, rewardType: Yield.RewardType): Yield.RewardInfo? {
+        val aprOrApy = validatorDTO.apr
+        val commission = validatorDTO.commission
+        // gross = net / (1 - commission)
+        return try {
+            val netApy = aprOrApy
+            val grossAprOrApy = if (netApy != null && commission != null) {
+                val commissionFraction = commission.toBigDecimal()
+                if (commissionFraction < 1.toBigDecimal()) {
+                    netApy.divide(
+                        1.toBigDecimal() - commissionFraction,
+                        DIVIDE_SCALE,
+                        RoundingMode.HALF_UP,
+                    )
+                } else {
+                    netApy
+                }
+            } else {
+                netApy
+            }
+            grossAprOrApy?.let { Yield.RewardInfo(rate = it, type = rewardType) }
+        } catch (_: Exception) {
+            aprOrApy?.let { Yield.RewardInfo(rate = it, type = rewardType) }
+        }
+    }
+
     private fun convertRewardType(rewardTypeDTO: YieldDTO.RewardTypeDTO): Yield.RewardType {
         return when (rewardTypeDTO) {
             YieldDTO.RewardTypeDTO.APY -> Yield.RewardType.APY
diff --git a/data/staking/src/test/kotlin/com/tangem/data/staking/multi/DefaultMultiYieldBalanceFetcherTest.kt b/data/staking/src/test/kotlin/com/tangem/data/staking/multi/DefaultMultiYieldBalanceFetcherTest.kt
index 7203f1fc73..1ae2b3fccd 100644
--- a/data/staking/src/test/kotlin/com/tangem/data/staking/multi/DefaultMultiYieldBalanceFetcherTest.kt
+++ b/data/staking/src/test/kotlin/com/tangem/data/staking/multi/DefaultMultiYieldBalanceFetcherTest.kt
@@ -309,7 +309,7 @@ internal class DefaultMultiYieldBalanceFetcherTest {
         val requests = setOf(tonId, solanaId).map(YieldBalanceRequestBodyFactory::create)
 
         @Suppress("UNCHECKED_CAST")
-        val errorResponse = ApiResponse.Error(ApiResponseError.NetworkException)
+        val errorResponse = ApiResponse.Error(ApiResponseError.NetworkException())
             as ApiResponse<Set<YieldBalanceWrapperDTO>>
 
         coEvery { stakeKitApi.getMultipleYieldBalances(requests) } returns errorResponse
@@ -328,7 +328,7 @@ internal class DefaultMultiYieldBalanceFetcherTest {
 
         coVerify(inverse = true) { yieldsBalancesStore.storeActual(userWalletId = any(), values = any()) }
 
-        val expected = ApiResponseError.NetworkException
+        val expected = ApiResponseError.NetworkException()
 
         assertEitherLeft(actual, expected)
     }
diff --git a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
index 277a7125be..343ba4d4bd 100644
--- a/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
+++ b/data/swap/src/main/java/com/tangem/data/swap/DefaultSwapRepositoryV2.kt
@@ -1,6 +1,8 @@
 package com.tangem.data.swap
 
-import arrow.core.right
+import arrow.core.none
+import arrow.core.some
+import arrow.core.toOption
 import com.squareup.moshi.Moshi
 import com.tangem.data.common.api.safeApiCall
 import com.tangem.data.swap.converter.SwapDataConverter
@@ -28,7 +30,7 @@ import com.tangem.domain.quotes.single.SingleQuoteStatusProducer
 import com.tangem.domain.quotes.single.SingleQuoteStatusSupplier
 import com.tangem.domain.swap.SwapRepositoryV2
 import com.tangem.domain.swap.models.*
-import com.tangem.domain.tokens.utils.CurrencyStatusProxyCreator
+import com.tangem.domain.tokens.operations.CryptoCurrencyStatusFactory
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
@@ -49,7 +51,6 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
     private val dataSignatureVerifier: DataSignatureVerifier,
     private val singleQuoteStatusSupplier: SingleQuoteStatusSupplier,
     private val singleQuoteStatusFetcher: SingleQuoteStatusFetcher,
-    private val currencyStatusProxyCreator: CurrencyStatusProxyCreator,
     @NetworkMoshi moshi: Moshi,
 ) : SwapRepositoryV2 {
 
@@ -95,7 +96,7 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
 
                 val mappedProviders = pair.providers.mapNotNull {
                     mappedProviders[it.providerId]
-                }
+                }.filterYieldSupplyProvider(statusFrom)
 
                 if (statusFrom != null && statusTo != null && mappedProviders.isNotEmpty()) {
                     SwapPairModel(
@@ -152,7 +153,7 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
 
                 val mappedProvider = pair.providers.mapNotNull {
                     mappedProviders[it.providerId]
-                }
+                }.filterYieldSupplyProvider(currencyStatusFrom)
 
                 if (currencyStatusFrom != null && currencyStatusTo != null && mappedProvider.isNotEmpty()) {
                     SwapPairModel(
@@ -391,17 +392,19 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
             )
         }
 
-        return currencyStatusProxyCreator.createCurrencyStatus(
+        val quoteStatus = quote ?: singleQuoteStatusSupplier.getSyncOrNull(
+            params = SingleQuoteStatusProducer.Params(rawCurrencyId = rawCurrencyId),
+        )
+
+        return CryptoCurrencyStatusFactory.create(
             currency = cryptoCurrency,
-            maybeQuoteStatus = quote?.right() ?: singleQuoteStatusSupplier.getSyncOrNull(
-                params = SingleQuoteStatusProducer.Params(rawCurrencyId = rawCurrencyId),
-            ).right(),
             maybeNetworkStatus = NetworkStatus(
                 network = cryptoCurrency.network,
                 value = NetworkStatus.MissedDerivation, // Caution!!! Do not change this status
-            ).right(),
-            maybeYieldBalance = null,
-        ).getOrNull()
+            ).some(),
+            maybeQuoteStatus = quoteStatus.toOption(),
+            maybeYieldBalance = none(),
+        )
     }
 
     private fun parseTxDetails(txDetailsJson: String): TxDetails? {
@@ -419,4 +422,15 @@ internal class DefaultSwapRepositoryV2 @Inject constructor(
             is CryptoCurrency.Coin -> "0"
         }
     }
+
+    private fun List<ExpressProvider>.filterYieldSupplyProvider(cryptoCurrencyStatus: CryptoCurrencyStatus?) =
+        filter { provider ->
+            // !!!WARNING!!! Filter out dex provider if yield supply is active
+            val yieldSupplyStatus = cryptoCurrencyStatus?.value?.yieldSupplyStatus
+            if (yieldSupplyStatus != null && yieldSupplyStatus.isActive) {
+                provider.type == ExpressProviderType.CEX
+            } else {
+                true
+            }
+        }
 }
\ No newline at end of file
diff --git a/data/swap/src/main/java/com/tangem/data/swap/di/SwapDataModule.kt b/data/swap/src/main/java/com/tangem/data/swap/di/SwapDataModule.kt
index 5edf45f002..595d799f2d 100644
--- a/data/swap/src/main/java/com/tangem/data/swap/di/SwapDataModule.kt
+++ b/data/swap/src/main/java/com/tangem/data/swap/di/SwapDataModule.kt
@@ -17,7 +17,6 @@ import com.tangem.domain.quotes.single.SingleQuoteStatusSupplier
 import com.tangem.domain.swap.SwapErrorResolver
 import com.tangem.domain.swap.SwapRepositoryV2
 import com.tangem.domain.swap.SwapTransactionRepository
-import com.tangem.domain.tokens.utils.CurrencyStatusProxyCreator
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -59,7 +58,6 @@ internal object SwapDataModule {
             moshi = moshi,
             singleQuoteStatusSupplier = singleQuoteStatusSupplier,
             singleQuoteStatusFetcher = singleQuoteStatusFetcher,
-            currencyStatusProxyCreator = CurrencyStatusProxyCreator(),
         )
     }
 
diff --git a/data/tokens/build.gradle.kts b/data/tokens/build.gradle.kts
index f35bd35737..eb3fe93e66 100644
--- a/data/tokens/build.gradle.kts
+++ b/data/tokens/build.gradle.kts
@@ -24,17 +24,18 @@ dependencies {
     // endregion
 
     // region Project - Domain
+    implementation(projects.domain.account)
+    implementation(projects.domain.card)
     implementation(projects.domain.core)
     implementation(projects.domain.demo)
     implementation(projects.domain.legacy)
-    implementation(projects.domain.walletManager)
-    implementation(projects.domain.card)
     implementation(projects.domain.models)
     implementation(projects.domain.staking)
     implementation(projects.domain.staking.models)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.txhistory.models)
+    implementation(projects.domain.walletManager)
     implementation(projects.domain.wallets.models)
     // endregion
 
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcher.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcher.kt
new file mode 100644
index 0000000000..5c8f9d9f23
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcher.kt
@@ -0,0 +1,35 @@
+package com.tangem.data.tokens
+
+import arrow.core.Either
+import com.tangem.data.common.account.WalletAccountsFetcher
+import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.core.utils.catchOn
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesFetcher
+import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesFetcher.Params
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+
+/**
+ * Implementation of [MultiWalletCryptoCurrenciesFetcher] that fetches crypto currencies of all accounts
+ *
+ * @property userWalletsStore      [UserWallet]'s store
+ * @property walletAccountsFetcher instance of [WalletAccountsFetcher] to fetch accounts for a multi wallet
+ * @property dispatchers           dispatchers
+ *
+[REDACTED_AUTHOR]
+ */
+internal class AccountListCryptoCurrenciesFetcher(
+    private val userWalletsStore: UserWalletsStore,
+    private val walletAccountsFetcher: WalletAccountsFetcher,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : MultiWalletCryptoCurrenciesFetcher {
+
+    override suspend fun invoke(params: Params) = Either.catchOn(dispatchers.default) {
+        val userWallet = userWalletsStore.getSyncStrict(key = params.userWalletId)
+
+        if (!userWallet.isMultiCurrency) error("${this::class.simpleName} supports only multi-currency wallet")
+
+        walletAccountsFetcher.fetch(userWalletId = params.userWalletId)
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/MultiWalletCryptoCurrenciesFetcherModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/MultiWalletCryptoCurrenciesFetcherModule.kt
index eea90a597e..c360054a04 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/MultiWalletCryptoCurrenciesFetcherModule.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/MultiWalletCryptoCurrenciesFetcherModule.kt
@@ -1,13 +1,16 @@
 package com.tangem.data.tokens.di
 
+import com.tangem.data.common.account.WalletAccountsFetcher
 import com.tangem.data.common.currency.CardCryptoCurrencyFactory
 import com.tangem.data.common.currency.UserTokensSaver
+import com.tangem.data.tokens.AccountListCryptoCurrenciesFetcher
 import com.tangem.data.tokens.DefaultMultiWalletCryptoCurrenciesFetcher
 import com.tangem.data.tokens.utils.CustomTokensMerger
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
 import com.tangem.datasource.local.token.UserTokensResponseStore
 import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
 import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesFetcher
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -24,28 +27,38 @@ internal class MultiWalletCryptoCurrenciesFetcherModule {
     @Singleton
     @Provides
     fun provideMultiWalletCryptoCurrenciesFetcher(
+        accountsFeatureToggles: AccountsFeatureToggles,
         tangemTechApi: TangemTechApi,
         userWalletsStore: UserWalletsStore,
         userTokensResponseStore: UserTokensResponseStore,
         userTokensSaver: UserTokensSaver,
         cardCryptoCurrencyFactory: CardCryptoCurrencyFactory,
         expressServiceLoader: ExpressServiceLoader,
+        walletAccountsFetcher: WalletAccountsFetcher,
         dispatchers: CoroutineDispatcherProvider,
     ): MultiWalletCryptoCurrenciesFetcher {
-        return DefaultMultiWalletCryptoCurrenciesFetcher(
-            demoConfig = DemoConfig(),
-            userWalletsStore = userWalletsStore,
-            tangemTechApi = tangemTechApi,
-            customTokensMerger = CustomTokensMerger(
-                tangemTechApi = tangemTechApi,
-                userTokensSaver = userTokensSaver,
+        return if (accountsFeatureToggles.isFeatureEnabled) {
+            AccountListCryptoCurrenciesFetcher(
+                userWalletsStore = userWalletsStore,
+                walletAccountsFetcher = walletAccountsFetcher,
                 dispatchers = dispatchers,
-            ),
-            userTokensResponseStore = userTokensResponseStore,
-            userTokensSaver = userTokensSaver,
-            cardCryptoCurrencyFactory = cardCryptoCurrencyFactory,
-            expressServiceLoader = expressServiceLoader,
-            dispatchers = dispatchers,
-        )
+            )
+        } else {
+            DefaultMultiWalletCryptoCurrenciesFetcher(
+                demoConfig = DemoConfig(),
+                userWalletsStore = userWalletsStore,
+                tangemTechApi = tangemTechApi,
+                customTokensMerger = CustomTokensMerger(
+                    tangemTechApi = tangemTechApi,
+                    userTokensSaver = userTokensSaver,
+                    dispatchers = dispatchers,
+                ),
+                userTokensResponseStore = userTokensResponseStore,
+                userTokensSaver = userTokensSaver,
+                cardCryptoCurrencyFactory = cardCryptoCurrencyFactory,
+                expressServiceLoader = expressServiceLoader,
+                dispatchers = dispatchers,
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
index fe5dd5cc34..23f10b2f4d 100644
--- a/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/di/TokensDataModule.kt
@@ -9,6 +9,7 @@ import com.tangem.data.tokens.repository.DefaultCurrenciesRepository
 import com.tangem.data.tokens.repository.DefaultCurrencyChecksRepository
 import com.tangem.data.tokens.repository.DefaultPolkadotAccountHealthCheckRepository
 import com.tangem.data.tokens.repository.DefaultTokenReceiveWarningsViewedRepository
+import com.tangem.data.tokens.repository.DefaultYieldSupplyWarningsViewedRepository
 import com.tangem.datasource.api.tangemTech.TangemTechApi
 import com.tangem.datasource.exchangeservice.swap.ExpressServiceLoader
 import com.tangem.datasource.local.preferences.AppPreferencesStore
@@ -19,6 +20,7 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.tokens.repository.CurrencyChecksRepository
 import com.tangem.domain.tokens.repository.PolkadotAccountHealthCheckRepository
 import com.tangem.domain.tokens.repository.TokenReceiveWarningsViewedRepository
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -96,4 +98,16 @@ internal object TokensDataModule {
             tokenReceiveWarningActionStore = tokenReceiveWarningActionStore,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideDefaultYieldSupplyWarningsViewedRepository(
+        appPreferencesStore: AppPreferencesStore,
+        dispatchers: CoroutineDispatcherProvider,
+    ): YieldSupplyWarningsViewedRepository {
+        return DefaultYieldSupplyWarningsViewedRepository(
+            appPreferencesStore = appPreferencesStore,
+            dispatchers = dispatchers,
+        )
+    }
 }
\ No newline at end of file
diff --git a/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultYieldSupplyWarningsViewedRepository.kt b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultYieldSupplyWarningsViewedRepository.kt
new file mode 100644
index 0000000000..193bbb03c6
--- /dev/null
+++ b/data/tokens/src/main/kotlin/com/tangem/data/tokens/repository/DefaultYieldSupplyWarningsViewedRepository.kt
@@ -0,0 +1,36 @@
+package com.tangem.data.tokens.repository
+
+import com.tangem.datasource.local.preferences.AppPreferencesStore
+import com.tangem.datasource.local.preferences.PreferencesKeys
+import com.tangem.datasource.local.preferences.utils.getObjectSet
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.withContext
+
+internal class DefaultYieldSupplyWarningsViewedRepository(
+    private val appPreferencesStore: AppPreferencesStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : YieldSupplyWarningsViewedRepository {
+
+    override suspend fun getViewedWarnings(): Set<String> = withContext(dispatchers.io) {
+        appPreferencesStore.getObjectSet<String>(PreferencesKeys.YIELD_SUPPLY_WARNINGS_STATES_KEY).firstOrNull()
+            ?: emptySet()
+    }
+
+    override suspend fun view(symbol: String) = withContext(dispatchers.io) {
+        appPreferencesStore.editData { mutablePreferences ->
+            val stored = mutablePreferences.getObjectSet<String>(
+                PreferencesKeys.YIELD_SUPPLY_WARNINGS_STATES_KEY,
+            ) ?: mutableSetOf()
+
+            val updated = stored + symbol
+
+            mutablePreferences.setObjectSet<String>(
+                key = PreferencesKeys.YIELD_SUPPLY_WARNINGS_STATES_KEY,
+                value = updated,
+            )
+        }
+        return@withContext
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/test/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcherTest.kt b/data/tokens/src/test/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcherTest.kt
new file mode 100644
index 0000000000..79bcd8e6f8
--- /dev/null
+++ b/data/tokens/src/test/kotlin/com/tangem/data/tokens/AccountListCryptoCurrenciesFetcherTest.kt
@@ -0,0 +1,103 @@
+package com.tangem.data.tokens
+
+import arrow.core.left
+import com.tangem.common.test.utils.assertEither
+import com.tangem.common.test.utils.assertEitherRight
+import com.tangem.data.common.account.WalletAccountsFetcher
+import com.tangem.datasource.local.userwallet.UserWalletsStore
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.tokens.MultiWalletCryptoCurrenciesFetcher
+import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
+import io.mockk.*
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+internal class AccountListCryptoCurrenciesFetcherTest {
+
+    private val userWalletsStore: UserWalletsStore = mockk(relaxUnitFun = true)
+    private val walletAccountsFetcher: WalletAccountsFetcher = mockk(relaxUnitFun = true)
+    private val dispatchers = TestingCoroutineDispatcherProvider()
+
+    private val fetcher = AccountListCryptoCurrenciesFetcher(
+        userWalletsStore = userWalletsStore,
+        walletAccountsFetcher = walletAccountsFetcher,
+        dispatchers = dispatchers,
+    )
+
+    @BeforeEach
+    fun resetMocks() {
+        clearMocks(userWalletsStore, walletAccountsFetcher)
+    }
+
+    @Test
+    fun `returns failure if wallet is not multi-currency`() = runTest {
+        // Arrange
+        val params = MultiWalletCryptoCurrenciesFetcher.Params(userWalletId = userWalletId)
+        val mockUserWallet = mockk<UserWallet> { every { isMultiCurrency } returns false }
+        every { userWalletsStore.getSyncStrict(key = params.userWalletId) } returns mockUserWallet
+
+        // Act
+        val actual = fetcher(params)
+
+        // Assert
+        val expected = IllegalStateException(
+            "${AccountListCryptoCurrenciesFetcher::class.simpleName} supports only multi-currency wallet",
+        ).left()
+        assertEither(actual, expected)
+
+        verify { userWalletsStore.getSyncStrict(key = params.userWalletId) }
+        coVerify(inverse = true) { walletAccountsFetcher.fetch(any()) }
+    }
+
+    @Test
+    fun `returns accounts if wallet is multi-currency`() = runTest {
+        // Arrange
+        val params = MultiWalletCryptoCurrenciesFetcher.Params(userWalletId = userWalletId)
+        val mockUserWallet = mockk<UserWallet> { every { isMultiCurrency } returns true }
+
+        every { userWalletsStore.getSyncStrict(key = params.userWalletId) } returns mockUserWallet
+
+        // Act
+        val actual = fetcher(params)
+
+        // Assert
+        assertEitherRight(actual)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsStore.getSyncStrict(key = params.userWalletId)
+            walletAccountsFetcher.fetch(userWalletId = params.userWalletId)
+        }
+    }
+
+    @Test
+    fun `returns error if walletAccountsFetcher returns error`() = runTest {
+        // Arrange
+        val params = MultiWalletCryptoCurrenciesFetcher.Params(userWalletId = userWalletId)
+        val mockUserWallet = mockk<UserWallet> { every { isMultiCurrency } returns true }
+        val error = RuntimeException("fetch error")
+
+        every { userWalletsStore.getSyncStrict(key = params.userWalletId) } returns mockUserWallet
+        coEvery { walletAccountsFetcher.fetch(userWalletId = params.userWalletId) } throws error
+
+        // Act
+        val actual = fetcher(params)
+
+        // Assert
+        val expected = error.left()
+        assertEither(actual, expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsStore.getSyncStrict(key = params.userWalletId)
+            walletAccountsFetcher.fetch(userWalletId = params.userWalletId)
+        }
+    }
+
+    private companion object {
+        val userWalletId = UserWalletId("012")
+    }
+}
\ No newline at end of file
diff --git a/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesFetcherTest.kt b/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesFetcherTest.kt
index f335e3d006..9b685b565c 100644
--- a/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesFetcherTest.kt
+++ b/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesFetcherTest.kt
@@ -246,7 +246,7 @@ internal class DefaultMultiWalletCryptoCurrenciesFetcherTest {
 
         @Suppress("UNCHECKED_CAST")
         val apiResponse = ApiResponse.Error(
-            cause = ApiResponseError.TimeoutException,
+            cause = ApiResponseError.TimeoutException(),
         ) as ApiResponse<UserTokensResponse>
 
         val defaultCoins = listOf(
@@ -307,7 +307,7 @@ internal class DefaultMultiWalletCryptoCurrenciesFetcherTest {
 
         @Suppress("UNCHECKED_CAST")
         val apiResponse = ApiResponse.Error(
-            cause = ApiResponseError.TimeoutException,
+            cause = ApiResponseError.TimeoutException(),
         ) as ApiResponse<UserTokensResponse>
 
         every { userWalletsStore.getSyncStrict(params.userWalletId) } returns mockUserWallet
diff --git a/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesProducerTest.kt b/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesProducerTest.kt
index 1d677e50ef..df9fa14413 100644
--- a/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesProducerTest.kt
+++ b/data/tokens/src/test/kotlin/com/tangem/data/tokens/DefaultMultiWalletCryptoCurrenciesProducerTest.kt
@@ -261,7 +261,7 @@ internal class DefaultMultiWalletCryptoCurrenciesProducerTest {
         val actual1 = getEmittedValues(flow = producerFlow)
 
         // Assert
-        val expected1 = producer.fallback
+        val expected1 = producer.fallback.getOrNull()
         Truth.assertThat(actual1.size).isEqualTo(1)
         Truth.assertThat(actual1.first()).isEqualTo(expected1)
 
@@ -297,7 +297,7 @@ internal class DefaultMultiWalletCryptoCurrenciesProducerTest {
         val actual = producer.produce().let(::getEmittedValues)
 
         // Assert
-        val expected = producer.fallback
+        val expected = producer.fallback.getOrNull()
         Truth.assertThat(actual.size).isEqualTo(1)
         Truth.assertThat(actual.first()).isEqualTo(expected)
 
diff --git a/data/tokens/src/test/kotlin/com/tangem/data/tokens/utils/CustomTokensMergerTest.kt b/data/tokens/src/test/kotlin/com/tangem/data/tokens/utils/CustomTokensMergerTest.kt
index 06d0021071..78f011687b 100644
--- a/data/tokens/src/test/kotlin/com/tangem/data/tokens/utils/CustomTokensMergerTest.kt
+++ b/data/tokens/src/test/kotlin/com/tangem/data/tokens/utils/CustomTokensMergerTest.kt
@@ -114,7 +114,7 @@ internal class CustomTokensMergerTest {
         )
 
         @Suppress("UNCHECKED_CAST")
-        val apiResponse = ApiResponse.Error(ApiResponseError.TimeoutException) as ApiResponse<CoinsResponse>
+        val apiResponse = ApiResponse.Error(ApiResponseError.TimeoutException()) as ApiResponse<CoinsResponse>
 
         coEvery {
             tangemTechApi.getCoins(contractAddress = customToken.contractAddress, networkIds = customToken.networkId)
diff --git a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultFeeRepository.kt b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultFeeRepository.kt
index 49b6e3c486..07898f241d 100644
--- a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultFeeRepository.kt
+++ b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultFeeRepository.kt
@@ -1,7 +1,13 @@
 package com.tangem.data.transaction
 
+import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
+import com.tangem.blockchain.blockchains.ethereum.eip1559.isSupportEIP1559
+import com.tangem.blockchain.blockchains.ethereum.network.EthereumFeeHistory
+import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchain.extensions.Result
 import com.tangem.blockchainsdk.utils.toBlockchain
@@ -12,6 +18,8 @@ import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.transaction.FeeRepository
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import java.math.BigDecimal
+import java.math.BigInteger
 
 internal class DefaultFeeRepository(
     private val walletManagersFacade: WalletManagersFacade,
@@ -22,6 +30,53 @@ internal class DefaultFeeRepository(
         return networkId.toBlockchain().isFeeApproximate(amountType)
     }
 
+    override suspend fun getEthereumFeeWithoutGas(
+        userWallet: UserWallet,
+        cryptoCurrency: CryptoCurrency,
+    ): Fee.Ethereum {
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            userWalletId = userWallet.walletId,
+            network = cryptoCurrency.network,
+        )
+
+        val blockchain = cryptoCurrency.network.toBlockchain()
+
+        val ethereumWalletManager = walletManager as? EthereumWalletManager
+            ?: error("Not supported for ${cryptoCurrency.network}")
+
+        val fee = if (blockchain.isSupportEIP1559) {
+            val gasHistory = when (val gasHistory = ethereumWalletManager.getGasHistory()) {
+                is Result.Failure -> throw gasHistory.error
+                is Result.Success -> gasHistory.data
+            }
+
+            val marketPriorityFee = when (gasHistory) {
+                is EthereumFeeHistory.Common -> gasHistory.marketPriorityFee
+                is EthereumFeeHistory.Fallback -> gasHistory.gasPrice.toBigDecimal() * MULTIPLIER_GAS_PRICE_NORMAL_FEE
+            }
+
+            val maxFeePerGas = gasHistory.baseFee * MULTIPLIER_GAS_PRICE_NORMAL_FEE + marketPriorityFee
+
+            getEthEip1559Fee(
+                maxFeePerGas = maxFeePerGas.toBigInteger(),
+                priorityFee = marketPriorityFee.toBigInteger(),
+                blockchain = blockchain,
+            )
+        } else {
+            val gasPrice = when (val gasPrice = ethereumWalletManager.getGasPrice()) {
+                is Result.Failure -> throw gasPrice.error
+                is Result.Success -> gasPrice.data
+            }
+
+            getEthLegacyFee(
+                gasPrice = gasPrice,
+                blockchain = blockchain,
+            )
+        }
+
+        return fee
+    }
+
     override suspend fun calculateFee(
         userWallet: UserWallet,
         cryptoCurrency: CryptoCurrency,
@@ -54,4 +109,37 @@ internal class DefaultFeeRepository(
                 ?: error("WalletManager is null"),
         )
     }
+
+    private fun getEthLegacyFee(gasPrice: BigInteger, blockchain: Blockchain): Fee.Ethereum.Legacy {
+        val amount = Amount(
+            value = BigDecimal.ZERO,
+            blockchain = blockchain,
+        )
+        return Fee.Ethereum.Legacy(
+            amount = amount,
+            gasLimit = BigInteger.ZERO,
+            gasPrice = gasPrice,
+        )
+    }
+
+    private fun getEthEip1559Fee(
+        maxFeePerGas: BigInteger,
+        priorityFee: BigInteger,
+        blockchain: Blockchain,
+    ): Fee.Ethereum.EIP1559 {
+        val amount = Amount(
+            value = BigDecimal.ZERO,
+            blockchain = blockchain,
+        )
+        return Fee.Ethereum.EIP1559(
+            amount = amount,
+            gasLimit = BigInteger.ZERO,
+            maxFeePerGas = maxFeePerGas,
+            priorityFee = priorityFee,
+        )
+    }
+
+    private companion object {
+        val MULTIPLIER_GAS_PRICE_NORMAL_FEE = "1.2".toBigDecimal() // 120%
+    }
 }
\ No newline at end of file
diff --git a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt
index 437fbe7c78..3ac0f16721 100644
--- a/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt
+++ b/data/transaction/src/main/java/com/tangem/data/transaction/DefaultTransactionRepository.kt
@@ -57,6 +57,17 @@ internal class DefaultTransactionRepository(
 
         val extras = txExtras ?: getMemoExtras(networkId = network.rawId, memo)
 
+        val destination = if (amount.type is AmountType.TokenYieldSupply) {
+            walletManager.getYieldModuleAddress()
+        } else {
+            destination
+        }
+        val amount = if (amount.type is AmountType.TokenYieldSupply) {
+            amount.copy(value = BigDecimal.ZERO)
+        } else {
+            amount
+        }
+
         return@withContext if (fee != null) {
             walletManager.createTransaction(
                 amount = amount,
@@ -86,11 +97,6 @@ internal class DefaultTransactionRepository(
         nonce: BigInteger?,
     ): TransactionData.Uncompiled = withContext(dispatchers.io) {
         val blockchain = network.toBlockchain()
-        val walletManager = walletManagersFacade.getOrCreateWalletManager(
-            userWalletId = userWalletId,
-            blockchain = blockchain,
-            derivationPath = network.derivationPath.value,
-        ) ?: error("Wallet manager not found")
 
         val callData = SmartContractCallDataProviderFactory.getTokenTransferCallData(
             destinationAddress = destination,
@@ -98,7 +104,7 @@ internal class DefaultTransactionRepository(
             blockchain = blockchain,
         )
 
-        val extras = if (amount.type is AmountType.Token && callData != null) {
+        val extras = if (callData != null) {
             createTransactionDataExtras(
                 callData = callData,
                 network = network,
@@ -109,25 +115,15 @@ internal class DefaultTransactionRepository(
             null
         }
 
-        return@withContext if (fee != null) {
-            createTransaction(
-                amount = amount,
-                fee = fee,
-                memo = null,
-                destination = destination,
-                userWalletId = userWalletId,
-                network = network,
-                txExtras = getMemoExtras(networkId = network.rawId, memo = memo) ?: extras,
-            )
-        } else {
-            TransactionData.Uncompiled(
-                amount = amount,
-                sourceAddress = walletManager.wallet.address,
-                destinationAddress = destination,
-                extras = getMemoExtras(networkId = network.rawId, memo = memo) ?: extras,
-                fee = null,
-            )
-        }
+        createTransaction(
+            amount = amount,
+            fee = fee,
+            memo = null,
+            destination = destination,
+            userWalletId = userWalletId,
+            network = network,
+            txExtras = getMemoExtras(networkId = network.rawId, memo = memo) ?: extras,
+        )
     }
 
     override suspend fun createApprovalTransaction(
@@ -141,6 +137,12 @@ internal class DefaultTransactionRepository(
     ): TransactionData.Uncompiled = withContext(dispatchers.io) {
         val blockchain = network.toBlockchain()
 
+        val walletManager = walletManagersFacade.getOrCreateWalletManager(
+            userWalletId = userWalletId,
+            blockchain = blockchain,
+            derivationPath = network.derivationPath.value,
+        ) ?: error("Wallet manager not found")
+
         val extras = createTransactionDataExtras(
             callData = SmartContractCallDataProviderFactory.getApprovalCallData(
                 spenderAddress = spenderAddress,
@@ -152,15 +154,23 @@ internal class DefaultTransactionRepository(
             gasLimit = null,
         )
 
-        return@withContext createTransaction(
-            amount = amount,
-            fee = fee,
-            memo = null,
-            destination = contractAddress,
-            userWalletId = userWalletId,
-            network = network,
-            txExtras = extras,
-        )
+        return@withContext if (fee != null) {
+            walletManager.createTransaction(
+                amount = amount,
+                fee = fee,
+                destination = contractAddress,
+            ).copy(
+                extras = extras,
+            )
+        } else {
+            TransactionData.Uncompiled(
+                amount = amount,
+                sourceAddress = walletManager.wallet.address,
+                destinationAddress = contractAddress,
+                extras = extras,
+                fee = null,
+            )
+        }
     }
 
     override suspend fun createNFTTransferTransaction(
diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
index 0be225606e..ed640bfe95 100644
--- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
+++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/DefaultTxHistoryRepository.kt
@@ -101,12 +101,12 @@ class DefaultTxHistoryRepository(
         userWalletId: UserWalletId,
         currency: CryptoCurrency,
         pageSize: Int,
-        refresh: Boolean,
+        shouldRefresh: Boolean,
     ): List<TxInfo> = withContext(dispatchers.io) {
         try {
             cacheRegistry.invokeOnExpire(
                 key = getTxHistoryPageKey(currency, userWalletId, Page.Initial),
-                skipCache = refresh,
+                skipCache = shouldRefresh,
                 block = { fetchFixedSizeTxHistoryItems(userWalletId, currency, pageSize) },
             )
             val txs = txHistoryItemsStore.getSyncOrNull(
diff --git a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt
index 419abdf8a1..972344ad6e 100644
--- a/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt
+++ b/data/txhistory/src/main/kotlin/com/tangem/data/txhistory/repository/RefactoredTxHistoryRepository.kt
@@ -55,7 +55,7 @@ internal class RefactoredTxHistoryRepository(
     ): PaginationWrapper<TxInfo> {
         cacheRegistry.invokeOnExpire(
             key = getTxHistoryPageKey(request.page, request.params),
-            skipCache = request.params.refresh,
+            skipCache = request.params.shouldRefresh,
             block = { fetch(request, batchSize) },
         )
 
diff --git a/data/visa/build.gradle.kts b/data/visa/build.gradle.kts
index 05adcdc660..75c79ae815 100644
--- a/data/visa/build.gradle.kts
+++ b/data/visa/build.gradle.kts
@@ -28,6 +28,11 @@ dependencies {
     implementation(projects.domain.appCurrency.models)
     implementation(projects.domain.tokens.models)
     implementation(projects.domain.tokens)
+    implementation(projects.domain.networks)
+    implementation(projects.domain.walletManager)
+
+    /** Feature API - remove after removing [HotWalletFeatureToggles] */
+    implementation(projects.features.hotWallet.api)
 
     /** Project - Utils */
     implementation(projects.core.utils)
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/di/TangemPayDataModule.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/di/TangemPayDataModule.kt
index c2d3ece8ad..8f407caa11 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/pay/di/TangemPayDataModule.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/di/TangemPayDataModule.kt
@@ -1,11 +1,18 @@
 package com.tangem.data.pay.di
 
+import com.tangem.data.pay.repository.DefaultCardDetailsRepository
 import com.tangem.data.pay.repository.DefaultKycRepository
+import com.tangem.data.pay.repository.DefaultTangemPayTxHistoryRepository
 import com.tangem.data.pay.repository.DefaultOnboardingRepository
+import com.tangem.domain.pay.repository.CardDetailsRepository
 import com.tangem.domain.pay.repository.KycRepository
 import com.tangem.domain.pay.repository.OnboardingRepository
+import com.tangem.domain.pay.usecase.TangemPayIssueOrderUseCase
+import com.tangem.domain.pay.usecase.TangemPayMainScreenCustomerInfoUseCase
+import com.tangem.domain.tangempay.repository.TangemPayTxHistoryRepository
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
@@ -21,4 +28,28 @@ internal interface TangemPayDataModule {
     @Binds
     @Singleton
     fun bindOnboardingRepository(repository: DefaultOnboardingRepository): OnboardingRepository
+
+    @Binds
+    @Singleton
+    fun bindTangemPayTxHistoryRepository(repository: DefaultTangemPayTxHistoryRepository): TangemPayTxHistoryRepository
+
+    @Binds
+    @Singleton
+    fun bindCardDetailsRepository(repository: DefaultCardDetailsRepository): CardDetailsRepository
+
+    companion object {
+        @Provides
+        @Singleton
+        fun provideTangemPayMainScreenCustomerInfoUseCase(
+            repository: OnboardingRepository,
+        ): TangemPayMainScreenCustomerInfoUseCase {
+            return TangemPayMainScreenCustomerInfoUseCase(repository = repository)
+        }
+
+        @Provides
+        @Singleton
+        fun provideTangemPayIssueOrderUseCase(repository: OnboardingRepository): TangemPayIssueOrderUseCase {
+            return TangemPayIssueOrderUseCase(repository = repository)
+        }
+    }
 }
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt
new file mode 100644
index 0000000000..97b84bd4e9
--- /dev/null
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultCardDetailsRepository.kt
@@ -0,0 +1,83 @@
+package com.tangem.data.pay.repository
+
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
+import com.tangem.data.pay.util.RainCryptoUtil
+import com.tangem.data.visa.config.VisaLibLoader
+import com.tangem.datasource.api.common.config.ApiConfig
+import com.tangem.datasource.api.common.config.ApiEnvironment
+import com.tangem.datasource.api.common.config.managers.ApiConfigsManager
+import com.tangem.datasource.api.pay.TangemPayApi
+import com.tangem.datasource.api.pay.models.request.CardDetailsRequest
+import com.tangem.domain.pay.model.TangemPayCardBalance
+import com.tangem.domain.pay.model.TangemPayCardDetails
+import com.tangem.domain.pay.repository.CardDetailsRepository
+import javax.inject.Inject
+
+private const val TAG = "TangemPay: CardDetailsRepository"
+
+internal class DefaultCardDetailsRepository @Inject constructor(
+    private val tangemPayApi: TangemPayApi,
+    private val requestHelper: TangemPayRequestPerformer,
+    private val visaLibLoader: VisaLibLoader,
+    private val apiConfigsManager: ApiConfigsManager,
+    private val rainCryptoUtil: RainCryptoUtil,
+) : CardDetailsRepository {
+
+    override suspend fun getCardBalance(): Either<UniversalError, TangemPayCardBalance> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val result = requestHelper.request { authHeader ->
+                tangemPayApi.getCardBalance(authHeader)
+            }.result ?: error("Cannot get card balance")
+            TangemPayCardBalance(
+                balance = result.availableBalance,
+                currencyCode = result.currency,
+            )
+        }
+    }
+
+    override suspend fun revealCardDetails(): Either<UniversalError, TangemPayCardDetails> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val publicKeyBase64 = getPublicKeyBase64()
+            val (secretKeyHex, sessionId) = rainCryptoUtil.generateSecretKeyAndSessionId(publicKeyBase64)
+
+            val result = requestHelper.request { authHeader ->
+                tangemPayApi.revealCardDetails(
+                    authHeader = authHeader,
+                    body = CardDetailsRequest(sessionId = sessionId),
+                )
+            }.result ?: error("Cannot reveal card details")
+
+            val pan = rainCryptoUtil.decryptSecret(
+                base64Secret = result.pan.secret,
+                base64Iv = result.pan.iv,
+                secretKeyHex = secretKeyHex,
+            )
+
+            val cvv = rainCryptoUtil.decryptSecret(
+                base64Secret = result.cvv.secret,
+                base64Iv = result.cvv.iv,
+                secretKeyHex = secretKeyHex,
+            )
+
+            TangemPayCardDetails(
+                pan = pan,
+                cvv = cvv,
+                expirationYear = result.expirationYear,
+                expirationMonth = result.expirationMonth,
+            )
+        }
+    }
+
+    private suspend fun getPublicKeyBase64(): String {
+        val env = apiConfigsManager.getEnvironmentConfig(ApiConfig.ID.TangemPay).environment
+        return when (env) {
+            ApiEnvironment.DEV,
+            ApiEnvironment.DEV_2,
+            ApiEnvironment.STAGE,
+            ApiEnvironment.MOCK,
+            -> visaLibLoader.getOrCreateConfig().rainRSAPublicKey.dev
+            ApiEnvironment.PROD -> visaLibLoader.getOrCreateConfig().rainRSAPublicKey.prod
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultKycRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultKycRepository.kt
index 0230e63d63..e7c91d654c 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultKycRepository.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultKycRepository.kt
@@ -1,24 +1,26 @@
 package com.tangem.data.pay.repository
 
-import com.tangem.datasource.api.common.response.getOrThrow
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
 import com.tangem.datasource.api.pay.TangemPayApi
 import com.tangem.domain.pay.KycStartInfo
 import com.tangem.domain.pay.repository.KycRepository
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
+private const val TAG = "TangemPay: KycRepository"
+
 internal class DefaultKycRepository @Inject constructor(
     private val tangemPayApi: TangemPayApi,
-    private val dispatchers: CoroutineDispatcherProvider,
     private val requestHelper: TangemPayRequestPerformer,
 ) : KycRepository {
 
-    override suspend fun getKycStartInfo() = withContext(dispatchers.io) {
-        requestHelper.request { authHeader ->
-            tangemPayApi.getKycAccess(authHeader = authHeader).getOrThrow().result
-        }.map {
-            KycStartInfo(token = it.token, locale = it.locale)
+    override suspend fun getKycStartInfo(): Either<UniversalError, KycStartInfo> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val result = requestHelper.request { authHeader ->
+                tangemPayApi.getKycAccess(authHeader = authHeader)
+            }.result
+
+            KycStartInfo(token = result.token, locale = result.locale)
         }
     }
 }
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
index 24eb2cbaa8..b005177a40 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
@@ -1,40 +1,110 @@
 package com.tangem.data.pay.repository
 
 import arrow.core.Either
-import arrow.core.raise.either
 import com.tangem.core.error.UniversalError
-import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.pay.TangemPayApi
 import com.tangem.datasource.api.pay.models.request.DeeplinkValidityRequest
+import com.tangem.datasource.api.pay.models.request.OrderRequest
+import com.tangem.datasource.api.pay.models.response.CustomerMeResponse
+import com.tangem.datasource.local.visa.TangemPayStorage
 import com.tangem.domain.pay.model.CustomerInfo
-import com.tangem.domain.pay.model.ProductInstance
+import com.tangem.domain.pay.model.CustomerInfo.CardInfo
+import com.tangem.domain.pay.model.CustomerInfo.ProductInstance
+import com.tangem.domain.pay.model.MainScreenCustomerInfo
+import com.tangem.domain.pay.model.OrderStatus
 import com.tangem.domain.pay.repository.OnboardingRepository
-import com.tangem.domain.visa.error.VisaApiError
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 private const val VALID_STATUS = "valid"
+private const val TAG = "TangemPay: OnboardingRepository"
 
 internal class DefaultOnboardingRepository @Inject constructor(
+    private val dispatcherProvider: CoroutineDispatcherProvider,
     private val tangemPayApi: TangemPayApi,
     private val requestHelper: TangemPayRequestPerformer,
+    private val tangemPayStorage: TangemPayStorage,
 ) : OnboardingRepository {
 
-    override suspend fun validateDeeplink(link: String): Either<UniversalError, Boolean> = either {
-        return requestHelper.request {
-            tangemPayApi.validateDeeplink(DeeplinkValidityRequest(link)).getOrThrow().result
-                ?: raise(VisaApiError.UnknownWithoutCode)
-        }.map { result -> result.status == VALID_STATUS }
+    override suspend fun validateDeeplink(link: String): Either<UniversalError, Boolean> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val result = requestHelper.request {
+                tangemPayApi.validateDeeplink(DeeplinkValidityRequest(link))
+            }.result
+            result?.status == VALID_STATUS
+        }
     }
 
-    override suspend fun getCustomerInfo(): Either<UniversalError, CustomerInfo> = either {
-        return requestHelper.request { authHeader ->
-            val response = tangemPayApi.getCustomerMe(authHeader).getOrThrow()
-            response.result ?: raise(VisaApiError.UnknownWithoutCode)
-        }.map { result ->
-            CustomerInfo(
-                productInstance = result.productInstance?.let { ProductInstance(id = it.id, status = it.status) },
-                kycStatus = result.kyc?.status,
+    override suspend fun getCustomerInfo(): Either<UniversalError, CustomerInfo> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val result = requestHelper.request { authHeader ->
+                tangemPayApi.getCustomerMe(authHeader)
+            }.result
+            getCustomerInfo(result)
+        }
+    }
+
+    override suspend fun getMainScreenCustomerInfo(): Either<UniversalError, MainScreenCustomerInfo> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val result = requestHelper.requestWithPersistedToken { authHeader ->
+                tangemPayApi.getCustomerMe(authHeader)
+            }.result
+
+            val orderStatus = getOrderStatus().getOrNull() ?: error("Order status is null")
+
+            MainScreenCustomerInfo(info = getCustomerInfo(result), orderStatus = orderStatus)
+        }
+    }
+
+    override suspend fun createOrder(): Either<UniversalError, Unit> = withContext(dispatcherProvider.io) {
+        requestHelper.runWithErrorLogs(TAG) {
+            val walletAddress = requestHelper.getCustomerWalletAddress()
+            val result = requestHelper.requestWithPersistedToken { authHeader ->
+                tangemPayApi.createOrder(authHeader, body = OrderRequest(walletAddress))
+            }.result ?: error("Create order result is null")
+
+            tangemPayStorage.storeOrderId(result.data.customerWalletAddress, result.id)
+        }
+    }
+
+    private fun getCustomerInfo(response: CustomerMeResponse.Result?): CustomerInfo {
+        val card = response?.card
+        val balance = response?.balance
+        val paymentAccount = response?.paymentAccount
+        val cardInfo = if (paymentAccount != null && card != null && balance != null) {
+            CardInfo(
+                lastFourDigits = card.cardNumberEnd,
+                balance = balance.availableBalance,
+                currencyCode = balance.currency,
+                customerWalletAddress = paymentAccount.customerWalletAddress,
             )
+        } else {
+            null
+        }
+        return CustomerInfo(
+            productInstance = response?.productInstance?.let { ProductInstance(id = it.id, status = it.status) },
+            kycStatus = response?.kyc?.status,
+            cardInfo = cardInfo,
+        )
+    }
+
+    private suspend fun getOrderStatus(): Either<UniversalError, OrderStatus> {
+        return requestHelper.runWithErrorLogs(TAG) {
+            val walletAddress = requestHelper.getCustomerWalletAddress()
+            val orderId: String = tangemPayStorage.getOrderId(walletAddress)
+                ?: return@runWithErrorLogs OrderStatus.NOT_ISSUED
+
+            val result = requestHelper.request { authHeader ->
+                tangemPayApi.getOrder(authHeader, orderId)
+            }.result ?: error("Order result is null")
+
+            when (result.status) {
+                OrderStatus.NEW.apiName -> OrderStatus.NEW
+                OrderStatus.PROCESSING.apiName -> OrderStatus.PROCESSING
+                OrderStatus.COMPLETED.apiName -> OrderStatus.COMPLETED
+                else -> OrderStatus.CANCELED
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPayTxHistoryRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPayTxHistoryRepository.kt
new file mode 100644
index 0000000000..be43b2bd72
--- /dev/null
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultTangemPayTxHistoryRepository.kt
@@ -0,0 +1,91 @@
+package com.tangem.data.pay.repository
+
+import com.tangem.data.common.cache.CacheRegistry
+import com.tangem.data.visa.utils.TangemPayTxHistoryItemConverter
+import com.tangem.datasource.api.pay.TangemPayApi
+import com.tangem.datasource.local.visa.TangemPayTxHistoryItemsStore
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListBatchFlow
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListBatchingContext
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListConfig
+import com.tangem.domain.tangempay.repository.TangemPayTxHistoryRepository
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.pagination.BatchFetchResult
+import com.tangem.pagination.BatchListSource
+import com.tangem.pagination.fetcher.BatchFetcher
+import com.tangem.pagination.fetcher.CursorBatchFetcher
+import com.tangem.pagination.toBatchFlow
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import javax.inject.Inject
+
+private const val INITIAL_CURSOR = "initial_cursor_key"
+private const val TAG = "TangemPay: TangemPayTxHistoryRepository:"
+
+internal class DefaultTangemPayTxHistoryRepository @Inject constructor(
+    private val requestPerformer: TangemPayRequestPerformer,
+    private val visaApi: TangemPayApi,
+    private val cacheRegistry: CacheRegistry,
+    private val txHistoryItemsStore: TangemPayTxHistoryItemsStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : TangemPayTxHistoryRepository {
+
+    override fun getTxHistoryBatchFlow(
+        batchSize: Int,
+        context: TangemPayTxHistoryListBatchingContext,
+    ): TangemPayTxHistoryListBatchFlow {
+        return BatchListSource(
+            fetchDispatcher = dispatchers.io,
+            context = context,
+            generateNewKey = { keys -> keys.lastOrNull()?.inc() ?: 0 },
+            batchFetcher = createFetcher(batchSize),
+        ).toBatchFlow()
+    }
+
+    private fun createFetcher(
+        batchSize: Int,
+    ): BatchFetcher<TangemPayTxHistoryListConfig, List<TangemPayTxHistoryItem>> {
+        return CursorBatchFetcher(
+            prefetchDistance = batchSize,
+            batchSize = batchSize,
+            subFetcher = { request, _, _ ->
+                val items = loadItems(config = request.params, cursor = request.cursor, limit = request.limit)
+                BatchFetchResult.Success(
+                    data = items,
+                    last = items.size < request.limit,
+                    empty = items.isEmpty(),
+                )
+            },
+            cursorFromItem = { item -> item.id }, // last item’s id becomes next cursor
+        )
+    }
+
+    private suspend fun loadItems(
+        config: TangemPayTxHistoryListConfig,
+        cursor: String?,
+        limit: Int,
+    ): List<TangemPayTxHistoryItem> {
+        cacheRegistry.invokeOnExpire(
+            key = getCacheKey(customerWalletAddress = config.customerWalletAddress, cursor = cursor),
+            skipCache = config.shouldRefresh,
+            block = { fetch(customerWalletAddress = config.customerWalletAddress, cursor = cursor, pageSize = limit) },
+        )
+
+        return txHistoryItemsStore.getSyncOrNull(
+            key = config.customerWalletAddress,
+            cursor = cursor ?: INITIAL_CURSOR,
+        ).orEmpty()
+    }
+
+    private fun getCacheKey(customerWalletAddress: String, cursor: String?): String {
+        return "tangem_pay_tx_history_${customerWalletAddress}_${cursor ?: INITIAL_CURSOR}"
+    }
+
+    private suspend fun fetch(customerWalletAddress: String, cursor: String?, pageSize: Int) {
+        requestPerformer.runWithErrorLogs(TAG) {
+            val result = requestPerformer.request { authHeader ->
+                visaApi.getTangemPayTxHistory(authHeader = authHeader, limit = pageSize, cursor = cursor)
+            }.result
+            val items = TangemPayTxHistoryItemConverter.convertList(result.transactions).filterNotNull()
+            txHistoryItemsStore.store(key = customerWalletAddress, cursor = cursor ?: INITIAL_CURSOR, value = items)
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/TangemPayRequestPerformer.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/TangemPayRequestPerformer.kt
index 943480ef0e..0865a2fd21 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/TangemPayRequestPerformer.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/TangemPayRequestPerformer.kt
@@ -1,80 +1,115 @@
 package com.tangem.data.pay.repository
 
 import arrow.core.Either
-import arrow.core.raise.either
 import com.squareup.moshi.Moshi
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.core.error.UniversalError
+import com.tangem.data.common.network.NetworkFactory
+import com.tangem.datasource.api.common.response.ApiResponse
 import com.tangem.datasource.api.common.response.ApiResponseError
+import com.tangem.datasource.api.common.response.getOrThrow
 import com.tangem.datasource.api.pay.models.response.VisaErrorResponseJsonAdapter
 import com.tangem.datasource.di.NetworkMoshi
 import com.tangem.datasource.local.visa.TangemPayStorage
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.pay.datasource.TangemPayAuthDataSource
-import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.visa.error.VisaApiError
 import com.tangem.domain.visa.model.VisaAuthTokens
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.derivations.derivationStyleProvider
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import javax.inject.Inject
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.async
-import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-
-/**
- * For TangemPay Customer Wallet auth we are using polygon address
- */
-private const val POL_VALUE = "coin⟨POLYGON⟩polygon-ecosystem-token"
+import timber.log.Timber
+import javax.inject.Inject
 
+@Suppress("LongParameterList")
 internal class TangemPayRequestPerformer @Inject constructor(
     @NetworkMoshi moshi: Moshi,
     private val dispatchers: CoroutineDispatcherProvider,
     private val tangemPayStorage: TangemPayStorage,
-    private val userWalletsRepository: UserWalletsListRepository,
-    private val getCurrencyUseCase: GetSingleCryptoCurrencyStatusUseCase,
     private val authDataSource: TangemPayAuthDataSource,
+    private val userWalletsListManager: UserWalletsListManager,
+    private val userWalletsListRepository: UserWalletsListRepository,
+    private val hotWalletFeatureToggles: HotWalletFeatureToggles,
+    private val walletManagersFacade: WalletManagersFacade,
+    private val networkFactory: NetworkFactory,
 ) {
-    private val visaErrorAdapter = VisaErrorResponseJsonAdapter(moshi)
 
     private var customerWalletAddress: String? = null
 
     private val refreshTokensMutex = Mutex()
-    private var refreshTokensJob: Deferred<Either<UniversalError, VisaAuthTokens>>? = null
+    private var refreshTokensJob: Deferred<VisaAuthTokens>? = null
 
-    suspend fun <T : Any> request(requestBlock: suspend (header: String) -> T): Either<UniversalError, T> = either {
-        withContext(dispatchers.io) {
-            performRequest(requestBlock = requestBlock, refreshTokens = ::refreshAuthTokens).bind()
-        }
-    }
+    private val visaErrorAdapter = VisaErrorResponseJsonAdapter(moshi)
 
-    private suspend fun <T : Any> performRequest(
-        requestBlock: suspend (header: String) -> T,
-        refreshTokens: (suspend () -> Either<UniversalError, VisaAuthTokens>)? = null,
-    ): Either<UniversalError, T> = either {
-        runCatching {
-            requestBlock("Bearer ${getAccessTokens().bind().accessToken}")
-        }.getOrElse { error ->
-            when (error) {
-                is ApiResponseError.HttpException -> {
-                    if (refreshTokens != null && error.code == ApiResponseError.HttpException.Code.UNAUTHORIZED) {
-                        refreshOrJoin(refreshTokens).bind()
-                        performRequest(requestBlock, refreshTokens = null).bind()
-                    } else {
-                        raise(mapHttpError(error))
-                    }
+    suspend fun <T : Any> runWithErrorLogs(tag: String, requestBlock: suspend () -> T): Either<UniversalError, T> {
+        return try {
+            val result = requestBlock()
+            Either.Right(result)
+        } catch (exception: Exception) {
+            when (exception) {
+                is CancellationException -> {
+                    throw exception
+                }
+                else -> {
+                    Timber.tag(tag).e(exception)
+                    Either.Left(mapError(exception))
                 }
-                else -> raise(VisaApiError.UnknownWithoutCode)
             }
         }
     }
 
-    private suspend fun refreshOrJoin(
-        refreshTokens: suspend () -> Either<UniversalError, VisaAuthTokens>,
-    ): Either<UniversalError, VisaAuthTokens> {
-        val jobToAwait: Deferred<Either<UniversalError, VisaAuthTokens>> =
+    suspend fun <T : Any> request(requestBlock: suspend (header: String) -> ApiResponse<T>): T =
+        withContext(dispatchers.io) {
+            performRequest(
+                requestBlock = requestBlock,
+                getTokens = ::getAccessTokens,
+                refreshTokens = ::refreshAuthTokens,
+            )
+        }
+
+    suspend fun <T : Any> requestWithPersistedToken(requestBlock: suspend (header: String) -> ApiResponse<T>): T =
+        withContext(dispatchers.io) {
+            performRequest(
+                requestBlock = requestBlock,
+                getTokens = { getAccessTokensIfSaved() ?: error("Cannot get saved access tokens") },
+                refreshTokens = ::refreshAuthTokens,
+            )
+        }
+
+    private fun getWallets(): Flow<List<UserWallet>> = if (hotWalletFeatureToggles.isHotWalletEnabled) {
+        userWalletsListRepository.userWallets.map { requireNotNull(it) }
+    } else {
+        userWalletsListManager.userWallets
+    }
+
+    private suspend fun <T : Any> performRequest(
+        requestBlock: suspend (header: String) -> ApiResponse<T>,
+        getTokens: (suspend () -> VisaAuthTokens),
+        refreshTokens: (suspend () -> VisaAuthTokens)? = null,
+    ): T = runCatching {
+        requestBlock("Bearer ${getTokens().accessToken}").getOrThrow()
+    }.getOrElse { error ->
+        val unauthorizedCode = ApiResponseError.HttpException.Code.UNAUTHORIZED
+        if (error is ApiResponseError.HttpException && refreshTokens != null && error.code == unauthorizedCode) {
+            refreshOrJoin(refreshTokens)
+            performRequest(requestBlock, refreshTokens = null, getTokens = getTokens)
+        } else {
+            throw error
+        }
+    }
+
+    private suspend fun refreshOrJoin(refreshTokens: suspend () -> VisaAuthTokens): VisaAuthTokens {
+        val jobToAwait: Deferred<VisaAuthTokens> =
             refreshTokensMutex.withLock {
                 val current = refreshTokensJob
                 if (current == null || current.isCompleted) {
@@ -87,8 +122,6 @@ internal class TangemPayRequestPerformer @Inject constructor(
             }
         val result = try {
             jobToAwait.await()
-        } catch (ignore: Throwable) {
-            Either.Left(VisaApiError.UnknownWithoutCode)
         } finally {
             refreshTokensMutex.withLock {
                 if (refreshTokensJob === jobToAwait && jobToAwait.isCompleted) {
@@ -99,57 +132,67 @@ internal class TangemPayRequestPerformer @Inject constructor(
         return result
     }
 
-    private suspend fun getCustomerWalletAddress(): Either<UniversalError, String> = either {
-        customerWalletAddress
-            ?: tangemPayStorage.getCustomerWalletAddress()
-            ?: fetchAuthInputData().bind().address
+    suspend fun getCustomerWalletAddress(): String = customerWalletAddress ?: fetchAuthInputData().address
+
+    private suspend fun getAccessTokens(): VisaAuthTokens {
+        return getAccessTokensIfSaved() ?: fetchTokens()
     }
 
-    private suspend fun getAccessTokens(): Either<UniversalError, VisaAuthTokens> = either {
-        val address = getCustomerWalletAddress().bind()
-        tangemPayStorage.getAuthTokens(address) ?: fetchTokens().bind()
+    private suspend fun getAccessTokensIfSaved(): VisaAuthTokens? {
+        return tangemPayStorage.getAuthTokens(getCustomerWalletAddress())
     }
 
-    private fun mapHttpError(throwable: ApiResponseError.HttpException): UniversalError {
-        val errorBody = throwable.errorBody ?: return VisaApiError.UnknownWithoutCode
-        return runCatching {
-            visaErrorAdapter.fromJson(errorBody)?.error?.code ?: throwable.code.numericCode
-        }.map {
-            VisaApiError.fromBackendError(it)
-        }.getOrElse {
-            VisaApiError.UnknownWithoutCode
-        }
-    }
+    private suspend fun fetchAuthInputData(): AuthInputData {
+        val userWallets = getWallets()
+            .filter { it.isNotEmpty() }
+            .first()
+        val wallet = userWallets.find { it is UserWallet.Cold } as? UserWallet.Cold
+            ?: error("Cannot find cold user wallet")
 
-    private suspend fun fetchAuthInputData(): Either<UniversalError, AuthInputData> = either {
-        val wallet = userWalletsRepository.userWalletsSync().find { it is UserWallet.Cold } as? UserWallet.Cold
-            ?: raise(VisaApiError.UnknownWithoutCode)
+        val network = networkFactory.create(
+            blockchain = Blockchain.Polygon,
+            extraDerivationPath = null,
+            derivationStyleProvider = wallet.derivationStyleProvider,
+            canHandleTokens = true,
+        ) ?: error("Cannot create network")
 
-        val address = getCurrencyUseCase.invokeMultiWalletSync(wallet.walletId, CryptoCurrency.ID.fromValue(POL_VALUE))
-            .getOrNull()?.value?.networkAddress?.defaultAddress?.value ?: raise(VisaApiError.UnknownWithoutCode)
+        val address = walletManagersFacade.getDefaultAddress(wallet.walletId, network)
+            ?: error("Cannot get polygon address")
 
         customerWalletAddress = address
-        tangemPayStorage.storeCustomerWalletAddress(address)
 
-        AuthInputData(address, wallet.cardId)
+        return AuthInputData(address, wallet.cardId)
     }
 
-    private suspend fun fetchTokens(): Either<UniversalError, VisaAuthTokens> = either {
-        val inputData = fetchAuthInputData().bind()
+    private suspend fun fetchTokens(): VisaAuthTokens {
+        val inputData = fetchAuthInputData()
         val tokens = authDataSource.generateNewAuthTokens(inputData.address, inputData.cardId)
-            .getOrNull()
-            ?: return Either.Left(VisaApiError.UnknownWithoutCode)
+            .getOrNull() ?: error("Cannot fetch tokens")
         tangemPayStorage.storeAuthTokens(inputData.address, tokens)
-        tokens
+        return tokens
     }
 
-    private suspend fun refreshAuthTokens(): Either<UniversalError, VisaAuthTokens> = either {
-        val customerWalletAddress = getCustomerWalletAddress().bind()
-        val refreshToken = getAccessTokens().bind().refreshToken.value
-        val tokens = authDataSource.refreshAuthTokens(refreshToken).getOrNull()
-            ?: raise(VisaApiError.UnknownWithoutCode)
+    private suspend fun refreshAuthTokens(): VisaAuthTokens {
+        val customerWalletAddress = getCustomerWalletAddress()
+        val refreshToken = getAccessTokens().refreshToken.value
+        val tokens = authDataSource.refreshAuthTokens(refreshToken).getOrNull() ?: error("Cannot refresh tokens")
         tangemPayStorage.storeAuthTokens(customerWalletAddress, tokens)
-        tokens
+        return tokens
+    }
+
+    private fun mapError(throwable: Throwable): UniversalError {
+        return if (throwable is ApiResponseError.HttpException) {
+            val errorBody = throwable.errorBody ?: return VisaApiError.UnknownWithoutCode
+            return runCatching {
+                visaErrorAdapter.fromJson(errorBody)?.error?.code ?: throwable.code.numericCode
+            }.map {
+                VisaApiError.fromBackendError(it)
+            }.getOrElse {
+                VisaApiError.UnknownWithoutCode
+            }
+        } else {
+            VisaApiError.UnknownWithoutCode
+        }
     }
 }
 
diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/util/RainCryptoUtil.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/util/RainCryptoUtil.kt
new file mode 100644
index 0000000000..24b60d6ea8
--- /dev/null
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/util/RainCryptoUtil.kt
@@ -0,0 +1,69 @@
+package com.tangem.data.pay.util
+
+import android.util.Base64
+import com.tangem.utils.extensions.hexToBytes
+import java.nio.charset.StandardCharsets
+import java.security.KeyFactory
+import java.security.SecureRandom
+import com.tangem.common.extensions.toHexString
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+import java.security.spec.X509EncodedKeySpec
+import javax.crypto.Cipher
+import javax.crypto.spec.GCMParameterSpec
+import javax.crypto.spec.SecretKeySpec
+import javax.inject.Inject
+
+private const val KEY_LENGTH_BYTES = 16
+private const val TAG_LENGTH_BYTES = 16
+private const val BITS_PER_BYTE = 8
+private const val RSA_TRANSFORMATION = "RSA/ECB/OAEPWithSHA-1AndMGF1Padding"
+private const val AES_TRANSFORMATION = "AES/GCM/NoPadding"
+private const val AES_ALGORITHM = "AES"
+private const val RSA_ALGORITHM = "RSA"
+
+internal class RainCryptoUtil @Inject constructor(
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    suspend fun generateSecretKeyAndSessionId(publicKeyBase64: String): Pair<String, String> =
+        withContext(dispatchers.default) {
+            val secretKeyHex = ByteArray(KEY_LENGTH_BYTES).also { SecureRandom().nextBytes(it) }.toHexString()
+            val sessionId = generateSessionId(publicKeyBase64, secretKeyHex)
+            secretKeyHex to sessionId
+        }
+
+    suspend fun decryptSecret(base64Secret: String, base64Iv: String, secretKeyHex: String): String =
+        withContext(dispatchers.default) {
+            val cipherTextBytes = Base64.decode(base64Secret, Base64.NO_WRAP)
+            if (cipherTextBytes.size < TAG_LENGTH_BYTES) error("Cipher text too short")
+
+            val initializationVectorBytes = Base64.decode(base64Iv, Base64.NO_WRAP)
+            val secretKeyBytes = secretKeyHex.hexToBytes()
+
+            val aesSecretKey = SecretKeySpec(secretKeyBytes, AES_ALGORITHM)
+            val gcmParameterSpec = GCMParameterSpec(TAG_LENGTH_BYTES * BITS_PER_BYTE, initializationVectorBytes)
+
+            val aesCipher = Cipher.getInstance(AES_TRANSFORMATION)
+            aesCipher.init(Cipher.DECRYPT_MODE, aesSecretKey, gcmParameterSpec)
+
+            val plaintextBytes = aesCipher.doFinal(cipherTextBytes)
+            plaintextBytes.toString(StandardCharsets.UTF_8).trim().ifEmpty { error("Invalid decrypted data") }
+        }
+
+    private fun generateSessionId(publicKeyBase64: String, secretKeyHex: String): String {
+        val secretKeyBytes = secretKeyHex.hexToBytes()
+        val publicKeyDerBytes = Base64.decode(publicKeyBase64, Base64.NO_WRAP)
+        val publicKeySpec = X509EncodedKeySpec(publicKeyDerBytes)
+        val rsaPublicKey = KeyFactory.getInstance(RSA_ALGORITHM).generatePublic(publicKeySpec)
+
+        val secretKeyBase64String = Base64.encodeToString(secretKeyBytes, Base64.NO_WRAP)
+        val plaintextUtf8Bytes = secretKeyBase64String.toByteArray(StandardCharsets.UTF_8)
+
+        val rsaCipher = Cipher.getInstance(RSA_TRANSFORMATION)
+        rsaCipher.init(Cipher.ENCRYPT_MODE, rsaPublicKey)
+        val cipherTextBytes = rsaCipher.doFinal(plaintextUtf8Bytes)
+
+        return Base64.encodeToString(cipherTextBytes, Base64.NO_WRAP)
+    }
+}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaRepository.kt
index 3acbfdd607..2a81db61e6 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaRepository.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/DefaultVisaRepository.kt
@@ -100,7 +100,7 @@ internal class DefaultVisaRepository @Inject constructor(
         )
     }
 
-    override suspend fun getTxHistory(
+    override fun getTxHistory(
         userWalletId: UserWalletId,
         pageSize: Int,
         isRefresh: Boolean,
@@ -218,7 +218,7 @@ internal class DefaultVisaRepository @Inject constructor(
         return cardWallet.publicKey.toHexString()
     }
 
-    private suspend fun findVisaUserWallet(userWalletId: UserWalletId): UserWallet {
+    private fun findVisaUserWallet(userWalletId: UserWalletId): UserWallet {
         val userWallet = requireNotNull(userWalletsStore.getSyncOrNull(userWalletId)) {
             "No user wallet found: $userWalletId"
         }
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/MockVisaRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/MockVisaRepository.kt
index e6165b5712..007b4b4e26 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/MockVisaRepository.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/MockVisaRepository.kt
@@ -15,7 +15,7 @@ internal class MockVisaRepository @Inject constructor() : VisaRepository {
         TODO("Not implemented for this build type")
     }
 
-    override suspend fun getTxHistory(
+    override fun getTxHistory(
         userWalletId: UserWalletId,
         pageSize: Int,
         isRefresh: Boolean,
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/config/VisaConfig.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/config/VisaConfig.kt
index cf76110918..d70626efc0 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/config/VisaConfig.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/config/VisaConfig.kt
@@ -13,6 +13,8 @@ internal data class VisaConfig(
     val header: Header,
     @Json(name = "rsaPublicKey")
     val rsaPublicKey: RsaPublicKey,
+    @Json(name = "rainRSAPublicKey")
+    val rainRSAPublicKey: RsaPublicKey,
 ) {
 
     @JsonClass(generateAdapter = true)
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt
new file mode 100644
index 0000000000..defb6559b9
--- /dev/null
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt
@@ -0,0 +1,58 @@
+package com.tangem.data.visa.utils
+
+import com.tangem.datasource.api.pay.models.response.TangemPayTxHistoryResponse
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.utils.converter.Converter
+import timber.log.Timber
+import java.util.Currency
+
+internal object TangemPayTxHistoryItemConverter :
+    Converter<TangemPayTxHistoryResponse.Transaction, TangemPayTxHistoryItem?> {
+
+    override fun convert(value: TangemPayTxHistoryResponse.Transaction): TangemPayTxHistoryItem? {
+        return value.spend?.let { convertSpend(id = value.id, spend = it) }
+            ?: value.payment?.let { convertPayment(id = value.id, payment = it) }
+            ?: value.fee?.let { convertFee(id = value.id, fee = it) }
+            ?: run {
+                Timber.wtf("unknown type of transaction: $value")
+                null
+            }
+    }
+
+    private fun convertSpend(id: String, spend: TangemPayTxHistoryResponse.Spend): TangemPayTxHistoryItem.Spend {
+        return TangemPayTxHistoryItem.Spend(
+            id = id,
+            // If postedAt is null, it means transaction wasn't posted and was likely declined. Use authorizedAt
+            date = spend.postedAt ?: spend.authorizedAt,
+            amount = spend.amount,
+            currency = Currency.getInstance(spend.currency),
+            enrichedMerchantName = spend.enrichedMerchantName,
+            merchantName = spend.merchantName,
+            enrichedMerchantCategory = spend.enrichedMerchantCategory,
+            merchantCategory = spend.merchantCategory,
+            status = spend.status,
+            enrichedMerchantIconUrl = spend.enrichedMerchantIcon,
+        )
+    }
+
+    private fun convertPayment(
+        id: String,
+        payment: TangemPayTxHistoryResponse.Payment,
+    ): TangemPayTxHistoryItem.Payment {
+        return TangemPayTxHistoryItem.Payment(
+            id = id,
+            date = payment.postedAt,
+            currency = Currency.getInstance(payment.currency),
+            amount = payment.amount,
+        )
+    }
+
+    private fun convertFee(id: String, fee: TangemPayTxHistoryResponse.Fee): TangemPayTxHistoryItem.Fee {
+        return TangemPayTxHistoryItem.Fee(
+            id = id,
+            date = fee.postedAt,
+            currency = Currency.getInstance(fee.currency),
+            amount = fee.amount,
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemConverter.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemConverter.kt
new file mode 100644
index 0000000000..6311b23e70
--- /dev/null
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemConverter.kt
@@ -0,0 +1,20 @@
+package com.tangem.data.visa.utils
+
+import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
+import com.tangem.domain.visa.model.VisaTxHistoryItem
+import com.tangem.utils.converter.Converter
+
+internal object VisaTxHistoryItemConverter : Converter<VisaTxHistoryResponse.Transaction, VisaTxHistoryItem> {
+
+    override fun convert(value: VisaTxHistoryResponse.Transaction): VisaTxHistoryItem {
+        return VisaTxHistoryItem(
+            id = value.transactionId.toString(),
+            date = value.transactionDt,
+            amount = value.blockchainAmount,
+            fiatAmount = value.transactionAmount,
+            merchantName = value.merchantName,
+            status = value.transactionStatus,
+            fiatCurrency = findCurrencyByNumericCode(value.transactionCurrencyCode),
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemFactory.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemFactory.kt
deleted file mode 100644
index d7be726e36..0000000000
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryItemFactory.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.tangem.data.visa.utils
-
-import com.tangem.datasource.api.pay.models.response.VisaTxHistoryResponse
-import com.tangem.domain.visa.model.VisaTxHistoryItem
-
-internal class VisaTxHistoryItemFactory {
-
-    fun create(transaction: VisaTxHistoryResponse.Transaction): VisaTxHistoryItem {
-        return VisaTxHistoryItem(
-            id = transaction.transactionId.toString(),
-            date = transaction.transactionDt,
-            amount = transaction.blockchainAmount,
-            fiatAmount = transaction.transactionAmount,
-            merchantName = transaction.merchantName,
-            status = transaction.transactionStatus,
-            fiatCurrency = findCurrencyByNumericCode(transaction.transactionCurrencyCode),
-        )
-    }
-}
\ No newline at end of file
diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryPagingSource.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryPagingSource.kt
index 44649d0bf8..01950d27b7 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryPagingSource.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/VisaTxHistoryPagingSource.kt
@@ -20,8 +20,6 @@ internal class VisaTxHistoryPagingSource(
     val requestTxHistory: suspend (offset: Int, pageSize: Int) -> VisaTxHistoryResponse,
 ) : PagingSource<Int, VisaTxHistoryItem>() {
 
-    private val itemsFactory = VisaTxHistoryItemFactory()
-
     private val cardPublicKey = params.cardPublicKey
     private val pageSize = params.pageSize
     private val isRefresh = params.isRefresh
@@ -82,7 +80,7 @@ internal class VisaTxHistoryPagingSource(
 
         pagedItems.update {
             it.toMutableMap().apply {
-                this[offset] = response.transactions.map(itemsFactory::create)
+                this[offset] = response.transactions.map(VisaTxHistoryItemConverter::convert)
             }
         }
     }
diff --git a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignTransactionUseCase.kt b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignTransactionUseCase.kt
index 89a968a5fd..c0d665b854 100644
--- a/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignTransactionUseCase.kt
+++ b/data/wallet-connect/src/main/kotlin/com/tangem/data/walletconnect/network/solana/WcSolanaSignTransactionUseCase.kt
@@ -21,6 +21,7 @@ import com.tangem.domain.walletconnect.usecase.method.BlockAidTransactionCheck
 import com.tangem.domain.walletconnect.usecase.method.SignRequirements
 import com.tangem.domain.walletconnect.usecase.method.WcSignState
 import com.tangem.domain.walletconnect.usecase.method.WcTransactionUseCase
+import com.tangem.lib.crypto.BlockchainUtils.SOLANA_TRANSACTION_SIZE_THRESHOLD_BYTES
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -107,7 +108,7 @@ internal class WcSolanaSignTransactionUseCase @AssistedInject constructor(
     }
 
     private fun isLargeHash(hash: ByteArray): Boolean {
-        return hash.size > LARGE_HASH_SIZE
+        return hash.size > SOLANA_TRANSACTION_SIZE_THRESHOLD_BYTES
     }
 
     private fun getFormattedHash(hash: ByteArray): ByteArray {
@@ -124,10 +125,6 @@ internal class WcSolanaSignTransactionUseCase @AssistedInject constructor(
         return isLargeHash(data)
     }
 
-    private companion object {
-        private const val LARGE_HASH_SIZE = 930 // bytes
-    }
-
     @AssistedFactory
     interface Factory {
         fun create(
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
index bf3dcaa1c9..f746aacfd4 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/DefaultWalletManagersFacade.kt
@@ -19,9 +19,11 @@ import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.blockchain.nft.models.NFTAsset
 import com.tangem.blockchain.nft.models.NFTCollection
 import com.tangem.blockchain.transactionhistory.models.TransactionHistoryRequest
+import com.tangem.blockchain.yieldsupply.YieldSupplyContractCallDataProviderFactory
 import com.tangem.blockchainsdk.BlockchainSDKFactory
 import com.tangem.blockchainsdk.models.UpdateWalletManagerResult
 import com.tangem.blockchainsdk.utils.toBlockchain
+import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.data.walletmanager.utils.*
 import com.tangem.datasource.asset.loader.AssetLoader
@@ -50,6 +52,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.math.BigDecimal
 import java.util.EnumSet
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 
 @Suppress("LargeClass", "TooManyFunctions")
@@ -71,7 +74,7 @@ internal class DefaultWalletManagersFacade @Inject constructor(
     private val requirementsConditionConverter by lazy { SdkRequirementsConditionConverter() }
     private val estimationFeeAddressFactory by lazy { EstimationFeeAddressFactory() }
 
-    private val initMutex = Mutex()
+    private val wmInitializationMutexes = ConcurrentHashMap<String, Mutex>()
 
     override suspend fun update(
         userWalletId: UserWalletId,
@@ -363,7 +366,7 @@ internal class DefaultWalletManagersFacade @Inject constructor(
         blockchain: Blockchain,
         derivationPath: String?,
     ): WalletManager? {
-        initMutex.withLock {
+        getWmInitializationMutex(blockchain, derivationPath).withLock {
             val userWallet = getUserWallet(userWalletId)
 
             var walletManager = walletManagersStore.getSyncOrNull(
@@ -496,18 +499,25 @@ internal class DefaultWalletManagersFacade @Inject constructor(
             userWalletId = userWalletId,
             blockchain = blockchain,
             derivationPath = network.derivationPath.value,
-        )
+        ) ?: error("Wallet manager not found")
 
-        val destination = estimationFeeAddressFactory.makeAddress(blockchain)
+        val destination = when (amount.type) {
+            is AmountType.TokenYieldSupply -> walletManager.getYieldModuleAddress()
+            else -> estimationFeeAddressFactory.makeAddress(blockchain)
+        }
 
-        val callData = if (amount.type is AmountType.Token) {
-            SmartContractCallDataProviderFactory.getTokenTransferCallData(
+        val callData = when (val amountType = amount.type) {
+            is AmountType.Token -> SmartContractCallDataProviderFactory.getTokenTransferCallData(
                 destinationAddress = destination,
                 amount = amount,
                 blockchain = blockchain,
             )
-        } else {
-            null
+            is AmountType.TokenYieldSupply -> YieldSupplyContractCallDataProviderFactory.getSendCallData(
+                tokenContractAddress = amountType.token.contractAddress,
+                destinationAddress = estimationFeeAddressFactory.makeAddress(blockchain),
+                amount = amount,
+            )
+            else -> null
         }
 
         (walletManager as? TransactionSender)?.estimateFee(
@@ -728,6 +738,17 @@ internal class DefaultWalletManagersFacade @Inject constructor(
         return initializableAccountWalletManger.accountInitializationState == InitializableAccount.State.INITIALIZED
     }
 
+    private fun getWmInitializationMutex(blockchain: Blockchain, derivationPath: String?): Mutex {
+        val key = createMutexMapKey(blockchain, derivationPath)
+        return wmInitializationMutexes.computeIfAbsent(key) {
+            Mutex()
+        }
+    }
+
+    private fun createMutexMapKey(blockchain: Blockchain, derivationPath: String?): String {
+        return blockchain.toNetworkId() + "|" + derivationPath
+    }
+
     private fun updateWalletManagerTokensIfNeeded(walletManager: WalletManager, tokens: Set<CryptoCurrency.Token>) {
         if (tokens.isEmpty()) return
 
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/extensions/WalletManagerFactory.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/extensions/WalletManagerFactory.kt
index b9dc8edf78..1a5442bfa2 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/extensions/WalletManagerFactory.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/extensions/WalletManagerFactory.kt
@@ -9,7 +9,7 @@ import com.tangem.common.extensions.toMapKey
 import com.tangem.crypto.hdWallet.DerivationPath
 import com.tangem.crypto.hdWallet.bip32.ExtendedPublicKey
 import com.tangem.domain.card.common.TapWorkarounds.isTestCard
-import com.tangem.domain.card.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.card.common.TapWorkarounds.hasOldStyleDerivation
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.configs.CardConfig
 import com.tangem.domain.card.configs.Wallet2CardConfig
@@ -112,7 +112,7 @@ fun makePublicKey(
 private fun getDerivationParams(card: CardDTO): DerivationParams? {
     return if (!card.settings.isHDWalletAllowed) {
         null
-    } else if (card.useOldStyleDerivation) {
+    } else if (card.hasOldStyleDerivation) {
         DerivationParams.Default(DerivationStyle.LEGACY)
     } else {
         DerivationParams.Default(DerivationStyle.NEW)
diff --git a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt
index 6d1b520c2f..5701b7eb2e 100644
--- a/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt
+++ b/data/wallet-manager/src/main/java/com/tangem/data/walletmanager/utils/TransactionDataToTxHistoryItemConverter.kt
@@ -1,6 +1,10 @@
 package com.tangem.data.walletmanager.utils
 
+import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
 import com.tangem.blockchain.common.*
+import com.tangem.blockchain.yieldsupply.providers.ethereum.factory.EthereumYieldSupplyDeployCallData
+import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplyEnterCallData
+import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplyExitCallData
 import com.tangem.blockchainsdk.models.UpdateWalletManagerResult.Address
 import com.tangem.domain.models.network.TxInfo
 import com.tangem.utils.converter.Converter
@@ -40,7 +44,18 @@ internal class TransactionDataToTxHistoryItemConverter(
                 TransactionStatus.Confirmed -> TxInfo.TransactionStatus.Confirmed
                 TransactionStatus.Unconfirmed -> TxInfo.TransactionStatus.Unconfirmed
             },
-            type = TxInfo.TransactionType.Transfer,
+            type = when (val extras = value.extras) {
+                is EthereumTransactionExtras -> {
+                    when (extras.callData) {
+                        is EthereumYieldSupplyDeployCallData,
+                        is EthereumYieldSupplyEnterCallData,
+                        -> TxInfo.TransactionType.YieldSupply.Enter
+                        is EthereumYieldSupplyExitCallData -> TxInfo.TransactionType.YieldSupply.Exit
+                        else -> TxInfo.TransactionType.Transfer
+                    }
+                }
+                else -> TxInfo.TransactionType.Transfer
+            },
             amount = amount,
         )
     }
diff --git a/data/wallet-manager/src/test/java/com/tangem/data/walletmanager/UpdateWalletManagerResultFactoryTest.kt b/data/wallet-manager/src/test/java/com/tangem/data/walletmanager/UpdateWalletManagerResultFactoryTest.kt
index 4c5c929262..94d6776409 100644
--- a/data/wallet-manager/src/test/java/com/tangem/data/walletmanager/UpdateWalletManagerResultFactoryTest.kt
+++ b/data/wallet-manager/src/test/java/com/tangem/data/walletmanager/UpdateWalletManagerResultFactoryTest.kt
@@ -250,7 +250,9 @@ internal class UpdateWalletManagerResultFactoryTest {
                             ),
                         ),
                         currenciesAmounts = setOf(
-                            UpdateWalletManagerResult.CryptoCurrencyAmount.Coin(value = BigDecimal.ZERO), // default for demo
+                            UpdateWalletManagerResult.CryptoCurrencyAmount.Coin(
+                                value = BigDecimal.ZERO,
+                            ), // default for demo
                         ),
                         currentTransactions = emptySet(),
                     ),
@@ -272,7 +274,9 @@ internal class UpdateWalletManagerResultFactoryTest {
                             ),
                         ),
                         currenciesAmounts = setOf(
-                            UpdateWalletManagerResult.CryptoCurrencyAmount.Coin(value = BigDecimal.ONE), // used demo amount
+                            UpdateWalletManagerResult.CryptoCurrencyAmount.Coin(
+                                value = BigDecimal.ONE,
+                            ), // used demo amount
                         ),
                         currentTransactions = emptySet(),
                     ),
diff --git a/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt b/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
index d8edb5dc18..56a5f027a2 100644
--- a/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
+++ b/data/wallets/src/main/java/com/tangem/data/wallets/DefaultWalletsRepository.kt
@@ -415,6 +415,6 @@ internal class DefaultWalletsRepository(
                 else -> ActivatePromoCodeError.ActivationFailed
             }
             return@fold error.left()
-        },)
+        })
     }
 }
\ No newline at end of file
diff --git a/data/wallets/src/main/java/com/tangem/data/wallets/hot/DefaultHotWalletAccessor.kt b/data/wallets/src/main/java/com/tangem/data/wallets/hot/DefaultHotWalletAccessor.kt
index 9fac877712..5e60776268 100644
--- a/data/wallets/src/main/java/com/tangem/data/wallets/hot/DefaultHotWalletAccessor.kt
+++ b/data/wallets/src/main/java/com/tangem/data/wallets/hot/DefaultHotWalletAccessor.kt
@@ -1,7 +1,7 @@
 package com.tangem.data.wallets.hot
 
 import com.tangem.common.core.TangemSdkError
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.hot.HotWalletAccessor
@@ -16,7 +16,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
-import kotlin.collections.set
 
 class DefaultHotWalletAccessor @Inject constructor(
     private val tangemHotSdk: TangemHotSdk,
diff --git a/data/wallets/src/test/java/com/tangem/data/wallets/DefaultWalletsRepositoryTest.kt b/data/wallets/src/test/java/com/tangem/data/wallets/DefaultWalletsRepositoryTest.kt
index f305beb722..d2e030bc54 100644
--- a/data/wallets/src/test/java/com/tangem/data/wallets/DefaultWalletsRepositoryTest.kt
+++ b/data/wallets/src/test/java/com/tangem/data/wallets/DefaultWalletsRepositoryTest.kt
@@ -114,62 +114,64 @@ class DefaultWalletsRepositoryTest {
     }
 
     @Test
-    fun `GIVEN API returns wallets WHEN getWalletsInfo THEN should return converted wallets and update cache if requested`() = runTest {
-        // GIVEN
-        val applicationId = "test_app_id"
-        val wallet1Id = "1234567890abcdef"
-        val wallet2Id = "fedcba0987654321"
-        val walletResponses = listOf(
-            WalletResponse(
-                id = wallet1Id,
-                notifyStatus = true,
-            ),
-            WalletResponse(
-                id = wallet2Id,
-                notifyStatus = false,
-            ),
-        )
-        coEvery { tangemTechApi.getWallets(applicationId) } returns ApiResponse.Success(walletResponses)
-        coEvery { preferencesDataStore.updateData(any()) } returns mockk()
+    fun `GIVEN API returns wallets WHEN getWalletsInfo THEN should return converted wallets and update cache if requested`() =
+        runTest {
+            // GIVEN
+            val applicationId = "test_app_id"
+            val wallet1Id = "1234567890abcdef"
+            val wallet2Id = "fedcba0987654321"
+            val walletResponses = listOf(
+                WalletResponse(
+                    id = wallet1Id,
+                    notifyStatus = true,
+                ),
+                WalletResponse(
+                    id = wallet2Id,
+                    notifyStatus = false,
+                ),
+            )
+            coEvery { tangemTechApi.getWallets(applicationId) } returns ApiResponse.Success(walletResponses)
+            coEvery { preferencesDataStore.updateData(any()) } returns mockk()
 
-        // WHEN
-        val result = repository.getWalletsInfo(applicationId, updateCache = true)
+            // WHEN
+            val result = repository.getWalletsInfo(applicationId, updateCache = true)
 
-        // THEN
-        assertThat(result).hasSize(2)
-        assertThat(result[0].walletId.stringValue).isEqualTo(wallet1Id)
-        assertThat(result[0].isNotificationsEnabled).isTrue()
-        assertThat(result[1].walletId.stringValue).isEqualTo(wallet2Id)
-        assertThat(result[1].isNotificationsEnabled).isFalse()
+            // THEN
+            assertThat(result).hasSize(2)
+            assertThat(result[0].walletId.stringValue).isEqualTo(wallet1Id)
+            assertThat(result[0].isNotificationsEnabled).isTrue()
+            assertThat(result[1].walletId.stringValue).isEqualTo(wallet2Id)
+            assertThat(result[1].isNotificationsEnabled).isFalse()
 
-        coVerify(exactly = 1) { tangemTechApi.getWallets(applicationId) }
-        coVerify(exactly = 2) { preferencesDataStore.updateData(any()) }
-    }
+            coVerify(exactly = 1) { tangemTechApi.getWallets(applicationId) }
+            coVerify(exactly = 2) { preferencesDataStore.updateData(any()) }
+        }
 
     @Test
-    fun `GIVEN API returns wallets WHEN getWalletsInfo with updateCache false THEN should return converted wallets without updating cache`() = runTest {
-        // GIVEN
-        val applicationId = "test_app_id"
-        val wallet1Id = "1234567890abcdef"
-        val walletResponses = listOf(
-            WalletResponse(
-                id = wallet1Id,
-                notifyStatus = true,
-            ),
-        )
-        coEvery { tangemTechApi.getWallets(applicationId) } returns ApiResponse.Success(walletResponses)
+    fun `GIVEN API returns wallets WHEN getWalletsInfo with updateCache false THEN should return converted wallets without updating cache`() =
+        runTest {
+            // GIVEN
+            val applicationId = "test_app_id"
+            val wallet1Id = "1234567890abcdef"
+            val walletResponses = listOf(
+                WalletResponse(
+                    id = wallet1Id,
+                    notifyStatus = true,
+                ),
+            )
+            coEvery { tangemTechApi.getWallets(applicationId) } returns ApiResponse.Success(walletResponses)
 
-        // WHEN
-        val result = repository.getWalletsInfo(applicationId, updateCache = false)
+            // WHEN
+            val result = repository.getWalletsInfo(applicationId, updateCache = false)
 
-        // THEN
-        assertThat(result).hasSize(1)
-        assertThat(result[0].walletId.stringValue).isEqualTo(wallet1Id)
-        assertThat(result[0].isNotificationsEnabled).isTrue()
+            // THEN
+            assertThat(result).hasSize(1)
+            assertThat(result[0].walletId.stringValue).isEqualTo(wallet1Id)
+            assertThat(result[0].isNotificationsEnabled).isTrue()
 
-        coVerify(exactly = 1) { tangemTechApi.getWallets(applicationId) }
-        coVerify(exactly = 0) { preferencesDataStore.updateData(any()) }
-    }
+            coVerify(exactly = 1) { tangemTechApi.getWallets(applicationId) }
+            coVerify(exactly = 0) { preferencesDataStore.updateData(any()) }
+        }
 
     @Test
     fun `GIVEN user wallets and application ID WHEN associateWallets THEN should convert and send to API`() = runTest {
@@ -271,8 +273,8 @@ class DefaultWalletsRepositoryTest {
         // GIVEN
         coEvery { tangemTechApi.activatePromoCode(any()) } returns
             ApiResponse.Error(
-            HttpException(code = HttpException.Code.NOT_FOUND, message = null, errorBody = null),
-        ) as ApiResponse<PromocodeActivationResponse>
+                HttpException(code = HttpException.Code.NOT_FOUND, message = null, errorBody = null),
+            ) as ApiResponse<PromocodeActivationResponse>
 
         // WHEN
         val result = repository.activatePromoCode(promoCode = "PROMO", bitcoinAddress = "addr")
@@ -288,8 +290,8 @@ class DefaultWalletsRepositoryTest {
         // GIVEN
         coEvery { tangemTechApi.activatePromoCode(any()) } returns
             ApiResponse.Error(
-            HttpException(code = HttpException.Code.CONFLICT, message = null, errorBody = null),
-        ) as ApiResponse<PromocodeActivationResponse>
+                HttpException(code = HttpException.Code.CONFLICT, message = null, errorBody = null),
+            ) as ApiResponse<PromocodeActivationResponse>
 
         // WHEN
         val result = repository.activatePromoCode(promoCode = "PROMO", bitcoinAddress = "addr")
diff --git a/data/wallets/src/test/java/com/tangem/data/wallets/derivations/DefaultDerivationsRepositoryTest.kt b/data/wallets/src/test/java/com/tangem/data/wallets/derivations/DefaultDerivationsRepositoryTest.kt
index eb812166f7..e9bccfd5a5 100644
--- a/data/wallets/src/test/java/com/tangem/data/wallets/derivations/DefaultDerivationsRepositoryTest.kt
+++ b/data/wallets/src/test/java/com/tangem/data/wallets/derivations/DefaultDerivationsRepositoryTest.kt
@@ -133,7 +133,7 @@ internal class DefaultDerivationsRepositoryTest {
             scanResponse = MockScanResponseFactory.create(cardConfig = MultiWalletCardConfig, derivedKeys = emptyMap()),
         )
         coEvery { userWalletsStore.getSyncStrict(defaultUserWalletId) } returns userWallet
-        coEvery { tangemSdkManager.derivePublicKeys(null, any(), any()) } throws ScanCardException.UserCancelled
+        coEvery { tangemSdkManager.derivePublicKeys(null, any(), any()) } throws ScanCardException.UserCancelled()
 
         runCatching {
             repository.derivePublicKeys(
diff --git a/data/yield-supply/build.gradle.kts b/data/yield-supply/build.gradle.kts
index b0cc1f2844..73b4ac8ab2 100644
--- a/data/yield-supply/build.gradle.kts
+++ b/data/yield-supply/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
 
     /** Domain */
     implementation(projects.domain.yieldSupply)
+    implementation(projects.domain.yieldSupply.models)
     implementation(projects.domain.walletManager)
     implementation(projects.domain.legacy)
 
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyErrorResolver.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyErrorResolver.kt
new file mode 100644
index 0000000000..ddd0c7ab43
--- /dev/null
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyErrorResolver.kt
@@ -0,0 +1,13 @@
+package com.tangem.data.yield.supply
+
+import com.tangem.domain.yield.supply.YieldSupplyError
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
+
+internal data object DefaultYieldSupplyErrorResolver : YieldSupplyErrorResolver {
+    override fun resolve(throwable: Throwable): YieldSupplyError {
+        return when (throwable) {
+            is YieldSupplyError -> throwable
+            else -> YieldSupplyError.DataError(throwable)
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyMarketRepository.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyMarketRepository.kt
new file mode 100644
index 0000000000..8abd538e91
--- /dev/null
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyMarketRepository.kt
@@ -0,0 +1,64 @@
+package com.tangem.data.yield.supply
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchainsdk.utils.fromNetworkId
+import com.tangem.blockchainsdk.utils.toNetworkId
+import com.tangem.datasource.api.common.response.getOrThrow
+import com.tangem.datasource.local.yieldsupply.YieldMarketsStore
+import com.tangem.data.yield.supply.converters.YieldMarketTokenConverter
+import com.tangem.datasource.api.tangemTech.YieldSupplyApi
+import com.tangem.data.yield.supply.converters.YieldTokenStatusConverter
+import com.tangem.data.yield.supply.converters.YieldTokenChartConverter
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import com.tangem.domain.yield.supply.models.YieldMarketTokenStatus
+import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+import kotlin.collections.map
+
+internal class DefaultYieldSupplyMarketRepository(
+    private val yieldSupplyApi: YieldSupplyApi,
+    private val store: YieldMarketsStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : YieldSupplyMarketRepository {
+
+    override suspend fun getCachedMarkets(): List<YieldMarketToken>? = withContext(dispatchers.io) {
+        store.getSyncOrNull()?.enrichNetworkIds()
+    }
+
+    override suspend fun updateMarkets(): List<YieldMarketToken> = withContext(dispatchers.io) {
+        val response = yieldSupplyApi.getYieldMarkets().getOrThrow()
+        val domain = response.marketDtos.map(YieldMarketTokenConverter::convert)
+        store.store(domain)
+        domain
+    }
+
+    override fun getMarketsFlow(): Flow<List<YieldMarketToken>> = store.get().map {
+        it.enrichNetworkIds()
+    }
+
+    override suspend fun getTokenStatus(cryptoCurrencyToken: CryptoCurrency.Token): YieldMarketTokenStatus {
+        val chainId = Blockchain.fromNetworkId(cryptoCurrencyToken.network.backendId)?.getChainId()
+            ?: error("Chain id is required for evm's")
+        val response = yieldSupplyApi.getYieldTokenStatus(chainId, cryptoCurrencyToken.contractAddress).getOrThrow()
+        return YieldTokenStatusConverter.convert(response)
+    }
+
+    override suspend fun getTokenChart(cryptoCurrencyToken: CryptoCurrency.Token): YieldSupplyMarketChartData {
+        val chainId = Blockchain.fromNetworkId(cryptoCurrencyToken.network.backendId)?.getChainId()
+            ?: error("Chain id is required for evm's")
+        val response = yieldSupplyApi.getYieldTokenChart(chainId, cryptoCurrencyToken.contractAddress).getOrThrow()
+        return YieldTokenChartConverter.convert(response)
+    }
+
+    private fun List<YieldMarketToken>.enrichNetworkIds(): List<YieldMarketToken> {
+        val chainIdMap = Blockchain.entries.associate { it.getChainId() to it.toNetworkId() }
+        return this.map { token ->
+            token.copy(backendId = chainIdMap[token.chainId])
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepository.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepository.kt
index 86c802d7db..12c2a98044 100644
--- a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepository.kt
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepository.kt
@@ -17,6 +17,7 @@ import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.orZero
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.math.BigDecimal
@@ -30,6 +31,7 @@ internal class DefaultYieldSupplyTransactionRepository(
     override suspend fun createEnterTransactions(
         userWalletId: UserWalletId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
+        maxNetworkFee: BigDecimal,
     ): List<TransactionData.Uncompiled> {
         val cryptoCurrency = cryptoCurrencyStatus.currency
 
@@ -51,27 +53,23 @@ internal class DefaultYieldSupplyTransactionRepository(
             cryptoCurrency = cryptoCurrency,
         ) ?: error("Calculated yield contract address is null")
 
-        val yieldTokenStatus = cryptoCurrencyStatus.value.yieldSupplyStatus ?: getYieldTokenStatus(
-            walletManager = walletManager,
-            cryptoCurrency = cryptoCurrency,
-        )
+        val maxNetworkFee = maxNetworkFee.convertToSdkAmount(cryptoCurrencyStatus)
 
         return buildEnterTransactions(
             walletManager = walletManager,
-            cryptoCurrency = cryptoCurrency,
-            existingYieldContractAddress = existingYieldContractAddress,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            existingYieldAddress = existingYieldContractAddress,
             calculatedYieldContractAddress = calculatedYieldContractAddress,
-            yieldTokenStatus = yieldTokenStatus,
+            maxNetworkFee = maxNetworkFee,
         )
     }
 
     override suspend fun createExitTransaction(
         userWalletId: UserWalletId,
-        cryptoCurrency: CryptoCurrency,
-        yieldSupplyStatus: YieldSupplyStatus,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
         fee: Fee?,
     ): TransactionData.Uncompiled = withContext(dispatchers.io) {
-        require(cryptoCurrency is CryptoCurrency.Token)
+        val cryptoCurrency = cryptoCurrencyStatus.currency as CryptoCurrency.Token
 
         val walletManager = walletManagersFacade.getOrCreateWalletManager(
             userWalletId = userWalletId,
@@ -87,51 +85,80 @@ internal class DefaultYieldSupplyTransactionRepository(
             walletManager = walletManager,
             cryptoCurrency = cryptoCurrency,
             callData = callData,
-            destinationAddress = walletManager.getYieldContract(),
-            yieldSupplyStatus = yieldSupplyStatus,
+            destinationAddress = walletManager.getYieldModuleAddress(),
+            amount = BigDecimal.ZERO.convertToSdkAmount(cryptoCurrencyStatus),
             fee = fee,
         )
     }
 
-    private fun buildEnterTransactions(
+    override suspend fun getProtocolBalance(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): BigDecimal? =
+        withContext(dispatchers.io) {
+            require(cryptoCurrency is CryptoCurrency.Token)
+            runCatching {
+                val walletManager = walletManagersFacade.getOrCreateWalletManager(
+                    userWalletId = userWalletId,
+                    blockchain = cryptoCurrency.network.toBlockchain(),
+                    derivationPath = cryptoCurrency.network.derivationPath.value,
+                ) ?: error("Wallet manager not found")
+                walletManager.getProtocolBalance(
+                    token = Token(
+                        symbol = cryptoCurrency.symbol,
+                        contractAddress = cryptoCurrency.contractAddress,
+                        decimals = cryptoCurrency.decimals,
+                    ),
+                )
+            }.onFailure(Timber::e).getOrThrow()
+        }
+
+    @Suppress("LongParameterList")
+    private suspend fun buildEnterTransactions(
         walletManager: WalletManager,
-        cryptoCurrency: CryptoCurrency.Token,
-        existingYieldContractAddress: String?,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+        existingYieldAddress: String?,
         calculatedYieldContractAddress: String,
-        yieldTokenStatus: YieldSupplyStatus?,
+        maxNetworkFee: Amount,
     ): MutableList<TransactionData.Uncompiled> {
         val enterTransactions = mutableListOf<TransactionData.Uncompiled>()
+        val cryptoCurrency = cryptoCurrencyStatus.currency as CryptoCurrency.Token
+        val yieldSupplyStatus = getYieldTokenStatus(walletManager, cryptoCurrency)
+
+        val amount = getEnterAmount(cryptoCurrency, yieldSupplyStatus)
+
+        val emptyContractAddress = existingYieldAddress == null || existingYieldAddress == EthereumUtils.ZERO_ADDRESS
 
         when {
-            existingYieldContractAddress == null || existingYieldContractAddress == EthereumUtils.ZERO_ADDRESS -> {
+            yieldSupplyStatus == null || emptyContractAddress -> {
                 enterTransactions.add(
                     createDeployTransaction(
                         walletManager = walletManager,
                         cryptoCurrency = cryptoCurrency,
+                        amount = amount,
+                        maxNetworkFee = maxNetworkFee,
                     ),
                 )
             }
-            yieldTokenStatus == null -> error("Yield token status is null")
-            !yieldTokenStatus.isInitialized -> enterTransactions.add(
+            !yieldSupplyStatus.isInitialized -> enterTransactions.add(
                 createInitTokenTransaction(
                     walletManager = walletManager,
                     cryptoCurrency = cryptoCurrency,
-                    yieldSupplyStatus = yieldTokenStatus,
                     yieldContractAddress = calculatedYieldContractAddress,
+                    amount = amount,
+                    maxNetworkFee = maxNetworkFee,
                 ),
             )
-            !yieldTokenStatus.isActive -> enterTransactions.add(
+            !yieldSupplyStatus.isActive -> enterTransactions.add(
                 createReactivateTokenTransaction(
                     walletManager = walletManager,
                     cryptoCurrency = cryptoCurrency,
-                    yieldSupplyStatus = yieldTokenStatus,
                     yieldContractAddress = calculatedYieldContractAddress,
+                    amount = amount,
+                    maxNetworkFee = maxNetworkFee,
                 ),
             )
             else -> Unit
         }
 
-        if (yieldTokenStatus?.isAllowedToSpend == false) {
+        if (yieldSupplyStatus?.isAllowedToSpend != true) {
             enterTransactions.add(
                 createTransaction(
                     walletManager = walletManager,
@@ -141,20 +168,22 @@ internal class DefaultYieldSupplyTransactionRepository(
                         amount = null,
                     ),
                     destinationAddress = cryptoCurrency.contractAddress,
-                    yieldSupplyStatus = yieldTokenStatus,
+                    amount = amount,
                     fee = null,
                 ),
             )
         }
 
-        enterTransactions.add(
-            createEnterTransaction(
-                walletManager = walletManager,
-                cryptoCurrency = cryptoCurrency,
-                yieldSupplyStatus = yieldTokenStatus,
-                yieldContractAddress = calculatedYieldContractAddress,
-            ),
-        )
+        if (cryptoCurrencyStatus.value.amount.orZero() > BigDecimal.ZERO) {
+            enterTransactions.add(
+                createEnterTransaction(
+                    walletManager = walletManager,
+                    cryptoCurrency = cryptoCurrency,
+                    amount = amount,
+                    yieldContractAddress = calculatedYieldContractAddress,
+                ),
+            )
+        }
 
         return enterTransactions
     }
@@ -170,12 +199,11 @@ internal class DefaultYieldSupplyTransactionRepository(
                 blockchain = cryptoCurrency.network.toBlockchain(),
                 derivationPath = cryptoCurrency.network.derivationPath.value,
             ) ?: error("Wallet manager not found")
-            walletManager.calculateYieldContract()
-        }.onFailure(Timber::e)
-            .getOrNull()
+            walletManager.calculateYieldModuleAddress()
+        }.onFailure(Timber::e).getOrThrow()
     }
 
-    private suspend fun getYieldContractAddress(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): String? =
+    override suspend fun getYieldContractAddress(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): String? =
         withContext(dispatchers.io) {
             require(cryptoCurrency is CryptoCurrency.Token)
             runCatching {
@@ -184,19 +212,23 @@ internal class DefaultYieldSupplyTransactionRepository(
                     blockchain = cryptoCurrency.network.toBlockchain(),
                     derivationPath = cryptoCurrency.network.derivationPath.value,
                 ) ?: error("Wallet manager not found")
-                walletManager.getYieldContract()
-            }.onFailure(Timber::e)
-                .getOrNull()
+                walletManager.getYieldModuleAddress()
+            }.onFailure(Timber::e).getOrThrow()
         }
 
     private suspend fun getYieldTokenStatus(
         walletManager: WalletManager,
-        cryptoCurrency: CryptoCurrency,
+        cryptoCurrency: CryptoCurrency.Token,
     ): YieldSupplyStatus? = withContext(dispatchers.io) {
-        require(cryptoCurrency is CryptoCurrency.Token)
         runCatching {
             val sdkSupplyStatus = walletManager.getYieldSupplyStatus(cryptoCurrency.contractAddress)
-            val isAllowedToSpend = walletManager.isAllowedToSpend(cryptoCurrency.contractAddress)
+            val isAllowedToSpend = walletManager.isAllowedToSpend(
+                Token(
+                    symbol = cryptoCurrency.symbol,
+                    contractAddress = cryptoCurrency.contractAddress,
+                    decimals = cryptoCurrency.decimals,
+                ),
+            )
 
             YieldSupplyStatus(
                 isActive = sdkSupplyStatus?.isActive == true,
@@ -209,11 +241,13 @@ internal class DefaultYieldSupplyTransactionRepository(
     private fun createDeployTransaction(
         walletManager: WalletManager,
         cryptoCurrency: CryptoCurrency.Token,
+        amount: Amount,
+        maxNetworkFee: Amount,
     ): TransactionData.Uncompiled {
         val callData = YieldSupplyContractCallDataProviderFactory.getDeployCallData(
             tokenContractAddress = cryptoCurrency.contractAddress,
             walletAddress = walletManager.wallet.address,
-            maxNetworkFee = MAX_NETWORK_FEE.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = maxNetworkFee,
         )
 
         val factoryContractAddress = walletManager.getYieldSupplyContractAddresses()?.factoryContractAddress
@@ -224,7 +258,7 @@ internal class DefaultYieldSupplyTransactionRepository(
             cryptoCurrency = cryptoCurrency,
             callData = callData,
             destinationAddress = factoryContractAddress,
-            yieldSupplyStatus = null,
+            amount = amount,
             fee = null,
         )
     }
@@ -233,11 +267,12 @@ internal class DefaultYieldSupplyTransactionRepository(
         walletManager: WalletManager,
         cryptoCurrency: CryptoCurrency.Token,
         yieldContractAddress: String,
-        yieldSupplyStatus: YieldSupplyStatus,
+        amount: Amount,
+        maxNetworkFee: Amount,
     ): TransactionData.Uncompiled {
         val callData = YieldSupplyContractCallDataProviderFactory.getInitTokenCallData(
             tokenContractAddress = cryptoCurrency.contractAddress,
-            maxNetworkFee = MAX_NETWORK_FEE.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = maxNetworkFee,
         )
 
         return createTransaction(
@@ -245,7 +280,7 @@ internal class DefaultYieldSupplyTransactionRepository(
             cryptoCurrency = cryptoCurrency,
             callData = callData,
             destinationAddress = yieldContractAddress,
-            yieldSupplyStatus = yieldSupplyStatus,
+            amount = amount,
             fee = null,
         )
     }
@@ -254,11 +289,12 @@ internal class DefaultYieldSupplyTransactionRepository(
         walletManager: WalletManager,
         cryptoCurrency: CryptoCurrency.Token,
         yieldContractAddress: String,
-        yieldSupplyStatus: YieldSupplyStatus,
+        amount: Amount,
+        maxNetworkFee: Amount,
     ): TransactionData.Uncompiled {
         val callData = YieldSupplyContractCallDataProviderFactory.getReactivateTokenCallData(
             tokenContractAddress = cryptoCurrency.contractAddress,
-            maxNetworkFee = MAX_NETWORK_FEE.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = maxNetworkFee,
         )
 
         return createTransaction(
@@ -266,7 +302,7 @@ internal class DefaultYieldSupplyTransactionRepository(
             cryptoCurrency = cryptoCurrency,
             callData = callData,
             destinationAddress = yieldContractAddress,
-            yieldSupplyStatus = yieldSupplyStatus,
+            amount = amount,
             fee = null,
         )
     }
@@ -274,7 +310,7 @@ internal class DefaultYieldSupplyTransactionRepository(
     private fun createEnterTransaction(
         walletManager: WalletManager,
         cryptoCurrency: CryptoCurrency.Token,
-        yieldSupplyStatus: YieldSupplyStatus?,
+        amount: Amount,
         yieldContractAddress: String,
     ): TransactionData.Uncompiled {
         val callData = YieldSupplyContractCallDataProviderFactory.getEnterCallData(
@@ -286,7 +322,7 @@ internal class DefaultYieldSupplyTransactionRepository(
             cryptoCurrency = cryptoCurrency,
             callData = callData,
             destinationAddress = yieldContractAddress,
-            yieldSupplyStatus = yieldSupplyStatus,
+            amount = amount,
             fee = null,
         )
     }
@@ -297,7 +333,7 @@ internal class DefaultYieldSupplyTransactionRepository(
         cryptoCurrency: CryptoCurrency,
         callData: SmartContractCallData,
         destinationAddress: String,
-        yieldSupplyStatus: YieldSupplyStatus?,
+        amount: Amount,
         fee: Fee?,
     ): TransactionData.Uncompiled {
         requireNotNull(cryptoCurrency as? CryptoCurrency.Token)
@@ -308,8 +344,6 @@ internal class DefaultYieldSupplyTransactionRepository(
             blockchain = blockchain,
         )
 
-        val amount = getYieldSupplyAmount(cryptoCurrency, yieldSupplyStatus)
-
         return if (fee != null) {
             walletManager.createTransaction(
                 amount = amount,
@@ -350,22 +384,19 @@ internal class DefaultYieldSupplyTransactionRepository(
         }
     }
 
-    private fun getYieldSupplyAmount(cryptoCurrency: CryptoCurrency.Token, yieldSupplyStatus: YieldSupplyStatus?) =
-        BigDecimal.ZERO.convertToSdkAmount(
-            cryptoCurrency = cryptoCurrency,
-            amountType = AmountType.TokenYieldSupply(
-                token = Token(
-                    symbol = cryptoCurrency.symbol,
-                    contractAddress = cryptoCurrency.contractAddress,
-                    decimals = cryptoCurrency.decimals,
-                ),
-                isActive = yieldSupplyStatus?.isActive ?: false,
-                isInitialized = yieldSupplyStatus?.isInitialized ?: false,
-                isAllowedToSpend = yieldSupplyStatus?.isAllowedToSpend ?: false,
+    private fun getEnterAmount(cryptoCurrency: CryptoCurrency.Token, yieldSupplyStatus: YieldSupplyStatus?) = Amount(
+        currencySymbol = cryptoCurrency.symbol,
+        value = BigDecimal.ZERO,
+        decimals = cryptoCurrency.decimals,
+        type = AmountType.TokenYieldSupply(
+            token = Token(
+                symbol = cryptoCurrency.symbol,
+                contractAddress = cryptoCurrency.contractAddress,
+                decimals = cryptoCurrency.decimals,
             ),
-        )
-
-    private companion object {
-        val MAX_NETWORK_FEE: BigDecimal = BigDecimal.TEN // TODO for TESTNET only
-    }
+            isActive = yieldSupplyStatus?.isActive ?: false,
+            isInitialized = yieldSupplyStatus?.isInitialized ?: false,
+            isAllowedToSpend = yieldSupplyStatus?.isAllowedToSpend ?: false,
+        ),
+    )
 }
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt
new file mode 100644
index 0000000000..ca069668ff
--- /dev/null
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldMarketTokenConverter.kt
@@ -0,0 +1,16 @@
+package com.tangem.data.yield.supply.converters
+
+import com.tangem.datasource.api.tangemTech.models.YieldMarketsResponse
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import com.tangem.utils.converter.Converter
+
+internal object YieldMarketTokenConverter : Converter<YieldMarketsResponse.MarketDto, YieldMarketToken> {
+    override fun convert(value: YieldMarketsResponse.MarketDto): YieldMarketToken {
+        return YieldMarketToken(
+            tokenAddress = value.tokenAddress.orEmpty(),
+            apy = value.apy,
+            isActive = value.isActive,
+            chainId = value.chainId ?: -1,
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenChartConverter.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenChartConverter.kt
new file mode 100644
index 0000000000..da9787852f
--- /dev/null
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenChartConverter.kt
@@ -0,0 +1,14 @@
+package com.tangem.data.yield.supply.converters
+
+import com.tangem.datasource.api.tangemTech.models.YieldTokenChartResponse
+import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
+
+internal object YieldTokenChartConverter {
+
+    fun convert(response: YieldTokenChartResponse): YieldSupplyMarketChartData {
+        val y = response.data.map { it.avgApy.toDouble() }
+        val x = response.data.map { it.bucketIndex.toDouble() }
+        val avr = response.averageApy.toDouble()
+        return YieldSupplyMarketChartData(y = y, x = x, avr = avr)
+    }
+}
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenStatusConverter.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenStatusConverter.kt
new file mode 100644
index 0000000000..8035634fc9
--- /dev/null
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/converters/YieldTokenStatusConverter.kt
@@ -0,0 +1,21 @@
+package com.tangem.data.yield.supply.converters
+
+import com.tangem.datasource.api.tangemTech.models.YieldTokenStatusResponse
+import com.tangem.domain.models.serialization.SerializedBigDecimal
+import com.tangem.domain.yield.supply.models.YieldMarketTokenStatus
+import com.tangem.utils.converter.Converter
+
+internal object YieldTokenStatusConverter : Converter<YieldTokenStatusResponse, YieldMarketTokenStatus> {
+    override fun convert(value: YieldTokenStatusResponse): YieldMarketTokenStatus {
+        return YieldMarketTokenStatus(
+            tokenAddress = value.tokenAddress.orEmpty(),
+            tokenSymbol = value.tokenSymbol.orEmpty(),
+            tokenName = value.tokenName.orEmpty(),
+            apy = value.apy ?: SerializedBigDecimal.ZERO,
+            isActive = value.isActive ?: false,
+            chainId = value.chainId ?: -1,
+            maxFeeUSD = value.maxFeeUSD.orEmpty(),
+            maxFeeNative = value.maxFeeNative.orEmpty(),
+        )
+    }
+}
\ No newline at end of file
diff --git a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/di/YieldSupplyDataModule.kt b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/di/YieldSupplyDataModule.kt
index 2b2f45f06c..8888eba918 100644
--- a/data/yield-supply/src/main/java/com/tangem/data/yield/supply/di/YieldSupplyDataModule.kt
+++ b/data/yield-supply/src/main/java/com/tangem/data/yield/supply/di/YieldSupplyDataModule.kt
@@ -1,7 +1,13 @@
 package com.tangem.data.yield.supply.di
 
+import com.tangem.data.yield.supply.DefaultYieldSupplyMarketRepository
+import com.tangem.data.yield.supply.DefaultYieldSupplyErrorResolver
 import com.tangem.data.yield.supply.DefaultYieldSupplyTransactionRepository
+import com.tangem.datasource.api.tangemTech.YieldSupplyApi
+import com.tangem.datasource.local.yieldsupply.YieldMarketsStore
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
 import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
@@ -25,4 +31,24 @@ internal object YieldSupplyDataModule {
             dispatchers = dispatchers,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyMarketRepository(
+        yieldSupplyApi: YieldSupplyApi,
+        store: YieldMarketsStore,
+        dispatchers: CoroutineDispatcherProvider,
+    ): YieldSupplyMarketRepository {
+        return DefaultYieldSupplyMarketRepository(
+            yieldSupplyApi = yieldSupplyApi,
+            store = store,
+            dispatchers = dispatchers,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideYieldSupplyErrorResolver(): YieldSupplyErrorResolver {
+        return DefaultYieldSupplyErrorResolver
+    }
 }
\ No newline at end of file
diff --git a/data/yield-supply/src/test/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepositoryTest.kt b/data/yield-supply/src/test/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepositoryTest.kt
index 069e3630f8..cf8174d299 100644
--- a/data/yield-supply/src/test/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepositoryTest.kt
+++ b/data/yield-supply/src/test/java/com/tangem/data/yield/supply/DefaultYieldSupplyTransactionRepositoryTest.kt
@@ -12,11 +12,9 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.network.Network
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.models.yield.supply.YieldSupplyStatus
 import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
-import com.tangem.blockchain.yieldsupply.providers.YieldSupplyStatus as SDKYieldSupplyStatus
 import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.mockk
@@ -26,6 +24,7 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.math.BigDecimal
+import com.tangem.blockchain.yieldsupply.providers.YieldSupplyStatus as SDKYieldSupplyStatus
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class DefaultYieldSupplyTransactionRepositoryTest {
@@ -42,6 +41,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
     private val cryptoCurrencyStatus = mockk<CryptoCurrencyStatus>(relaxed = true) {
         every { currency } returns cryptoCurrency
         every { value.yieldSupplyStatus } returns null
+        every { value.amount } returns BigDecimal.TEN
     }
 
     private val walletManager = mockk<WalletManager>(relaxed = true) {
@@ -69,12 +69,16 @@ class DefaultYieldSupplyTransactionRepositoryTest {
 
     @Test
     fun `createEnterTransactions returns deploy-approve-enter transactions`() = runTest {
-        coEvery { walletManager.getYieldContract() } returns EthereumUtils.ZERO_ADDRESS
+        coEvery { walletManager.getYieldModuleAddress() } returns EthereumUtils.ZERO_ADDRESS
         coEvery { walletManager.getYieldSupplyStatus(any()) } returns null
         coEvery { walletManager.isAllowedToSpend(any()) } returns false
-        coEvery { walletManager.calculateYieldContract() } returns yieldContractAddress
+        coEvery { walletManager.calculateYieldModuleAddress() } returns yieldContractAddress
 
-        val result = repository.createEnterTransactions(userWalletId, cryptoCurrencyStatus)
+        val result = repository.createEnterTransactions(
+            userWalletId = userWalletId,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = BigDecimal.TEN,
+        )
 
         // Assert that 3 transactions are returned: deploy, approve, enter
         Truth.assertThat(result).isNotNull()
@@ -84,7 +88,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         val firstExpectedCallData = YieldSupplyContractCallDataProviderFactory.getDeployCallData(
             walletAddress = walletManager.wallet.address,
             tokenContractAddress = mockedContractAddress,
-            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrencyStatus),
         )
         val firstTransaction = result.first()
 
@@ -115,15 +119,20 @@ class DefaultYieldSupplyTransactionRepositoryTest {
 
     @Test
     fun `createEnterTransactions returns init-approve-enter transactions`() = runTest {
-        coEvery { walletManager.getYieldContract() } returns yieldContractAddress
-        coEvery { walletManager.calculateYieldContract() } returns yieldContractAddress
+        coEvery { walletManager.getYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.calculateYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.isAllowedToSpend(any()) } returns false
         coEvery { walletManager.getYieldSupplyStatus(any()) } returns SDKYieldSupplyStatus(
             isActive = false,
             isInitialized = false,
             maxNetworkFee = BigDecimal.TEN,
         )
 
-        val result = repository.createEnterTransactions(userWalletId, cryptoCurrencyStatus)
+        val result = repository.createEnterTransactions(
+            userWalletId = userWalletId,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = BigDecimal.TEN,
+        )
 
         // Assert that 3 transactions are returned: init token, approve, enter
         Truth.assertThat(result).isNotNull()
@@ -132,7 +141,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         // Check transaction - init token
         val firstExpectedCallData = YieldSupplyContractCallDataProviderFactory.getInitTokenCallData(
             tokenContractAddress = mockedContractAddress,
-            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrencyStatus),
         )
         val firstTransaction = result.first()
 
@@ -163,15 +172,20 @@ class DefaultYieldSupplyTransactionRepositoryTest {
 
     @Test
     fun `createEnterTransactions returns reactivate-approve-enter transactions`() = runTest {
-        coEvery { walletManager.getYieldContract() } returns yieldContractAddress
-        coEvery { walletManager.calculateYieldContract() } returns yieldContractAddress
+        coEvery { walletManager.getYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.calculateYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.isAllowedToSpend(any()) } returns false
         coEvery { walletManager.getYieldSupplyStatus(any()) } returns SDKYieldSupplyStatus(
             isActive = false,
             isInitialized = true,
             maxNetworkFee = BigDecimal.TEN,
         )
 
-        val result = repository.createEnterTransactions(userWalletId, cryptoCurrencyStatus)
+        val result = repository.createEnterTransactions(
+            userWalletId = userWalletId,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = BigDecimal.TEN,
+        )
 
         // Assert that 3 transactions are returned: reactivate token, approve, enter
         Truth.assertThat(result).isNotNull()
@@ -180,7 +194,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         // Check transaction - reactivate token
         val firstExpectedCallData = YieldSupplyContractCallDataProviderFactory.getReactivateTokenCallData(
             tokenContractAddress = mockedContractAddress,
-            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrencyStatus),
         )
         val firstTransaction = result.first()
 
@@ -211,8 +225,8 @@ class DefaultYieldSupplyTransactionRepositoryTest {
 
     @Test
     fun `createEnterTransactions returns reactivate-enter transactions`() = runTest {
-        coEvery { walletManager.getYieldContract() } returns yieldContractAddress
-        coEvery { walletManager.calculateYieldContract() } returns yieldContractAddress
+        coEvery { walletManager.getYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.calculateYieldModuleAddress() } returns yieldContractAddress
         coEvery { walletManager.getYieldSupplyStatus(any()) } returns SDKYieldSupplyStatus(
             isActive = false,
             isInitialized = true,
@@ -220,7 +234,11 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         )
         coEvery { walletManager.isAllowedToSpend(any()) } returns true
 
-        val result = repository.createEnterTransactions(userWalletId, cryptoCurrencyStatus)
+        val result = repository.createEnterTransactions(
+            userWalletId = userWalletId,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = BigDecimal.TEN,
+        )
 
         // Assert that 2 transactions are returned: approve, enter
         Truth.assertThat(result).isNotNull()
@@ -229,7 +247,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         // Check transaction - reactivate token
         val firstExpectedCallData = YieldSupplyContractCallDataProviderFactory.getReactivateTokenCallData(
             tokenContractAddress = mockedContractAddress,
-            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrency),
+            maxNetworkFee = BigDecimal.TEN.convertToSdkAmount(cryptoCurrencyStatus),
         )
         val firstTransaction = result.first()
 
@@ -248,8 +266,8 @@ class DefaultYieldSupplyTransactionRepositoryTest {
 
     @Test
     fun `createEnterTransactions returns enter transactions`() = runTest {
-        coEvery { walletManager.getYieldContract() } returns yieldContractAddress
-        coEvery { walletManager.calculateYieldContract() } returns yieldContractAddress
+        coEvery { walletManager.getYieldModuleAddress() } returns yieldContractAddress
+        coEvery { walletManager.calculateYieldModuleAddress() } returns yieldContractAddress
         coEvery { walletManager.getYieldSupplyStatus(any()) } returns SDKYieldSupplyStatus(
             isActive = true,
             isInitialized = true,
@@ -257,7 +275,11 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         )
         coEvery { walletManager.isAllowedToSpend(any()) } returns true
 
-        val result = repository.createEnterTransactions(userWalletId, cryptoCurrencyStatus)
+        val result = repository.createEnterTransactions(
+            userWalletId = userWalletId,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = BigDecimal.TEN,
+        )
 
         // Assert that transaction is returned: enter
         Truth.assertThat(result).isNotNull()
@@ -277,9 +299,7 @@ class DefaultYieldSupplyTransactionRepositoryTest {
         val expectedCallData =
             YieldSupplyContractCallDataProviderFactory.getExitCallData(mockedContractAddress)
 
-        val yieldSupplyStatus = mockk<YieldSupplyStatus>(relaxed = true)
-
-        val result = repository.createExitTransaction(userWalletId, cryptoCurrency, yieldSupplyStatus, null)
+        val result = repository.createExitTransaction(userWalletId, cryptoCurrencyStatus, null)
 
         Truth.assertThat(result).isNotNull()
         Truth.assertThat(result.extras).isInstanceOf(EthereumTransactionExtras::class.java)
diff --git a/domain/account/src/main/java/com/tangem/domain/account/models/AccountList.kt b/domain/account/src/main/java/com/tangem/domain/account/models/AccountList.kt
index 0a5b08f87b..2f848f2f16 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/models/AccountList.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/models/AccountList.kt
@@ -120,14 +120,14 @@ data class AccountList private constructor(
         }
 
         @Serializable
-        data class DuplicateAccountNames(val message: String) : Error {
-            override fun toString(): String = "$tag: Account list contains duplicate account names. $message"
+        data object DuplicateAccountNames : Error {
+            override fun toString(): String = "$tag: Account list contains duplicate account names"
         }
     }
 
     companion object {
 
-        private const val MAX_ACCOUNTS_COUNT = 20
+        const val MAX_ACCOUNTS_COUNT = 20
         private const val MAX_MAIN_ACCOUNTS_COUNT = 1
 
         /**
@@ -161,17 +161,11 @@ data class AccountList private constructor(
             val uniqueAccountIdsCount = accounts.map { it.accountId.value }.distinct().size
             ensure(accounts.size == uniqueAccountIdsCount) { Error.DuplicateAccountIds }
 
-            val defaultMainNameCount = accounts.count { it.accountName is AccountName.DefaultMain }
-
             val customNames = accounts.mapNotNull { (it.accountName as? AccountName.Custom)?.value }
             val uniqueCustomNameCount = customNames.distinct().size
 
-            ensure(defaultMainNameCount == 0 || defaultMainNameCount == 1) {
-                Error.DuplicateAccountNames("Only one account can have the default main name.")
-            }
-
             ensure(customNames.size == uniqueCustomNameCount) {
-                Error.DuplicateAccountNames("Custom account names must be unique.")
+                Error.DuplicateAccountNames
             }
 
             AccountList(
diff --git a/domain/account/src/main/java/com/tangem/domain/account/models/AccountStatusList.kt b/domain/account/src/main/java/com/tangem/domain/account/models/AccountStatusList.kt
index acd8f76d35..9581d1a6fb 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/models/AccountStatusList.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/models/AccountStatusList.kt
@@ -1,15 +1,18 @@
 package com.tangem.domain.account.models
 
+import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import kotlinx.serialization.Serializable
 
 /**
  * Represents a list of account statuses associated with a user wallet
  *
- * @property userWallet      the user wallet to which the account statuses belong
- * @property accountStatuses a set of account statuses associated with the user wallet
- * @property totalAccounts   the total number of accounts
+ * @property userWallet       the user wallet to which the account statuses belong
+ * @property accountStatuses  a set of account statuses associated with the user wallet
+ * @property totalAccounts    the total number of accounts (including archived ones)
+ * @property totalFiatBalance the total fiat balance across all accounts
  *
 [REDACTED_AUTHOR]
  */
@@ -18,4 +21,17 @@ data class AccountStatusList(
     val userWallet: UserWallet,
     val accountStatuses: Set<AccountStatus>,
     val totalAccounts: Int,
-)
\ No newline at end of file
+    val totalFiatBalance: TotalFiatBalance,
+) {
+
+    val mainAccount: AccountStatus
+        get() = accountStatuses.first { accountStatus ->
+            when (accountStatus) {
+                is AccountStatus.CryptoPortfolio -> accountStatus.account.isMainAccount
+            }
+        }
+
+    fun flattenCurrencies(): List<CryptoCurrencyStatus> = accountStatuses
+        .map { accountStatus -> accountStatus.flattenCurrencies() }
+        .flatten()
+}
\ No newline at end of file
diff --git a/domain/account/src/main/java/com/tangem/domain/account/producer/SingleAccountListProducer.kt b/domain/account/src/main/java/com/tangem/domain/account/producer/SingleAccountListProducer.kt
index 8d85130007..9acea3c434 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/producer/SingleAccountListProducer.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/producer/SingleAccountListProducer.kt
@@ -5,7 +5,7 @@ import com.tangem.domain.core.flow.FlowProducer
 import com.tangem.domain.models.wallet.UserWalletId
 
 /**
- * Produces a list of [AccountList] for a specific user wallet.
+ * Produces a [AccountList] for a specific user wallet.
  *
 [REDACTED_AUTHOR]
  */
diff --git a/domain/account/src/main/java/com/tangem/domain/account/tokens/MainAccountTokensMigration.kt b/domain/account/src/main/java/com/tangem/domain/account/tokens/MainAccountTokensMigration.kt
new file mode 100644
index 0000000000..0071b6c972
--- /dev/null
+++ b/domain/account/src/main/java/com/tangem/domain/account/tokens/MainAccountTokensMigration.kt
@@ -0,0 +1,23 @@
+package com.tangem.domain.account.tokens
+
+import arrow.core.Either
+import com.tangem.domain.models.account.DerivationIndex
+import com.tangem.domain.models.wallet.UserWalletId
+
+/**
+ * Interface for migrating tokens associated with a main account,
+ * but belonging to another account according to the derivation path.
+ *
+[REDACTED_AUTHOR]
+ */
+interface MainAccountTokensMigration {
+
+    /**
+     * Migration of non-native tokens from the main account to the account with the provided [derivationIndex].
+     * If there are no such tokens, the function will complete successfully.
+     *
+     * @param userWalletId The unique identifier of the user's wallet.
+     * @param derivationIndex The derivation index associated with the account.
+     */
+    suspend fun migrate(userWalletId: UserWalletId, derivationIndex: DerivationIndex): Either<Throwable, Unit>
+}
\ No newline at end of file
diff --git a/domain/account/src/main/java/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCase.kt b/domain/account/src/main/java/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCase.kt
index 6f233d2da7..8085ff2eb1 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCase.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCase.kt
@@ -1,15 +1,14 @@
 package com.tangem.domain.account.usecase
 
 import arrow.core.Either
-import arrow.core.Option
 import arrow.core.getOrElse
 import arrow.core.raise.Raise
 import arrow.core.raise.catch
 import arrow.core.raise.either
+import com.tangem.domain.account.fetcher.SingleAccountListFetcher
 import com.tangem.domain.account.models.AccountList
 import com.tangem.domain.account.repository.AccountsCRUDRepository
-import com.tangem.domain.models.TokensGroupType
-import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.account.tokens.MainAccountTokensMigration
 import com.tangem.domain.models.account.*
 import com.tangem.domain.models.wallet.UserWalletId
 
@@ -17,11 +16,15 @@ import com.tangem.domain.models.wallet.UserWalletId
  * Use case for adding a new crypto portfolio account
  *
  * @property crudRepository the repository used for performing CRUD operations on accounts
+ * @property singleAccountListFetcher fetches the list of accounts for a single user wallet
+ * @property mainAccountTokensMigration handles the migration of tokens from the main account to the new
  *
 [REDACTED_AUTHOR]
  */
 class AddCryptoPortfolioUseCase(
     private val crudRepository: AccountsCRUDRepository,
+    private val singleAccountListFetcher: SingleAccountListFetcher,
+    private val mainAccountTokensMigration: MainAccountTokensMigration,
 ) {
 
     /**
@@ -40,21 +43,29 @@ class AddCryptoPortfolioUseCase(
         icon: CryptoPortfolioIcon,
         derivationIndex: DerivationIndex,
     ): Either<Error, Account.CryptoPortfolio> = either {
-        val newAccount = createAccount(userWalletId, accountName, icon, derivationIndex)
+        fetchAccountList(userWalletId)
 
-        val accountList = getAccountList(userWalletId = userWalletId).getOrElse {
-            createNewAccountList(userWalletId = userWalletId)
-        }
+        val accountList = getAccountList(userWalletId = userWalletId)
+
+        val newAccount = createAccount(userWalletId, accountName, icon, derivationIndex)
 
         val updatedAccounts = (accountList + newAccount).getOrElse {
             raise(Error.AccountListRequirementsNotMet(it))
         }
 
-        saveAccounts(updatedAccounts)
+        saveAccounts(accountList = updatedAccounts)
+
+        mainAccountTokensMigration.migrate(userWalletId, derivationIndex)
 
         newAccount
     }
 
+    private suspend fun Raise<Error>.fetchAccountList(userWalletId: UserWalletId) {
+        singleAccountListFetcher(params = SingleAccountListFetcher.Params(userWalletId)).onLeft {
+            raise(Error.DataOperationFailed(cause = it))
+        }
+    }
+
     private fun createAccount(
         userWalletId: UserWalletId,
         accountName: AccountName,
@@ -70,26 +81,14 @@ class AddCryptoPortfolioUseCase(
         )
     }
 
-    private suspend fun Raise<Error>.getAccountList(userWalletId: UserWalletId): Option<AccountList> {
+    private suspend fun Raise<Error>.getAccountList(userWalletId: UserWalletId): AccountList {
         return catch(
             block = { crudRepository.getAccountListSync(userWalletId = userWalletId) },
             catch = { raise(Error.DataOperationFailed(cause = it)) },
         )
-    }
-
-    private fun Raise<Error>.createNewAccountList(userWalletId: UserWalletId): AccountList {
-        val userWallet = catch(
-            block = { crudRepository.getUserWallet(userWalletId = userWalletId) },
-            catch = { raise(Error.DataOperationFailed(cause = it)) },
-        )
-
-        // TODO: [REDACTED_JIRA]
-        return AccountList.empty(
-            userWallet = userWallet,
-            cryptoCurrencies = emptySet(),
-            sortType = TokensSortType.NONE,
-            groupType = TokensGroupType.NONE,
-        )
+            .getOrElse {
+                raise(Error.DataOperationFailed(message = "Account list not found for wallet $userWalletId"))
+            }
     }
 
     private suspend fun Raise<Error>.saveAccounts(accountList: AccountList) {
@@ -115,7 +114,8 @@ class AddCryptoPortfolioUseCase(
 
         /** Error indicating that a data operation failed */
         data class DataOperationFailed(val cause: Throwable) : Error {
-            override fun toString(): String = "Data operation failed: ${cause.message ?: "Unknown error"}"
+
+            constructor(message: String) : this(cause = IllegalStateException(message))
         }
     }
 }
\ No newline at end of file
diff --git a/domain/account/src/main/java/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCase.kt b/domain/account/src/main/java/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCase.kt
index 9fbb2ed7d5..6e3d4faf1d 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCase.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCase.kt
@@ -5,6 +5,7 @@ import arrow.core.getOrElse
 import arrow.core.raise.Raise
 import arrow.core.raise.catch
 import arrow.core.raise.either
+import arrow.core.raise.ensure
 import com.tangem.domain.account.repository.AccountsCRUDRepository
 import com.tangem.domain.models.account.DerivationIndex
 import com.tangem.domain.models.wallet.UserWalletId
@@ -28,7 +29,11 @@ class GetUnoccupiedAccountIndexUseCase(
     suspend operator fun invoke(userWalletId: UserWalletId): Either<Error, DerivationIndex> = either {
         val totalAccountsCount = getTotalAccountsCount(userWalletId = userWalletId)
 
-        DerivationIndex(totalAccountsCount + 1).getOrElse {
+        ensure(totalAccountsCount != 0) {
+            Error.DataOperationFailed("DerivationIndex cannot be zero because it is reserved for the main account")
+        }
+
+        DerivationIndex(value = totalAccountsCount).getOrElse {
             raise(Error.InvalidDerivationIndex(it))
         }
     }
@@ -60,7 +65,8 @@ class GetUnoccupiedAccountIndexUseCase(
 
         /** Error indicating that a data operation failed */
         data class DataOperationFailed(val cause: Throwable) : Error {
-            override fun toString(): String = "$tag: Data operation failed: ${cause.message ?: "Unknown error"}"
+
+            constructor(message: String) : this(cause = IllegalStateException(message))
         }
     }
 }
\ No newline at end of file
diff --git a/domain/account/src/main/java/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCase.kt b/domain/account/src/main/java/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCase.kt
index 2145e7ed15..9b0487ea55 100644
--- a/domain/account/src/main/java/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCase.kt
+++ b/domain/account/src/main/java/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCase.kt
@@ -38,20 +38,20 @@ class UpdateCryptoPortfolioUseCase(
         accountName: AccountName? = null,
         icon: CryptoPortfolioIcon? = null,
     ): Either<Error, Account.CryptoPortfolio> = either {
-        ensure(accountName != null || icon != null) { Error.NothingToUpdate }
+        validate(accountName, icon)
 
         val accountList = getAccountList(userWalletId = accountId.userWalletId)
 
         val account = accountList.accounts
             .firstOrNull { it.accountId == accountId } as? Account.CryptoPortfolio
-            ?: raise(Error.CriticalTechError.AccountNotFound(accountId = accountId))
+            ?: raise(Error.DataOperationFailed(message = "Account not found: $accountId"))
 
         val updatedAccount = account
             .setName(name = accountName)
             .setIcon(icon = icon)
 
         val updatedAccounts = (accountList + updatedAccount).getOrElse {
-            raise(Error.CriticalTechError.AccountListRequirementsNotMet(it))
+            raise(Error.AccountListRequirementsNotMet(it))
         }
 
         saveAccounts(updatedAccounts)
@@ -59,12 +59,18 @@ class UpdateCryptoPortfolioUseCase(
         updatedAccount
     }
 
+    private fun Raise<Error>.validate(accountName: AccountName?, icon: CryptoPortfolioIcon?) {
+        ensure(accountName != null || icon != null) { Error.NothingToUpdate }
+    }
+
     private suspend fun Raise<Error>.getAccountList(userWalletId: UserWalletId): AccountList {
         return catch(
             block = { crudRepository.getAccountListSync(userWalletId = userWalletId) },
             catch = { raise(Error.DataOperationFailed(cause = it)) },
         )
-            .getOrElse { raise(Error.CriticalTechError.AccountsNotCreated(userWalletId = userWalletId)) }
+            .getOrElse {
+                raise(Error.DataOperationFailed(message = "Account list not found for wallet $userWalletId"))
+            }
     }
 
     private suspend fun Raise<Error>.saveAccounts(accountList: AccountList) {
@@ -92,39 +98,14 @@ class UpdateCryptoPortfolioUseCase(
             override fun toString(): String = "Nothing to update: both account name and icon are null"
         }
 
-        /** Error indicating that a data operation failed */
-        data class DataOperationFailed(val cause: Throwable) : Error {
-            override fun toString(): String = "Data operation failed: ${cause.message ?: "Unknown error"}"
+        data class AccountListRequirementsNotMet(val cause: AccountList.Error) : Error {
+            override fun toString(): String = "Account list requirements not met: $cause"
         }
 
-        /**
-         * Represents critical technical errors that can occur during the update operation.
-         * These errors are a consequence of an inconsistent state.
-         */
-        sealed interface CriticalTechError : Error {
+        /** Error indicating that a data operation failed */
+        data class DataOperationFailed(val cause: Throwable) : Error {
 
-            /**
-
-             *
-             * @property userWalletId the unique identifier of the user wallet
-             */
-            data class AccountsNotCreated(val userWalletId: UserWalletId) : CriticalTechError {
-                override fun toString(): String = "Accounts for $userWalletId are not created"
-            }
-
-            /** Error indicating that the account with [accountId] was not found */
-            data class AccountNotFound(val accountId: AccountId) : CriticalTechError {
-                override fun toString(): String = "Account with ID $accountId not found"
-            }
-
-            /**
-             * Error indicating that the account list requirements were not met.
-             *
-             * @property cause the underlying cause of the error
-             */
-            data class AccountListRequirementsNotMet(val cause: AccountList.Error) : CriticalTechError {
-                override fun toString(): String = "Account list requirements not met: $cause"
-            }
+            constructor(message: String) : this(cause = IllegalStateException(message))
         }
     }
 }
\ No newline at end of file
diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt
index 4ed41500f0..0c43198fa0 100644
--- a/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt
+++ b/domain/account/src/test/kotlin/com/tangem/domain/account/models/AccountListTest.kt
@@ -157,7 +157,7 @@ class AccountListTest {
                     createAccount(userWalletId = userWalletId, name = "Name", derivationIndex = 0),
                     createAccount(userWalletId = userWalletId, name = "Name", derivationIndex = 1),
                 ),
-                expected = AccountList.Error.DuplicateAccountNames("Custom account names must be unique.").left(),
+                expected = AccountList.Error.DuplicateAccountNames.left(),
             ),
         )
     }
diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCaseTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCaseTest.kt
index f677187f17..4808e416a1 100644
--- a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCaseTest.kt
+++ b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/AddCryptoPortfolioUseCaseTest.kt
@@ -5,8 +5,11 @@ import arrow.core.left
 import arrow.core.right
 import arrow.core.toOption
 import com.google.common.truth.Truth
+import com.tangem.domain.account.fetcher.SingleAccountListFetcher
 import com.tangem.domain.account.models.AccountList
 import com.tangem.domain.account.repository.AccountsCRUDRepository
+import com.tangem.domain.account.tokens.MainAccountTokensMigration
+import com.tangem.domain.account.usecase.AddCryptoPortfolioUseCase.Error
 import com.tangem.domain.account.utils.createAccount
 import com.tangem.domain.account.utils.createAccounts
 import com.tangem.domain.models.account.Account
@@ -23,13 +26,20 @@ import org.junit.jupiter.api.TestInstance
 class AddCryptoPortfolioUseCaseTest {
 
     private val crudRepository: AccountsCRUDRepository = mockk(relaxUnitFun = true)
-    private val useCase = AddCryptoPortfolioUseCase(crudRepository)
+    private val singleAccountListFetcher = mockk<SingleAccountListFetcher>()
+    private val mainAccountTokensMigration = mockk<MainAccountTokensMigration>()
+
+    private val useCase = AddCryptoPortfolioUseCase(
+        crudRepository = crudRepository,
+        singleAccountListFetcher = singleAccountListFetcher,
+        mainAccountTokensMigration = mainAccountTokensMigration,
+    )
 
     private val userWallet = mockk<UserWallet>()
 
     @BeforeEach
     fun resetMocks() {
-        clearMocks(crudRepository, userWallet)
+        clearMocks(crudRepository, singleAccountListFetcher, mainAccountTokensMigration, userWallet)
 
         every { userWallet.walletId } returns userWalletId
     }
@@ -41,7 +51,13 @@ class AddCryptoPortfolioUseCaseTest {
         val accountList = AccountList.empty(userWallet)
         val updatedAccountList = (accountList + newAccount).getOrNull()!!
 
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
         coEvery { crudRepository.getAccountListSync(userWalletId) } returns accountList.toOption()
+        coEvery {
+            mainAccountTokensMigration.migrate(userWalletId, newAccount.derivationIndex)
+        } returns Unit.right()
 
         // Act
         val actual = useCase(
@@ -55,22 +71,23 @@ class AddCryptoPortfolioUseCaseTest {
         val expected = newAccount.right()
         Truth.assertThat(actual).isEqualTo(expected)
 
-        coVerifyOrder {
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
             crudRepository.getAccountListSync(userWalletId)
             crudRepository.saveAccounts(updatedAccountList)
+            mainAccountTokensMigration.migrate(userWalletId, newAccount.derivationIndex)
         }
-
-        coVerify(inverse = true) { crudRepository.getUserWallet(userWalletId) }
     }
 
     @Test
-    fun `invoke should create new account list if none exists`() = runTest {
+    fun `invoke should return error if fetch is failed`() = runTest {
         // Arrange
         val newAccount = createNewAccount()
-        val newAccountList = (AccountList.empty(userWallet) + newAccount).getOrNull()!!
+        val exception = Exception("Fetch error")
 
-        coEvery { crudRepository.getAccountListSync(userWalletId) } returns None
-        coEvery { crudRepository.getUserWallet(userWalletId) } returns userWallet
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns exception.left()
 
         // Act
         val actual = useCase(
@@ -81,13 +98,53 @@ class AddCryptoPortfolioUseCaseTest {
         )
 
         // Assert
-        val expected = newAccount.right()
-        Truth.assertThat(actual).isEqualTo(expected)
+        val expected = exception
+        Truth.assertThat((actual.leftOrNull() as Error.DataOperationFailed).cause).isInstanceOf(expected::class.java)
+        Truth.assertThat((actual.leftOrNull() as Error.DataOperationFailed).cause).hasMessageThat()
+            .isEqualTo(expected.message)
 
-        coVerifyOrder {
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        }
+
+        coVerify(inverse = true) {
+            crudRepository.getAccountListSync(any())
+            crudRepository.saveAccounts(any())
+            mainAccountTokensMigration.migrate(any(), any())
+        }
+    }
+
+    @Test
+    fun `invoke should return error if account list none exists`() = runTest {
+        // Arrange
+        val newAccount = createNewAccount()
+
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
+        coEvery { crudRepository.getAccountListSync(userWalletId) } returns None
+
+        // Act
+        val actual = useCase(
+            userWalletId = userWalletId,
+            accountName = newAccount.accountName,
+            icon = newAccount.icon,
+            derivationIndex = newAccount.derivationIndex,
+        ).leftOrNull() as Error.DataOperationFailed
+
+        // Assert
+        val expected = IllegalStateException("Account list not found for wallet $userWalletId")
+        Truth.assertThat(actual.cause).isInstanceOf(expected::class.java)
+        Truth.assertThat(actual.cause).hasMessageThat().isEqualTo(expected.message)
+
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
             crudRepository.getAccountListSync(userWalletId)
-            crudRepository.getUserWallet(userWalletId)
-            crudRepository.saveAccounts(newAccountList)
+        }
+
+        coVerify(inverse = true) {
+            crudRepository.saveAccounts(any())
+            mainAccountTokensMigration.migrate(any(), any())
         }
     }
 
@@ -102,6 +159,9 @@ class AddCryptoPortfolioUseCaseTest {
 
         val newAccount = createNewAccount(derivationIndex = 21)
 
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
         coEvery { crudRepository.getAccountListSync(userWalletId) } returns accountList.toOption()
 
         // Act
@@ -113,17 +173,20 @@ class AddCryptoPortfolioUseCaseTest {
         )
 
         // Assert
-        val expected = AddCryptoPortfolioUseCase.Error.AccountListRequirementsNotMet(
+        val expected = Error.AccountListRequirementsNotMet(
             cause = AccountList.Error.ExceedsMaxAccountsCount,
         ).left()
 
         Truth.assertThat(actual).isEqualTo(expected)
 
-        coVerifyOrder { crudRepository.getAccountListSync(userWalletId) }
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+            crudRepository.getAccountListSync(userWalletId)
+        }
 
         coVerify(inverse = true) {
-            crudRepository.getUserWallet(any())
             crudRepository.saveAccounts(any())
+            mainAccountTokensMigration.migrate(any(), any())
         }
     }
 
@@ -133,6 +196,9 @@ class AddCryptoPortfolioUseCaseTest {
         val newAccount = createNewAccount()
         val exception = IllegalStateException("Test error")
 
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
         coEvery { crudRepository.getAccountListSync(userWalletId) } throws exception
 
         // Act
@@ -144,14 +210,17 @@ class AddCryptoPortfolioUseCaseTest {
         )
 
         // Assert
-        val expected = AddCryptoPortfolioUseCase.Error.DataOperationFailed(cause = exception).left()
+        val expected = Error.DataOperationFailed(cause = exception).left()
         Truth.assertThat(actual).isEqualTo(expected)
 
-        coVerifyOrder { crudRepository.getAccountListSync(userWalletId) }
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+            crudRepository.getAccountListSync(userWalletId)
+        }
 
         coVerify(inverse = true) {
-            crudRepository.getUserWallet(any())
             crudRepository.saveAccounts(any())
+            mainAccountTokensMigration.migrate(any(), any())
         }
     }
 
@@ -164,6 +233,9 @@ class AddCryptoPortfolioUseCaseTest {
 
         val exception = IllegalStateException("Test error")
 
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
         coEvery { crudRepository.getAccountListSync(userWalletId) } returns accountList.toOption()
         coEvery { crudRepository.saveAccounts(updatedAccountList) } throws exception
 
@@ -176,15 +248,54 @@ class AddCryptoPortfolioUseCaseTest {
         )
 
         // Assert
-        val expected = AddCryptoPortfolioUseCase.Error.DataOperationFailed(cause = exception).left()
+        val expected = Error.DataOperationFailed(cause = exception).left()
         Truth.assertThat(actual).isEqualTo(expected)
 
-        coVerifyOrder {
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
             crudRepository.getAccountListSync(userWalletId)
             crudRepository.saveAccounts(updatedAccountList)
         }
 
-        coVerify(inverse = true) { crudRepository.getUserWallet(userWalletId) }
+        coVerify(inverse = true) {
+            mainAccountTokensMigration.migrate(any(), any())
+        }
+    }
+
+    @Test
+    fun `invoke should return new account if migrate returns error`() = runTest {
+        // Arrange
+        val newAccount = createNewAccount()
+        val accountList = AccountList.empty(userWallet)
+        val updatedAccountList = (accountList + newAccount).getOrNull()!!
+
+        val exception = Exception("Migration error")
+        coEvery {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+        } returns Unit.right()
+        coEvery { crudRepository.getAccountListSync(userWalletId) } returns accountList.toOption()
+        coEvery {
+            mainAccountTokensMigration.migrate(userWalletId, newAccount.derivationIndex)
+        } returns exception.left()
+
+        // Act
+        val actual = useCase(
+            userWalletId = userWalletId,
+            accountName = newAccount.accountName,
+            icon = newAccount.icon,
+            derivationIndex = newAccount.derivationIndex,
+        )
+
+        // Assert
+        val expected = newAccount.right()
+        Truth.assertThat(actual).isEqualTo(expected)
+
+        coVerifySequence {
+            singleAccountListFetcher(SingleAccountListFetcher.Params(userWalletId))
+            crudRepository.getAccountListSync(userWalletId)
+            crudRepository.saveAccounts(updatedAccountList)
+            mainAccountTokensMigration.migrate(userWalletId, newAccount.derivationIndex)
+        }
     }
 
     private companion object {
diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCaseTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCaseTest.kt
index 5f85fe95ef..c469708e18 100644
--- a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCaseTest.kt
+++ b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/GetUnoccupiedAccountIndexUseCaseTest.kt
@@ -4,6 +4,7 @@ import arrow.core.left
 import arrow.core.toOption
 import com.google.common.truth.Truth
 import com.tangem.domain.account.repository.AccountsCRUDRepository
+import com.tangem.domain.account.usecase.GetUnoccupiedAccountIndexUseCase.Error
 import com.tangem.domain.models.account.DerivationIndex
 import com.tangem.domain.models.wallet.UserWalletId
 import io.mockk.clearMocks
@@ -27,6 +28,23 @@ class GetUnoccupiedAccountIndexUseCaseTest {
         clearMocks(crudRepository)
     }
 
+    @Test
+    fun `invoke should return error if repository returns 0`() = runTest {
+        // Arrange
+        coEvery { crudRepository.getTotalAccountsCountSync(userWalletId) } returns 0.toOption()
+
+        // Act
+        val actual = useCase(userWalletId = userWalletId).leftOrNull() as Error.DataOperationFailed
+
+        // Assert
+        val expected =
+            IllegalStateException("DerivationIndex cannot be zero because it is reserved for the main account")
+        Truth.assertThat(actual.cause).isInstanceOf(expected::class.java)
+        Truth.assertThat(actual.cause).hasMessageThat().isEqualTo(expected.message)
+
+        coVerify { crudRepository.getTotalAccountsCountSync(userWalletId) }
+    }
+
     @Test
     fun `invoke should return next unoccupied index when repository returns count`() = runTest {
         // Arrange
@@ -36,7 +54,7 @@ class GetUnoccupiedAccountIndexUseCaseTest {
         val actual = useCase(userWalletId = userWalletId)
 
         // Assert
-        val expected = DerivationIndex(4)
+        val expected = DerivationIndex(3)
         Truth.assertThat(actual).isEqualTo(expected)
 
         coVerify { crudRepository.getTotalAccountsCountSync(userWalletId) }
@@ -52,7 +70,7 @@ class GetUnoccupiedAccountIndexUseCaseTest {
         val actual = useCase(userWalletId = userWalletId)
 
         // Assert
-        val expected = GetUnoccupiedAccountIndexUseCase.Error.DataOperationFailed(exception).left()
+        val expected = Error.DataOperationFailed(exception).left()
         Truth.assertThat(actual).isEqualTo(expected)
 
         coVerify { crudRepository.getTotalAccountsCountSync(userWalletId) }
diff --git a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCaseTest.kt b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCaseTest.kt
index 5d6625fbe0..3d904d3117 100644
--- a/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCaseTest.kt
+++ b/domain/account/src/test/kotlin/com/tangem/domain/account/usecase/UpdateCryptoPortfolioUseCaseTest.kt
@@ -178,11 +178,12 @@ class UpdateCryptoPortfolioUseCaseTest {
         coEvery { crudRepository.getAccountListSync(userWalletId = userWalletId) } returns accountList
 
         // Act
-        val actual = useCase(accountId = accountId, accountName = newAccountName)
+        val actual = useCase(accountId, newAccountName).leftOrNull() as Error.DataOperationFailed
 
         // Assert
-        val expected = Error.CriticalTechError.AccountsNotCreated(userWalletId = userWalletId).left()
-        Truth.assertThat(actual).isEqualTo(expected)
+        val expected = IllegalStateException("Account list not found for wallet $userWalletId")
+        Truth.assertThat(actual.cause).isInstanceOf(expected::class.java)
+        Truth.assertThat(actual.cause).hasMessageThat().isEqualTo(expected.message)
 
         coVerifyOrder { crudRepository.getAccountListSync(userWalletId = userWalletId) }
         coVerify(inverse = true) { crudRepository.saveAccounts(accountList = any()) }
@@ -202,11 +203,12 @@ class UpdateCryptoPortfolioUseCaseTest {
         coEvery { crudRepository.getAccountListSync(userWalletId = userWalletId) } returns accountList.toOption()
 
         // Act
-        val actual = useCase(accountId = accountId, accountName = newAccountName)
+        val actual = useCase(accountId, newAccountName).leftOrNull() as Error.DataOperationFailed
 
         // Assert
-        val expected = Error.CriticalTechError.AccountNotFound(accountId = accountId).left()
-        Truth.assertThat(actual).isEqualTo(expected)
+        val expected = IllegalStateException("Account not found: $accountId")
+        Truth.assertThat(actual.cause).isInstanceOf(expected::class.java)
+        Truth.assertThat(actual.cause).hasMessageThat().isEqualTo(expected.message)
 
         coVerifyOrder { crudRepository.getAccountListSync(userWalletId = userWalletId) }
         coVerify(inverse = true) { crudRepository.saveAccounts(accountList = any()) }
diff --git a/domain/account/status/.gitignore b/domain/account/status/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/domain/account/status/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/account/status/build.gradle.kts b/domain/account/status/build.gradle.kts
new file mode 100644
index 0000000000..1bc12d67f3
--- /dev/null
+++ b/domain/account/status/build.gradle.kts
@@ -0,0 +1,46 @@
+plugins {
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
+    alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.hilt.android)
+    alias(deps.plugins.kotlin.serialization)
+    id("configuration")
+}
+
+android {
+    namespace = "com.tangem.domain.account.status"
+}
+
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform()
+}
+
+dependencies {
+    api(projects.domain.account)
+    api(projects.domain.core)
+    api(projects.domain.common)
+    api(projects.domain.quotes)
+    api(projects.domain.models)
+    api(projects.domain.networks)
+    api(projects.domain.staking)
+    api(projects.domain.tokens)
+
+    implementation(projects.libs.crypto)
+
+    implementation(deps.kotlin.datetime)
+    implementation(deps.kotlin.serialization)
+    implementation(deps.timber)
+
+    // region DI
+    implementation(deps.hilt.android)
+    kapt(deps.hilt.kapt)
+    // end
+
+    testImplementation(deps.test.coroutine)
+    testImplementation(deps.test.junit5)
+    testRuntimeOnly(deps.test.junit5.engine)
+    testImplementation(deps.test.mockk)
+    testImplementation(deps.test.truth)
+    testImplementation(tangemDeps.blockchain)
+    testImplementation(projects.common.test)
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListProducerFactoryModule.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListProducerFactoryModule.kt
new file mode 100644
index 0000000000..926780dc55
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListProducerFactoryModule.kt
@@ -0,0 +1,28 @@
+package com.tangem.domain.account.status.di
+
+import com.tangem.domain.account.status.producer.DefaultMultiAccountStatusListProducer
+import com.tangem.domain.account.status.producer.DefaultSingleAccountStatusListProducer
+import com.tangem.domain.account.status.producer.MultiAccountStatusListProducer
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface AccountStatusListProducerFactoryModule {
+
+    @Binds
+    @Singleton
+    fun bindSingleAccountStatusListProducerFactory(
+        factory: DefaultSingleAccountStatusListProducer.Factory,
+    ): SingleAccountStatusListProducer.Factory
+
+    @Binds
+    @Singleton
+    fun bindMultiAccountStatusListProducerFactory(
+        factory: DefaultMultiAccountStatusListProducer.Factory,
+    ): MultiAccountStatusListProducer.Factory
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListSupplierModule.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListSupplierModule.kt
new file mode 100644
index 0000000000..51b10dc806
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusListSupplierModule.kt
@@ -0,0 +1,38 @@
+package com.tangem.domain.account.status.di
+
+import com.tangem.domain.account.status.producer.MultiAccountStatusListProducer
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import com.tangem.domain.account.status.supplier.MultiAccountStatusListSupplier
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object AccountStatusListSupplierModule {
+
+    @Provides
+    @Singleton
+    fun provideSingleAccountStatusListSupplier(
+        factory: SingleAccountStatusListProducer.Factory,
+    ): SingleAccountStatusListSupplier {
+        return object : SingleAccountStatusListSupplier(
+            factory = factory,
+            keyCreator = { "account_status_list_${it.userWalletId}" },
+        ) {}
+    }
+
+    @Provides
+    @Singleton
+    fun provideMultiAccountStatusListSupplier(
+        factory: MultiAccountStatusListProducer.Factory,
+    ): MultiAccountStatusListSupplier {
+        return object : MultiAccountStatusListSupplier(
+            factory = factory,
+            keyCreator = { "multi_account_status_list" },
+        ) {}
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusUseCaseModule.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusUseCaseModule.kt
new file mode 100644
index 0000000000..2e1d0ce365
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/di/AccountStatusUseCaseModule.kt
@@ -0,0 +1,37 @@
+package com.tangem.domain.account.status.di
+
+import com.tangem.domain.account.status.usecase.GetAccountCurrencyByAddressUseCase
+import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.networks.multi.MultiNetworkStatusSupplier
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object AccountStatusUseCaseModule {
+
+    @Provides
+    @Singleton
+    fun provideGetAccountCurrencyByAddressUseCase(
+        userWalletsListRepository: UserWalletsListRepository,
+        multiNetworkStatusSupplier: MultiNetworkStatusSupplier,
+        singleAccountListSupplier: SingleAccountListSupplier,
+    ): GetAccountCurrencyByAddressUseCase {
+        return GetAccountCurrencyByAddressUseCase(
+            userWalletsListRepository = userWalletsListRepository,
+            multiNetworkStatusSupplier = multiNetworkStatusSupplier,
+            singleAccountListSupplier = singleAccountListSupplier,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideGetAccountCurrencyStatusUseCase(): GetAccountCurrencyStatusUseCase {
+        return GetAccountCurrencyStatusUseCase()
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrency.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrency.kt
new file mode 100644
index 0000000000..e4dabbc8cc
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrency.kt
@@ -0,0 +1,20 @@
+package com.tangem.domain.account.status.model
+
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.currency.CryptoCurrency
+import kotlinx.serialization.Serializable
+
+/**
+ * Combines an [Account] with its corresponding [CryptoCurrency].
+ *
+ * This data class is useful for representing the relationship between an account and the cryptocurrency it holds.
+ *
+[REDACTED_AUTHOR]
+ */
+@Serializable
+data class AccountCryptoCurrency(val account: Account.CryptoPortfolio, val cryptoCurrency: CryptoCurrency) {
+
+    init {
+        require(account.cryptoCurrencies.contains(cryptoCurrency))
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrencyStatus.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrencyStatus.kt
new file mode 100644
index 0000000000..221fe1d49d
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/model/AccountCryptoCurrencyStatus.kt
@@ -0,0 +1,20 @@
+package com.tangem.domain.account.status.model
+
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import kotlinx.serialization.Serializable
+
+/**
+ * Combines an [Account] with its corresponding [CryptoCurrencyStatus].
+ *
+ * This data class is useful for representing the relationship between an account and the cryptocurrency it holds.
+ *
+[REDACTED_AUTHOR]
+ */
+@Serializable
+data class AccountCryptoCurrencyStatus(val account: Account.CryptoPortfolio, val status: CryptoCurrencyStatus) {
+
+    init {
+        require(account.cryptoCurrencies.contains(status.currency))
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducer.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducer.kt
new file mode 100644
index 0000000000..29a36b58cb
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducer.kt
@@ -0,0 +1,54 @@
+package com.tangem.domain.account.status.producer
+
+import arrow.core.Option
+import arrow.core.some
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+
+/**
+ * Produces a flow of [AccountStatusList] for multiple user wallets.
+ *
+ * @property params Parameters for the producer (currently unused).
+ * @property userWalletsListRepository Repository to get the list of user wallets.
+ * @property singleAccountStatusListSupplier Supplier to get the account status list for a single user wallet.
+ * @property dispatchers Coroutine dispatcher provider for managing threading.
+ *
+[REDACTED_AUTHOR]
+ */
+internal class DefaultMultiAccountStatusListProducer @AssistedInject constructor(
+    @Assisted val params: Unit,
+    private val userWalletsListRepository: UserWalletsListRepository,
+    private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : MultiAccountStatusListProducer {
+
+    override val fallback: Option<List<AccountStatusList>> = emptyList<AccountStatusList>().some()
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun produce(): Flow<List<AccountStatusList>> {
+        return userWalletsListRepository.userWallets
+            .filterNotNull()
+            .flatMapLatest { userWallets ->
+                val flows = userWallets.map {
+                    singleAccountStatusListSupplier(
+                        params = SingleAccountStatusListProducer.Params(it.walletId),
+                    )
+                }
+
+                combine(flows) { it.toList() }
+            }
+            .flowOn(dispatchers.default)
+    }
+
+    @AssistedFactory
+    interface Factory : MultiAccountStatusListProducer.Factory {
+        override fun create(params: Unit): DefaultMultiAccountStatusListProducer
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducer.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducer.kt
new file mode 100644
index 0000000000..9cc97e0760
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducer.kt
@@ -0,0 +1,126 @@
+package com.tangem.domain.account.status.producer
+
+import arrow.core.Option
+import arrow.core.none
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.status.utils.CryptoCurrencyStatusesFlowFactory
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TokensGroupType
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.quote.PriceChange
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.tokens.operations.PriceChangeCalculator
+import com.tangem.domain.tokens.operations.TokenListFactory
+import com.tangem.domain.tokens.operations.TotalFiatBalanceCalculator
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+import java.math.BigDecimal
+
+/**
+ * Produces a flow of [AccountStatusList] for a single user wallet.
+ *
+ * @property params Parameters containing the user wallet ID.
+ * @property singleAccountListSupplier Supplier to get the list of accounts for the user wallet.
+ * @property cryptoCurrencyStatusesFlowFactory Factory to create flows of cryptocurrency statuses.
+ * @property dispatchers Coroutine dispatcher provider for managing threading.
+ *
+[REDACTED_AUTHOR]
+ */
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class DefaultSingleAccountStatusListProducer @AssistedInject constructor(
+    @Assisted private val params: SingleAccountStatusListProducer.Params,
+    private val singleAccountListSupplier: SingleAccountListSupplier,
+    private val cryptoCurrencyStatusesFlowFactory: CryptoCurrencyStatusesFlowFactory,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : SingleAccountStatusListProducer {
+
+    override val fallback: Option<AccountStatusList> = none()
+
+    override fun produce(): Flow<AccountStatusList> {
+        val accountListFlow = singleAccountListSupplier(
+            params = SingleAccountListProducer.Params(params.userWalletId),
+        )
+
+        return accountListFlow.flatMapLatest { accountList ->
+            val accountStatusFlows = accountList.accounts
+                .filterIsInstance<Account.CryptoPortfolio>()
+                .map { account ->
+                    if (account.cryptoCurrencies.isEmpty()) {
+                        createEmptyAccountStatusFlow(account)
+                    } else {
+                        getAccountStatusFlow(
+                            userWallet = accountList.userWallet,
+                            account = account,
+                            groupType = accountList.groupType,
+                            sortType = accountList.sortType,
+                        )
+                    }
+                }
+
+            combine(accountStatusFlows) { accountStatuses ->
+                val balances = accountStatuses.map { it.tokenList.totalFiatBalance }
+
+                AccountStatusList(
+                    userWallet = accountList.userWallet,
+                    accountStatuses = accountStatuses.toSet(),
+                    totalAccounts = accountList.totalAccounts,
+                    totalFiatBalance = TotalFiatBalanceCalculator.calculate(balances),
+                )
+            }
+        }
+            .flowOn(dispatchers.default)
+    }
+
+    private fun createEmptyAccountStatusFlow(account: Account.CryptoPortfolio): Flow<AccountStatus.CryptoPortfolio> {
+        return flowOf(
+            AccountStatus.CryptoPortfolio(
+                account = account,
+                tokenList = TokenList.Empty,
+                priceChangeLce = PriceChange(
+                    value = BigDecimal.ZERO.movePointLeft(2),
+                    source = StatusSource.ACTUAL,
+                ).lceContent(),
+            ),
+        )
+    }
+
+    private fun getAccountStatusFlow(
+        userWallet: UserWallet,
+        account: Account.CryptoPortfolio,
+        groupType: TokensGroupType,
+        sortType: TokensSortType,
+    ): Flow<AccountStatus.CryptoPortfolio> {
+        val statusesFlows = account.cryptoCurrencies.map { currency ->
+            cryptoCurrencyStatusesFlowFactory.create(userWallet = userWallet, currency = currency)
+        }
+
+        return combine(statusesFlows) { statuses ->
+            val statusList = statuses.toList()
+
+            AccountStatus.CryptoPortfolio(
+                account = account,
+                tokenList = TokenListFactory.create(
+                    statuses = statusList,
+                    groupType = groupType,
+                    sortType = sortType,
+                ),
+                priceChangeLce = PriceChangeCalculator.calculate(statuses = statusList),
+            )
+        }
+    }
+
+    @AssistedFactory
+    interface Factory : SingleAccountStatusListProducer.Factory {
+        override fun create(params: SingleAccountStatusListProducer.Params): DefaultSingleAccountStatusListProducer
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/MultiAccountStatusListProducer.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/MultiAccountStatusListProducer.kt
new file mode 100644
index 0000000000..5ebd910a58
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/MultiAccountStatusListProducer.kt
@@ -0,0 +1,15 @@
+package com.tangem.domain.account.status.producer
+
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.core.flow.FlowProducer
+
+/**
+ * Produces a list of [AccountList]s for all user wallets.
+ *
+[REDACTED_AUTHOR]
+ */
+interface MultiAccountStatusListProducer : FlowProducer<List<AccountStatusList>> {
+
+    interface Factory : FlowProducer.Factory<Unit, MultiAccountStatusListProducer>
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/SingleAccountStatusListProducer.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/SingleAccountStatusListProducer.kt
new file mode 100644
index 0000000000..97935a14f3
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/producer/SingleAccountStatusListProducer.kt
@@ -0,0 +1,17 @@
+package com.tangem.domain.account.status.producer
+
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.core.flow.FlowProducer
+import com.tangem.domain.models.wallet.UserWalletId
+
+/**
+ * Produces a [AccountStatusList] for a specific user wallet.
+ *
+[REDACTED_AUTHOR]
+ */
+interface SingleAccountStatusListProducer : FlowProducer<AccountStatusList> {
+
+    data class Params(val userWalletId: UserWalletId)
+
+    interface Factory : FlowProducer.Factory<Params, SingleAccountStatusListProducer>
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/MultiAccountStatusListSupplier.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/MultiAccountStatusListSupplier.kt
new file mode 100644
index 0000000000..60ed1d5971
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/MultiAccountStatusListSupplier.kt
@@ -0,0 +1,15 @@
+package com.tangem.domain.account.status.supplier
+
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.MultiAccountStatusListProducer
+import com.tangem.domain.core.flow.FlowCachingSupplier
+
+/**
+ * Supplier that provides a list of [AccountStatusList]s for all user wallets.
+ *
+[REDACTED_AUTHOR]
+ */
+abstract class MultiAccountStatusListSupplier(
+    override val factory: MultiAccountStatusListProducer.Factory,
+    override val keyCreator: (Unit) -> String,
+) : FlowCachingSupplier<MultiAccountStatusListProducer, Unit, List<AccountStatusList>>()
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/SingleAccountStatusListSupplier.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/SingleAccountStatusListSupplier.kt
new file mode 100644
index 0000000000..5e5ef8f506
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/supplier/SingleAccountStatusListSupplier.kt
@@ -0,0 +1,15 @@
+package com.tangem.domain.account.status.supplier
+
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import com.tangem.domain.core.flow.FlowCachingSupplier
+
+/**
+ * Supplier that provides a single [AccountStatusList] for a specific user wallet.
+ *
+[REDACTED_AUTHOR]
+ */
+abstract class SingleAccountStatusListSupplier(
+    override val factory: SingleAccountStatusListProducer.Factory,
+    override val keyCreator: (SingleAccountStatusListProducer.Params) -> String,
+) : FlowCachingSupplier<SingleAccountStatusListProducer, SingleAccountStatusListProducer.Params, AccountStatusList>()
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCase.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCase.kt
new file mode 100644
index 0000000000..f038816b91
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCase.kt
@@ -0,0 +1,136 @@
+package com.tangem.domain.account.status.usecase
+
+import arrow.core.NonEmptyList
+import arrow.core.None
+import arrow.core.Option
+import arrow.core.raise.OptionRaise
+import arrow.core.raise.RaiseDSL
+import arrow.core.raise.option
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.status.model.AccountCryptoCurrency
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.network.Network
+import com.tangem.domain.models.network.getAddress
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.networks.multi.MultiNetworkStatusProducer
+import com.tangem.domain.networks.multi.MultiNetworkStatusSupplier
+import timber.log.Timber
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+
+private typealias WalletIdWithNetworkId = Pair<UserWalletId, Network.ID>
+
+/**
+ * Use case to retrieve an [AccountCryptoCurrency] based on a provided address.
+ *
+ * @property userWalletsListRepository Repository to access user wallets.
+ * @property multiNetworkStatusSupplier Supplier to get network status for multiple networks.
+ * @property singleAccountListSupplier Supplier to get account lists for a single wallet.
+ *
+[REDACTED_AUTHOR]
+ */
+class GetAccountCurrencyByAddressUseCase(
+    private val userWalletsListRepository: UserWalletsListRepository,
+    private val multiNetworkStatusSupplier: MultiNetworkStatusSupplier,
+    private val singleAccountListSupplier: SingleAccountListSupplier,
+) {
+
+    /**
+     * Invokes the use case to get an [AccountCryptoCurrency] for the given address.
+     *
+     * @param address The address to look up.
+     * @return An [Option] containing the [AccountCryptoCurrency] if found, or [None] if not found or if any validation
+     * fails.
+     */
+    suspend operator fun invoke(address: String): Option<AccountCryptoCurrency> = option {
+        validate(address)
+
+        val userWalletIds = getUserWalletIds()
+
+        val (walletId, networkId) = getWalletIdWithNetworkId(userWalletIds, address)
+
+        val accountList = getAccountList(userWalletId = walletId)
+
+        getAccountCryptoCurrency(accountList, networkId)
+    }
+
+    private fun OptionRaise.validate(address: String) {
+        ensureNotNull(address.takeIf { it.isNotEmpty() }) { "Address is empty" }
+    }
+
+    private fun OptionRaise.getUserWalletIds(): NonEmptyList<UserWalletId> {
+        val userWalletIds = userWalletsListRepository.userWallets.value.orEmpty()
+            .filter(UserWallet::isMultiCurrency)
+            .map(UserWallet::walletId)
+            .toNonEmptyListOrNull()
+
+        return ensureNotNull(userWalletIds) { "No multi-currency wallets found" }
+    }
+
+    private suspend fun OptionRaise.getWalletIdWithNetworkId(
+        userWalletIds: NonEmptyList<UserWalletId>,
+        address: String,
+    ): WalletIdWithNetworkId {
+        var pair: WalletIdWithNetworkId? = null
+
+        for (id in userWalletIds) {
+            val networkStatus = multiNetworkStatusSupplier.getSyncOrNull(
+                params = MultiNetworkStatusProducer.Params(userWalletId = id),
+            )
+                ?.firstOrNull { it.getAddress() == address }
+
+            if (networkStatus != null) {
+                pair = id to networkStatus.network.id
+                break
+            }
+        }
+
+        return ensureNotNull(value = pair) { "No network status found for address: $address" }
+    }
+
+    private suspend fun OptionRaise.getAccountList(userWalletId: UserWalletId): AccountList {
+        val accountList = singleAccountListSupplier.getSyncOrNull(
+            params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+        )
+
+        return ensureNotNull(accountList) { "No account list found for walletId: $userWalletId" }
+    }
+
+    private fun OptionRaise.getAccountCryptoCurrency(
+        accountList: AccountList,
+        networkId: Network.ID,
+    ): AccountCryptoCurrency {
+        val result = accountList.accounts.asSequence()
+            .filterIsInstance<Account.CryptoPortfolio>()
+            .mapNotNull { account ->
+                val currency = account.cryptoCurrencies.firstOrNull { it.network.id == networkId }
+                    ?: return@mapNotNull null
+
+                AccountCryptoCurrency(account = account, cryptoCurrency = currency)
+            }
+            .firstOrNull()
+
+        return ensureNotNull(result) {
+            "No account found for network: $networkId in walletId: ${accountList.userWallet.walletId}"
+        }
+    }
+
+    @OptIn(ExperimentalContracts::class)
+    @RaiseDSL
+    inline fun <B : Any> OptionRaise.ensureNotNull(value: B?, message: () -> String): B {
+        contract {
+            returns() implies (value != null)
+        }
+
+        return value ?: run {
+            Timber.d(message())
+            raise(None)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyStatusUseCase.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyStatusUseCase.kt
new file mode 100644
index 0000000000..be08772f57
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/GetAccountCurrencyStatusUseCase.kt
@@ -0,0 +1,25 @@
+package com.tangem.domain.account.status.usecase
+
+import arrow.core.Option
+import arrow.core.none
+import com.tangem.domain.account.status.model.AccountCryptoCurrencyStatus
+import com.tangem.domain.models.currency.CryptoCurrency
+
+/**
+ * Use case to retrieve the status of a specific cryptocurrency associated with an account.
+ *
+[REDACTED_AUTHOR]
+ */
+// TODO: Implement [REDACTED_JIRA]
+class GetAccountCurrencyStatusUseCase {
+
+    /**
+     * Invokes the use case to get the [AccountCryptoCurrencyStatus] for the given [currencyId].
+     *
+     * @param currencyId The ID of the cryptocurrency to look up.
+     *
+     * @return An [Option] containing the [AccountCryptoCurrencyStatus] if found,
+     * or [arrow.core.None] if not found or if any validation fails.
+     */
+    suspend operator fun invoke(currencyId: CryptoCurrency.ID): Option<AccountCryptoCurrencyStatus> = none()
+}
\ No newline at end of file
diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactory.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactory.kt
new file mode 100644
index 0000000000..bd7df0e9f4
--- /dev/null
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactory.kt
@@ -0,0 +1,162 @@
+package com.tangem.domain.account.status.utils
+
+import arrow.core.some
+import arrow.core.toOption
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.Network
+import com.tangem.domain.models.network.NetworkStatus
+import com.tangem.domain.models.network.getAddress
+import com.tangem.domain.models.quote.QuoteStatus
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.networks.single.SingleNetworkStatusProducer
+import com.tangem.domain.networks.single.SingleNetworkStatusSupplier
+import com.tangem.domain.quotes.single.SingleQuoteStatusProducer
+import com.tangem.domain.quotes.single.SingleQuoteStatusSupplier
+import com.tangem.domain.staking.StakingIdFactory
+import com.tangem.domain.staking.single.SingleYieldBalanceProducer
+import com.tangem.domain.staking.single.SingleYieldBalanceSupplier
+import com.tangem.domain.tokens.operations.CryptoCurrencyStatusFactory
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+/**
+ * Factory that creates a flow of [CryptoCurrencyStatus] for a given [CryptoCurrency] in a [UserWallet].
+ *
+ * @property singleNetworkStatusSupplier Supplier for obtaining network status.
+ * @property singleQuoteStatusSupplier Supplier for obtaining quote status.
+ * @property singleYieldBalanceSupplier Supplier for obtaining yield balance.
+ * @property stakingIdFactory Factory for creating staking IDs.
+ *
+[REDACTED_AUTHOR]
+ */
+internal class CryptoCurrencyStatusesFlowFactory @Inject constructor(
+    private val singleNetworkStatusSupplier: SingleNetworkStatusSupplier,
+    private val singleQuoteStatusSupplier: SingleQuoteStatusSupplier,
+    private val singleYieldBalanceSupplier: SingleYieldBalanceSupplier,
+    private val stakingIdFactory: StakingIdFactory,
+) {
+
+    /**
+     * Creates a flow of [CryptoCurrencyStatus] for the specified [userWallet] and [currency].
+     *
+     * @param userWallet The user wallet containing the currency.
+
+     */
+    fun create(userWallet: UserWallet, currency: CryptoCurrency): Flow<CryptoCurrencyStatus> {
+        return getCryptoCurrencyStatusSourcesFlow(userWallet = userWallet, currency = currency)
+            .map { statusSources ->
+                CryptoCurrencyStatusFactory.create(
+                    currency = currency,
+                    maybeNetworkStatus = statusSources.networkStatus.some(),
+                    maybeQuoteStatus = statusSources.quoteStatus.toOption(),
+                    maybeYieldBalance = statusSources.yieldBalance.toOption(),
+                )
+            }
+            .onEmpty {
+                emit(
+                    CryptoCurrencyStatus(currency = currency, value = CryptoCurrencyStatus.Loading),
+                )
+            }
+            .conflate()
+            .distinctUntilChanged()
+    }
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun getCryptoCurrencyStatusSourcesFlow(
+        userWallet: UserWallet,
+        currency: CryptoCurrency,
+    ): Flow<CryptoCurrencyStatusSources> {
+        val networkStatusFlow = getNetworkStatusFlow(userWalletId = userWallet.walletId, network = currency.network)
+
+        val yieldBalanceFlow = if (userWallet.isMultiCurrency) {
+            networkStatusFlow.flatMapLatest { networkStatus ->
+                getYieldBalanceFlow(
+                    userWalletId = userWallet.walletId,
+                    currencyId = currency.id,
+                    networkStatus = networkStatus,
+                )
+            }
+        } else {
+            null
+        }
+
+        val quoteStatusFlow = currency.id.rawCurrencyId?.let(::getQuoteStatusFlow)
+
+        return combine(networkStatusFlow, yieldBalanceFlow, quoteStatusFlow)
+    }
+
+    private fun combine(
+        networkStatusFlow: Flow<NetworkStatus>,
+        yieldBalanceFlow: Flow<YieldBalance?>?,
+        quoteStatusFlow: Flow<QuoteStatus>?,
+    ): Flow<CryptoCurrencyStatusSources> {
+        return when {
+            yieldBalanceFlow != null && quoteStatusFlow != null -> {
+                combine(
+                    flow = networkStatusFlow,
+                    flow2 = yieldBalanceFlow,
+                    flow3 = quoteStatusFlow,
+                    transform = ::CryptoCurrencyStatusSources,
+                )
+            }
+            yieldBalanceFlow != null -> {
+                combine(flow = networkStatusFlow, flow2 = yieldBalanceFlow, transform = ::CryptoCurrencyStatusSources)
+            }
+            quoteStatusFlow != null -> {
+                combine(flow = networkStatusFlow, flow2 = quoteStatusFlow) { networkStatus, quoteStatus ->
+                    CryptoCurrencyStatusSources(networkStatus = networkStatus, quoteStatus = quoteStatus)
+                }
+            }
+            else -> networkStatusFlow.map(::CryptoCurrencyStatusSources)
+        }
+    }
+
+    private fun getNetworkStatusFlow(userWalletId: UserWalletId, network: Network): Flow<NetworkStatus> {
+        return singleNetworkStatusSupplier(
+            params = SingleNetworkStatusProducer.Params(userWalletId = userWalletId, network = network),
+        )
+            .conflate()
+            .distinctUntilChanged()
+    }
+
+    private fun getQuoteStatusFlow(rawCurrencyId: CryptoCurrency.RawID): Flow<QuoteStatus> {
+        return singleQuoteStatusSupplier(
+            params = SingleQuoteStatusProducer.Params(rawCurrencyId = rawCurrencyId),
+        )
+            .conflate()
+            .distinctUntilChanged()
+    }
+
+    private fun getYieldBalanceFlow(
+        userWalletId: UserWalletId,
+        currencyId: CryptoCurrency.ID,
+        networkStatus: NetworkStatus,
+    ): Flow<YieldBalance?> {
+        val stakingId = stakingIdFactory.create(
+            currencyId = currencyId,
+            defaultAddress = networkStatus.getAddress(),
+        )
+            .getOrNull()
+
+        return if (stakingId != null) {
+            singleYieldBalanceSupplier(
+                params = SingleYieldBalanceProducer.Params(userWalletId = userWalletId, stakingId = stakingId),
+            )
+                .conflate()
+                .distinctUntilChanged()
+        } else {
+            flowOf(null)
+        }
+    }
+
+    private data class CryptoCurrencyStatusSources(
+        val networkStatus: NetworkStatus,
+        val yieldBalance: YieldBalance? = null,
+        val quoteStatus: QuoteStatus? = null,
+    )
+}
\ No newline at end of file
diff --git a/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducerTest.kt b/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducerTest.kt
new file mode 100644
index 0000000000..a3becc8abf
--- /dev/null
+++ b/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultMultiAccountStatusListProducerTest.kt
@@ -0,0 +1,198 @@
+package com.tangem.domain.account.status.producer
+
+import com.google.common.truth.Truth
+import com.tangem.common.test.utils.getEmittedValues
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
+import io.mockk.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+@Suppress("UnusedFlow")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class DefaultMultiAccountStatusListProducerTest {
+
+    private val userWalletsListRepository: UserWalletsListRepository = mockk()
+    private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier = mockk()
+    private val dispatchers = TestingCoroutineDispatcherProvider()
+
+    private val userWalletId1 = UserWalletId("001")
+    private val userWallet1 = mockk<UserWallet> {
+        every { walletId } returns userWalletId1
+    }
+
+    private val userWalletId2 = UserWalletId("002")
+    private val userWallet2 = mockk<UserWallet> {
+        every { walletId } returns userWalletId2
+    }
+
+    private val producer = DefaultMultiAccountStatusListProducer(
+        params = Unit,
+        userWalletsListRepository = userWalletsListRepository,
+        singleAccountStatusListSupplier = singleAccountStatusListSupplier,
+        dispatchers = dispatchers,
+    )
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(userWalletsListRepository, singleAccountStatusListSupplier)
+    }
+
+    @Test
+    fun `produce returns status lists for all user wallets`() = runTest {
+        // Arrange
+        val wallets = listOf(userWallet1, userWallet2)
+        val walletsFlow = MutableStateFlow(wallets)
+
+        every { userWalletsListRepository.userWallets } returns walletsFlow
+        val accountStatusList1 = mockk<AccountStatusList>()
+        val accountStatusList2 = mockk<AccountStatusList>()
+
+        every {
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+        } returns flowOf(accountStatusList1)
+
+        every {
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+        } returns flowOf(accountStatusList2)
+
+        // Act
+        val actual = producer.produce().let(::getEmittedValues)
+
+        // Assert
+        val expected = listOf(accountStatusList1, accountStatusList2)
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsListRepository.userWallets
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+        }
+    }
+
+    @Test
+    fun `produce returns empty flow if userWallets is empty list`() = runTest {
+        // Arrange
+        val walletsFlow = MutableStateFlow<List<UserWallet>>(emptyList())
+        every { userWalletsListRepository.userWallets } returns walletsFlow
+
+        // Act
+        val actual = producer.produce().let(::getEmittedValues)
+
+        // Assert
+        Truth.assertThat(actual).isEmpty()
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsListRepository.userWallets
+        }
+    }
+
+    @Test
+    fun `produce returns empty flow if userWallets is null`() = runTest {
+        // Arrange
+        val walletsFlow = MutableStateFlow<List<UserWallet>?>(null)
+        every { userWalletsListRepository.userWallets } returns walletsFlow
+
+        // Act
+        val actual = producer.produce().let(::getEmittedValues)
+
+        // Assert
+        Truth.assertThat(actual).isEmpty()
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsListRepository.userWallets
+        }
+    }
+
+    @Test
+    fun `flow will updated if userWallets are updated`() = runTest {
+        // Arrange
+        val userWalletId3 = UserWalletId("003")
+        val userWallet3 = mockk<UserWallet> { every { walletId } returns userWalletId3 }
+
+        val walletsFlow = MutableStateFlow(listOf(userWallet1, userWallet2))
+        every { userWalletsListRepository.userWallets } returns walletsFlow
+
+        val accountStatusList1 = mockk<AccountStatusList>()
+        val accountStatusList2 = mockk<AccountStatusList>()
+        val accountStatusList3 = mockk<AccountStatusList>()
+
+        every {
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+        } returns flowOf(accountStatusList1)
+
+        every {
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+        } returns flowOf(accountStatusList2)
+
+        every {
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId3),
+            )
+        } returns flowOf(accountStatusList3)
+
+        // Act (first emission)
+        val actual1 = producer.produce().let(::getEmittedValues)
+
+        // Assert (first emission)
+        val expected1 = listOf(accountStatusList1, accountStatusList2)
+        Truth.assertThat(actual1).containsExactly(expected1)
+
+        // Act (second emission)
+        walletsFlow.value = listOf(userWallet1, userWallet2, userWallet3)
+        val actual2 = producer.produce().let(::getEmittedValues)
+
+        // Assert (second emission)
+        val expected2 = listOf(accountStatusList1, accountStatusList2, accountStatusList3)
+        Truth.assertThat(actual2).containsExactly(expected2)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            userWalletsListRepository.userWallets
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId3),
+            )
+            userWalletsListRepository.userWallets
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId1),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId2),
+            )
+            singleAccountStatusListSupplier(
+                params = SingleAccountStatusListProducer.Params(userWalletId3),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducerTest.kt b/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducerTest.kt
new file mode 100644
index 0000000000..ca151e1478
--- /dev/null
+++ b/domain/account/status/src/test/java/com/tangem/domain/account/status/producer/DefaultSingleAccountStatusListProducerTest.kt
@@ -0,0 +1,244 @@
+package com.tangem.domain.account.status.producer
+
+import arrow.core.nonEmptyListOf
+import com.google.common.truth.Truth
+import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
+import com.tangem.common.test.utils.getEmittedValues
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.status.utils.CryptoCurrencyStatusesFlowFactory
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceLoading
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.quote.PriceChange
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
+import io.mockk.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@Suppress("UnusedFlow")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class DefaultSingleAccountStatusListProducerTest {
+
+    private val singleAccountListSupplier: SingleAccountListSupplier = mockk()
+    private val cryptoCurrencyStatusesFlowFactory: CryptoCurrencyStatusesFlowFactory = mockk()
+
+    private val userWalletId = UserWalletId("011")
+    private val userWallet = mockk<UserWallet> {
+        every { this@mockk.walletId } returns userWalletId
+    }
+
+    private val producer = DefaultSingleAccountStatusListProducer(
+        params = SingleAccountStatusListProducer.Params(userWalletId),
+        singleAccountListSupplier = singleAccountListSupplier,
+        cryptoCurrencyStatusesFlowFactory = cryptoCurrencyStatusesFlowFactory,
+        dispatchers = TestingCoroutineDispatcherProvider(),
+    )
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(singleAccountListSupplier, cryptoCurrencyStatusesFlowFactory)
+    }
+
+    @Test
+    fun `flow is mapped for user wallet id from params`() = runTest {
+        // Arrange
+        val accountList = AccountList.empty(userWallet)
+
+        every {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        } returns flowOf(accountList)
+
+        // Act
+        val actual = producer.produce().let(::getEmittedValues)
+
+        // Assert
+        val expected = AccountStatusList(
+            userWallet = userWallet,
+            accountStatuses = setOf(
+                AccountStatus.CryptoPortfolio(
+                    account = accountList.mainAccount,
+                    tokenList = TokenList.Empty,
+                    priceChangeLce = PriceChange(value = BigDecimal("0.00"), source = StatusSource.ACTUAL).lceContent(),
+                ),
+            ),
+            totalAccounts = 1,
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `flow will updated if balances are updated`() = runTest {
+        // Arrange
+        val accountList = AccountList.empty(userWallet)
+        val updatedAccountList = AccountList.empty(userWallet = userWallet, sortType = TokensSortType.BALANCE)
+
+        val accountListFlow = MutableStateFlow(value = accountList)
+
+        every {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        } returns accountListFlow
+
+        // Act (first emission)
+        val actual1 = producer.produce().let(::getEmittedValues)
+
+        // Assert (first emission)
+        val expected = AccountStatusList(
+            userWallet = userWallet,
+            accountStatuses = setOf(
+                AccountStatus.CryptoPortfolio(
+                    account = accountList.mainAccount,
+                    tokenList = TokenList.Empty,
+                    priceChangeLce = PriceChange(value = BigDecimal("0.00"), source = StatusSource.ACTUAL).lceContent(),
+                ),
+            ),
+            totalAccounts = 1,
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
+        )
+        Truth.assertThat(actual1).containsExactly(expected)
+
+        // Act (second emission)
+        accountListFlow.value = updatedAccountList
+        val actual2 = producer.produce().let(::getEmittedValues)
+
+        // Assert (second emission)
+        val expected2 = AccountStatusList(
+            userWallet = userWallet,
+            accountStatuses = setOf(
+                AccountStatus.CryptoPortfolio(
+                    account = updatedAccountList.mainAccount,
+                    tokenList = TokenList.Empty,
+                    priceChangeLce = PriceChange(value = BigDecimal("0.00"), source = StatusSource.ACTUAL).lceContent(),
+                ),
+            ),
+            totalAccounts = 1,
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
+        )
+        Truth.assertThat(actual2).containsExactly(expected2)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `flow is filtered the same balance`() = runTest {
+        // Arrange
+        val accountList = AccountList.empty(userWallet)
+        val accountListFlow = MutableStateFlow(value = accountList)
+
+        every {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        } returns accountListFlow
+
+        val expected = AccountStatusList(
+            userWallet = userWallet,
+            accountStatuses = setOf(
+                AccountStatus.CryptoPortfolio(
+                    account = accountList.mainAccount,
+                    tokenList = TokenList.Empty,
+                    priceChangeLce = PriceChange(value = BigDecimal("0.00"), source = StatusSource.ACTUAL).lceContent(),
+                ),
+            ),
+            totalAccounts = 1,
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal.ZERO, source = StatusSource.ACTUAL),
+        )
+
+        // Act (first emission)
+        val actual1 = producer.produce().let(::getEmittedValues)
+
+        // Assert (first emission)
+        Truth.assertThat(actual1).containsExactly(expected)
+
+        // Act (second emission)
+        accountListFlow.value = accountList
+        val actual2 = producer.produce().let(::getEmittedValues)
+
+        // Assert (second emission)
+        Truth.assertThat(actual2).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `flow is produced for account with non empty crypto currencies`() = runTest {
+        // Arrange
+        val cryptoCurrencyFactory = MockCryptoCurrencyFactory()
+        val accountList = AccountList.empty(
+            userWallet = userWallet,
+            cryptoCurrencies = cryptoCurrencyFactory.ethereumAndStellar.toSet(),
+        )
+
+        every {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        } returns flowOf(accountList)
+
+        val ethereumStatus = CryptoCurrencyStatus(
+            currency = cryptoCurrencyFactory.ethereum,
+            value = CryptoCurrencyStatus.Loading,
+        )
+        every {
+            cryptoCurrencyStatusesFlowFactory.create(userWallet = userWallet, currency = cryptoCurrencyFactory.ethereum)
+        } returns flowOf(ethereumStatus)
+
+        val stellarStatus = CryptoCurrencyStatus(
+            currency = cryptoCurrencyFactory.stellar,
+            value = CryptoCurrencyStatus.MissedDerivation(priceChange = null, fiatRate = null),
+        )
+        every {
+            cryptoCurrencyStatusesFlowFactory.create(userWallet = userWallet, currency = cryptoCurrencyFactory.stellar)
+        } returns flowOf(stellarStatus)
+
+        // Act
+        val actual = producer.produce().let(::getEmittedValues)
+
+        // Assert
+        val expected = AccountStatusList(
+            userWallet = userWallet,
+            accountStatuses = setOf(
+                AccountStatus.CryptoPortfolio(
+                    account = accountList.mainAccount,
+                    tokenList = TokenList.Ungrouped(
+                        totalFiatBalance = TotalFiatBalance.Loading,
+                        sortedBy = TokensSortType.NONE,
+                        currencies = nonEmptyListOf(ethereumStatus, stellarStatus),
+                    ),
+                    priceChangeLce = lceLoading(),
+                ),
+            ),
+            totalAccounts = 1,
+            totalFiatBalance = TotalFiatBalance.Loading,
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId))
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/test/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactoryTest.kt b/domain/account/status/src/test/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactoryTest.kt
new file mode 100644
index 0000000000..0036579daf
--- /dev/null
+++ b/domain/account/status/src/test/java/com/tangem/domain/account/status/utils/CryptoCurrencyStatusesFlowFactoryTest.kt
@@ -0,0 +1,308 @@
+package com.tangem.domain.account.status.utils
+
+import arrow.core.left
+import arrow.core.right
+import com.google.common.truth.Truth
+import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
+import com.tangem.common.test.utils.getEmittedValues
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.network.NetworkStatus
+import com.tangem.domain.models.quote.QuoteStatus
+import com.tangem.domain.models.staking.StakingID
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.networks.single.SingleNetworkStatusProducer
+import com.tangem.domain.networks.single.SingleNetworkStatusSupplier
+import com.tangem.domain.quotes.single.SingleQuoteStatusProducer
+import com.tangem.domain.quotes.single.SingleQuoteStatusSupplier
+import com.tangem.domain.staking.StakingIdFactory
+import com.tangem.domain.staking.single.SingleYieldBalanceProducer
+import com.tangem.domain.staking.single.SingleYieldBalanceSupplier
+import io.mockk.*
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@Suppress("UnusedFlow")
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class CryptoCurrencyStatusesFlowFactoryTest {
+
+    private val singleNetworkStatusSupplier: SingleNetworkStatusSupplier = mockk()
+    private val singleQuoteStatusSupplier: SingleQuoteStatusSupplier = mockk()
+    private val singleYieldBalanceSupplier: SingleYieldBalanceSupplier = mockk()
+    private val stakingIdFactory: StakingIdFactory = mockk()
+
+    private val factory = CryptoCurrencyStatusesFlowFactory(
+        singleNetworkStatusSupplier = singleNetworkStatusSupplier,
+        singleQuoteStatusSupplier = singleQuoteStatusSupplier,
+        singleYieldBalanceSupplier = singleYieldBalanceSupplier,
+        stakingIdFactory = stakingIdFactory,
+    )
+
+    private val userWalletId = UserWalletId("011")
+    private val cryptoCurrencyFactory = MockCryptoCurrencyFactory()
+
+    private val networkAddress = NetworkAddress.Single(
+        defaultAddress = NetworkAddress.Address(value = "0x1", type = NetworkAddress.Address.Type.Primary),
+    )
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(
+            singleNetworkStatusSupplier,
+            singleQuoteStatusSupplier,
+            singleYieldBalanceSupplier,
+            stakingIdFactory,
+        )
+    }
+
+    @Test
+    fun `if rawCurrencyId is null, there will be no subscription to the quote status`() = runTest {
+        // Arrange
+        val userWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns true
+        }
+
+        val currency = cryptoCurrencyFactory.ethereum.copy(
+            id = cryptoCurrencyFactory.ethereum.id.copy(
+                suffix = CryptoCurrency.ID.Suffix.ContractAddress(contractAddress = "0x12345"),
+            ),
+        )
+
+        val networkStatus = NetworkStatus(
+            network = currency.network,
+            value = NetworkStatus.Unreachable(address = networkAddress),
+        )
+        val networkStatusFlow = flowOf(networkStatus)
+        every {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        } returns networkStatusFlow
+
+        val stakingId = StakingID(integrationId = "id", address = networkAddress.defaultAddress.value)
+        coEvery {
+            stakingIdFactory.create(currencyId = currency.id, defaultAddress = networkAddress.defaultAddress.value)
+        } returns stakingId.right()
+
+        val yieldBalance = YieldBalance.Empty(stakingId = stakingId, source = StatusSource.ACTUAL)
+        val yieldBalanceFlow = flowOf(yieldBalance)
+        every {
+            singleYieldBalanceSupplier(
+                params = SingleYieldBalanceProducer.Params(userWalletId = userWalletId, stakingId = stakingId),
+            )
+        } returns yieldBalanceFlow
+
+        // Act
+        val actual = factory.create(userWallet = userWallet, currency = currency).let(::getEmittedValues)
+
+        // Assert
+        val expected = CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Unreachable(
+                priceChange = null,
+                fiatRate = null,
+                networkAddress = networkAddress,
+            ),
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+            stakingIdFactory.create(currencyId = currency.id, defaultAddress = networkAddress.defaultAddress.value)
+            singleYieldBalanceSupplier(params = SingleYieldBalanceProducer.Params(userWalletId, stakingId))
+        }
+    }
+
+    @Test
+    fun `if userWallet is not multi-currency, there will be no subscription to the yield balance`() = runTest {
+        // Arrange
+        val userWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns false
+        }
+
+        val currency = cryptoCurrencyFactory.ethereum
+
+        val networkStatus = NetworkStatus(
+            network = currency.network,
+            value = NetworkStatus.Unreachable(address = networkAddress),
+        )
+        val networkStatusFlow = flowOf(networkStatus)
+        every {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        } returns networkStatusFlow
+
+        val quoteStatus = QuoteStatus(
+            rawCurrencyId = currency.id.rawCurrencyId!!,
+            value = QuoteStatus.Data(
+                source = StatusSource.ACTUAL,
+                fiatRate = BigDecimal.ONE,
+                priceChange = BigDecimal.ONE,
+            ),
+        )
+        val quoteStatusFlow = flowOf(quoteStatus)
+        every {
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        } returns quoteStatusFlow
+
+        // Act
+        val actual = factory.create(userWallet = userWallet, currency = currency).let(::getEmittedValues)
+
+        // Assert
+        val expected = CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Unreachable(
+                priceChange = BigDecimal.ONE,
+                fiatRate = BigDecimal.ONE,
+                networkAddress = networkAddress,
+            ),
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        }
+    }
+
+    @Test
+    fun `no subscription to the quote status and yield balance`() = runTest {
+        // Arrange
+        val userWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns false
+        }
+
+        val currency = cryptoCurrencyFactory.ethereum.copy(
+            id = cryptoCurrencyFactory.ethereum.id.copy(
+                suffix = CryptoCurrency.ID.Suffix.ContractAddress(contractAddress = "0x12345"),
+            ),
+        )
+
+        val networkStatus = NetworkStatus(
+            network = currency.network,
+            value = NetworkStatus.Unreachable(address = networkAddress),
+        )
+        val networkStatusFlow = flowOf(networkStatus)
+        every {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        } returns networkStatusFlow
+
+        // Act
+        val actual = factory.create(userWallet = userWallet, currency = currency).let(::getEmittedValues)
+
+        // Assert
+        val expected = CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Unreachable(
+                priceChange = null,
+                fiatRate = null,
+                networkAddress = networkAddress,
+            ),
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        }
+    }
+
+    @Test
+    fun `if stakingId is not supported, yield balance will be null`() = runTest {
+        // Arrange
+        val userWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns true
+        }
+
+        val currency = cryptoCurrencyFactory.ethereum
+
+        val networkStatus = NetworkStatus(
+            network = currency.network,
+            value = NetworkStatus.Unreachable(address = networkAddress),
+        )
+        val networkStatusFlow = flowOf(networkStatus)
+        every {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        } returns networkStatusFlow
+
+        val quoteStatus = QuoteStatus(
+            rawCurrencyId = currency.id.rawCurrencyId!!,
+            value = QuoteStatus.Data(
+                source = StatusSource.ACTUAL,
+                fiatRate = BigDecimal.ONE,
+                priceChange = BigDecimal.ONE,
+            ),
+        )
+        val quoteStatusFlow = flowOf(quoteStatus)
+        every {
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        } returns quoteStatusFlow
+
+        coEvery {
+            stakingIdFactory.create(currencyId = currency.id, defaultAddress = networkAddress.defaultAddress.value)
+        } returns StakingIdFactory.Error.UnsupportedCurrency.left()
+
+        // Act
+        val actual = factory.create(userWallet = userWallet, currency = currency).let(::getEmittedValues)
+
+        // Assert
+        val expected = CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Unreachable(
+                priceChange = BigDecimal.ONE,
+                fiatRate = BigDecimal.ONE,
+                networkAddress = networkAddress,
+            ),
+        )
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        }
+    }
+
+    @Test
+    fun `all sources are empty`() = runTest {
+        // Arrange
+        val userWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns true
+        }
+
+        val currency = cryptoCurrencyFactory.ethereum
+
+        every {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+        } returns emptyFlow()
+
+        every {
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        } returns emptyFlow()
+
+        // Act
+        val actual = factory.create(userWallet = userWallet, currency = currency).let(::getEmittedValues)
+
+        // Assert
+        val expected = CryptoCurrencyStatus(currency = currency, value = CryptoCurrencyStatus.Loading)
+        Truth.assertThat(actual).containsExactly(expected)
+
+        coVerify(ordering = Ordering.SEQUENCE) {
+            singleNetworkStatusSupplier(params = SingleNetworkStatusProducer.Params(userWalletId, currency.network))
+            singleQuoteStatusSupplier(params = SingleQuoteStatusProducer.Params(currency.id.rawCurrencyId!!))
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCaseTest.kt b/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCaseTest.kt
new file mode 100644
index 0000000000..829ce7b3ec
--- /dev/null
+++ b/domain/account/status/src/test/kotlin/com/tangem/domain/account/status/usecase/GetAccountCurrencyByAddressUseCaseTest.kt
@@ -0,0 +1,299 @@
+package com.tangem.domain.account.status.usecase
+
+import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
+import com.tangem.common.test.utils.assertNone
+import com.tangem.common.test.utils.assertSome
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.status.model.AccountCryptoCurrency
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.network.Network
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.network.NetworkStatus
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.networks.multi.MultiNetworkStatusProducer
+import com.tangem.domain.networks.multi.MultiNetworkStatusSupplier
+import io.mockk.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+
+/**
+[REDACTED_AUTHOR]
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class GetAccountCurrencyByAddressUseCaseTest {
+
+    private val userWalletsListRepository: UserWalletsListRepository = mockk()
+    private val multiNetworkStatusSupplier: MultiNetworkStatusSupplier = mockk()
+    private val singleAccountListSupplier: SingleAccountListSupplier = mockk()
+
+    private val useCase = GetAccountCurrencyByAddressUseCase(
+        userWalletsListRepository = userWalletsListRepository,
+        multiNetworkStatusSupplier = multiNetworkStatusSupplier,
+        singleAccountListSupplier = singleAccountListSupplier,
+    )
+
+    @AfterEach
+    fun tearDown() {
+        clearMocks(userWalletsListRepository, multiNetworkStatusSupplier, singleAccountListSupplier)
+    }
+
+    @Test
+    fun `returns None if address is empty`() = runTest {
+        // Arrange
+        val address = ""
+
+        // Act
+        val actual = useCase(address)
+
+        // Assert
+        assertNone(actual)
+    }
+
+    @Test
+    fun `returns None if userWalletIds is null`() = runTest {
+        // Arrange
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(null)
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+        }
+    }
+
+    @Test
+    fun `returns None if userWalletIds is empty list`() = runTest {
+        // Arrange
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(emptyList())
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+        }
+    }
+
+    @Test
+    fun `returns None if userWalletIds contain only single wallet`() = runTest {
+        // Arrange
+        val singleWallet = mockk<UserWallet> {
+            every { isMultiCurrency } returns false
+        }
+
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(singleWallet))
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+        }
+    }
+
+    @Test
+    fun `returns None if multiNetworkStatusSupplier returns null`() = runTest {
+        // Arrange
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns null
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `returns None if multiNetworkStatusSupplier returns empty list`() = runTest {
+        // Arrange
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns emptySet()
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `returns None if network status not found`() = runTest {
+        // Arrange
+        val networkStatus = NetworkStatus(
+            network = mockk(),
+            value = NetworkStatus.Unreachable(address = null),
+        )
+
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns setOf(networkStatus)
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        }
+    }
+
+    @Test
+    fun `returns None if singleAccountListSupplier returns null`() = runTest {
+        // Arrange
+        val networkStatus = NetworkStatus(
+            network = mockk {
+                every { id } returns Network.ID(value = "bitcoin", derivationPath = Network.DerivationPath.None)
+            },
+            value = NetworkStatus.Unreachable(address = validNetworkAddress),
+        )
+
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns setOf(networkStatus)
+        coEvery {
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        } returns null
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        }
+    }
+
+    @Test
+    fun `returns None if crypto currencies is empty list`() = runTest {
+        // Arrange
+        val networkId = Network.ID(value = "bitcoin", derivationPath = Network.DerivationPath.None)
+        val networkStatus = NetworkStatus(
+            network = mockk {
+                every { id } returns networkId
+            },
+            value = NetworkStatus.Unreachable(address = validNetworkAddress),
+        )
+        val accountList = AccountList.empty(multiUserWallet)
+
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns setOf(networkStatus)
+        coEvery {
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        } returns accountList
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        assertNone(actual)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        }
+    }
+
+    @Test
+    fun `returns Some if all data is valid`() = runTest {
+        // Arrange
+        val currency = MockCryptoCurrencyFactory().ethereum
+        val networkStatus = NetworkStatus(
+            network = currency.network,
+            value = NetworkStatus.Unreachable(address = validNetworkAddress),
+        )
+        val accountList = AccountList.empty(userWallet = multiUserWallet, cryptoCurrencies = setOf(currency))
+
+        every { userWalletsListRepository.userWallets } returns MutableStateFlow(listOf(multiUserWallet))
+        coEvery {
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+        } returns setOf(networkStatus)
+        coEvery {
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        } returns accountList
+
+        // Act
+        val actual = useCase(validAddress)
+
+        // Assert
+        val expected = AccountCryptoCurrency(account = accountList.mainAccount, cryptoCurrency = currency)
+        assertSome(actual, expected)
+
+        coVerifySequence {
+            userWalletsListRepository.userWallets
+            multiNetworkStatusSupplier.getSyncOrNull(params = MultiNetworkStatusProducer.Params(userWalletId))
+            singleAccountListSupplier.getSyncOrNull(
+                params = SingleAccountListProducer.Params(userWalletId = userWalletId),
+            )
+        }
+    }
+
+    private companion object Companion {
+        const val validAddress = "0x1234567890abcdef"
+        val validNetworkAddress = NetworkAddress.Single(
+            defaultAddress = NetworkAddress.Address(
+                value = validAddress,
+                type = NetworkAddress.Address.Type.Primary,
+            ),
+        )
+
+        val userWalletId = UserWalletId("011")
+        val multiUserWallet = mockk<UserWallet> {
+            every { this@mockk.walletId } returns userWalletId
+            every { this@mockk.isMultiCurrency } returns true
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetSelectedAppCurrencyUseCase.kt b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetSelectedAppCurrencyUseCase.kt
index 179973c048..9defeeadae 100644
--- a/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetSelectedAppCurrencyUseCase.kt
+++ b/domain/app-currency/src/main/kotlin/com/tangem/domain/appcurrency/GetSelectedAppCurrencyUseCase.kt
@@ -1,6 +1,7 @@
 package com.tangem.domain.appcurrency
 
 import arrow.core.Either
+import arrow.core.getOrElse
 import arrow.core.left
 import arrow.core.right
 import com.tangem.domain.appcurrency.error.SelectedAppCurrencyError
@@ -19,6 +20,10 @@ class GetSelectedAppCurrencyUseCase(
             .onEmpty { emit(SelectedAppCurrencyError.NoAppCurrencySelected.left()) }
     }
 
+    fun invokeOrDefault(): Flow<AppCurrency> = invoke()
+        .map { it.getOrElse { AppCurrency.Default } }
+        .distinctUntilChanged()
+
     suspend fun invokeSync(): Either<SelectedAppCurrencyError, AppCurrency> {
         return invoke().firstOrNull() ?: SelectedAppCurrencyError.NoAppCurrencySelected.left()
     }
diff --git a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/GetBalanceHidingSettingsUseCase.kt b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/GetBalanceHidingSettingsUseCase.kt
index 6f4c08e5fa..bfd742292f 100644
--- a/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/GetBalanceHidingSettingsUseCase.kt
+++ b/domain/balance-hiding/src/main/kotlin/com/tangem/domain/balancehiding/GetBalanceHidingSettingsUseCase.kt
@@ -2,6 +2,8 @@ package com.tangem.domain.balancehiding
 
 import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 
 class GetBalanceHidingSettingsUseCase(
     private val balanceHidingRepository: BalanceHidingRepository,
@@ -10,4 +12,8 @@ class GetBalanceHidingSettingsUseCase(
     operator fun invoke(): Flow<BalanceHidingSettings> {
         return balanceHidingRepository.getBalanceHidingSettingsFlow()
     }
+
+    fun isBalanceHidden(): Flow<Boolean> = invoke()
+        .map { it.isBalanceHidden }
+        .distinctUntilChanged()
 }
\ No newline at end of file
diff --git a/domain/blockaid/build.gradle.kts b/domain/blockaid/build.gradle.kts
index 9fda0da981..83e274658e 100644
--- a/domain/blockaid/build.gradle.kts
+++ b/domain/blockaid/build.gradle.kts
@@ -1,13 +1,24 @@
 plugins {
-    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.android)
     id("configuration")
 }
 
+android {
+    namespace = "com.tangem.domain.blockaid"
+}
+
+
 dependencies {
-    /* Project - Domain */
+    /** Project - Domain */
+    implementation(projects.domain.models)
     implementation(projects.domain.core)
     implementation(projects.domain.blockaid.models)
 
-    /* Other */
+    /** Tangem SDK */
+    implementation(tangemDeps.blockchain)
+
+
+    /** Other */
     implementation(deps.moshi.adapters)
 }
\ No newline at end of file
diff --git a/domain/blockaid/models/src/main/kotlin/com/domain/blockaid/models/transaction/GasEstimationResult.kt b/domain/blockaid/models/src/main/kotlin/com/domain/blockaid/models/transaction/GasEstimationResult.kt
new file mode 100644
index 0000000000..775eb8a970
--- /dev/null
+++ b/domain/blockaid/models/src/main/kotlin/com/domain/blockaid/models/transaction/GasEstimationResult.kt
@@ -0,0 +1,7 @@
+package com.domain.blockaid.models.transaction
+
+import java.math.BigInteger
+
+data class GasEstimationResult(
+    val estimatedGasList: List<BigInteger>,
+)
\ No newline at end of file
diff --git a/domain/blockaid/src/main/kotlin/com/tangem/domain/blockaid/BlockAidGasEstimate.kt b/domain/blockaid/src/main/kotlin/com/tangem/domain/blockaid/BlockAidGasEstimate.kt
new file mode 100644
index 0000000000..4cfc8eff9d
--- /dev/null
+++ b/domain/blockaid/src/main/kotlin/com/tangem/domain/blockaid/BlockAidGasEstimate.kt
@@ -0,0 +1,14 @@
+package com.tangem.domain.blockaid
+
+import arrow.core.Either
+import com.domain.blockaid.models.transaction.GasEstimationResult
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.domain.models.currency.CryptoCurrency
+
+interface BlockAidGasEstimate {
+
+    suspend fun getGasEstimation(
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<TransactionData.Uncompiled>,
+    ): Either<Throwable, GasEstimationResult>
+}
\ No newline at end of file
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardException.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardException.kt
index 667e29f062..abca85611d 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardException.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardException.kt
@@ -2,14 +2,14 @@ package com.tangem.domain.card
 
 sealed class ScanCardException : Exception() {
 
-    data object UserCancelled : ScanCardException() {
+    class UserCancelled : ScanCardException() {
         @Suppress("UnusedPrivateMember")
-        private fun readResolve(): Any = UserCancelled
+        private fun readResolve(): Any = UserCancelled()
     }
 
-    data object WrongAccessCode : ScanCardException() {
+    class WrongAccessCode : ScanCardException() {
         @Suppress("UnusedPrivateMember")
-        private fun readResolve(): Any = WrongAccessCode
+        private fun readResolve(): Any = WrongAccessCode()
     }
 
     open class ChainException : ScanCardException()
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/TangemCardTypesResolver.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/TangemCardTypesResolver.kt
index e8badaf526..ee83c3d83a 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/TangemCardTypesResolver.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/TangemCardTypesResolver.kt
@@ -109,8 +109,8 @@ internal class TangemCardTypesResolver(
     override fun isAttestationFailed(): Boolean = card.attestation.status == Attestation.Status.Failed
 
     override fun hasWalletSignedHashes(): Boolean {
-        return card.wallets.any {
-            val totalSignedHashes = it.totalSignedHashes ?: 0
+        return card.wallets.any { wallet ->
+            val totalSignedHashes = wallet.totalSignedHashes ?: 0
             totalSignedHashes > 0
         }
     }
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/IntroductionProcess.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/IntroductionProcess.kt
index 0cb4a3685c..15916c16cf 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/IntroductionProcess.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/IntroductionProcess.kt
@@ -4,7 +4,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
 
 sealed class IntroductionProcess(
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent("Introduction Process", event, params) {
 
     object ScreenOpened : IntroductionProcess("Introduction Process Screen Opened")
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/ParamCardCurrencyConverter.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/ParamCardCurrencyConverter.kt
index 2398da3650..8f5e77e8e3 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/ParamCardCurrencyConverter.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/ParamCardCurrencyConverter.kt
@@ -14,7 +14,9 @@ class ParamCardCurrencyConverter : Converter<CardTypesResolver, WalletType?> {
             value.isTangemNote() -> AnalyticsParam.CurrencyType.Blockchain(value.getBlockchain())
             value.isTangemTwins() -> AnalyticsParam.CurrencyType.Blockchain(Blockchain.Bitcoin)
             value.getBlockchain() != Blockchain.Unknown -> AnalyticsParam.CurrencyType.Blockchain(value.getBlockchain())
-            value.getPrimaryToken() != null -> AnalyticsParam.CurrencyType.Token(value.getPrimaryToken()!!)
+            value.getPrimaryToken() != null -> {
+                AnalyticsParam.CurrencyType.Token(requireNotNull(value.getPrimaryToken()))
+            }
             else -> null
         } ?: return null
 
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/Shop.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/Shop.kt
index 62c02a56ab..11536725f8 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/Shop.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/analytics/Shop.kt
@@ -4,7 +4,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent
 
 sealed class Shop(
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent("Shop", event, params) {
 
     object ScreenOpened : Shop("Shop Screen Opened")
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/common/TapWorkarounds.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/common/TapWorkarounds.kt
index 2790b54665..f3692995b3 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/common/TapWorkarounds.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/common/TapWorkarounds.kt
@@ -36,14 +36,14 @@ object TapWorkarounds {
     val CardDTO.canSkipBackup: Boolean
         get() = this.firmwareVersion < backupRequiredFirmwareVersion || demoConfig.isDemoCardId(cardId)
 
-    val CardDTO.useOldStyleDerivation: Boolean
+    val CardDTO.hasOldStyleDerivation: Boolean
         get() = batchId == "AC01" || batchId == "AC02" || batchId == "CB95"
 
     val CardDTO.isExcluded: Boolean
         get() {
-            val excludedBatch = excludedBatches.contains(batchId)
-            val excludedIssuerName = excludedIssuers.contains(issuer.name.uppercase(Locale.ROOT))
-            return excludedBatch || excludedIssuerName
+            val isBatchExcluded = excludedBatches.contains(batchId)
+            val isIssuerNameExcluded = excludedIssuers.contains(issuer.name.uppercase(Locale.ROOT))
+            return isBatchExcluded || isIssuerNameExcluded
         }
 
     val CardDTO.isNotSupportedInThatRelease: Boolean
diff --git a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt
index 58c029cccb..0d983f457f 100644
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/configs/Wallet2CardConfig.kt
@@ -18,6 +18,7 @@ data object Wallet2CardConfig : CardConfig {
      * Logic to determine primary curve for blockchain in TangemWallet 2.0
      * Order is important here
      */
+    @Suppress("NullableToStringCall")
     override fun primaryCurve(blockchain: Blockchain): EllipticCurve? {
         // order is important, new curve is preferred for wallet 2
         // TODO Comment old logic without direct mapping until tests and release
@@ -209,6 +210,8 @@ data object Wallet2CardConfig : CardConfig {
             Blockchain.PepecoinTestnet -> EllipticCurve.Secp256k1
             Blockchain.Hyperliquid -> EllipticCurve.Secp256k1
             Blockchain.HyperliquidTestnet -> EllipticCurve.Secp256k1
+            Blockchain.Quai -> EllipticCurve.Secp256k1
+            Blockchain.QuaiTestnet -> EllipticCurve.Secp256k1
         }
     }
 }
\ No newline at end of file
diff --git a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt
index 927e7f0aa1..8f9f3f26ff 100644
--- a/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt
+++ b/domain/card/src/test/java/com/tangem/domain/card/configs/Wallet2CardConfigTest.kt
@@ -166,6 +166,8 @@ class Wallet2CardConfigTest {
         Blockchain.PepecoinTestnet to EllipticCurve.Secp256k1,
         Blockchain.Hyperliquid to EllipticCurve.Secp256k1,
         Blockchain.HyperliquidTestnet to EllipticCurve.Secp256k1,
+        Blockchain.Quai to EllipticCurve.Secp256k1,
+        Blockchain.QuaiTestnet to EllipticCurve.Secp256k1,
     )
 
     @Test
diff --git a/domain/common/.gitignore b/domain/common/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/domain/common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/domain/common/build.gradle.kts b/domain/common/build.gradle.kts
new file mode 100644
index 0000000000..20e637a0a5
--- /dev/null
+++ b/domain/common/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.kotlin.serialization)
+    id("configuration")
+}
+
+dependencies {
+    api(deps.kotlin.coroutines)
+    api(deps.arrow.core)
+    api(deps.arrow.fx)
+    api(projects.domain.models)
+
+    implementation(deps.kotlin.serialization)
+
+    testImplementation(deps.test.coroutine)
+    testImplementation(deps.test.junit)
+    testImplementation(deps.test.mockk)
+    testImplementation(deps.test.truth)
+}
\ No newline at end of file
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/UserWalletsListRepository.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/UserWalletsListRepository.kt
similarity index 91%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/UserWalletsListRepository.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/UserWalletsListRepository.kt
index c3704524c2..7a07b10402 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/UserWalletsListRepository.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/UserWalletsListRepository.kt
@@ -1,12 +1,7 @@
-package com.tangem.domain.core.wallets
+package com.tangem.domain.common.wallets
 
 import arrow.core.Either
-import com.tangem.domain.core.wallets.error.DeleteWalletError
-import com.tangem.domain.core.wallets.error.LockWalletsError
-import com.tangem.domain.core.wallets.error.SaveWalletError
-import com.tangem.domain.core.wallets.error.SelectWalletError
-import com.tangem.domain.core.wallets.error.SetLockError
-import com.tangem.domain.core.wallets.error.UnlockWalletError
+import com.tangem.domain.common.wallets.error.*
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
@@ -18,8 +13,8 @@ import kotlinx.coroutines.flow.StateFlow
  *
  * TODO tests [REDACTED_TASK_KEY]
  *
- * @see com.tangem.domain.models.wallet.UserWallet
- * @see com.tangem.domain.models.wallet.UserWalletId
+ * @see UserWallet
+ * @see UserWalletId
  */
 interface UserWalletsListRepository {
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/DeleteWalletError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/DeleteWalletError.kt
similarity index 65%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/DeleteWalletError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/DeleteWalletError.kt
index 91b685a84c..3fb51ef8cc 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/DeleteWalletError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/DeleteWalletError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 sealed interface DeleteWalletError {
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/LockWalletsError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/LockWalletsError.kt
similarity index 63%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/LockWalletsError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/LockWalletsError.kt
index abedc5aa4a..529b47abf5 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/LockWalletsError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/LockWalletsError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 interface LockWalletsError {
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveFirstColdWalletError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveFirstColdWalletError.kt
similarity index 85%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveFirstColdWalletError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveFirstColdWalletError.kt
index 24c29fd411..22f840c315 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveFirstColdWalletError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveFirstColdWalletError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 sealed interface SaveFirstColdWalletError {
     data object CreateWalletError : SaveFirstColdWalletError
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveWalletError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveWalletError.kt
similarity index 83%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveWalletError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveWalletError.kt
index 30fc8a743b..4a988ed353 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SaveWalletError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SaveWalletError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 /**
 [REDACTED_AUTHOR]
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SelectWalletError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SelectWalletError.kt
similarity index 68%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SelectWalletError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/SelectWalletError.kt
index 05b07e53d0..98fab266b1 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SelectWalletError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SelectWalletError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 sealed interface SelectWalletError {
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SetLockError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SetLockError.kt
similarity index 81%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SetLockError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/SetLockError.kt
index 688f618c74..3eab7da5e0 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/SetLockError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/SetLockError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 sealed interface SetLockError {
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/UnlockWalletError.kt b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/UnlockWalletError.kt
similarity index 87%
rename from domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/UnlockWalletError.kt
rename to domain/common/src/main/java/com/tangem/domain/common/wallets/error/UnlockWalletError.kt
index 8bed3120a7..c1f6e1fe89 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/wallets/error/UnlockWalletError.kt
+++ b/domain/common/src/main/java/com/tangem/domain/common/wallets/error/UnlockWalletError.kt
@@ -1,4 +1,4 @@
-package com.tangem.domain.core.wallets.error
+package com.tangem.domain.common.wallets.error
 
 sealed interface UnlockWalletError {
 
diff --git a/domain/core/build.gradle.kts b/domain/core/build.gradle.kts
index 20e637a0a5..f153e89d62 100644
--- a/domain/core/build.gradle.kts
+++ b/domain/core/build.gradle.kts
@@ -5,10 +5,9 @@ plugins {
 }
 
 dependencies {
-    api(deps.kotlin.coroutines)
     api(deps.arrow.core)
     api(deps.arrow.fx)
-    api(projects.domain.models)
+    api(deps.kotlin.coroutines)
 
     implementation(deps.kotlin.serialization)
 
diff --git a/domain/core/src/main/kotlin/com/tangem/domain/core/lce/Lce.kt b/domain/core/src/main/kotlin/com/tangem/domain/core/lce/Lce.kt
index 1eba8138a8..24f77bbc0c 100644
--- a/domain/core/src/main/kotlin/com/tangem/domain/core/lce/Lce.kt
+++ b/domain/core/src/main/kotlin/com/tangem/domain/core/lce/Lce.kt
@@ -5,6 +5,7 @@ import com.tangem.domain.core.utils.flatMap
 import com.tangem.domain.core.utils.lceContent
 import com.tangem.domain.core.utils.lceError
 import com.tangem.domain.core.utils.lceLoading
+import kotlinx.serialization.Serializable
 
 /**
  * A sealed class representing the three states of a data load operation: Loading, Content, and Error.
@@ -12,6 +13,7 @@ import com.tangem.domain.core.utils.lceLoading
  * @param E The type of the error object.
  * @param C The type of the content object.
  */
+@Serializable
 sealed class Lce<out E : Any, out C : Any> {
 
     /**
@@ -19,6 +21,7 @@ sealed class Lce<out E : Any, out C : Any> {
      *
      * @param partialContent The partial content that has been loaded so far, if any.
      */
+    @Serializable
     data class Loading<C : Any>(val partialContent: C?) : Lce<Nothing, C>()
 
     /**
@@ -26,6 +29,7 @@ sealed class Lce<out E : Any, out C : Any> {
      *
      * @param content The loaded content.
      */
+    @Serializable
     data class Content<C : Any>(val content: C) : Lce<Nothing, C>()
 
     /**
@@ -33,6 +37,7 @@ sealed class Lce<out E : Any, out C : Any> {
      *
      * @param error The error that occurred during loading.
      */
+    @Serializable
     data class Error<E : Any>(val error: E) : Lce<E, Nothing>()
 
     /**
diff --git a/domain/demo/models/src/main/kotlin/com/tangem/domain/demo/models/DemoConfig.kt b/domain/demo/models/src/main/kotlin/com/tangem/domain/demo/models/DemoConfig.kt
index 95693247f1..a98f1c5107 100644
--- a/domain/demo/models/src/main/kotlin/com/tangem/domain/demo/models/DemoConfig.kt
+++ b/domain/demo/models/src/main/kotlin/com/tangem/domain/demo/models/DemoConfig.kt
@@ -432,5 +432,5 @@ class DemoConfig {
     )
 
     @Suppress("ClassOrdering")
-    private val debugTestDemoCardIds = listOf<String>()
+    private val debugTestDemoCardIds = emptyList<String>()
 }
\ No newline at end of file
diff --git a/domain/feedback/src/main/java/com/tangem/domain/feedback/utils/EmailMessageTitleResolver.kt b/domain/feedback/src/main/java/com/tangem/domain/feedback/utils/EmailMessageTitleResolver.kt
index 1708558099..583f43cb02 100644
--- a/domain/feedback/src/main/java/com/tangem/domain/feedback/utils/EmailMessageTitleResolver.kt
+++ b/domain/feedback/src/main/java/com/tangem/domain/feedback/utils/EmailMessageTitleResolver.kt
@@ -16,7 +16,7 @@ internal class EmailMessageTitleResolver(private val resources: Resources) {
 
     /** Resolve email message title by [type] */
     fun resolve(type: FeedbackEmailType): String {
-        return when (type) {
+        val resId = when (type) {
             is FeedbackEmailType.DirectUserRequest,
             is FeedbackEmailType.CurrencyDescriptionError,
             is FeedbackEmailType.CardAttestationFailed,
@@ -32,6 +32,7 @@ internal class EmailMessageTitleResolver(private val resources: Resources) {
             -> R.string.feedback_preface_tx_failed
             is FeedbackEmailType.PreActivatedWallet -> R.string.feedback_preface_support
         }
-            .let(resources::getStringSafe)
+
+        return resources.getStringSafe(resId)
     }
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/redux/StateDialog.kt b/domain/legacy/src/main/java/com/tangem/domain/redux/StateDialog.kt
index 120604ae39..9d5084361d 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/redux/StateDialog.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/redux/StateDialog.kt
@@ -7,6 +7,6 @@ interface StateDialog {
     data class ScanFailsDialog(val source: ScanFailsSource, val onTryAgain: (() -> Unit)? = null) : StateDialog
 
     enum class ScanFailsSource {
-        MAIN, SIGN_IN, SETTINGS, INTRO;
+        MAIN, SIGN_IN, SETTINGS, INTRO
     }
 }
\ No newline at end of file
diff --git a/domain/legacy/src/main/java/com/tangem/domain/utils/BigDecimalUtils.kt b/domain/legacy/src/main/java/com/tangem/domain/utils/BigDecimalUtils.kt
index 677c7b354a..f99fb60e4f 100644
--- a/domain/legacy/src/main/java/com/tangem/domain/utils/BigDecimalUtils.kt
+++ b/domain/legacy/src/main/java/com/tangem/domain/utils/BigDecimalUtils.kt
@@ -3,30 +3,37 @@ package com.tangem.domain.utils
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Token
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import java.math.BigDecimal
 import com.tangem.blockchain.common.Amount as SdkAmount
 
-/** Converts `BigDecimal` [cryptoCurrency] to [SdkAmount] */
-fun BigDecimal.convertToSdkAmount(
-    cryptoCurrency: CryptoCurrency,
-    amountType: AmountType = getAmountTypeFromCryptoCurrency(cryptoCurrency),
-): SdkAmount = SdkAmount(
-    currencySymbol = cryptoCurrency.symbol,
-    value = this,
-    decimals = cryptoCurrency.decimals,
-    type = amountType,
-)
-
-/**
- * Converts [CryptoCurrency] to [AmountType] based on its type
- */
-private fun getAmountTypeFromCryptoCurrency(cryptoCurrency: CryptoCurrency) = when (cryptoCurrency) {
-    is CryptoCurrency.Coin -> AmountType.Coin
-    is CryptoCurrency.Token -> AmountType.Token(
-        token = Token(
-            symbol = cryptoCurrency.symbol,
-            contractAddress = cryptoCurrency.contractAddress,
-            decimals = cryptoCurrency.decimals,
-        ),
+/** Converts `BigDecimal` [cryptoCurrencyStatus] to [SdkAmount] */
+fun BigDecimal.convertToSdkAmount(cryptoCurrencyStatus: CryptoCurrencyStatus): SdkAmount {
+    val cryptoCurrency = cryptoCurrencyStatus.currency
+    val yieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
+    return SdkAmount(
+        currencySymbol = cryptoCurrency.symbol,
+        value = this,
+        decimals = cryptoCurrency.decimals,
+        type = when (cryptoCurrency) {
+            is CryptoCurrency.Coin -> AmountType.Coin
+            is CryptoCurrency.Token -> {
+                val token = Token(
+                    symbol = cryptoCurrency.symbol,
+                    contractAddress = cryptoCurrency.contractAddress,
+                    decimals = cryptoCurrency.decimals,
+                )
+                if (yieldSupplyStatus == null) {
+                    AmountType.Token(token = token)
+                } else {
+                    AmountType.TokenYieldSupply(
+                        token = token,
+                        isActive = yieldSupplyStatus.isActive,
+                        isInitialized = yieldSupplyStatus.isInitialized,
+                        isAllowedToSpend = yieldSupplyStatus.isAllowedToSpend,
+                    )
+                }
+            }
+        },
     )
 }
\ No newline at end of file
diff --git a/domain/markets/src/main/java/com/tangem/domain/markets/FilterAvailableNetworksForWalletUseCase.kt b/domain/markets/src/main/java/com/tangem/domain/markets/FilterAvailableNetworksForWalletUseCase.kt
index 044bc6a726..467ab832d1 100644
--- a/domain/markets/src/main/java/com/tangem/domain/markets/FilterAvailableNetworksForWalletUseCase.kt
+++ b/domain/markets/src/main/java/com/tangem/domain/markets/FilterAvailableNetworksForWalletUseCase.kt
@@ -4,10 +4,10 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.ExcludedBlockchains
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.domain.card.common.extensions.supportedBlockchains
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.requireUserWalletsSync
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.requireUserWalletsSync
 
 class FilterAvailableNetworksForWalletUseCase(
     private val userWalletsListManager: UserWalletsListManager,
diff --git a/domain/models/build.gradle.kts b/domain/models/build.gradle.kts
index 6c9f6b1143..fa609f56f6 100644
--- a/domain/models/build.gradle.kts
+++ b/domain/models/build.gradle.kts
@@ -1,5 +1,3 @@
-import com.tangem.plugin.configuration.configurations.extension.kaptForObfuscatingVariants
-
 plugins {
     alias(deps.plugins.kotlin.jvm)
     alias(deps.plugins.kotlin.serialization)
@@ -13,6 +11,7 @@ tasks.withType<Test>().configureEach {
 
 dependencies {
     api(projects.domain.visa.models)
+    api(projects.domain.core)
     api(projects.core.utils)
 
     implementation(tangemDeps.card.core)
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/PortfolioId.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/PortfolioId.kt
new file mode 100644
index 0000000000..07b9e3d022
--- /dev/null
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/PortfolioId.kt
@@ -0,0 +1,38 @@
+package com.tangem.domain.models
+
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.wallet.UserWalletId
+import kotlinx.serialization.Serializable
+
+/**
+ * Temporary wrapper over ID to support a gradual migration between two modes:
+ *
+ * - [Wallet] — legacy flow, wallet design; used when the [AccountsFeatureToggles] is disabled.
+ * - [Account] — new flow, wallet/account design; used when the [AccountsFeatureToggles] is enabled.
+ *
+ * ⚠️ When an [Account] you must verify the current app mode with [IsAccountsModeEnabledUseCase]
+ *      and then use wallet/account design
+ *
+ * Intended to be removed after the full migration to the new mode.
+ */
+@Serializable
+sealed interface PortfolioId {
+    val userWalletId: UserWalletId
+    val stringValue: String
+
+    @Serializable
+    data class Wallet(override val userWalletId: UserWalletId) : PortfolioId {
+        override val stringValue: String = userWalletId.stringValue
+    }
+
+    @Serializable
+    data class Account(val accountId: AccountId) : PortfolioId {
+        override val userWalletId: UserWalletId get() = accountId.userWalletId
+        override val stringValue: String = accountId.value
+    }
+
+    companion object {
+        operator fun invoke(accountId: AccountId) = Account(accountId)
+        operator fun invoke(userWalletId: UserWalletId) = Wallet(userWalletId)
+    }
+}
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/TokenReceiveConfig.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/TokenReceiveConfig.kt
index d884942aeb..032940c3ee 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/TokenReceiveConfig.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/TokenReceiveConfig.kt
@@ -29,6 +29,7 @@ data class ReceiveAddressModel(
 data class TokenReceiveNotification(
     val title: Int,
     val subtitle: Int,
+    val isYieldSupplyNotification: Boolean = false,
 )
 
 enum class Asset {
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/TokensGroupType.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/TokensGroupType.kt
index 23982e6f41..735b112edf 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/TokensGroupType.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/TokensGroupType.kt
@@ -15,5 +15,4 @@ enum class TokensGroupType {
 
     /** Grouping by network */
     NETWORK,
-    ;
 }
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/TokensSortType.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/TokensSortType.kt
index 0e85408187..3a68f0be35 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/TokensSortType.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/TokensSortType.kt
@@ -15,5 +15,4 @@ enum class TokensSortType {
 
     /** Sorted by their balance */
     BALANCE,
-    ;
 }
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/TotalFiatBalance.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/TotalFiatBalance.kt
index 374956a548..88af8c6bbd 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/TotalFiatBalance.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/TotalFiatBalance.kt
@@ -26,13 +26,12 @@ sealed interface TotalFiatBalance {
     /**
      * Represents the successfully loaded state of the fiat balance.
      *
-     * @property amount                 the loaded fiat balance amount
-     * @property isAllAmountsSummarized indicates whether the amount includes a summary of all underlying amounts
+     * @property amount the loaded fiat balance amount
+     * @property source status source
      */
     @Serializable
     data class Loaded(
         val amount: SerializedBigDecimal,
-        val isAllAmountsSummarized: Boolean,
         val source: StatusSource,
     ) : TotalFiatBalance
 }
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/account/AccountStatus.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/account/AccountStatus.kt
index 73bc34e70e..0d99a1abb2 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/account/AccountStatus.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/account/AccountStatus.kt
@@ -1,5 +1,8 @@
 package com.tangem.domain.models.account
 
+import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.quote.PriceChange
 import com.tangem.domain.models.tokenlist.TokenList
 import kotlinx.serialization.Serializable
 
@@ -17,12 +20,18 @@ sealed interface AccountStatus {
     /**
      * Represents the status of a crypto portfolio account
      *
-     * @property account   the crypto portfolio account
-     * @property tokenList the list of tokens associated with the account
+     * @property account        the crypto portfolio account
+     * @property tokenList      the list of tokens associated with the account
+     * @property priceChangeLce the price change information wrapped in a Lce (Loading, Content, Error) state
      */
     @Serializable
     data class CryptoPortfolio(
         override val account: Account.CryptoPortfolio,
         val tokenList: TokenList,
+        val priceChangeLce: Lce<Unit, PriceChange>,
     ) : AccountStatus
+
+    fun flattenCurrencies(): List<CryptoCurrencyStatus> = when (this) {
+        is CryptoPortfolio -> tokenList.flattenCurrencies()
+    }
 }
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/account/CryptoPortfolioIcon.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/account/CryptoPortfolioIcon.kt
index 15b906020b..681a6d940e 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/account/CryptoPortfolioIcon.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/account/CryptoPortfolioIcon.kt
@@ -44,7 +44,6 @@ data class CryptoPortfolioIcon private constructor(
         Clock,
         Package,
         Gift,
-        ;
     }
 
     /**
@@ -64,7 +63,6 @@ data class CryptoPortfolioIcon private constructor(
         Pattypan,
         UFOGreen,
         VitalGreen,
-        ;
     }
 
     companion object {
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt
index bb3a9b95ee..3e745dc152 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/currency/CryptoCurrency.kt
@@ -99,7 +99,7 @@ sealed class CryptoCurrency {
         val rawCurrencyId: RawID? get() = (suffix as? Suffix.RawID)?.rawId?.let { RawID(it) }
 
         /** Represents a contract address */
-        val contractAddress: String? get() = (suffix as? Suffix.RawID)?.contractAddress
+        val contractAddress: String? get() = suffix.contractAddress
 
         /** Represents a raw cryptocurrency's network ID */
         val rawNetworkId: String
@@ -170,10 +170,11 @@ sealed class CryptoCurrency {
 
             /** The value of the suffix, which could be either a raw ID or a contract address. */
             abstract val value: String
+            abstract val contractAddress: String?
 
             /** Represents a raw ID suffix. */
             @Serializable
-            data class RawID(val rawId: String, val contractAddress: String? = null) : Suffix() {
+            data class RawID(val rawId: String, override val contractAddress: String? = null) : Suffix() {
                 override val value: String
                     get() = buildString {
                         append(rawId)
@@ -186,7 +187,7 @@ sealed class CryptoCurrency {
 
             /** Represents a contract address suffix. */
             @Serializable
-            data class ContractAddress(val contractAddress: String) : Suffix() {
+            data class ContractAddress(override val contractAddress: String) : Suffix() {
                 override val value: String get() = contractAddress
             }
         }
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
index d5bb077099..ed13b42827 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/network/TxInfo.kt
@@ -107,6 +107,16 @@ data class TxInfo(
         @Serializable
         data class Operation(val name: String) : TransactionType
 
+        @Serializable
+        sealed interface YieldSupply : TransactionType {
+
+            @Serializable
+            data object Enter : YieldSupply
+
+            @Serializable
+            data object Exit : YieldSupply
+        }
+
         @Serializable
         sealed interface Staking : TransactionType {
 
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/quote/PriceChange.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/quote/PriceChange.kt
new file mode 100644
index 0000000000..35b2175cce
--- /dev/null
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/quote/PriceChange.kt
@@ -0,0 +1,19 @@
+package com.tangem.domain.models.quote
+
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.serialization.SerializedBigDecimal
+import kotlinx.serialization.Serializable
+
+/**
+ * Represents the price change of a cryptocurrency asset over a specific time period.
+ *
+ * @param value The amount of price change (like `0.00`)
+ * @param source The source of the price change information.
+ *
+[REDACTED_AUTHOR]
+ */
+@Serializable
+data class PriceChange(
+    val value: SerializedBigDecimal,
+    val source: StatusSource,
+)
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/staking/YieldBalanceItem.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/staking/YieldBalanceItem.kt
index f5aef4acfa..c8dbe3b3d9 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/staking/YieldBalanceItem.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/staking/YieldBalanceItem.kt
@@ -107,12 +107,14 @@ enum class BalanceType(val order: Int) {
 }
 
 @Serializable
-enum class RewardBlockType {
-    NoRewards,
-    Rewards,
-    RewardsRequirementsError,
-    RewardUnavailable,
-    ;
+sealed interface RewardBlockType {
+    data object NoRewards : RewardBlockType
+    data object Rewards : RewardBlockType
+    data object RewardsRequirementsError : RewardBlockType
+    sealed interface RewardUnavailable : RewardBlockType {
+        data object DefaultRewardUnavailable : RewardUnavailable
+        data object SolanaRewardUnavailable : RewardUnavailable
+    }
 
     /**
      * Indicated whether action can be performed on available reward
@@ -120,11 +122,11 @@ enum class RewardBlockType {
      */
     val isActionable: Boolean
         get() = when (this) {
-            NoRewards,
-            RewardUnavailable,
+            is NoRewards,
+            is RewardUnavailable,
             -> false
-            RewardsRequirementsError,
-            Rewards,
+            is RewardsRequirementsError,
+            is Rewards,
             -> true
         }
 }
\ No newline at end of file
diff --git a/domain/models/src/main/kotlin/com/tangem/domain/models/tokenlist/TokenList.kt b/domain/models/src/main/kotlin/com/tangem/domain/models/tokenlist/TokenList.kt
index bec343c4df..776c46147f 100644
--- a/domain/models/src/main/kotlin/com/tangem/domain/models/tokenlist/TokenList.kt
+++ b/domain/models/src/main/kotlin/com/tangem/domain/models/tokenlist/TokenList.kt
@@ -70,7 +70,6 @@ sealed interface TokenList {
 
         override val totalFiatBalance: TotalFiatBalance = TotalFiatBalance.Loaded(
             amount = SerializedBigDecimal.ZERO,
-            isAllAmountsSummarized = true,
             source = StatusSource.ACTUAL,
         )
 
diff --git a/domain/notifications/src/main/java/com/tangem/domain/notifications/repository/NotificationsRepository.kt b/domain/notifications/src/main/java/com/tangem/domain/notifications/repository/NotificationsRepository.kt
index 0f1d3cb606..00d20b0f04 100644
--- a/domain/notifications/src/main/java/com/tangem/domain/notifications/repository/NotificationsRepository.kt
+++ b/domain/notifications/src/main/java/com/tangem/domain/notifications/repository/NotificationsRepository.kt
@@ -1,5 +1,7 @@
 package com.tangem.domain.notifications.repository
 
+import kotlinx.coroutines.flow.Flow
+
 /**
  * Repository interface for managing local notification logic and state.
  *
@@ -20,6 +22,13 @@ interface NotificationsRepository {
      */
     suspend fun shouldShowNotification(key: String): Boolean
 
+    /**
+     * Subscribe on whether a notification with the given [key] should be shown to the user.
+     * @param key The unique identifier for the notification.
+     * @return true if the notification should be shown, false otherwise.
+     */
+    fun getShouldShowNotification(key: String): Flow<Boolean>
+
     /**
      * Sets whether a notification with the given [key] should be shown to the user.
      * @param key The unique identifier for the notification.
diff --git a/domain/notifications/src/test/java/com/tangem/domain/notifications/GetApplicationIdUseCaseTest.kt b/domain/notifications/src/test/java/com/tangem/domain/notifications/GetApplicationIdUseCaseTest.kt
index e3a191f205..83fae860be 100644
--- a/domain/notifications/src/test/java/com/tangem/domain/notifications/GetApplicationIdUseCaseTest.kt
+++ b/domain/notifications/src/test/java/com/tangem/domain/notifications/GetApplicationIdUseCaseTest.kt
@@ -114,39 +114,40 @@ class GetApplicationIdUseCaseTest {
         }
 
     @Test
-    fun `GIVEN no local application ID WHEN multiple concurrent invokes with delay THEN create only one application ID`() = runTest {
-        // GIVEN
-        val newApplicationId = ApplicationId("new-app-id")
-        var isIdCreated = false
+    fun `GIVEN no local application ID WHEN multiple concurrent invokes with delay THEN create only one application ID`() =
+        runTest {
+            // GIVEN
+            val newApplicationId = ApplicationId("new-app-id")
+            var isIdCreated = false
 
-        coEvery { pushNotificationsRepository.getApplicationId() } answers {
-            if (!isIdCreated) null else newApplicationId
-        }
-        coEvery { pushNotificationsRepository.createApplicationId() } answers {
-            isIdCreated = true
-            newApplicationId
-        }
-        coEvery { pushNotificationsRepository.saveApplicationId(newApplicationId) } returns Unit
+            coEvery { pushNotificationsRepository.getApplicationId() } answers {
+                if (!isIdCreated) null else newApplicationId
+            }
+            coEvery { pushNotificationsRepository.createApplicationId() } answers {
+                isIdCreated = true
+                newApplicationId
+            }
+            coEvery { pushNotificationsRepository.saveApplicationId(newApplicationId) } returns Unit
 
-        // WHEN
-        val results = coroutineScope {
-            List(PARALLEL_COUNT) {
-                async {
-                    delay(100)
-                    useCase()
-                }
-            }.awaitAll()
-        }
+            // WHEN
+            val results = coroutineScope {
+                List(PARALLEL_COUNT) {
+                    async {
+                        delay(100)
+                        useCase()
+                    }
+                }.awaitAll()
+            }
 
-        // THEN
-        results.forEach { result ->
-            assertThat(result).isInstanceOf(Either.Right::class.java)
-            assertThat((result as Either.Right).value).isEqualTo(newApplicationId)
+            // THEN
+            results.forEach { result ->
+                assertThat(result).isInstanceOf(Either.Right::class.java)
+                assertThat((result as Either.Right).value).isEqualTo(newApplicationId)
+            }
+            coVerify(exactly = PARALLEL_COUNT + 1) { pushNotificationsRepository.getApplicationId() }
+            coVerify(exactly = 1) { pushNotificationsRepository.createApplicationId() }
+            coVerify(exactly = 1) { pushNotificationsRepository.saveApplicationId(newApplicationId) }
         }
-        coVerify(exactly = PARALLEL_COUNT + 1) { pushNotificationsRepository.getApplicationId() }
-        coVerify(exactly = 1) { pushNotificationsRepository.createApplicationId() }
-        coVerify(exactly = 1) { pushNotificationsRepository.saveApplicationId(newApplicationId) }
-    }
 
     companion object {
         private const val PARALLEL_COUNT = 100
diff --git a/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampV2QuotesUseCase.kt b/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampV2QuotesUseCase.kt
new file mode 100644
index 0000000000..5039240734
--- /dev/null
+++ b/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampV2QuotesUseCase.kt
@@ -0,0 +1,73 @@
+package com.tangem.domain.onramp
+
+import arrow.core.Either
+import arrow.core.left
+import arrow.core.right
+import com.tangem.domain.onramp.model.OnrampQuote
+import com.tangem.domain.onramp.model.error.OnrampError
+import com.tangem.domain.onramp.repositories.OnrampErrorResolver
+import com.tangem.domain.onramp.repositories.OnrampRepository
+import com.tangem.domain.settings.repositories.SettingsRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.map
+import java.math.BigDecimal
+import java.util.Comparator
+
+class GetOnrampV2QuotesUseCase(
+    private val settingsRepository: SettingsRepository,
+    private val repository: OnrampRepository,
+    private val errorResolver: OnrampErrorResolver,
+) {
+
+    operator fun invoke(): Flow<Either<OnrampError, List<OnrampQuote>>> {
+        return repository.getQuotes()
+            .map<List<OnrampQuote>, Either<OnrampError, List<OnrampQuote>>> { quotes ->
+                val isGooglePayAvailable = settingsRepository.isGooglePayAvailability()
+                quotes.sortedWith(
+                    Comparator.comparing<OnrampQuote, SortableBigDecimalWrapper> { quote ->
+                        getQuoteSortPriority(quote)
+                    }
+                        .thenComparingInt { quote ->
+                            quote.paymentMethod.type.getPriority(isGooglePayAvailable)
+                        },
+                ).right()
+            }
+            .catch {
+                emit(errorResolver.resolve(it).left())
+            }
+    }
+
+    private class SortableBigDecimalWrapper(
+        val value: BigDecimal?,
+        val negateForSort: Boolean = false,
+    ) : Comparable<SortableBigDecimalWrapper> {
+        override fun compareTo(other: SortableBigDecimalWrapper): Int {
+            return when {
+                value == null && other.value == null -> 0
+                value == null -> 1
+                other.value == null -> -1
+                else -> {
+                    val thisValue = if (negateForSort) value.negate() else value
+                    val otherValue = if (other.negateForSort) other.value.negate() else other.value
+                    thisValue.compareTo(otherValue)
+                }
+            }
+        }
+    }
+
+    private fun getQuoteSortPriority(quote: OnrampQuote): SortableBigDecimalWrapper {
+        return when (quote) {
+            is OnrampQuote.Data -> SortableBigDecimalWrapper(quote.toAmount.value, negateForSort = true)
+            is OnrampQuote.Error -> SortableBigDecimalWrapper(null)
+            is OnrampQuote.AmountError -> {
+                when (val error = quote.error) {
+                    is OnrampError.AmountError.TooSmallError ->
+                        SortableBigDecimalWrapper((quote.fromAmount.value - error.requiredAmount).abs())
+                    is OnrampError.AmountError.TooBigError ->
+                        SortableBigDecimalWrapper((error.requiredAmount - quote.fromAmount.value).abs())
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt
index c400337e61..004608a9f3 100644
--- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt
+++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt
@@ -1,10 +1,9 @@
 package com.tangem.domain.staking.model
 
 import com.tangem.domain.staking.model.stakekit.Yield
-import java.math.BigDecimal
 
 data class StakingEntryInfo(
-    val apr: BigDecimal,
+    val rewardInfo: Yield.RewardInfo,
     val rewardSchedule: Yield.Metadata.RewardSchedule,
     val tokenSymbol: String,
 )
\ No newline at end of file
diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt
index 093fd13bef..fc79ef7a9d 100644
--- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt
+++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt
@@ -70,7 +70,7 @@ data class Yield(
         val name: String,
         val image: String? = null,
         val website: String? = null,
-        val apr: SerializedBigDecimal? = null,
+        val rewardInfo: RewardInfo? = null,
         val commission: Double? = null,
         val stakedBalance: String? = null,
         val votingPower: Double? = null,
@@ -144,6 +144,12 @@ data class Yield(
         APR, // simple rate
         UNKNOWN,
     }
+
+    @Serializable
+    data class RewardInfo(
+        val rate: SerializedBigDecimal,
+        val type: RewardType,
+    )
 }
 
 @Serializable
diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingIntegrationID.kt b/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingIntegrationID.kt
index 435abeeffc..f1514e69a5 100644
--- a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingIntegrationID.kt
+++ b/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingIntegrationID.kt
@@ -110,7 +110,7 @@ sealed interface StakingIntegrationID {
 
             val integrationId = blockchain.integrationId ?: return null
 
-            if (integrationId is Coin && currencyId.contractAddress != null) {
+            if (integrationId is Coin && !currencyId.contractAddress.isNullOrBlank()) {
                 return null
             }
 
diff --git a/domain/swap/models/src/main/java/com/tangem/domain/swap/models/SwapCurrencies.kt b/domain/swap/models/src/main/java/com/tangem/domain/swap/models/SwapCurrencies.kt
index 81eb91fe42..b22f150071 100644
--- a/domain/swap/models/src/main/java/com/tangem/domain/swap/models/SwapCurrencies.kt
+++ b/domain/swap/models/src/main/java/com/tangem/domain/swap/models/SwapCurrencies.kt
@@ -36,12 +36,12 @@ fun SwapCurrencies.getGroupWithDirection(swapDirection: SwapDirection): SwapCurr
  *
  * @param available list of available currencies to swap
  * @param available list of unavailable currencies to swap
- * @param afterSearch flag indicates whether user searched token
+ * @param isAfterSearch flag indicates whether user searched token
  */
 data class SwapCurrenciesGroup(
     val available: List<SwapCryptoCurrency>,
     val unavailable: List<SwapCryptoCurrency>,
-    val afterSearch: Boolean,
+    val isAfterSearch: Boolean,
 )
 
 /**
diff --git a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapPairsUseCase.kt b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapPairsUseCase.kt
index 1284c416c3..fce04175b5 100644
--- a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapPairsUseCase.kt
+++ b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapPairsUseCase.kt
@@ -81,7 +81,7 @@ class GetSwapPairsUseCase(
         return SwapCurrenciesGroup(
             available = availableCryptoCurrencies,
             unavailable = unavailableCryptoCurrencies.map { pair -> SwapCryptoCurrency(pair, emptyList()) },
-            afterSearch = false,
+            isAfterSearch = false,
         )
     }
 }
\ No newline at end of file
diff --git a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapSupportedPairsUseCase.kt b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapSupportedPairsUseCase.kt
index 6ef54ca2bd..775eb8f797 100644
--- a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapSupportedPairsUseCase.kt
+++ b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/GetSwapSupportedPairsUseCase.kt
@@ -87,7 +87,7 @@ class GetSwapSupportedPairsUseCase(
                     emptyList(),
                 )
             },
-            afterSearch = false,
+            isAfterSearch = false,
         )
     }
 }
\ No newline at end of file
diff --git a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/SelectInitialPairUseCase.kt b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/SelectInitialPairUseCase.kt
index dcfd5cffb4..4efb56dffe 100644
--- a/domain/swap/src/main/java/com/tangem/domain/swap/usecase/SelectInitialPairUseCase.kt
+++ b/domain/swap/src/main/java/com/tangem/domain/swap/usecase/SelectInitialPairUseCase.kt
@@ -43,8 +43,8 @@ class SelectInitialPairUseCase(
         swapCurrenciesGroup: SwapCurrenciesGroup,
     ): CryptoCurrencyStatus? {
         return secondaryCryptoCurrency?.let {
-            swapCurrenciesGroup.available.firstOrNull {
-                secondaryCryptoCurrency.id == it.currencyStatus.currency.id
+            swapCurrenciesGroup.available.firstOrNull { currency ->
+                secondaryCryptoCurrency.id == currency.currencyStatus.currency.id
             }?.currencyStatus
         }
     }
diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/details/TokenAction.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/details/TokenAction.kt
new file mode 100644
index 0000000000..2eb98d3e78
--- /dev/null
+++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/details/TokenAction.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.tokens.model.details
+
+enum class TokenAction {
+    Receive,
+    Send,
+    Swap,
+    Info,
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetWalletTotalBalanceUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetWalletTotalBalanceUseCase.kt
index 0fc94390be..18401f9621 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetWalletTotalBalanceUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/GetWalletTotalBalanceUseCase.kt
@@ -13,7 +13,7 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.tokens.operations.BaseCurrencyStatusOperations
-import com.tangem.domain.tokens.operations.TokenListFiatBalanceOperations
+import com.tangem.domain.tokens.operations.TotalFiatBalanceCalculator
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import timber.log.Timber
@@ -112,11 +112,8 @@ class GetWalletTotalBalanceUseCase(
             }
         }
 
-        val operations = TokenListFiatBalanceOperations(
-            currencies = ensureNotNull(statuses.toNonEmptyListOrNull()) { lceLoading() },
-            isAnyTokenLoading = false,
+        TotalFiatBalanceCalculator.calculate(
+            statuses = ensureNotNull(statuses.toNonEmptyListOrNull()) { lceLoading() },
         )
-
-        operations.calculateFiatBalance()
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCase.kt
new file mode 100644
index 0000000000..417e84e987
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCase.kt
@@ -0,0 +1,19 @@
+package com.tangem.domain.tokens
+
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+
+class NeedShowYieldSupplyDepositedWarningUseCase(
+    private val yieldSupplyWarningsViewedRepository: YieldSupplyWarningsViewedRepository,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
+
+    suspend operator fun invoke(cryptoCurrencyStatus: CryptoCurrencyStatus?): Boolean = withContext(dispatchers.io) {
+        val hasActiveLending = cryptoCurrencyStatus?.value?.yieldSupplyStatus?.isActive == true
+        if (!hasActiveLending) return@withContext false
+        val showedWarnings = yieldSupplyWarningsViewedRepository.getViewedWarnings()
+        return@withContext !showedWarnings.contains(cryptoCurrencyStatus?.currency?.name)
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/SaveViewedYieldSupplyWarningUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/SaveViewedYieldSupplyWarningUseCase.kt
new file mode 100644
index 0000000000..8175e13b51
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/SaveViewedYieldSupplyWarningUseCase.kt
@@ -0,0 +1,11 @@
+package com.tangem.domain.tokens
+
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
+
+class SaveViewedYieldSupplyWarningUseCase(
+    private val yieldSupplyWarningsViewedRepository: YieldSupplyWarningsViewedRepository,
+) {
+    suspend operator fun invoke(symbol: String) {
+        yieldSupplyWarningsViewedRepository.view(symbol)
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
index b0b9ac0e7c..11bdea2a34 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingUseCase.kt
@@ -4,12 +4,10 @@ import arrow.core.Either
 import arrow.core.raise.Raise
 import arrow.core.raise.either
 import arrow.core.raise.ensure
-import arrow.core.raise.withError
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.tokens.error.TokenListSortingError
-import com.tangem.domain.tokens.error.mapper.mapToTokenListSortingError
-import com.tangem.domain.tokens.operations.TokenListSortingOperations
+import com.tangem.domain.tokens.operations.TokenListFactory
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
 
@@ -30,36 +28,24 @@ class ToggleTokenListGroupingUseCase(
     }
 
     private fun Raise<TokenListSortingError>.groupTokens(tokenList: TokenList.Ungrouped): TokenList.GroupedByNetwork {
-        ensure(tokenList.totalFiatBalance !is TotalFiatBalance.Loading) {
-            TokenListSortingError.TokenListIsLoading
-        }
+        validate(tokenList)
 
-        val sortingOperations = TokenListSortingOperations(tokenList)
-
-        return TokenList.GroupedByNetwork(
-            groups = withError(TokenListSortingOperations.Error::mapToTokenListSortingError) {
-                sortingOperations.getGroupedTokens().bind()
-            },
-            totalFiatBalance = tokenList.totalFiatBalance,
-            sortedBy = sortingOperations.getSortType(),
-        )
+        return TokenListFactory.createGroupedByNetwork(tokenList)
     }
 
-    private fun Raise<TokenListSortingError>.ungroupTokens(
-        tokenList: TokenList.GroupedByNetwork,
-    ): TokenList.Ungrouped {
+    private fun Raise<TokenListSortingError>.ungroupTokens(tokenList: TokenList.GroupedByNetwork): TokenList.Ungrouped {
+        validate(tokenList)
+
+        return TokenListFactory.createUngrouped(tokenList)
+    }
+
+    private fun Raise<TokenListSortingError>.validate(tokenList: TokenList) {
         ensure(tokenList.totalFiatBalance !is TotalFiatBalance.Loading) {
             TokenListSortingError.TokenListIsLoading
         }
 
-        val sortingOperations = TokenListSortingOperations(tokenList)
-
-        return TokenList.Ungrouped(
-            currencies = withError(TokenListSortingOperations.Error::mapToTokenListSortingError) {
-                sortingOperations.getTokens().bind()
-            },
-            totalFiatBalance = tokenList.totalFiatBalance,
-            sortedBy = sortingOperations.getSortType(),
-        )
+        ensure(tokenList.flattenCurrencies().isNotEmpty()) {
+            TokenListSortingError.TokenListIsEmpty
+        }
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
index 9283f50615..2bc37f5bb1 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCase.kt
@@ -1,16 +1,14 @@
 package com.tangem.domain.tokens
 
 import arrow.core.Either
-import arrow.core.raise.Raise
 import arrow.core.raise.either
 import arrow.core.raise.ensure
-import arrow.core.raise.withError
+import com.tangem.domain.models.TokensGroupType
 import com.tangem.domain.models.TokensSortType
 import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.tokens.error.TokenListSortingError
-import com.tangem.domain.tokens.error.mapper.mapToTokenListSortingError
-import com.tangem.domain.tokens.operations.TokenListSortingOperations
+import com.tangem.domain.tokens.operations.TokenListFactory
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
 
@@ -21,53 +19,20 @@ class ToggleTokenListSortingUseCase(
     suspend operator fun invoke(tokenList: TokenList): Either<TokenListSortingError, TokenList> {
         return withContext(dispatchers.default) {
             either {
-                when (tokenList) {
-                    is TokenList.GroupedByNetwork -> sortGroupedTokenList(tokenList)
-                    is TokenList.Ungrouped -> sortUngroupedTokenList(tokenList)
-                    is TokenList.Empty -> raise(TokenListSortingError.TokenListIsEmpty)
+                ensure(tokenList.totalFiatBalance !is TotalFiatBalance.Loading) {
+                    TokenListSortingError.TokenListIsLoading
                 }
+
+                TokenListFactory.create(
+                    statuses = tokenList.flattenCurrencies(),
+                    groupType = when (tokenList) {
+                        is TokenList.GroupedByNetwork -> TokensGroupType.NETWORK
+                        is TokenList.Ungrouped -> TokensGroupType.NONE
+                        is TokenList.Empty -> raise(TokenListSortingError.TokenListIsEmpty)
+                    },
+                    sortType = TokensSortType.BALANCE,
+                )
             }
         }
     }
-
-    private fun Raise<TokenListSortingError>.sortGroupedTokenList(
-        tokenList: TokenList.GroupedByNetwork,
-    ): TokenList.GroupedByNetwork {
-        ensure(tokenList.totalFiatBalance !is TotalFiatBalance.Loading) {
-            TokenListSortingError.TokenListIsLoading
-        }
-
-        val operations = getSortingOperations(tokenList)
-
-        return tokenList.copy(
-            groups = withError(TokenListSortingOperations.Error::mapToTokenListSortingError) {
-                operations.getGroupedTokens().bind()
-            },
-            sortedBy = operations.getSortType(),
-        )
-    }
-
-    private fun Raise<TokenListSortingError>.sortUngroupedTokenList(
-        tokenList: TokenList.Ungrouped,
-    ): TokenList.Ungrouped {
-        ensure(tokenList.totalFiatBalance !is TotalFiatBalance.Loading) {
-            TokenListSortingError.TokenListIsLoading
-        }
-
-        val operations = getSortingOperations(tokenList)
-
-        return tokenList.copy(
-            currencies = withError(TokenListSortingOperations.Error::mapToTokenListSortingError) {
-                operations.getTokens().bind()
-            },
-            sortedBy = operations.getSortType(),
-        )
-    }
-
-    private fun getSortingOperations(tokenList: TokenList): TokenListSortingOperations {
-        return TokenListSortingOperations(
-            tokenList = tokenList,
-            sortByBalance = tokenList.sortedBy != TokensSortType.BALANCE,
-        )
-    }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/mapper/TokenListSortingErrorMappers.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/mapper/TokenListSortingErrorMappers.kt
deleted file mode 100644
index eefa5d1417..0000000000
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/error/mapper/TokenListSortingErrorMappers.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tangem.domain.tokens.error.mapper
-
-import com.tangem.domain.tokens.error.TokenListSortingError
-import com.tangem.domain.tokens.operations.TokenListSortingOperations
-
-internal fun TokenListSortingOperations.Error.mapToTokenListSortingError(): TokenListSortingError {
-    return when (this) {
-        is TokenListSortingOperations.Error.EmptyTokens -> TokenListSortingError.TokenListIsEmpty
-        is TokenListSortingOperations.Error.NetworkNotFound,
-        -> TokenListSortingError.UnableToSortTokenList
-    }
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/BaseCurrencyStatusOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/BaseCurrencyStatusOperations.kt
index 55d53e54c8..76c726d9de 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/BaseCurrencyStatusOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/BaseCurrencyStatusOperations.kt
@@ -54,7 +54,7 @@ abstract class BaseCurrencyStatusOperations(
     private val stakingIdFactory: StakingIdFactory,
 ) {
 
-    protected val currencyStatusProxyCreator = CurrencyStatusProxyCreator()
+    private val currencyStatusProxyCreator = CurrencyStatusProxyCreator()
 
     abstract fun getCurrenciesStatuses(userWalletId: UserWalletId): LceFlow<TokenListError, List<CryptoCurrencyStatus>>
 
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CachedCurrenciesStatusesOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CachedCurrenciesStatusesOperations.kt
index d261a865d9..fb20d04a34 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CachedCurrenciesStatusesOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CachedCurrenciesStatusesOperations.kt
@@ -171,29 +171,22 @@ class CachedCurrenciesStatusesOperations(
     ): Lce<TokenListError, List<CryptoCurrencyStatus>> = lce {
         isLoading.set(isUpdating)
 
-        var quotesRetrievingFailed = false
-
         val networksStatuses = maybeNetworkStatuses?.bindEither()?.toNonEmptySetOrNull()
         val yieldBalances = maybeYieldBalances?.bindEither()
         val quotes = recover({ maybeQuotes?.bind()?.toNonEmptySetOrNull() }) {
             null
         }
 
-        if (quotes == null) {
-            quotesRetrievingFailed = true
-        }
-
         currencies.map { currency ->
             val quote = quotes?.firstOrNull { it.rawCurrencyId == currency.id.rawCurrencyId }
             val networkStatus = networksStatuses?.firstOrNull { it.network == currency.network }
             val yieldBalance = findYieldBalanceOrNull(yieldBalances, currency, networkStatus)
 
-            val currencyStatus = currencyStatusProxyCreator.createCurrencyStatus(
+            val currencyStatus = CryptoCurrencyStatusFactory.create(
                 currency = currency,
-                quoteStatus = quote,
-                networkStatus = networkStatus,
-                yieldBalance = yieldBalance,
-                ignoreQuote = quotesRetrievingFailed,
+                maybeNetworkStatus = networkStatus.toOption(),
+                maybeQuoteStatus = quote.toOption(),
+                maybeYieldBalance = yieldBalance.toOption(),
             )
 
             currencyStatus
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactory.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactory.kt
new file mode 100644
index 0000000000..3ba3d65d4e
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactory.kt
@@ -0,0 +1,266 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.Option
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.network.NetworkStatus
+import com.tangem.domain.models.network.TxInfo
+import com.tangem.domain.models.quote.QuoteStatus
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.yield.supply.YieldSupplyStatus
+import java.math.BigDecimal
+
+/**
+ * Factory to create [CryptoCurrencyStatus] from [NetworkStatus], [QuoteStatus] and [YieldBalance].
+ *
+[REDACTED_AUTHOR]
+ */
+object CryptoCurrencyStatusFactory {
+
+    private val QuoteStatus?.fiatRate: BigDecimal?
+        get() = (this?.value as? QuoteStatus.Data)?.fiatRate
+
+    private val QuoteStatus?.priceChange: BigDecimal?
+        get() = (this?.value as? QuoteStatus.Data)?.priceChange
+
+    /**
+     * Creates [CryptoCurrencyStatus] from [NetworkStatus], [QuoteStatus] and [YieldBalance].
+     *
+
+     * @param maybeNetworkStatus An optional network status containing blockchain information.
+     * @param maybeQuoteStatus An optional quote status containing price information.
+     * @param maybeYieldBalance An optional yield balance containing staking information.
+     */
+    fun create(
+        currency: CryptoCurrency,
+        maybeNetworkStatus: Option<NetworkStatus>,
+        maybeQuoteStatus: Option<QuoteStatus>,
+        maybeYieldBalance: Option<YieldBalance>,
+    ): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = createStatus(
+                currency = currency,
+                maybeNetworkStatus = maybeNetworkStatus,
+                maybeYieldBalance = maybeYieldBalance,
+                maybeQuoteStatus = maybeQuoteStatus,
+            ),
+        )
+    }
+
+    private fun createStatus(
+        currency: CryptoCurrency,
+        maybeNetworkStatus: Option<NetworkStatus>,
+        maybeQuoteStatus: Option<QuoteStatus>,
+        maybeYieldBalance: Option<YieldBalance>,
+    ): CryptoCurrencyStatus.Value {
+        val quoteStatus = maybeQuoteStatus.getOrNull()
+
+        return when (val status = maybeNetworkStatus.getOrNull()?.value) {
+            is NetworkStatus.MissedDerivation -> createMissedDerivation(quoteStatus)
+            is NetworkStatus.Unreachable -> createUnreachable(status, quoteStatus)
+            is NetworkStatus.NoAccount -> createNoAccount(status, quoteStatus)
+            is NetworkStatus.Verified -> createStatus(currency, status, quoteStatus, maybeYieldBalance)
+            null -> CryptoCurrencyStatus.Loading
+        }
+    }
+
+    private fun createMissedDerivation(quoteStatus: QuoteStatus?): CryptoCurrencyStatus.MissedDerivation {
+        return CryptoCurrencyStatus.MissedDerivation(
+            priceChange = quoteStatus.priceChange,
+            fiatRate = quoteStatus.fiatRate,
+        )
+    }
+
+    private fun createUnreachable(
+        status: NetworkStatus.Unreachable,
+        quoteStatus: QuoteStatus?,
+    ): CryptoCurrencyStatus.Unreachable {
+        return CryptoCurrencyStatus.Unreachable(
+            priceChange = quoteStatus.priceChange,
+            fiatRate = quoteStatus.fiatRate,
+            networkAddress = status.address,
+        )
+    }
+
+    private fun createNoAccount(
+        status: NetworkStatus.NoAccount,
+        quoteStatus: QuoteStatus?,
+    ): CryptoCurrencyStatus.NoAccount {
+        return CryptoCurrencyStatus.NoAccount(
+            amountToCreateAccount = status.amountToCreateAccount,
+            fiatAmount = BigDecimal.ZERO,
+            priceChange = quoteStatus.priceChange,
+            fiatRate = quoteStatus.fiatRate,
+            networkAddress = status.address,
+            sources = CryptoCurrencyStatus.Sources(
+                networkSource = status.source,
+                quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
+            ),
+        )
+    }
+
+    private fun createStatus(
+        currency: CryptoCurrency,
+        status: NetworkStatus.Verified,
+        quoteStatus: QuoteStatus?,
+        maybeYieldBalance: Option<YieldBalance>,
+    ): CryptoCurrencyStatus.Value {
+        val amount = when (val amount = status.amounts[currency.id]) {
+            is NetworkStatus.Amount.Loaded -> amount.value
+            is NetworkStatus.Amount.NotFound -> {
+                return createNoAmount(quoteStatus = quoteStatus)
+            }
+            null -> {
+                return CryptoCurrencyStatus.Loading
+            }
+        }
+
+        val yieldBalance = maybeYieldBalance.getOrNull(id = currency.id, address = status.address)
+
+        if (currency is CryptoCurrency.Token && currency.isCustom) {
+            return createCustom(
+                id = currency.id,
+                status = status,
+                amount = amount,
+                quoteStatus = quoteStatus,
+                yieldBalance = yieldBalance,
+            )
+        }
+
+        // order is important for correct total balance calculation
+        return when (val quoteValue = quoteStatus?.value) {
+            is QuoteStatus.Empty -> {
+                createNoQuote(
+                    id = currency.id,
+                    status = status,
+                    amount = amount,
+                    quoteStatus = quoteStatus,
+                    yieldBalance = yieldBalance,
+                )
+            }
+            is QuoteStatus.Data -> {
+                createLoaded(
+                    id = currency.id,
+                    status = status,
+                    amount = amount,
+                    quoteStatus = quoteValue,
+                    yieldBalance = yieldBalance,
+                )
+            }
+            null -> CryptoCurrencyStatus.Loading
+        }
+    }
+
+    private fun createNoAmount(quoteStatus: QuoteStatus?): CryptoCurrencyStatus.NoAmount {
+        return CryptoCurrencyStatus.NoAmount(
+            priceChange = quoteStatus.priceChange,
+            fiatRate = quoteStatus.fiatRate,
+        )
+    }
+
+    private fun createCustom(
+        id: CryptoCurrency.ID,
+        status: NetworkStatus.Verified,
+        amount: BigDecimal,
+        quoteStatus: QuoteStatus?,
+        yieldBalance: YieldBalance.Data?,
+    ): CryptoCurrencyStatus.Custom {
+        return CryptoCurrencyStatus.Custom(
+            amount = amount,
+            fiatAmount = quoteStatus.fiatRate?.let { calculateFiatAmount(amount, it) },
+            fiatRate = quoteStatus.fiatRate,
+            priceChange = quoteStatus.priceChange,
+            hasCurrentNetworkTransactions = status.hasCurrentNetworkTransactions(),
+            pendingTransactions = status.getCurrentTransactions(id),
+            networkAddress = status.address,
+            yieldBalance = yieldBalance,
+            yieldSupplyStatus = status.getYieldSupplyStatus(id),
+            sources = CryptoCurrencyStatus.Sources(
+                networkSource = status.source,
+                yieldBalanceSource = yieldBalance?.source ?: StatusSource.ACTUAL,
+                quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
+            ),
+        )
+    }
+
+    private fun createNoQuote(
+        id: CryptoCurrency.ID,
+        status: NetworkStatus.Verified,
+        amount: BigDecimal,
+        quoteStatus: QuoteStatus?,
+        yieldBalance: YieldBalance.Data?,
+    ): CryptoCurrencyStatus.NoQuote {
+        return CryptoCurrencyStatus.NoQuote(
+            amount = amount,
+            hasCurrentNetworkTransactions = status.hasCurrentNetworkTransactions(),
+            pendingTransactions = status.getCurrentTransactions(id),
+            networkAddress = status.address,
+            yieldBalance = yieldBalance,
+            yieldSupplyStatus = status.getYieldSupplyStatus(id),
+            sources = CryptoCurrencyStatus.Sources(
+                networkSource = status.source,
+                yieldBalanceSource = yieldBalance?.source ?: StatusSource.ACTUAL,
+                quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
+            ),
+        )
+    }
+
+    private fun createLoaded(
+        id: CryptoCurrency.ID,
+        status: NetworkStatus.Verified,
+        amount: BigDecimal,
+        quoteStatus: QuoteStatus.Data,
+        yieldBalance: YieldBalance.Data?,
+    ): CryptoCurrencyStatus.Loaded {
+        return CryptoCurrencyStatus.Loaded(
+            amount = amount,
+            fiatAmount = calculateFiatAmount(amount, quoteStatus.fiatRate),
+            fiatRate = quoteStatus.fiatRate,
+            priceChange = quoteStatus.priceChange,
+            hasCurrentNetworkTransactions = status.hasCurrentNetworkTransactions(),
+            pendingTransactions = status.getCurrentTransactions(id),
+            networkAddress = status.address,
+            yieldBalance = yieldBalance,
+            yieldSupplyStatus = status.getYieldSupplyStatus(id),
+            sources = CryptoCurrencyStatus.Sources(
+                networkSource = status.source,
+                yieldBalanceSource = yieldBalance?.source ?: StatusSource.ACTUAL,
+                quoteSource = quoteStatus.source,
+            ),
+        )
+    }
+
+    private fun NetworkStatus.Verified.hasCurrentNetworkTransactions() = pendingTransactions.isNotEmpty()
+
+    private fun NetworkStatus.Verified.getCurrentTransactions(id: CryptoCurrency.ID): Set<TxInfo> {
+        return pendingTransactions.getOrElse(key = id, defaultValue = ::emptySet)
+    }
+
+    private fun NetworkStatus.Verified.getYieldSupplyStatus(id: CryptoCurrency.ID): YieldSupplyStatus? {
+        return yieldSupplyStatuses[id]
+    }
+
+    private fun Option<YieldBalance>.getOrNull(id: CryptoCurrency.ID, address: NetworkAddress): YieldBalance.Data? {
+        val yieldBalance = this.getOrNull() as? YieldBalance.Data ?: return null
+
+        val isCurrentAddressStaking = yieldBalance.stakingId.address == address.defaultAddress.value
+        val filteredTokenBalances = yieldBalance.balance.items.filter {
+            it.token.coinGeckoId == id.rawCurrencyId?.value
+        }
+
+        return if (isCurrentAddressStaking && filteredTokenBalances.isNotEmpty()) {
+            yieldBalance.copy(
+                balance = yieldBalance.balance.copy(items = filteredTokenBalances),
+            )
+        } else {
+            null
+        }
+    }
+
+    private fun calculateFiatAmount(amount: BigDecimal, fiatRate: BigDecimal): BigDecimal {
+        return amount * fiatRate
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
deleted file mode 100644
index 5a6576e4b3..0000000000
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.tangem.domain.tokens.operations
-
-import com.tangem.domain.models.StatusSource
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.network.NetworkStatus
-import com.tangem.domain.models.quote.QuoteStatus
-import com.tangem.domain.models.staking.YieldBalance
-import java.math.BigDecimal
-
-internal class CurrencyStatusOperations(
-    private val currency: CryptoCurrency,
-    private val quoteStatus: QuoteStatus?,
-    private val networkStatus: NetworkStatus?,
-    private val yieldBalance: YieldBalance?,
-    private val ignoreQuote: Boolean,
-) {
-
-    private val QuoteStatus?.fiatRate: BigDecimal?
-        get() = (this?.value as? QuoteStatus.Data)?.fiatRate
-
-    private val QuoteStatus?.priceChange: BigDecimal?
-        get() = (this?.value as? QuoteStatus.Data)?.priceChange
-
-    fun createTokenStatus(): CryptoCurrencyStatus = CryptoCurrencyStatus(currency, createStatus())
-
-    private fun createStatus(): CryptoCurrencyStatus.Value {
-        return when (val status = networkStatus?.value) {
-            null -> CryptoCurrencyStatus.Loading
-            is NetworkStatus.MissedDerivation -> createMissedDerivationStatus()
-            is NetworkStatus.Unreachable -> createUnreachableStatus(status)
-            is NetworkStatus.NoAccount -> createNoAccountStatus(status)
-            is NetworkStatus.Verified -> createStatus(status, yieldBalance)
-        }
-    }
-
-    private fun createMissedDerivationStatus(): CryptoCurrencyStatus.MissedDerivation =
-        CryptoCurrencyStatus.MissedDerivation(priceChange = quoteStatus?.priceChange, fiatRate = quoteStatus?.fiatRate)
-
-    private fun createUnreachableStatus(status: NetworkStatus.Unreachable): CryptoCurrencyStatus.Unreachable {
-        return CryptoCurrencyStatus.Unreachable(
-            priceChange = quoteStatus?.priceChange,
-            fiatRate = quoteStatus?.fiatRate,
-            networkAddress = status.address,
-        )
-    }
-
-    private fun createNoAccountStatus(status: NetworkStatus.NoAccount): CryptoCurrencyStatus.NoAccount {
-        return CryptoCurrencyStatus.NoAccount(
-            amountToCreateAccount = status.amountToCreateAccount,
-            fiatAmount = if (quoteStatus == null) null else BigDecimal.ZERO,
-            priceChange = quoteStatus?.priceChange,
-            fiatRate = quoteStatus?.fiatRate,
-            networkAddress = status.address,
-            sources = CryptoCurrencyStatus.Sources(
-                networkSource = status.source,
-                quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
-            ),
-        )
-    }
-
-    @Suppress("CyclomaticComplexMethod", "LongMethod")
-    private fun createStatus(
-        networkStatusValue: NetworkStatus.Verified,
-        yieldBalance: YieldBalance?,
-    ): CryptoCurrencyStatus.Value {
-        val amount = when (val amount = networkStatusValue.amounts[currency.id]) {
-            null -> {
-                return CryptoCurrencyStatus.Loading
-            }
-            is NetworkStatus.Amount.NotFound -> {
-                return CryptoCurrencyStatus.NoAmount(
-                    priceChange = quoteStatus?.priceChange,
-                    fiatRate = quoteStatus?.fiatRate,
-                )
-            }
-            is NetworkStatus.Amount.Loaded -> amount.value
-        }
-
-        val hasCurrentNetworkTransactions = networkStatusValue.pendingTransactions.isNotEmpty()
-        val currentTransactions = networkStatusValue.pendingTransactions.getOrElse(currency.id, ::emptySet)
-        val yieldBalanceData = yieldBalance as? YieldBalance.Data
-        val isCurrentAddressStaking =
-            yieldBalanceData?.stakingId?.address == networkStatusValue.address.defaultAddress.value
-        val filteredTokenBalances = yieldBalanceData?.balance?.items?.filter {
-            it.token.coinGeckoId == currency.id.rawCurrencyId?.value
-        }
-        val currentYieldBalance = if (isCurrentAddressStaking && filteredTokenBalances?.isNotEmpty() == true) {
-            yieldBalanceData.copy(
-                balance = yieldBalanceData.balance.copy(
-                    items = filteredTokenBalances,
-                ),
-            )
-        } else {
-            null
-        }
-        val yieldSupplyStatus = networkStatusValue.yieldSupplyStatuses[currency.id]
-
-        val quoteValue = quoteStatus?.value
-
-        // order is important for correct total balance calculation
-        return when {
-            currency is CryptoCurrency.Token && currency.isCustom -> CryptoCurrencyStatus.Custom(
-                amount = amount,
-                fiatAmount = calculateFiatAmountOrNull(amount, quoteStatus?.fiatRate),
-                fiatRate = quoteStatus?.fiatRate,
-                priceChange = quoteStatus?.priceChange,
-                hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
-                pendingTransactions = currentTransactions,
-                networkAddress = networkStatusValue.address,
-                yieldBalance = currentYieldBalance,
-                yieldSupplyStatus = yieldSupplyStatus,
-                sources = CryptoCurrencyStatus.Sources(
-                    networkSource = networkStatusValue.source,
-                    quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
-                    yieldBalanceSource = currentYieldBalance?.source ?: StatusSource.ACTUAL,
-                ),
-            )
-            quoteValue is QuoteStatus.Empty || ignoreQuote -> CryptoCurrencyStatus.NoQuote(
-                amount = amount,
-                hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
-                pendingTransactions = currentTransactions,
-                networkAddress = networkStatusValue.address,
-                yieldBalance = currentYieldBalance,
-                yieldSupplyStatus = yieldSupplyStatus,
-                sources = CryptoCurrencyStatus.Sources(
-                    networkSource = networkStatusValue.source,
-                    quoteSource = quoteStatus?.value?.source ?: StatusSource.ACTUAL,
-                    yieldBalanceSource = currentYieldBalance?.source ?: StatusSource.ACTUAL,
-                ),
-            )
-            quoteValue is QuoteStatus.Data -> CryptoCurrencyStatus.Loaded(
-                amount = amount,
-                fiatAmount = calculateFiatAmount(amount, quoteValue.fiatRate),
-                fiatRate = quoteValue.fiatRate,
-                priceChange = quoteValue.priceChange,
-                hasCurrentNetworkTransactions = hasCurrentNetworkTransactions,
-                pendingTransactions = currentTransactions,
-                networkAddress = networkStatusValue.address,
-                yieldBalance = currentYieldBalance,
-                yieldSupplyStatus = yieldSupplyStatus,
-                sources = CryptoCurrencyStatus.Sources(
-                    networkSource = networkStatusValue.source,
-                    quoteSource = quoteValue.source,
-                    yieldBalanceSource = currentYieldBalance?.source ?: StatusSource.ACTUAL,
-                ),
-            )
-            else -> CryptoCurrencyStatus.Loading
-        }
-    }
-
-    private fun calculateFiatAmountOrNull(amount: BigDecimal, fiatRate: BigDecimal?): BigDecimal? {
-        if (fiatRate == null) return null
-
-        return calculateFiatAmount(amount, fiatRate)
-    }
-
-    private fun calculateFiatAmount(amount: BigDecimal, fiatRate: BigDecimal): BigDecimal {
-        return amount * fiatRate
-    }
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculator.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculator.kt
new file mode 100644
index 0000000000..19c51a1f07
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculator.kt
@@ -0,0 +1,68 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.core.lce.Lce
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceLoading
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.quote.PriceChange
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.utils.extensions.isZero
+import com.tangem.utils.extensions.orZero
+import java.math.BigDecimal
+
+/**
+ * Utility object for calculating the [PriceChange] of a cryptocurrency portfolio.
+ *
+ * This object provides methods to calculate the weighted average price change of a list of cryptocurrency statuses
+ * based on their fiat balance weights.
+ */
+object PriceChangeCalculator {
+
+    /**
+     * Calculates the weighted average price change of a list of cryptocurrency statuses.
+     *
+     * @param statuses A list of `CryptoCurrencyStatus` objects representing the statuses of cryptocurrencies.
+     * @return An `Lce` object containing the calculated `PriceChange` or an error/loading state.
+     *         - Returns `Lce.Content` with the calculated `PriceChange` if successful.
+     *         - Returns `Lce.Loading` if the total fiat balance is still loading.
+     *         - Returns `Lce.Error` if the total fiat balance calculation fails.
+     */
+    fun calculate(statuses: List<CryptoCurrencyStatus>): Lce<Unit, PriceChange> {
+        val walletTotalFiatBalance = statuses.toNonEmptyListOrNull()
+            ?.let(TotalFiatBalanceCalculator::calculate)
+            ?: TokenList.Empty.totalFiatBalance
+
+        val balance = when (walletTotalFiatBalance) {
+            is TotalFiatBalance.Loaded -> walletTotalFiatBalance.amount
+            TotalFiatBalance.Loading -> {
+                return lceLoading()
+            }
+            TotalFiatBalance.Failed -> {
+                return Lce.Error(error = Unit)
+            }
+        }
+
+        if (balance.isZero()) {
+            return createZeroPriceChange(source = walletTotalFiatBalance.source).lceContent()
+        }
+
+        val total = statuses.sumOf {
+            val weight = it.value.fiatAmount.orZero().divide(balance)
+            val priceChange = it.value.priceChange.orZero()
+
+            weight * priceChange
+        }
+
+        return PriceChange(value = total, source = walletTotalFiatBalance.source).lceContent()
+    }
+
+    private fun createZeroPriceChange(source: StatusSource): PriceChange {
+        return PriceChange(
+            value = BigDecimal.ZERO.movePointLeft(2),
+            source = source,
+        )
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFactory.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFactory.kt
new file mode 100644
index 0000000000..7a84e34972
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFactory.kt
@@ -0,0 +1,132 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.NonEmptyList
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.models.TokensGroupType
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.domain.models.tokenlist.TokenList.GroupedByNetwork.NetworkGroup
+import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
+import com.tangem.utils.extensions.orZero
+import java.math.BigDecimal
+
+/**
+ * This factory creates a [TokenList] based on the provided list of [CryptoCurrencyStatus], [TokensGroupType],
+ * and [TokensSortType].
+ *
+[REDACTED_AUTHOR]
+ */
+object TokenListFactory {
+
+    /**
+     * Creates a [TokenList] based on the provided parameters.
+     *
+     * @param statuses A list of [CryptoCurrencyStatus] representing the cryptocurrencies to be included in the token list.
+     * @param groupType The type of grouping to be applied to the token list, either by network or none.
+     * @param sortType The type of sorting to be applied to the token list, either by balance or none.
+     */
+    fun create(statuses: List<CryptoCurrencyStatus>, groupType: TokensGroupType, sortType: TokensSortType): TokenList {
+        val nonEmptyStatuses = statuses.toNonEmptyListOrNull() ?: return TokenList.Empty
+        val totalFiatBalance = TotalFiatBalanceCalculator.calculate(statuses = nonEmptyStatuses)
+
+        return when (groupType) {
+            TokensGroupType.NONE -> createUngrouped(totalFiatBalance, nonEmptyStatuses, sortType)
+            TokensGroupType.NETWORK -> createGroupedByNetwork(totalFiatBalance, nonEmptyStatuses, sortType)
+        }
+    }
+
+    fun createUngrouped(tokenList: TokenList.GroupedByNetwork): TokenList.Ungrouped {
+        return createUngrouped(
+            totalFiatBalance = tokenList.totalFiatBalance,
+            nonEmptyStatuses = tokenList.flattenCurrencies().toNonEmptyListOrNull()
+                ?: error("GroupedByNetwork.flattenCurrencies should be non empty list"),
+            sortType = tokenList.sortedBy,
+        )
+    }
+
+    fun createGroupedByNetwork(tokenList: TokenList.Ungrouped): TokenList.GroupedByNetwork {
+        return createGroupedByNetwork(
+            totalFiatBalance = tokenList.totalFiatBalance,
+            nonEmptyStatuses = tokenList.flattenCurrencies().toNonEmptyListOrNull()
+                ?: error("Ungrouped.flattenCurrencies should be non empty list"),
+            sortType = tokenList.sortedBy,
+        )
+    }
+
+    private fun createUngrouped(
+        totalFiatBalance: TotalFiatBalance,
+        nonEmptyStatuses: NonEmptyList<CryptoCurrencyStatus>,
+        sortType: TokensSortType,
+    ): TokenList.Ungrouped {
+        return TokenList.Ungrouped(
+            totalFiatBalance = totalFiatBalance,
+            sortedBy = sortType,
+            currencies = nonEmptyStatuses.sortStatuses(sortType),
+        )
+    }
+
+    private fun createGroupedByNetwork(
+        totalFiatBalance: TotalFiatBalance,
+        nonEmptyStatuses: NonEmptyList<CryptoCurrencyStatus>,
+        sortType: TokensSortType,
+    ): TokenList.GroupedByNetwork {
+        return TokenList.GroupedByNetwork(
+            totalFiatBalance = totalFiatBalance,
+            sortedBy = sortType,
+            groups = nonEmptyStatuses.groupByNetworkAndSort(sortType),
+        )
+    }
+
+    private fun NonEmptyList<CryptoCurrencyStatus>.groupByNetworkAndSort(sortType: TokensSortType): List<NetworkGroup> {
+        return this
+            .groupBy { it.currency.network }
+            .map { (network, currencies) ->
+                NetworkGroup(
+                    network = network,
+                    currencies = currencies.sortStatuses(sortType),
+                )
+            }
+            .sortGroups(sortType)
+    }
+
+    private fun List<NetworkGroup>.sortGroups(type: TokensSortType): List<NetworkGroup> {
+        return when (type) {
+            TokensSortType.NONE -> this
+            TokensSortType.BALANCE -> {
+                val hasLoading = this.asSequence()
+                    .flatMap(NetworkGroup::currencies)
+                    .any { it.value is CryptoCurrencyStatus.Loading }
+
+                if (hasLoading) return this
+
+                sortedByDescending { group ->
+                    group.currencies.sumOf { it.calculateBalance() }
+                }
+            }
+        }
+    }
+
+    private fun List<CryptoCurrencyStatus>.sortStatuses(type: TokensSortType): List<CryptoCurrencyStatus> {
+        return when (type) {
+            TokensSortType.NONE -> this
+            TokensSortType.BALANCE -> {
+                val hasLoading = any { it.value is CryptoCurrencyStatus.Loading }
+
+                if (hasLoading) return this
+
+                sortedByDescending { it.calculateBalance() }
+            }
+        }
+    }
+
+    private fun CryptoCurrencyStatus.calculateBalance(): BigDecimal {
+        val yieldBalance = value.yieldBalance as? YieldBalance.Data
+        val totalYieldBalance = yieldBalance?.getTotalWithRewardsStakingBalance(currency.network.rawId).orZero()
+        val totalFiatYieldBalance = totalYieldBalance.multiply(value.fiatRate.orZero())
+
+        return value.fiatAmount?.plus(totalFiatYieldBalance).orZero()
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt
deleted file mode 100644
index 198890fd63..0000000000
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.tangem.domain.tokens.operations
-
-import arrow.core.NonEmptyList
-import com.tangem.domain.models.StatusSource
-import com.tangem.domain.models.TotalFiatBalance
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.getResultStatusSource
-import com.tangem.domain.models.staking.YieldBalance
-import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
-import com.tangem.lib.crypto.BlockchainUtils
-import com.tangem.utils.extensions.orZero
-import java.math.BigDecimal
-
-internal class TokenListFiatBalanceOperations(
-    private val currencies: NonEmptyList<CryptoCurrencyStatus>,
-    private val isAnyTokenLoading: Boolean,
-) {
-
-    @Suppress("LoopWithTooManyJumpStatements")
-    fun calculateFiatBalance(): TotalFiatBalance {
-        var fiatBalance: TotalFiatBalance = TotalFiatBalance.Loading
-        if (isAnyTokenLoading) return fiatBalance
-
-        for (token in currencies) {
-            val blockchainId = token.currency.network.rawId
-            when (val status = token.value) {
-                is CryptoCurrencyStatus.Loading -> {
-                    fiatBalance = TotalFiatBalance.Loading
-                    break
-                }
-                is CryptoCurrencyStatus.NoQuote,
-                is CryptoCurrencyStatus.MissedDerivation,
-                -> {
-                    fiatBalance = TotalFiatBalance.Failed
-                    break
-                }
-                is CryptoCurrencyStatus.Unreachable,
-                is CryptoCurrencyStatus.NoAmount,
-                -> {
-                    if (BlockchainUtils.isIncludeToBalanceOnError(blockchainId)) {
-                        fiatBalance = recalculateNoAccountBalance(status, fiatBalance)
-                    } else {
-                        fiatBalance = TotalFiatBalance.Failed
-                        break
-                    }
-                }
-                is CryptoCurrencyStatus.NoAccount -> {
-                    fiatBalance = recalculateNoAccountBalance(status, fiatBalance)
-                }
-                is CryptoCurrencyStatus.Loaded -> {
-                    fiatBalance = recalculateBalance(status, fiatBalance, blockchainId)
-                }
-                is CryptoCurrencyStatus.Custom -> {
-                    fiatBalance = recalculateBalance(status, fiatBalance, blockchainId)
-                }
-            }
-        }
-
-        return (fiatBalance as? TotalFiatBalance.Loaded)?.copy(
-            source = currencies.map { it.value.sources.total }.getResultStatusSource(),
-        ) ?: fiatBalance
-    }
-
-    private fun recalculateNoAccountBalance(
-        status: CryptoCurrencyStatus.Value,
-        currentBalance: TotalFiatBalance,
-    ): TotalFiatBalance {
-        return (currentBalance as? TotalFiatBalance.Loaded)?.copy(isAllAmountsSummarized = false)
-            ?: TotalFiatBalance.Loaded(
-                amount = BigDecimal.ZERO,
-                isAllAmountsSummarized = false,
-                source = (status as? CryptoCurrencyStatus.NoAccount)?.sources?.total ?: StatusSource.ACTUAL,
-            )
-    }
-
-    private fun recalculateBalance(
-        status: CryptoCurrencyStatus.Loaded,
-        currentBalance: TotalFiatBalance,
-        blockchainId: String,
-    ): TotalFiatBalance {
-        return with(currentBalance) {
-            val yieldBalance = status.yieldBalance as? YieldBalance.Data
-            val stakingBalance = yieldBalance?.getTotalWithRewardsStakingBalance(blockchainId).orZero()
-            val fiatStakingBalance = status.fiatRate.times(stakingBalance)
-            (this as? TotalFiatBalance.Loaded)?.copy(
-                amount = this.amount + status.fiatAmount + fiatStakingBalance,
-            ) ?: TotalFiatBalance.Loaded(
-                amount = status.fiatAmount + fiatStakingBalance,
-                isAllAmountsSummarized = true,
-                source = status.sources.total,
-            )
-        }
-    }
-
-    private fun recalculateBalance(
-        status: CryptoCurrencyStatus.Custom,
-        currentBalance: TotalFiatBalance,
-        blockchainId: String,
-    ): TotalFiatBalance {
-        return with(currentBalance) {
-            val isTokenAmountCanBeSummarized = status.fiatAmount != null
-            val yieldBalance = (status.yieldBalance as? YieldBalance.Data)
-                ?.getTotalWithRewardsStakingBalance(blockchainId).orZero()
-            val fiatYieldBalance = status.fiatRate?.times(yieldBalance).orZero()
-            (this as? TotalFiatBalance.Loaded)?.copy(
-                amount = this.amount + status.fiatAmount.orZero() + fiatYieldBalance,
-                isAllAmountsSummarized = isTokenAmountCanBeSummarized,
-            ) ?: TotalFiatBalance.Loaded(
-                amount = status.fiatAmount.orZero() + fiatYieldBalance,
-                isAllAmountsSummarized = isTokenAmountCanBeSummarized,
-                source = StatusSource.ACTUAL,
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
index 01eac8c1bb..e42588514f 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListOperations.kt
@@ -1,11 +1,12 @@
 package com.tangem.domain.tokens.operations
 
-import arrow.core.*
-import arrow.core.raise.Raise
+import arrow.core.Either
+import arrow.core.left
 import arrow.core.raise.either
-import arrow.core.raise.withError
+import arrow.core.right
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.models.TokensGroupType
 import com.tangem.domain.models.TokensSortType
-import com.tangem.domain.models.TotalFiatBalance
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWalletId
@@ -30,85 +31,13 @@ internal class TokenListOperations(
         }
     }
 
-    private fun Raise<Error>.createTokenList(isGrouped: Boolean, isSortedByBalance: Boolean): TokenList {
+    private fun createTokenList(isGrouped: Boolean, isSortedByBalance: Boolean): TokenList {
         val nonEmptyCurrencies = tokens.toNonEmptyListOrNull() ?: return TokenList.Empty
 
-        val isAnyTokenLoading = nonEmptyCurrencies.any { it.value is CryptoCurrencyStatus.Loading }
-        val fiatBalanceOperations = TokenListFiatBalanceOperations(nonEmptyCurrencies, isAnyTokenLoading)
-
-        return createTokenList(
-            currencies = nonEmptyCurrencies,
-            fiatBalance = fiatBalanceOperations.calculateFiatBalance(),
-            isAnyTokenLoading = isAnyTokenLoading,
-            isGrouped = isGrouped,
-            isSortedByBalance = isSortedByBalance,
-        )
-    }
-
-    private fun Raise<Error>.createTokenList(
-        currencies: NonEmptyList<CryptoCurrencyStatus>,
-        fiatBalance: TotalFiatBalance,
-        isAnyTokenLoading: Boolean,
-        isGrouped: Boolean,
-        isSortedByBalance: Boolean,
-    ): TokenList {
-        val sortingOperations = TokenListSortingOperations(
-            currencies = currencies,
-            isAnyTokenLoading = isAnyTokenLoading,
-            sortByBalance = isSortedByBalance,
-        )
-
-        return createTokenList(sortingOperations, fiatBalance, isGrouped)
-    }
-
-    private fun Raise<Error>.createTokenList(
-        sortingOperations: TokenListSortingOperations,
-        fiatBalance: TotalFiatBalance,
-        isGrouped: Boolean,
-    ): TokenList {
-        return if (isGrouped) {
-            createGroupedTokenList(sortingOperations, fiatBalance)
-        } else {
-            createUngroupedTokenList(sortingOperations, fiatBalance)
-        }
-    }
-
-    private fun Raise<Error>.createUngroupedTokenList(
-        sortingOperations: TokenListSortingOperations,
-        fiatBalance: TotalFiatBalance,
-    ): TokenList.Ungrouped = TokenList.Ungrouped(
-        sortedBy = sortingOperations.getSortType(),
-        totalFiatBalance = fiatBalance,
-        currencies = withError(
-            transform = { e ->
-                Error.fromTokenListOperations(e) { createUnsortedUngroupedTokenList(tokens, fiatBalance) }
-            },
-            block = { sortingOperations.getTokens().bind() },
-        ),
-    )
-
-    private fun Raise<Error>.createGroupedTokenList(
-        sortingOperations: TokenListSortingOperations,
-        fiatBalance: TotalFiatBalance,
-    ): TokenList.GroupedByNetwork = TokenList.GroupedByNetwork(
-        sortedBy = sortingOperations.getSortType(),
-        totalFiatBalance = fiatBalance,
-        groups = withError(
-            transform = { e ->
-                Error.fromTokenListOperations(e) { createUnsortedUngroupedTokenList(tokens, fiatBalance) }
-            },
-            block = { sortingOperations.getGroupedTokens().bind() },
-        ),
-    )
-
-    private fun createUnsortedUngroupedTokenList(
-        tokens: List<CryptoCurrencyStatus>,
-        fiatBalance: TotalFiatBalance,
-    ): TokenList.Ungrouped {
-        return TokenList.Ungrouped(
-            sortedBy = TokensSortType.NONE,
-            totalFiatBalance = fiatBalance,
-            currencies = tokens,
+        return TokenListFactory.create(
+            statuses = nonEmptyCurrencies,
+            groupType = if (isGrouped) TokensGroupType.NETWORK else TokensGroupType.NONE,
+            sortType = if (isSortedByBalance) TokensSortType.BALANCE else TokensSortType.NONE,
         )
     }
 
@@ -133,19 +62,5 @@ internal class TokenListOperations(
         data class UnableToSortTokenList(val unsortedTokenList: TokenList.Ungrouped) : Error()
 
         data class DataError(val cause: Throwable) : Error()
-
-        internal companion object {
-
-            fun fromTokenListOperations(
-                e: TokenListSortingOperations.Error,
-                createUnsortedUngroupedTokenList: () -> TokenList.Ungrouped,
-            ): Error = when (e) {
-                is TokenListSortingOperations.Error.EmptyTokens,
-                is TokenListSortingOperations.Error.NetworkNotFound,
-                -> UnableToSortTokenList(
-                    unsortedTokenList = createUnsortedUngroupedTokenList(),
-                )
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt
deleted file mode 100644
index 7669211249..0000000000
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListSortingOperations.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.tangem.domain.tokens.operations
-
-import arrow.core.Either
-import arrow.core.NonEmptyList
-import arrow.core.raise.Raise
-import arrow.core.raise.either
-import arrow.core.raise.ensure
-import arrow.core.raise.ensureNotNull
-import arrow.core.toNonEmptyListOrNull
-import com.tangem.domain.models.TokensSortType
-import com.tangem.domain.models.TotalFiatBalance
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.network.Network
-import com.tangem.domain.models.staking.YieldBalance
-import com.tangem.domain.models.tokenlist.TokenList
-import com.tangem.domain.models.tokenlist.TokenList.GroupedByNetwork.NetworkGroup
-import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
-import com.tangem.utils.extensions.orZero
-import java.math.BigDecimal
-
-internal class TokenListSortingOperations(
-    private val currencies: List<CryptoCurrencyStatus>,
-    private val isAnyTokenLoading: Boolean,
-    private val sortByBalance: Boolean,
-) {
-
-    constructor(
-        tokenList: TokenList,
-        sortByBalance: Boolean = tokenList.sortedBy == TokensSortType.BALANCE,
-        isAnyTokenLoading: Boolean = tokenList.totalFiatBalance is TotalFiatBalance.Loading,
-    ) : this(
-        currencies = tokenList.flattenCurrencies(),
-        isAnyTokenLoading = isAnyTokenLoading,
-        sortByBalance = sortByBalance,
-    )
-
-    fun getGroupedTokens(): Either<Error, NonEmptyList<NetworkGroup>> = either {
-        ensure(currencies.isNotEmpty()) { Error.EmptyTokens }
-
-        if (sortByBalance) {
-            groupAndSortTokensByBalance()
-        } else {
-            groupTokens()
-        }
-    }
-
-    fun getTokens(): Either<Error, NonEmptyList<CryptoCurrencyStatus>> = either {
-        val nonEmptyCurrencies = ensureNotNull(currencies.toNonEmptyListOrNull()) {
-            Error.EmptyTokens
-        }
-
-        if (sortByBalance) sortTokensByBalance(nonEmptyCurrencies) else nonEmptyCurrencies
-    }
-
-    fun getSortType(): TokensSortType = if (sortByBalance) TokensSortType.BALANCE else TokensSortType.NONE
-
-    private fun Raise<Error>.groupTokens(): NonEmptyList<NetworkGroup> {
-        val groupedTokens = currencies
-            .groupBy { it.currency.network }
-            .map { (network, tokens) ->
-                NetworkGroup(
-                    network = network,
-                    currencies = ensureNotNull(tokens.toNonEmptyListOrNull()) { Error.EmptyTokens },
-                )
-            }
-            .toNonEmptyListOrNull()
-
-        return ensureNotNull(groupedTokens) { Error.EmptyTokens }
-    }
-
-    private fun Raise<Error>.groupAndSortTokensByBalance(): NonEmptyList<NetworkGroup> {
-        val groupsWithSortedTokens = groupTokens()
-            .map { group ->
-                val tokens = group.currencies as? NonEmptyList<CryptoCurrencyStatus>
-                    ?: error("Tokens can not be empty here")
-                group.copy(currencies = sortTokensByBalance(tokens))
-            }
-
-        return if (isAnyTokenLoading) {
-            groupsWithSortedTokens
-        } else {
-            sortGroupsByBalance(groupsWithSortedTokens)
-        }
-    }
-
-    private fun sortTokensByBalance(tokens: NonEmptyList<CryptoCurrencyStatus>): NonEmptyList<CryptoCurrencyStatus> {
-        return if (isAnyTokenLoading) {
-            tokens
-        } else {
-            tokens.sortedByDescending { it.getTotalBalance() }
-                .toNonEmptyListOrNull()
-                ?: error("Tokens can not be empty here")
-        }
-    }
-
-    private fun sortGroupsByBalance(groupsWithSortedTokens: NonEmptyList<NetworkGroup>): NonEmptyList<NetworkGroup> {
-        return groupsWithSortedTokens
-            .sortedByDescending { group ->
-                group.currencies.sumOf { it.getTotalBalance() }
-            }
-            .toNonEmptyListOrNull()
-            ?: error("Tokens can not be empty here")
-    }
-
-    private fun CryptoCurrencyStatus.getTotalBalance(): BigDecimal {
-        val yieldBalance = value.yieldBalance as? YieldBalance.Data
-        val totalYieldBalance = yieldBalance?.getTotalWithRewardsStakingBalance(currency.network.rawId).orZero()
-        val totalFiatYieldBalance = totalYieldBalance.multiply(value.fiatRate.orZero())
-        return value.fiatAmount?.plus(totalFiatYieldBalance).orZero()
-    }
-
-    sealed class Error {
-
-        object EmptyTokens : Error()
-
-        data class NetworkNotFound(val networkId: Network.ID) : Error()
-    }
-}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculator.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculator.kt
new file mode 100644
index 0000000000..47826a442d
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculator.kt
@@ -0,0 +1,228 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.NonEmptyList
+import arrow.core.toNonEmptyListOrNull
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.getResultStatusSource
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.domain.staking.utils.getTotalWithRewardsStakingBalance
+import com.tangem.lib.crypto.BlockchainUtils
+import com.tangem.utils.extensions.orZero
+import java.math.BigDecimal
+
+/**
+ * Utility to calculate total fiat balance from a set of [CryptoCurrencyStatus].
+ *
+ * The calculation considers various states of each cryptocurrency, including loading,
+ * unreachable, no amount, no account, loaded, and custom states.
+ *
+ * The result is a [TotalFiatBalance], which can be in one of the following states:
+ * - [TotalFiatBalance.Loading]: If any cryptocurrency is still loading.
+ * - [TotalFiatBalance.Failed]: If any cryptocurrency is in a non-computable state (e.g., no quote).
+ * - [TotalFiatBalance.Loaded]: If all cryptocurrencies are computable, containing the total fiat amount,
+ *   a flag indicating if all amounts were summarized, and the source of the data.
+ *
+ * The calculation also takes into account staking balances when available.
+ */
+object TotalFiatBalanceCalculator {
+
+    fun calculate(statuses: NonEmptyList<CryptoCurrencyStatus>): TotalFiatBalance {
+        val computationState = ComputationState.resolve(statuses)
+
+        return when (computationState) {
+            ComputationState.LOADING -> TotalFiatBalance.Loading
+            ComputationState.NON_COMPUTABLE -> TotalFiatBalance.Failed
+            ComputationState.COMPUTABLE -> compute(statuses)
+        }
+    }
+
+    fun calculate(balances: List<TotalFiatBalance>): TotalFiatBalance {
+        val nonEmptyBalances = balances.toNonEmptyListOrNull()
+            ?: return TokenList.Empty.totalFiatBalance
+
+        val computationState = ComputationState.resolve(balances = nonEmptyBalances)
+
+        return when (computationState) {
+            ComputationState.LOADING -> TotalFiatBalance.Loading
+            ComputationState.NON_COMPUTABLE -> TotalFiatBalance.Failed
+            ComputationState.COMPUTABLE -> {
+                val loaded = balances.filterIsInstance<TotalFiatBalance.Loaded>()
+
+                TotalFiatBalance.Loaded(
+                    amount = loaded.sumOf(TotalFiatBalance.Loaded::amount),
+                    source = loaded.map(TotalFiatBalance.Loaded::source).getResultStatusSource(),
+                )
+            }
+        }
+    }
+
+    private fun compute(statuses: NonEmptyList<CryptoCurrencyStatus>): TotalFiatBalance {
+        var mutableBalance: TotalFiatBalance = TotalFiatBalance.Loading
+
+        for (token in statuses) {
+            val blockchainId = token.currency.network.rawId
+
+            when (val status = token.value) {
+                is CryptoCurrencyStatus.Unreachable,
+                is CryptoCurrencyStatus.NoAmount,
+                is CryptoCurrencyStatus.NoAccount,
+                -> {
+                    mutableBalance = mutableBalance.plusEmptyBalance(status)
+                }
+                is CryptoCurrencyStatus.Loaded -> {
+                    mutableBalance = mutableBalance.plusLoaded(status, blockchainId)
+                }
+                is CryptoCurrencyStatus.Custom -> {
+                    mutableBalance = mutableBalance.plusLoaded(status, blockchainId)
+                }
+                // Non computable states, should be handled before
+                CryptoCurrencyStatus.Loading,
+                is CryptoCurrencyStatus.MissedDerivation,
+                is CryptoCurrencyStatus.NoQuote,
+                -> continue
+            }
+        }
+
+        return mutableBalance.updateSource(statuses)
+    }
+
+    private fun TotalFiatBalance.plusEmptyBalance(status: CryptoCurrencyStatus.Value): TotalFiatBalance {
+        return fold(
+            ifLoaded = { it },
+            ifNot = {
+                TotalFiatBalance.Loaded(
+                    amount = BigDecimal.ZERO,
+                    source = status.sources.total, // never mind
+                )
+            },
+        )
+    }
+
+    private fun TotalFiatBalance.plusLoaded(
+        status: CryptoCurrencyStatus.Loaded,
+        blockchainId: String,
+    ): TotalFiatBalance {
+        val fiatStakingBalance = status.getFiatStakingBalance(blockchainId)
+
+        return fold(
+            ifLoaded = { loaded ->
+                loaded.copy(amount = loaded.amount + status.fiatAmount + fiatStakingBalance)
+            },
+            ifNot = {
+                TotalFiatBalance.Loaded(
+                    amount = status.fiatAmount + fiatStakingBalance,
+                    source = status.sources.total, // never mind
+                )
+            },
+        )
+    }
+
+    private fun TotalFiatBalance.plusLoaded(
+        status: CryptoCurrencyStatus.Custom,
+        blockchainId: String,
+    ): TotalFiatBalance {
+        val fiatStakingBalance = status.getFiatStakingBalance(blockchainId)
+
+        return fold(
+            ifLoaded = { loaded ->
+                loaded.copy(
+                    amount = loaded.amount + status.fiatAmount.orZero() + fiatStakingBalance,
+                )
+            },
+            ifNot = {
+                TotalFiatBalance.Loaded(
+                    amount = status.fiatAmount.orZero() + fiatStakingBalance,
+                    source = StatusSource.ACTUAL,
+                )
+            },
+        )
+    }
+
+    private fun TotalFiatBalance.updateSource(statuses: NonEmptyList<CryptoCurrencyStatus>): TotalFiatBalance {
+        return fold(
+            ifLoaded = { loaded ->
+                loaded.copy(
+                    source = statuses.map { it.value.sources.total }.getResultStatusSource(),
+                )
+            },
+            ifNot = { this },
+        )
+    }
+
+    private fun CryptoCurrencyStatus.Loaded.getFiatStakingBalance(blockchainId: String): BigDecimal {
+        val yieldBalance = yieldBalance as? YieldBalance.Data
+        val stakingBalance = yieldBalance?.getTotalWithRewardsStakingBalance(blockchainId).orZero()
+
+        return fiatRate.times(stakingBalance)
+    }
+
+    private fun CryptoCurrencyStatus.Custom.getFiatStakingBalance(blockchainId: String): BigDecimal {
+        val yieldBalance = yieldBalance as? YieldBalance.Data
+        val stakingBalance = yieldBalance?.getTotalWithRewardsStakingBalance(blockchainId).orZero()
+
+        return fiatRate?.times(stakingBalance).orZero()
+    }
+
+    private inline fun TotalFiatBalance.fold(
+        ifLoaded: (TotalFiatBalance.Loaded) -> TotalFiatBalance,
+        ifNot: () -> TotalFiatBalance,
+    ): TotalFiatBalance {
+        return if (this is TotalFiatBalance.Loaded) {
+            ifLoaded(this)
+        } else {
+            ifNot()
+        }
+    }
+
+    private enum class ComputationState {
+
+        LOADING, NON_COMPUTABLE, COMPUTABLE;
+
+        companion object {
+
+            fun resolve(statuses: NonEmptyList<CryptoCurrencyStatus>): ComputationState {
+                for (status in statuses) {
+                    when (status.value) {
+                        CryptoCurrencyStatus.Loading -> {
+                            return LOADING
+                        }
+                        is CryptoCurrencyStatus.NoQuote,
+                        is CryptoCurrencyStatus.MissedDerivation,
+                        -> {
+                            return NON_COMPUTABLE
+                        }
+                        is CryptoCurrencyStatus.Unreachable,
+                        is CryptoCurrencyStatus.NoAmount,
+                        -> {
+                            val blockchainId = status.currency.network.rawId
+                            if (!BlockchainUtils.isIncludeToBalanceOnError(blockchainId)) {
+                                return NON_COMPUTABLE
+                            }
+                        }
+                        is CryptoCurrencyStatus.Loaded,
+                        is CryptoCurrencyStatus.Custom,
+                        is CryptoCurrencyStatus.NoAccount,
+                        -> continue
+                    }
+                }
+
+                return COMPUTABLE
+            }
+
+            fun resolve(balances: List<TotalFiatBalance>): ComputationState {
+                for (balance in balances) {
+                    when (balance) {
+                        TotalFiatBalance.Failed -> return NON_COMPUTABLE
+                        TotalFiatBalance.Loading -> return LOADING
+                        is TotalFiatBalance.Loaded -> continue
+                    }
+                }
+
+                return COMPUTABLE
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/YieldSupplyWarningsViewedRepository.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/YieldSupplyWarningsViewedRepository.kt
new file mode 100644
index 0000000000..d85720dad6
--- /dev/null
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/repository/YieldSupplyWarningsViewedRepository.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.tokens.repository
+
+interface YieldSupplyWarningsViewedRepository {
+
+    suspend fun getViewedWarnings(): Set<String>
+
+    suspend fun view(symbol: String)
+}
\ No newline at end of file
diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/utils/CurrencyStatusProxyCreator.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/utils/CurrencyStatusProxyCreator.kt
index 215e06104f..b917edebde 100644
--- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/utils/CurrencyStatusProxyCreator.kt
+++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/utils/CurrencyStatusProxyCreator.kt
@@ -3,7 +3,9 @@ package com.tangem.domain.tokens.utils
 import arrow.core.Either
 import arrow.core.NonEmptyList
 import arrow.core.raise.either
+import arrow.core.raise.recover
 import arrow.core.toNonEmptySetOrNull
+import arrow.core.toOption
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.network.NetworkStatus
@@ -12,11 +14,11 @@ import com.tangem.domain.models.quote.QuoteStatus
 import com.tangem.domain.models.staking.StakingID
 import com.tangem.domain.models.staking.YieldBalance
 import com.tangem.domain.staking.model.StakingIntegrationID
+import com.tangem.domain.tokens.operations.CryptoCurrencyStatusFactory
 import com.tangem.domain.tokens.operations.CurrenciesStatusesOperations.Error
-import com.tangem.domain.tokens.operations.CurrencyStatusOperations
 
 /**
- * Proxy creator of [CryptoCurrencyStatus]. Used [CurrencyStatusOperations] to create statuses.
+ * Proxy creator of [CryptoCurrencyStatus]. Used [CryptoCurrencyStatusFactory] to create statuses.
  *
 [REDACTED_AUTHOR]
  */
@@ -28,20 +30,17 @@ class CurrencyStatusProxyCreator {
         maybeNetworkStatus: Either<Error, NetworkStatus?>,
         maybeYieldBalance: Either<Error, YieldBalance>?,
     ): Either<Error, CryptoCurrencyStatus> = either {
-        var quoteRetrievingFailed = false
-
         val networkStatus = maybeNetworkStatus.bind()
-        val quote = arrow.core.raise.recover({ maybeQuoteStatus.bind() }) {
-            quoteRetrievingFailed = true
-            null
-        }
+        val quote = recover(
+            block = { maybeQuoteStatus.bind() },
+            recover = { null },
+        )
         val yieldBalance = maybeYieldBalance?.getOrNull()
 
         createCurrencyStatus(
             currency = currency,
             quoteStatus = quote,
             networkStatus = networkStatus,
-            ignoreQuote = quoteRetrievingFailed,
             yieldBalance = yieldBalance,
         )
     }
@@ -52,21 +51,8 @@ class CurrencyStatusProxyCreator {
         maybeNetworkStatuses: Either<Error, Set<NetworkStatus>>,
         maybeYieldBalances: Either<Error, List<YieldBalance>>,
     ): Either<Error, List<CryptoCurrencyStatus>> = either {
-        var quotesRetrievingFailed = false
-
         val networksStatuses = maybeNetworkStatuses.bind().toNonEmptySetOrNull()
-        val quoteStatuses: Set<QuoteStatus>? = maybeQuotes?.fold(
-            ifLeft = {
-                quotesRetrievingFailed = true
-                null
-            },
-            ifRight = {
-                it.ifEmpty {
-                    quotesRetrievingFailed = true
-                    null
-                }
-            },
-        )
+        val quoteStatuses: Set<QuoteStatus>? = maybeQuotes?.getOrNull()?.ifEmpty { null }
 
         val yieldBalances = maybeYieldBalances.getOrNull()
 
@@ -90,27 +76,22 @@ class CurrencyStatusProxyCreator {
                 currency = currency,
                 quoteStatus = quote,
                 networkStatus = networkStatus,
-                ignoreQuote = quotesRetrievingFailed,
                 yieldBalance = yieldBalance,
             )
         }
     }
 
-    fun createCurrencyStatus(
+    private fun createCurrencyStatus(
         currency: CryptoCurrency,
         quoteStatus: QuoteStatus?,
         networkStatus: NetworkStatus?,
-        ignoreQuote: Boolean,
         yieldBalance: YieldBalance?,
     ): CryptoCurrencyStatus {
-        val currencyStatusOperations = CurrencyStatusOperations(
+        return CryptoCurrencyStatusFactory.create(
             currency = currency,
-            quoteStatus = quoteStatus,
-            networkStatus = networkStatus,
-            ignoreQuote = ignoreQuote,
-            yieldBalance = yieldBalance,
+            maybeNetworkStatus = networkStatus.toOption(),
+            maybeQuoteStatus = quoteStatus.toOption(),
+            maybeYieldBalance = yieldBalance.toOption(),
         )
-
-        return currencyStatusOperations.createTokenStatus()
     }
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCaseTest.kt
new file mode 100644
index 0000000000..1873ddeed3
--- /dev/null
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/NeedShowYieldSupplyDepositedWarningUseCaseTest.kt
@@ -0,0 +1,107 @@
+package com.tangem.domain.tokens
+
+import com.google.common.truth.Truth.assertThat
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.serialization.SerializedBigDecimal
+import com.tangem.domain.models.yield.supply.YieldSupplyStatus
+import com.tangem.domain.tokens.repository.YieldSupplyWarningsViewedRepository
+import com.tangem.domain.tokens.mock.MockTokens
+import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.impl.annotations.RelaxedMockK
+import io.mockk.junit5.MockKExtension
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@ExtendWith(MockKExtension::class)
+class NeedShowYieldSupplyDepositedWarningUseCaseTest {
+
+    @RelaxedMockK
+    private lateinit var repository: YieldSupplyWarningsViewedRepository
+
+    private lateinit var dispatchers: TestingCoroutineDispatcherProvider
+
+    @BeforeEach
+    fun setup() {
+        dispatchers = TestingCoroutineDispatcherProvider()
+    }
+
+    @Test
+    fun `GIVEN null status WHEN invoke THEN returns false`() = runTest {
+        val useCase = NeedShowYieldSupplyDepositedWarningUseCase(repository, dispatchers)
+
+        val result = useCase.invoke(null)
+
+        assertThat(result).isFalse()
+        coVerify(exactly = 0) { repository.getViewedWarnings() }
+    }
+
+    @Test
+    fun `GIVEN inactive lending WHEN invoke THEN returns false`() = runTest {
+        val useCase = NeedShowYieldSupplyDepositedWarningUseCase(repository, dispatchers)
+        val status = createStatus(isActive = false)
+
+        val result = useCase.invoke(status)
+
+        assertThat(result).isFalse()
+        coVerify(exactly = 0) { repository.getViewedWarnings() }
+    }
+
+    @Test
+    fun `GIVEN active lending and not viewed WHEN invoke THEN returns true`() = runTest {
+        val useCase = NeedShowYieldSupplyDepositedWarningUseCase(repository, dispatchers)
+        val status = createStatus(isActive = true)
+        coEvery { repository.getViewedWarnings() } returns emptySet()
+
+        val result = useCase.invoke(status)
+
+        assertThat(result).isTrue()
+        coVerify(exactly = 1) { repository.getViewedWarnings() }
+    }
+
+    @Test
+    fun `GIVEN active lending and already viewed WHEN invoke THEN returns false`() = runTest {
+        val useCase = NeedShowYieldSupplyDepositedWarningUseCase(repository, dispatchers)
+        val status = createStatus(isActive = true)
+        coEvery { repository.getViewedWarnings() } returns setOf(status.currency.name)
+
+        val result = useCase.invoke(status)
+
+        assertThat(result).isFalse()
+        coVerify(exactly = 1) { repository.getViewedWarnings() }
+    }
+
+    private fun createStatus(isActive: Boolean): CryptoCurrencyStatus {
+        val currency = MockTokens.token1
+        val yieldSupplyStatus = YieldSupplyStatus(
+            isActive = isActive,
+            isInitialized = true,
+            isAllowedToSpend = true,
+        )
+        val value = CryptoCurrencyStatus.NoQuote(
+            amount = SerializedBigDecimal.ZERO,
+            yieldBalance = null,
+            yieldSupplyStatus = yieldSupplyStatus,
+            hasCurrentNetworkTransactions = false,
+            pendingTransactions = emptySet(),
+            networkAddress = NetworkAddress.Single(
+                defaultAddress = NetworkAddress.Address(
+                    value = "address",
+                    type = NetworkAddress.Address.Type.Primary,
+                ),
+            ),
+            sources = CryptoCurrencyStatus.Sources(),
+        )
+
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = value,
+        )
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
index c34710cd97..8630063505 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListGroupingTest.kt
@@ -2,114 +2,102 @@ package com.tangem.domain.tokens
 
 import arrow.core.left
 import arrow.core.right
+import com.google.common.truth.Truth
 import com.tangem.domain.tokens.error.TokenListSortingError
 import com.tangem.domain.tokens.mock.MockTokenLists
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
-import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
-import org.junit.Test
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class ToggleTokenListGroupingTest {
 
+    private val useCase = ToggleTokenListGroupingUseCase(
+        dispatchers = TestingCoroutineDispatcherProvider(),
+    )
+
     @Test
     fun `when list is empty then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsEmpty.left()
 
         // When
-        val result = useCase(MockTokenLists.emptyUngroupedTokenList)
+        val actual = useCase(MockTokenLists.emptyUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and loading then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsLoading.left()
 
         // When
-        val result = useCase(MockTokenLists.loadingGroupedTokenList)
+        val actual = useCase(MockTokenLists.loadingGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and loading then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsLoading.left()
 
         // When
-        val result = useCase(MockTokenLists.loadingUngroupedTokenList)
+        val actual = useCase(MockTokenLists.loadingUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and sorted then sorted grouped list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedGroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedGroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.sortedUngroupedTokenList)
+        val actual = useCase(MockTokenLists.sortedUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and unsorted then unsorted grouped list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.unsortedGroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.unsortedGroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedUngroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and sorted then sorted ungrouped list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedUngroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedUngroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.sortedGroupedTokenList)
+        val actual = useCase(MockTokenLists.sortedGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and unsorted then unsorted ungrouped list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.unsortedUngroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.unsortedUngroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedGroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
-
-    private fun getUseCase() = ToggleTokenListGroupingUseCase(
-        dispatchers = TestingCoroutineDispatcherProvider(),
-    )
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
index ebbc935479..787d55393c 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/ToggleTokenListSortingUseCaseTest.kt
@@ -2,114 +2,102 @@ package com.tangem.domain.tokens
 
 import arrow.core.left
 import arrow.core.right
+import com.google.common.truth.Truth
 import com.tangem.domain.tokens.error.TokenListSortingError
 import com.tangem.domain.tokens.mock.MockTokenLists
 import com.tangem.utils.coroutines.TestingCoroutineDispatcherProvider
-import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.test.runTest
-import org.junit.Test
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class ToggleTokenListSortingUseCaseTest {
 
+    private val useCase = ToggleTokenListSortingUseCase(
+        dispatchers = TestingCoroutineDispatcherProvider(),
+    )
+
     @Test
     fun `when list is empty then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsEmpty.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsEmpty.left()
 
         // When
-        val result = useCase(MockTokenLists.emptyTokenList)
+        val actual = useCase(MockTokenLists.emptyTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and loading then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsLoading.left()
 
         // When
-        val result = useCase(MockTokenLists.loadingGroupedTokenList)
+        val actual = useCase(MockTokenLists.loadingGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and loading then error should be received`() = runTest {
         // Given
-        val expectedResult = TokenListSortingError.TokenListIsLoading.left()
-
-        val useCase = getUseCase()
+        val expected = TokenListSortingError.TokenListIsLoading.left()
 
         // When
-        val result = useCase(MockTokenLists.loadingUngroupedTokenList)
+        val actual = useCase(MockTokenLists.loadingUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and unsorted then grouped and sorted list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedGroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedGroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedGroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and unsorted then ungrouped and sorted list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedUngroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedUngroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedUngroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is grouped and sorted then grouped and unsorted list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedGroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedGroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedGroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedGroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
 
     @Test
     fun `when list is ungrouped and sorted then ungrouped and unsorted list should be received`() = runTest {
         // Given
-        val expectedResult = MockTokenLists.sortedUngroupedTokenList.right()
-
-        val useCase = getUseCase()
+        val expected = MockTokenLists.sortedUngroupedTokenList.right()
 
         // When
-        val result = useCase(MockTokenLists.unsortedUngroupedTokenList)
+        val actual = useCase(MockTokenLists.unsortedUngroupedTokenList)
 
         // Then
-        assertEquals(expectedResult, result)
+        Truth.assertThat(actual).isEqualTo(expected)
     }
-
-    private fun getUseCase() = ToggleTokenListSortingUseCase(
-        dispatchers = TestingCoroutineDispatcherProvider(),
-    )
 }
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
index caa2c13c6f..af553ea246 100644
--- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokenLists.kt
@@ -80,7 +80,6 @@ internal object MockTokenLists {
                 sortedBy = TokensSortType.NONE,
                 totalFiatBalance = TotalFiatBalance.Loaded(
                     amount = tokens.sumOf { it.value.fiatAmount ?: BigDecimal.ZERO },
-                    isAllAmountsSummarized = true,
                     source = StatusSource.ACTUAL,
                 ),
             )
@@ -97,7 +96,6 @@ internal object MockTokenLists {
                     amount = groups
                         .flatMap { it.currencies as NonEmptyList<CryptoCurrencyStatus> }
                         .sumOf { it.value.fiatAmount ?: BigDecimal.ZERO },
-                    isAllAmountsSummarized = true,
                     source = StatusSource.ACTUAL,
                 ),
             )
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactoryTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactoryTest.kt
new file mode 100644
index 0000000000..5888b68d94
--- /dev/null
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/CryptoCurrencyStatusFactoryTest.kt
@@ -0,0 +1,686 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.none
+import arrow.core.some
+import com.google.common.truth.Truth
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.network.NetworkStatus
+import com.tangem.domain.models.network.NetworkStatus.Amount
+import com.tangem.domain.models.network.TxInfo
+import com.tangem.domain.models.quote.QuoteStatus
+import com.tangem.domain.models.staking.BalanceItem
+import com.tangem.domain.models.staking.StakingID
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.YieldBalanceItem
+import com.tangem.domain.models.yield.supply.YieldSupplyStatus
+import com.tangem.domain.staking.model.StakingIntegrationID
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class CryptoCurrencyStatusFactoryTest {
+
+    private val cryptoCurrencyFactory = MockCryptoCurrencyFactory()
+    private val currency = cryptoCurrencyFactory.cardano
+
+    private val networkAddress = NetworkAddress.Single(
+        defaultAddress = NetworkAddress.Address(
+            value = "0x123",
+            type = NetworkAddress.Address.Type.Primary,
+        ),
+    )
+
+    private val fullQuote = QuoteStatus.Data(
+        fiatRate = 1800.0.toBigDecimal(),
+        priceChange = (-2.5).toBigDecimal(),
+        source = StatusSource.ACTUAL,
+    )
+    private val emptyQuoteStatus = QuoteStatus.Empty.toStatus()
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class MissedDerivation {
+
+        private val networkStatus = NetworkStatus.MissedDerivation.toStatus()
+        private val maybeYieldBalance = none<YieldBalance>() // not relevant for this test
+
+        @Test
+        fun `network is MissedDerivation and QuoteStatus is Data`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.MissedDerivation(
+                fiatRate = fullQuote.fiatRate,
+                priceChange = fullQuote.priceChange,
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is MissedDerivation and QuoteStatus is Empty`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = emptyQuoteStatus.some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.MissedDerivation(fiatRate = null, priceChange = null).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is MissedDerivation and QuoteStatus is null`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.MissedDerivation(fiatRate = null, priceChange = null).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class Unreachable {
+
+        private val networkStatus = NetworkStatus.Unreachable(address = networkAddress).toStatus()
+
+        private val maybeYieldBalance = none<YieldBalance>() // not relevant for this test
+
+        @Test
+        fun `network is Unreachable and QuoteStatus is Data`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Unreachable(
+                fiatRate = fullQuote.fiatRate,
+                priceChange = fullQuote.priceChange,
+                networkAddress = networkAddress,
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Unreachable and QuoteStatus is Empty`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = emptyQuoteStatus.some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Unreachable(
+                fiatRate = null,
+                priceChange = null,
+                networkAddress = networkAddress,
+            )
+                .toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Unreachable and QuoteStatus is null`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Unreachable(
+                fiatRate = null,
+                priceChange = null,
+                networkAddress = networkAddress,
+            ).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class NoAccount {
+
+        private val networkStatus = NetworkStatus.NoAccount(
+            address = networkAddress,
+            amountToCreateAccount = BigDecimal.ONE,
+            errorMessage = "error message",
+            source = StatusSource.ACTUAL,
+        ).toStatus()
+
+        private val maybeYieldBalance = none<YieldBalance>() // not relevant for this test
+
+        @Test
+        fun `network is NoAccount and QuoteStatus is Data`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAccount(
+                amountToCreateAccount = BigDecimal.ONE,
+                fiatAmount = BigDecimal.ZERO,
+                priceChange = fullQuote.priceChange,
+                fiatRate = fullQuote.fiatRate,
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is NoAccount and QuoteStatus is Empty`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = emptyQuoteStatus.some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAccount(
+                amountToCreateAccount = BigDecimal.ONE,
+                fiatAmount = BigDecimal.ZERO,
+                priceChange = null,
+                fiatRate = null,
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is NoAccount and QuoteStatus is null`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAccount(
+                amountToCreateAccount = BigDecimal.ONE,
+                fiatAmount = BigDecimal.ZERO,
+                priceChange = null,
+                fiatRate = null,
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class NoAmount {
+
+        private val networkStatus = createVerified(amounts = mapOf(currency.id to Amount.NotFound)).toStatus()
+
+        private val maybeYieldBalance = none<YieldBalance>() // not relevant for this test
+
+        @Test
+        fun `network is Verified with Amount is NotFound and QuoteStatus is Data`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAmount(
+                priceChange = fullQuote.priceChange,
+                fiatRate = fullQuote.fiatRate,
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified with Amount is NotFound and QuoteStatus is Empty`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = emptyQuoteStatus.some(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAmount(priceChange = null, fiatRate = null).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified with Amount is NotFound and QuoteStatus is null`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoAmount(priceChange = null, fiatRate = null).toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class Loading {
+
+        private val maybeYieldBalance = none<YieldBalance>() // not relevant for this test
+
+        @Test
+        fun `network is null`() {
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = none(),
+                maybeQuoteStatus = none(), // not relevant for this test,
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Loading.toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified with Amount is null`() {
+            // Arrange
+            val networkStatus = createVerified().toStatus()
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(), // not relevant for this test,
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Loading.toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified and QuoteStatus is null`() {
+            // Arrange
+            val networkStatus = createVerified(
+                amounts = mapOf(currency.id to Amount.Loaded(value = BigDecimal.ZERO)),
+            ).toStatus()
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = none(),
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Loading.toStatus()
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class Custom {
+
+        private val currency = cryptoCurrencyFactory.createToken(blockchain = Blockchain.Cardano).copy(isCustom = true)
+
+        private val networkStatus = createVerified(
+            amounts = mapOf(currency.id to Amount.Loaded(value = BigDecimal.TEN)),
+        ).toStatus()
+
+        @Test
+        fun `network is Verified, QuoteStatus is null, YieldBalance is null`() {
+            // Arrange
+            val maybeQuoteStatus = none<QuoteStatus>()
+            val maybeYieldBalance = none<YieldBalance>()
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = maybeQuoteStatus,
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus(
+                currency = currency,
+                value = CryptoCurrencyStatus.Custom(
+                    amount = BigDecimal.TEN,
+                    fiatAmount = null,
+                    fiatRate = null,
+                    priceChange = null,
+                    yieldBalance = null,
+                    yieldSupplyStatus = null,
+                    hasCurrentNetworkTransactions = false,
+                    pendingTransactions = emptySet(),
+                    networkAddress = networkAddress,
+                    sources = CryptoCurrencyStatus.Sources(),
+                ),
+            )
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified, QuoteStatus is Data, YieldBalance is Data`() {
+            // Arrange
+            val yieldBalance = YieldBalance.Data(
+                stakingId = StakingID(
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                    address = networkAddress.defaultAddress.value,
+                ),
+                source = StatusSource.ACTUAL,
+                balance = YieldBalanceItem(
+                    items = listOf(
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns currency.id.rawCurrencyId?.value
+                        },
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns "unknown"
+                        },
+                    ),
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                ),
+            )
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = yieldBalance.some(),
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus(
+                currency = currency,
+                value = CryptoCurrencyStatus.Custom(
+                    amount = BigDecimal.TEN,
+                    fiatAmount = BigDecimal.TEN * fullQuote.fiatRate,
+                    fiatRate = fullQuote.fiatRate,
+                    priceChange = fullQuote.priceChange,
+                    yieldBalance = yieldBalance.copy(
+                        balance = yieldBalance.balance.copy(
+                            items = yieldBalance.balance.items.subList(0, 1),
+                        ),
+                    ),
+                    yieldSupplyStatus = null,
+                    hasCurrentNetworkTransactions = false,
+                    pendingTransactions = emptySet(),
+                    networkAddress = networkAddress,
+                    sources = CryptoCurrencyStatus.Sources(),
+                ),
+            )
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class NoQuote {
+
+        private val pendingTransactions = mapOf(currency.id to setOf(mockk<TxInfo>()))
+        private val yieldSupplyStatuses = mapOf(currency.id to mockk<YieldSupplyStatus>())
+
+        private val networkStatus = createVerified(
+            amounts = mapOf(currency.id to Amount.Loaded(value = BigDecimal.TEN)),
+            pendingTransactions = pendingTransactions,
+            yieldSupplyStatuses = yieldSupplyStatuses,
+        ).toStatus()
+
+        private val maybeQuoteStatus = emptyQuoteStatus.some()
+
+        @Test
+        fun `network is Verified and YieldBalance is null`() {
+            // Arrange
+            val maybeYieldBalance = none<YieldBalance>()
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = maybeQuoteStatus,
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoQuote(
+                amount = BigDecimal.TEN,
+                yieldBalance = null,
+                yieldSupplyStatus = yieldSupplyStatuses[currency.id]!!,
+                hasCurrentNetworkTransactions = true,
+                pendingTransactions = pendingTransactions[currency.id]!!,
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified and YieldBalance is Data`() {
+            // Arrange
+            val yieldBalance = YieldBalance.Data(
+                stakingId = StakingID(
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                    address = networkAddress.defaultAddress.value,
+                ),
+                source = StatusSource.ACTUAL,
+                balance = YieldBalanceItem(
+                    items = listOf(
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns currency.id.rawCurrencyId?.value
+                        },
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns "unknown"
+                        },
+                    ),
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                ),
+            )
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = maybeQuoteStatus,
+                maybeYieldBalance = yieldBalance.some(),
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.NoQuote(
+                amount = BigDecimal.TEN,
+                yieldBalance = yieldBalance.copy(
+                    balance = yieldBalance.balance.copy(
+                        items = yieldBalance.balance.items.subList(0, 1),
+                    ),
+                ),
+                yieldSupplyStatus = yieldSupplyStatuses[currency.id]!!,
+                hasCurrentNetworkTransactions = true,
+                pendingTransactions = pendingTransactions[currency.id]!!,
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class Loaded {
+
+        private val networkStatus = createVerified(
+            amounts = mapOf(currency.id to Amount.Loaded(value = BigDecimal.TEN)),
+        ).toStatus()
+
+        private val maybeQuoteStatus = fullQuote.toStatus().some()
+
+        @Test
+        fun `network is Verified and YieldBalance is null`() {
+            // Arrange
+            val maybeYieldBalance = none<YieldBalance>()
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = maybeQuoteStatus,
+                maybeYieldBalance = maybeYieldBalance,
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Loaded(
+                amount = BigDecimal.TEN,
+                fiatAmount = BigDecimal.TEN * fullQuote.fiatRate,
+                fiatRate = fullQuote.fiatRate,
+                priceChange = fullQuote.priceChange,
+                yieldBalance = null,
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `network is Verified and YieldBalance is Data`() {
+            // Arrange
+            val yieldBalance = YieldBalance.Data(
+                stakingId = StakingID(
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                    address = networkAddress.defaultAddress.value,
+                ),
+                source = StatusSource.ACTUAL,
+                balance = YieldBalanceItem(
+                    items = listOf(
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns currency.id.rawCurrencyId?.value
+                        },
+                        mockk<BalanceItem> {
+                            every { this@mockk.token.coinGeckoId } returns "unknown"
+                        },
+                    ),
+                    integrationId = StakingIntegrationID.Coin.Cardano.value,
+                ),
+            )
+
+            // Act
+            val actual = CryptoCurrencyStatusFactory.create(
+                currency = currency,
+                maybeNetworkStatus = networkStatus.some(),
+                maybeQuoteStatus = fullQuote.toStatus().some(),
+                maybeYieldBalance = yieldBalance.some(),
+            )
+
+            // Assert
+            val expected = CryptoCurrencyStatus.Loaded(
+                amount = BigDecimal.TEN,
+                fiatAmount = BigDecimal.TEN * fullQuote.fiatRate,
+                fiatRate = fullQuote.fiatRate,
+                priceChange = fullQuote.priceChange,
+                yieldBalance = yieldBalance.copy(
+                    balance = yieldBalance.balance.copy(
+                        items = yieldBalance.balance.items.subList(0, 1),
+                    ),
+                ),
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = networkAddress,
+                sources = CryptoCurrencyStatus.Sources(),
+            ).toStatus()
+
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    private fun createVerified(
+        amounts: Map<CryptoCurrency.ID, Amount> = emptyMap(),
+        pendingTransactions: Map<CryptoCurrency.ID, Set<TxInfo>> = emptyMap(),
+        yieldSupplyStatuses: Map<CryptoCurrency.ID, YieldSupplyStatus?> = emptyMap(),
+    ): NetworkStatus.Verified {
+        return NetworkStatus.Verified(
+            address = networkAddress,
+            amounts = amounts,
+            pendingTransactions = pendingTransactions,
+            yieldSupplyStatuses = yieldSupplyStatuses,
+            source = StatusSource.ACTUAL,
+        )
+    }
+
+    private fun NetworkStatus.Value.toStatus(): NetworkStatus {
+        return NetworkStatus(network = currency.network, value = this)
+    }
+
+    private fun CryptoCurrencyStatus.Value.toStatus(): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(currency = currency, value = this)
+    }
+
+    private fun QuoteStatus.Value.toStatus(): QuoteStatus {
+        return when (this) {
+            is QuoteStatus.Data -> QuoteStatus(rawCurrencyId = currency.id.rawCurrencyId!!, value = this)
+            is QuoteStatus.Empty -> QuoteStatus(rawCurrencyId = currency.id.rawCurrencyId!!, value = this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculatorTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculatorTest.kt
new file mode 100644
index 0000000000..7dbbeec80b
--- /dev/null
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/PriceChangeCalculatorTest.kt
@@ -0,0 +1,155 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.nonEmptyListOf
+import com.google.common.truth.Truth
+import com.tangem.domain.core.utils.lceContent
+import com.tangem.domain.core.utils.lceError
+import com.tangem.domain.core.utils.lceLoading
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.quote.PriceChange
+import com.tangem.domain.tokens.mock.MockTokens
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class PriceChangeCalculatorTest {
+
+    @Test
+    fun `calculate if statuses is empty list`() {
+        // Act
+        val actual = PriceChangeCalculator.calculate(statuses = emptyList())
+
+        // Assert
+        val expected = PriceChange(
+            value = BigDecimal("0.00"),
+            source = StatusSource.ACTUAL,
+        ).lceContent()
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `calculate if any status is Loading`() {
+        // Arrange
+        val statuses = nonEmptyListOf(
+            create(
+                amount = BigDecimal.ZERO,
+                priceChange = BigDecimal("0.06"),
+            ),
+            CryptoCurrencyStatus(
+                currency = MockTokens.token1,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
+
+        // Act
+        val actual = PriceChangeCalculator.calculate(statuses)
+
+        // Assert
+        val expected = lceLoading<PriceChange>()
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `calculate if any status is Unreachable`() {
+        // Arrange
+        val statuses = nonEmptyListOf(
+            create(
+                amount = BigDecimal.ZERO,
+                priceChange = BigDecimal("0.06"),
+            ),
+            CryptoCurrencyStatus(
+                currency = MockTokens.token1,
+                value = CryptoCurrencyStatus.Unreachable(priceChange = null, fiatRate = null, networkAddress = null),
+            ),
+        )
+
+        // Act
+        val actual = PriceChangeCalculator.calculate(statuses)
+
+        // Assert
+        val expected = Unit.lceError()
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `calculate if total fiat balance is zero`() {
+        // Arrange
+        val statuses = nonEmptyListOf(
+            create(
+                amount = BigDecimal.ZERO,
+                priceChange = BigDecimal("0.06"),
+            ),
+            create(
+                amount = BigDecimal("0.00"),
+                priceChange = BigDecimal("0.00"),
+            ),
+        )
+
+        // Act
+        val actual = PriceChangeCalculator.calculate(statuses)
+
+        // Assert
+        val expected = PriceChange(
+            value = BigDecimal("0.00"),
+            source = StatusSource.ACTUAL,
+        ).lceContent()
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `calculate if all statuses are loaded`() {
+        // Arrange
+        val statuses = nonEmptyListOf(
+            create(
+                amount = BigDecimal("5"), // 50%
+                priceChange = BigDecimal("0.06"), // 6%
+            ),
+            create(
+                amount = BigDecimal("3"), // 30%
+                priceChange = BigDecimal("-0.02"), // -2%
+            ),
+            create(
+                amount = BigDecimal("2"), // 20%
+                priceChange = BigDecimal("0.04"), // 4%
+            ),
+        )
+
+        // Act
+        val actual = PriceChangeCalculator.calculate(statuses)
+
+        // Assert
+        val expected = PriceChange(
+            value = BigDecimal("0.032"), // 3.2%
+            source = StatusSource.ACTUAL,
+        ).lceContent()
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    private fun create(amount: BigDecimal, priceChange: BigDecimal): CryptoCurrencyStatus {
+        val value = CryptoCurrencyStatus.Loaded(
+            amount = amount,
+            fiatAmount = amount,
+            fiatRate = BigDecimal.ONE,
+            priceChange = priceChange,
+            yieldBalance = null,
+            yieldSupplyStatus = null,
+            hasCurrentNetworkTransactions = false,
+            pendingTransactions = emptySet(),
+            networkAddress = NetworkAddress.Single(
+                defaultAddress = NetworkAddress.Address(
+                    value = "0x123",
+                    type = NetworkAddress.Address.Type.Primary,
+                ),
+            ),
+            sources = CryptoCurrencyStatus.Sources(),
+        )
+
+        return CryptoCurrencyStatus(currency = MockTokens.token1, value = value)
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TokenListFactoryTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TokenListFactoryTest.kt
new file mode 100644
index 0000000000..6e81b41b9a
--- /dev/null
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TokenListFactoryTest.kt
@@ -0,0 +1,185 @@
+package com.tangem.domain.tokens.operations
+
+import com.google.common.truth.Truth
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TokensGroupType
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.tokenlist.TokenList
+import com.tangem.domain.tokens.mock.MockTokens
+import com.tangem.domain.tokens.mock.MockTokensStates
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class TokenListFactoryTest {
+
+    @Test
+    fun `statuses is empty, return TokenList Empty`() {
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = emptyList(),
+            groupType = TokensGroupType.NONE, // doesn't matter
+            sortType = TokensSortType.BALANCE, // doesn't matter
+        )
+
+        // Assert
+        val expected = TokenList.Empty
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `create UNGROUPED token list WITHOUT sorting`() {
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = MockTokensStates.loadedTokensStates,
+            groupType = TokensGroupType.NONE,
+            sortType = TokensSortType.NONE,
+        )
+
+        // Assert
+        val expected = TokenList.Ungrouped(
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal("599.50"), source = StatusSource.ACTUAL),
+            sortedBy = TokensSortType.NONE,
+            currencies = MockTokensStates.loadedTokensStates,
+        )
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `create UNGROUPED token list WITH SORTING BY BALANCE`() {
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = MockTokensStates.loadedTokensStates,
+            groupType = TokensGroupType.NONE,
+            sortType = TokensSortType.BALANCE,
+        )
+
+        // Assert
+        val expected = TokenList.Ungrouped(
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal("599.50"), source = StatusSource.ACTUAL),
+            sortedBy = TokensSortType.BALANCE,
+            currencies = MockTokensStates.loadedTokensStates.reversed(),
+        )
+
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `create GROUPED token list WITHOUT sorting`() {
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = MockTokensStates.loadedTokensStates,
+            groupType = TokensGroupType.NETWORK,
+            sortType = TokensSortType.NONE,
+        )
+
+        // Assert
+        val expected = TokenList.GroupedByNetwork(
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal("599.50"), source = StatusSource.ACTUAL),
+            sortedBy = TokensSortType.NONE,
+            groups = listOf(
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token3.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[0],
+                        MockTokensStates.loadedTokensStates[1],
+                        MockTokensStates.loadedTokensStates[2],
+                    ),
+                ),
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token6.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[3],
+                        MockTokensStates.loadedTokensStates[4],
+                        MockTokensStates.loadedTokensStates[5],
+                    ),
+                ),
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token10.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[6],
+                        MockTokensStates.loadedTokensStates[7],
+                        MockTokensStates.loadedTokensStates[8],
+                        MockTokensStates.loadedTokensStates[9],
+                    ),
+                ),
+            ),
+        )
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `create GROUPED token list WITH SORTING BY BALANCE`() {
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = MockTokensStates.loadedTokensStates,
+            groupType = TokensGroupType.NETWORK,
+            sortType = TokensSortType.BALANCE,
+        )
+
+        // Assert
+        val expected = TokenList.GroupedByNetwork(
+            totalFiatBalance = TotalFiatBalance.Loaded(amount = BigDecimal("599.50"), source = StatusSource.ACTUAL),
+            sortedBy = TokensSortType.BALANCE,
+            groups = listOf(
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token10.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[9],
+                        MockTokensStates.loadedTokensStates[8],
+                        MockTokensStates.loadedTokensStates[7],
+                        MockTokensStates.loadedTokensStates[6],
+                    ),
+                ),
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token6.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[5],
+                        MockTokensStates.loadedTokensStates[4],
+                        MockTokensStates.loadedTokensStates[3],
+                    ),
+                ),
+                TokenList.GroupedByNetwork.NetworkGroup(
+                    network = MockTokens.token3.network,
+                    currencies = listOf(
+                        MockTokensStates.loadedTokensStates[2],
+                        MockTokensStates.loadedTokensStates[1],
+                        MockTokensStates.loadedTokensStates[0],
+                    ),
+                ),
+            ),
+        )
+
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+
+    @Test
+    fun `sorting will not be applied if any status is Loading`() {
+        // Arrange
+        val statuses = listOf(
+            CryptoCurrencyStatus(currency = MockTokens.token1, value = CryptoCurrencyStatus.Loading),
+            MockTokensStates.tokenState10,
+        )
+
+        // Act
+        val actual = TokenListFactory.create(
+            statuses = statuses,
+            groupType = TokensGroupType.NONE,
+            sortType = TokensSortType.BALANCE,
+        )
+
+        // Assert
+        val expected = TokenList.Ungrouped(
+            totalFiatBalance = TotalFiatBalance.Loading,
+            sortedBy = TokensSortType.BALANCE,
+            currencies = statuses,
+        )
+        Truth.assertThat(actual).isEqualTo(expected)
+    }
+}
\ No newline at end of file
diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculatorTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculatorTest.kt
new file mode 100644
index 0000000000..5c2a253292
--- /dev/null
+++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/operations/TotalFiatBalanceCalculatorTest.kt
@@ -0,0 +1,614 @@
+package com.tangem.domain.tokens.operations
+
+import arrow.core.nonEmptyListOf
+import com.google.common.truth.Truth
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.test.domain.token.MockCryptoCurrencyFactory
+import com.tangem.domain.models.StatusSource
+import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.NetworkAddress
+import com.tangem.domain.models.staking.BalanceItem
+import com.tangem.domain.models.staking.BalanceType
+import com.tangem.domain.models.staking.YieldBalance
+import com.tangem.domain.models.staking.YieldBalanceItem
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class TotalFiatBalanceCalculatorTest {
+
+    private val cryptoCurrencyFactory = MockCryptoCurrencyFactory()
+    private val binance = cryptoCurrencyFactory.createCoin(Blockchain.Binance)
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class CalculateCurrenciesLoadingOrNonComputable {
+
+        @Test
+        fun `one token is Loading, total is Loading`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createLoading(currency = cryptoCurrencyFactory.ethereum),
+                createNoQuote(currency = cryptoCurrencyFactory.stellar),
+                createMissedDerivation(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loading
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `one token is NoQuote, total is Failed`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoQuote(currency = cryptoCurrencyFactory.stellar),
+                createUnreachable(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Failed
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `one token is MissedDerivation, total is Failed`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoQuote(currency = cryptoCurrencyFactory.stellar),
+                createUnreachable(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Failed
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `one token is Unreachable and isIncludeToBalanceOnError is FALSE, total is Failed`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createUnreachable(currency = cryptoCurrencyFactory.stellar),
+                createNoAccount(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Failed
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `one token is NoAmount and isIncludeToBalanceOnError is FALSE, total is Failed`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAmount(currency = cryptoCurrencyFactory.stellar),
+                createNoAccount(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Failed
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class CalculateCurrenciesComputable {
+
+        @Test
+        fun `Unreachable token isIncludeToBalanceOnError, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(createUnreachable(currency = binance))
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal.ZERO,
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `NoAmount token isIncludeToBalanceOnError, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(createNoAmount(currency = binance))
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal.ZERO,
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `all tokens are NoAccount, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAccount(currency = cryptoCurrencyFactory.ethereum),
+                createNoAccount(currency = cryptoCurrencyFactory.stellar),
+                createNoAccount(currency = cryptoCurrencyFactory.chia),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal.ZERO,
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `all tokens are Custom, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                /**
+                 * Balance: 10
+                 * - fiat: 10
+                 * - staking: 0
+                 */
+                createCustom(
+                    currency = cryptoCurrencyFactory.ethereum,
+                    fiatAmount = BigDecimal.TEN,
+                ),
+                /**
+                 * Balance: 20
+                 * - fiat: 0
+                 * - staking: 20 (REWARDS)
+                 */
+                createCustom(
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ZERO,
+                    yieldBalance = createYieldBalance(
+                        amount = BigDecimal(20),
+                        // It is important to use `BalanceType.REWARDS` because Cardano should not include the full
+                        // staking balance. See `getTotalWithRewardsStakingBalance`.
+                        balanceType = BalanceType.REWARDS,
+                    ),
+                ),
+                /**
+                 * Balance: 10
+                 * - fiat: 1
+                 * - staking: 9 (STAKED)
+                 */
+                createCustom(
+                    currency = cryptoCurrencyFactory.stellar,
+                    fiatAmount = BigDecimal.ONE,
+                    yieldBalance = createYieldBalance(
+                        amount = BigDecimal(9),
+                        balanceType = BalanceType.STAKED,
+                    ),
+                ),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal(40),
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `all tokens are Loaded, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                /**
+                 * Balance: 10
+                 * - fiat: 10
+                 * - staking: 0
+                 */
+                createLoaded(
+                    currency = cryptoCurrencyFactory.ethereum,
+                    fiatAmount = BigDecimal.TEN,
+                ),
+                /**
+                 * Balance: 20
+                 * - fiat: 0
+                 * - staking: 20 (REWARDS)
+                 */
+                createLoaded(
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ZERO,
+                    yieldBalance = createYieldBalance(
+                        amount = BigDecimal(20),
+                        // It is important to use `BalanceType.REWARDS` because Cardano should not include the full
+                        // staking balance. See `getTotalWithRewardsStakingBalance`.
+                        balanceType = BalanceType.REWARDS,
+                    ),
+                ),
+                /**
+                 * Balance: 10
+                 * - fiat: 1
+                 * - staking: 9 (STAKED)
+                 */
+                createLoaded(
+                    currency = cryptoCurrencyFactory.stellar,
+                    fiatAmount = BigDecimal.ONE,
+                    yieldBalance = createYieldBalance(
+                        amount = BigDecimal(9),
+                        balanceType = BalanceType.STAKED,
+                    ),
+                ),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal(40),
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `tokens contain all types of computable statuses, total is Loaded`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAccount(currency = cryptoCurrencyFactory.ethereum), // 0
+                createNoAmount(currency = binance), // 0
+                createUnreachable(currency = binance), // 0
+                createCustom(
+                    // 1
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ONE,
+                ),
+                createLoaded(
+                    // 10
+                    currency = cryptoCurrencyFactory.stellar,
+                    fiatAmount = BigDecimal.TEN,
+                ),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(statuses)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal(11),
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is Actual is all tokens are Actual`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAccount(currency = cryptoCurrencyFactory.ethereum),
+                createNoAmount(currency = binance),
+                createUnreachable(currency = binance),
+                createCustom(
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ONE,
+                ),
+                createLoaded(
+                    currency = cryptoCurrencyFactory.stellar,
+                    fiatAmount = BigDecimal.TEN,
+                ),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(statuses) as TotalFiatBalance.Loaded).source
+
+            // Assert
+            val expected = StatusSource.ACTUAL
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is Cache is any token is Cache`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAccount(currency = cryptoCurrencyFactory.ethereum),
+                createNoAmount(currency = binance),
+                createLoaded(
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ONE,
+                    source = StatusSource.CACHE,
+                ),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(statuses) as TotalFiatBalance.Loaded).source
+
+            // Assert
+            val expected = StatusSource.CACHE
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is ONLY_CACHE is any token is ONLY_CACHE`() {
+            // Arrange
+            val statuses = nonEmptyListOf(
+                createNoAccount(currency = cryptoCurrencyFactory.ethereum),
+                createNoAmount(currency = binance),
+                createLoaded(
+                    currency = cryptoCurrencyFactory.cardano,
+                    fiatAmount = BigDecimal.ONE,
+                    source = StatusSource.ONLY_CACHE,
+                ),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(statuses) as TotalFiatBalance.Loaded).source
+
+            // Assert
+            val expected = StatusSource.ONLY_CACHE
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class CalculateBalancesLoadingOrNonComputable {
+
+        @Test
+        fun `one balance is Loading, total is Loading`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Loading,
+                TotalFiatBalance.Failed,
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(balances)
+
+            // Assert
+            val expected = TotalFiatBalance.Loading
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `one balance is Failed, total is Failed`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Failed,
+                TotalFiatBalance.Loaded(amount = BigDecimal.ONE, source = StatusSource.ACTUAL),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(balances)
+
+            // Assert
+            val expected = TotalFiatBalance.Failed
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    inner class CalculateBalancesComputable {
+
+        @Test
+        fun `all balances are Loaded, total is Loaded`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Loaded(amount = BigDecimal.TEN, source = StatusSource.ACTUAL),
+                TotalFiatBalance.Loaded(amount = BigDecimal.ONE, source = StatusSource.ACTUAL),
+            )
+
+            // Act
+            val actual = TotalFiatBalanceCalculator.calculate(balances)
+
+            // Assert
+            val expected = TotalFiatBalance.Loaded(
+                amount = BigDecimal(11),
+                source = StatusSource.ACTUAL,
+            )
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is Actual is all balances are Actual`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Loaded(amount = BigDecimal.TEN, source = StatusSource.ACTUAL),
+                TotalFiatBalance.Loaded(amount = BigDecimal.ONE, source = StatusSource.ACTUAL),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(balances) as TotalFiatBalance.Loaded).source
+
+            // Assert
+            val expected = StatusSource.ACTUAL
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is Cache is any balance is Cache`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Loaded(amount = BigDecimal.TEN, source = StatusSource.ACTUAL),
+                TotalFiatBalance.Loaded(amount = BigDecimal.ONE, source = StatusSource.CACHE),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(balances) as TotalFiatBalance.Loaded).source
+
+            // Assert
+            val expected = StatusSource.CACHE
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+
+        @Test
+        fun `StatusSource is ONLY_CACHE is any balance is ONLY_CACHE`() {
+            // Arrange
+            val balances = nonEmptyListOf(
+                TotalFiatBalance.Loaded(amount = BigDecimal.TEN, source = StatusSource.ACTUAL),
+                TotalFiatBalance.Loaded(amount = BigDecimal.ONE, source = StatusSource.ONLY_CACHE),
+            )
+
+            // Act
+            val actual = (TotalFiatBalanceCalculator.calculate(balances) as TotalFiatBalance.Loaded).source
+            // Assert
+            val expected = StatusSource.ONLY_CACHE
+            Truth.assertThat(actual).isEqualTo(expected)
+        }
+    }
+
+    private fun createLoading(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Loading,
+        )
+    }
+
+    private fun createNoQuote(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.NoQuote(
+                amount = BigDecimal.ONE,
+                yieldBalance = null,
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = createNetworkAddress(),
+                sources = CryptoCurrencyStatus.Sources(),
+            ),
+        )
+    }
+
+    private fun createMissedDerivation(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.MissedDerivation(priceChange = null, fiatRate = null),
+        )
+    }
+
+    private fun createUnreachable(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Unreachable(priceChange = null, fiatRate = null, networkAddress = null),
+        )
+    }
+
+    private fun createNoAmount(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.NoAmount(priceChange = null, fiatRate = null),
+        )
+    }
+
+    private fun createNoAccount(currency: CryptoCurrency): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.NoAccount(
+                priceChange = null,
+                amountToCreateAccount = BigDecimal.ONE,
+                fiatAmount = null,
+                fiatRate = null,
+                networkAddress = createNetworkAddress(),
+                sources = CryptoCurrencyStatus.Sources(),
+            ),
+        )
+    }
+
+    private fun createCustom(
+        currency: CryptoCurrency,
+        fiatAmount: BigDecimal?,
+        yieldBalance: YieldBalance? = null,
+    ): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Custom(
+                amount = BigDecimal.ONE,
+                fiatAmount = fiatAmount,
+                fiatRate = BigDecimal.ONE,
+                priceChange = BigDecimal.ZERO,
+                yieldBalance = yieldBalance,
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = createNetworkAddress(),
+                sources = CryptoCurrencyStatus.Sources(),
+            ),
+        )
+    }
+
+    private fun createLoaded(
+        currency: CryptoCurrency,
+        fiatAmount: BigDecimal,
+        yieldBalance: YieldBalance? = null,
+        source: StatusSource = StatusSource.ACTUAL,
+    ): CryptoCurrencyStatus {
+        return CryptoCurrencyStatus(
+            currency = currency,
+            value = CryptoCurrencyStatus.Loaded(
+                amount = BigDecimal.ONE,
+                fiatAmount = fiatAmount,
+                fiatRate = BigDecimal.ONE,
+                priceChange = BigDecimal.ZERO,
+                yieldBalance = yieldBalance,
+                yieldSupplyStatus = null,
+                hasCurrentNetworkTransactions = false,
+                pendingTransactions = emptySet(),
+                networkAddress = createNetworkAddress(),
+                sources = CryptoCurrencyStatus.Sources(source, source, source),
+            ),
+        )
+    }
+
+    private fun createYieldBalance(amount: BigDecimal, balanceType: BalanceType): YieldBalance.Data {
+        return YieldBalance.Data(
+            stakingId = mockk(),
+            source = StatusSource.ACTUAL,
+            balance = YieldBalanceItem(
+                items = listOf(
+                    mockk<BalanceItem> {
+                        every { this@mockk.amount } returns amount
+                        every { this@mockk.type } returns balanceType
+                    },
+                ),
+                integrationId = "",
+            ),
+        )
+    }
+
+    private fun createNetworkAddress(): NetworkAddress.Single {
+        return NetworkAddress.Single(
+            defaultAddress = NetworkAddress.Address(
+                value = "0x1",
+                type = NetworkAddress.Address.Type.Primary,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/FeeRepository.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/FeeRepository.kt
index f2b3a91661..f0bfdcf442 100644
--- a/domain/transaction/src/main/java/com/tangem/domain/transaction/FeeRepository.kt
+++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/FeeRepository.kt
@@ -2,6 +2,7 @@ package com.tangem.domain.transaction
 
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.network.Network
@@ -18,4 +19,6 @@ interface FeeRepository {
         cryptoCurrency: CryptoCurrency,
         transactionData: TransactionData,
     ): TransactionFee
+
+    suspend fun getEthereumFeeWithoutGas(userWallet: UserWallet, cryptoCurrency: CryptoCurrency): Fee.Ethereum
 }
\ No newline at end of file
diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/CreateApprovalTransactionUseCase.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/CreateApprovalTransactionUseCase.kt
index f4671bc0c4..372658db74 100644
--- a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/CreateApprovalTransactionUseCase.kt
+++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/CreateApprovalTransactionUseCase.kt
@@ -2,10 +2,10 @@ package com.tangem.domain.transaction.usecase
 
 import arrow.core.Either
 import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.transaction.TransactionRepository
 import com.tangem.domain.utils.convertToSdkAmount
-import com.tangem.domain.models.wallet.UserWalletId
 import java.math.BigDecimal
 
 /**
@@ -17,7 +17,7 @@ class CreateApprovalTransactionUseCase(
 
     @Suppress("LongParameterList")
     suspend operator fun invoke(
-        cryptoCurrency: CryptoCurrency.Token,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
         userWalletId: UserWalletId,
         amount: BigDecimal?,
         fee: Fee?,
@@ -25,31 +25,31 @@ class CreateApprovalTransactionUseCase(
         spenderAddress: String,
     ) = Either.catch {
         transactionRepository.createApprovalTransaction(
-            amount = BigDecimal.ZERO.convertToSdkAmount(cryptoCurrency),
-            approvalAmount = amount?.convertToSdkAmount(cryptoCurrency),
+            amount = BigDecimal.ZERO.convertToSdkAmount(cryptoCurrencyStatus),
+            approvalAmount = amount?.convertToSdkAmount(cryptoCurrencyStatus),
             contractAddress = contractAddress,
             spenderAddress = spenderAddress,
             userWalletId = userWalletId,
-            network = cryptoCurrency.network,
+            network = cryptoCurrencyStatus.currency.network,
             fee = fee,
         )
     }
 
     @Suppress("LongParameterList")
     suspend operator fun invoke(
-        cryptoCurrency: CryptoCurrency.Token,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
         userWalletId: UserWalletId,
         amount: BigDecimal?,
         contractAddress: String,
         spenderAddress: String,
     ) = Either.catch {
         transactionRepository.createApprovalTransaction(
-            amount = BigDecimal.ZERO.convertToSdkAmount(cryptoCurrency),
-            approvalAmount = amount?.convertToSdkAmount(cryptoCurrency),
+            amount = BigDecimal.ZERO.convertToSdkAmount(cryptoCurrencyStatus),
+            approvalAmount = amount?.convertToSdkAmount(cryptoCurrencyStatus),
             contractAddress = contractAddress,
             spenderAddress = spenderAddress,
             userWalletId = userWalletId,
-            network = cryptoCurrency.network,
+            network = cryptoCurrencyStatus.currency.network,
             fee = null,
         )
     }
diff --git a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/EstimateFeeUseCase.kt b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/EstimateFeeUseCase.kt
index 0a7a430a35..1120252b63 100644
--- a/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/EstimateFeeUseCase.kt
+++ b/domain/transaction/src/main/java/com/tangem/domain/transaction/usecase/EstimateFeeUseCase.kt
@@ -3,18 +3,17 @@ package com.tangem.domain.transaction.usecase
 import arrow.core.Either
 import arrow.core.left
 import arrow.core.right
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.AmountType
-import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchain.extensions.Result
-import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.demo.DemoTransactionSender
+import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.transaction.error.GetFeeError
 import com.tangem.domain.transaction.error.mapToFeeError
+import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.models.wallet.UserWallet
 import java.math.BigDecimal
 
 /**
@@ -27,13 +26,13 @@ class EstimateFeeUseCase(
     suspend operator fun invoke(
         amount: BigDecimal,
         userWallet: UserWallet,
-        cryptoCurrency: CryptoCurrency,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
     ): Either<GetFeeError, TransactionFee> {
-        val amountData = convertCryptoCurrencyToAmount(cryptoCurrency, amount)
+        val amountData = amount.convertToSdkAmount(cryptoCurrencyStatus)
         val result = if (userWallet is UserWallet.Cold &&
             demoConfig.isDemoCardId(userWallet.scanResponse.card.cardId)
         ) {
-            demoTransactionSender(userWallet, cryptoCurrency).estimateFee(
+            demoTransactionSender(userWallet, cryptoCurrencyStatus.currency).estimateFee(
                 amount = amountData,
                 destination = "",
             )
@@ -41,7 +40,7 @@ class EstimateFeeUseCase(
             walletManagersFacade.estimateFee(
                 amount = amountData,
                 userWalletId = userWallet.walletId,
-                network = cryptoCurrency.network,
+                network = cryptoCurrencyStatus.currency.network,
             )
         }
 
@@ -62,20 +61,4 @@ class EstimateFeeUseCase(
                 ?: error("WalletManager is null"),
         )
     }
-
-    private fun convertCryptoCurrencyToAmount(cryptoCurrency: CryptoCurrency, amount: BigDecimal) = Amount(
-        currencySymbol = cryptoCurrency.symbol,
-        value = amount,
-        decimals = cryptoCurrency.decimals,
-        type = when (cryptoCurrency) {
-            is CryptoCurrency.Coin -> AmountType.Coin
-            is CryptoCurrency.Token -> AmountType.Token(
-                token = Token(
-                    symbol = cryptoCurrency.symbol,
-                    contractAddress = cryptoCurrency.contractAddress,
-                    decimals = cryptoCurrency.decimals,
-                ),
-            )
-        },
-    )
 }
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/model/TxHistoryListConfig.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/model/TxHistoryListConfig.kt
index e39db49219..2d18dfca95 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/model/TxHistoryListConfig.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/model/TxHistoryListConfig.kt
@@ -3,4 +3,4 @@ package com.tangem.domain.txhistory.model
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
 
-data class TxHistoryListConfig(val userWalletId: UserWalletId, val currency: CryptoCurrency, val refresh: Boolean)
\ No newline at end of file
+data class TxHistoryListConfig(val userWalletId: UserWalletId, val currency: CryptoCurrency, val shouldRefresh: Boolean)
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
index 43ba92e686..d040f021e3 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/repository/TxHistoryRepository.kt
@@ -32,6 +32,6 @@ interface TxHistoryRepository {
         userWalletId: UserWalletId,
         currency: CryptoCurrency,
         pageSize: Int,
-        refresh: Boolean,
+        shouldRefresh: Boolean,
     ): List<TxInfo>
 }
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetFixedTxHistoryItemsUseCase.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetFixedTxHistoryItemsUseCase.kt
index 903126a53d..912cd3cc36 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetFixedTxHistoryItemsUseCase.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetFixedTxHistoryItemsUseCase.kt
@@ -29,7 +29,14 @@ class GetFixedTxHistoryItemsUseCase(
     ): Either<TxHistoryListError, Flow<List<TxInfo>>> {
         return Either.catch {
             flow {
-                emit(repository.getFixedSizeTxHistoryItems(userWalletId, currency, pageSize, refresh))
+                emit(
+                    repository.getFixedSizeTxHistoryItems(
+                        userWalletId = userWalletId,
+                        currency = currency,
+                        pageSize = pageSize,
+                        shouldRefresh = refresh,
+                    ),
+                )
             }
         }.mapLeft { TxHistoryListError.DataError(it) }
     }
@@ -38,10 +45,15 @@ class GetFixedTxHistoryItemsUseCase(
         userWalletId: UserWalletId,
         currency: CryptoCurrency,
         pageSize: Int = DEFAULT_PAGE_SIZE,
-        refresh: Boolean = false,
+        shouldRefresh: Boolean = false,
     ): Either<TxHistoryListError, List<TxInfo>> {
         return Either.catch {
-            repository.getFixedSizeTxHistoryItems(userWalletId, currency, pageSize, refresh)
+            repository.getFixedSizeTxHistoryItems(
+                userWalletId = userWalletId,
+                currency = currency,
+                pageSize = pageSize,
+                shouldRefresh = shouldRefresh,
+            )
         }.mapLeft { TxHistoryListError.DataError(it) }
     }
 }
\ No newline at end of file
diff --git a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
index 83a3920bb2..128e4a23b6 100644
--- a/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
+++ b/domain/txhistory/src/main/kotlin/com/tangem/domain/txhistory/usecase/GetTxHistoryItemsUseCase.kt
@@ -25,7 +25,12 @@ class GetTxHistoryItemsUseCase(private val repository: TxHistoryRepository) {
     ): Either<TxHistoryListError, Flow<PagingData<TxInfo>>> {
         return either {
             repository
-                .getTxHistoryItems(userWalletId, currency, pageSize, refresh)
+                .getTxHistoryItems(
+                    userWalletId = userWalletId,
+                    currency = currency,
+                    pageSize = pageSize,
+                    refresh = refresh,
+                )
                 .catch { raise(TxHistoryListError.DataError(it)) }
         }
     }
diff --git a/domain/visa/build.gradle.kts b/domain/visa/build.gradle.kts
index 921d77a54c..e3bc73d03b 100644
--- a/domain/visa/build.gradle.kts
+++ b/domain/visa/build.gradle.kts
@@ -10,17 +10,18 @@ android {
 }
 
 dependencies {
-    /** Domain models */
-    api(projects.domain.visa.models)
-
-    /** Project - Domain */
+    /** Project - Core */
+    api(projects.core.pagination)
     implementation(projects.core.utils)
     implementation(projects.core.error)
+
+    /** Project - Domain */
     api(projects.domain.models)
-    implementation(projects.domain.core)
-    implementation(projects.domain.wallets.models)
-    implementation(projects.domain.tokens.models)
+    api(projects.domain.visa.models)
     implementation(projects.domain.appCurrency.models)
+    implementation(projects.domain.core)
+    implementation(projects.domain.tokens.models)
+    implementation(projects.domain.wallets.models)
 
     /** Security */
     implementation(deps.spongecastle.core)
diff --git a/domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/TangemPayTxHistoryItem.kt b/domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/TangemPayTxHistoryItem.kt
new file mode 100644
index 0000000000..65d960d01c
--- /dev/null
+++ b/domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/TangemPayTxHistoryItem.kt
@@ -0,0 +1,39 @@
+package com.tangem.domain.visa.model
+
+import org.joda.time.DateTime
+import java.math.BigDecimal
+import java.util.Currency
+
+sealed class TangemPayTxHistoryItem {
+    abstract val id: String
+    abstract val date: DateTime
+    abstract val amount: BigDecimal
+    abstract val currency: Currency
+
+    data class Spend(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+        val enrichedMerchantName: String?,
+        val merchantName: String,
+        val enrichedMerchantCategory: String?,
+        val merchantCategory: String,
+        val status: String,
+        val enrichedMerchantIconUrl: String?,
+    ) : TangemPayTxHistoryItem()
+
+    data class Payment(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+    ) : TangemPayTxHistoryItem()
+
+    data class Fee(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+    ) : TangemPayTxHistoryItem()
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt b/domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt
similarity index 87%
rename from domain/visa/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt
rename to domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt
index 6d3bcc876a..154766e32c 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt
+++ b/domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/VisaTxHistoryItem.kt
@@ -12,4 +12,6 @@ data class VisaTxHistoryItem(
     val merchantName: String?,
     val status: String,
     val fiatCurrency: Currency,
-)
\ No newline at end of file
+) {
+    val timeStampInMillis: Long = date.millis
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/CustomerInfo.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/CustomerInfo.kt
index b018ac10da..9a5438f259 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/CustomerInfo.kt
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/CustomerInfo.kt
@@ -1,19 +1,31 @@
 package com.tangem.domain.pay.model
 
+import java.math.BigDecimal
+
 private const val APPROVED_KYC_STATUS = "APPROVED"
-private const val ACTIVE_PI_STATUS = "active"
+
+data class MainScreenCustomerInfo(
+    val info: CustomerInfo,
+    val orderStatus: OrderStatus,
+)
 
 data class CustomerInfo(
     val productInstance: ProductInstance?,
     val kycStatus: String?,
+    val cardInfo: CardInfo?,
 ) {
 
+    data class ProductInstance(
+        val id: String,
+        val status: String,
+    )
+
+    data class CardInfo(
+        val lastFourDigits: String,
+        val balance: BigDecimal,
+        val currencyCode: String,
+        val customerWalletAddress: String,
+    )
+
     fun isKycApproved() = kycStatus == APPROVED_KYC_STATUS
-
-    fun isProductInstanceActive() = productInstance?.status == ACTIVE_PI_STATUS
-}
-
-data class ProductInstance(
-    val id: String,
-    val status: String,
-)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/OrderStatus.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/OrderStatus.kt
new file mode 100644
index 0000000000..6cab68a6fd
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/OrderStatus.kt
@@ -0,0 +1,9 @@
+package com.tangem.domain.pay.model
+
+enum class OrderStatus(val apiName: String) {
+    NOT_ISSUED(""),
+    NEW("NEW"),
+    PROCESSING("PROCESSING"),
+    COMPLETED("COMPLETED"),
+    CANCELED("CANCELED"),
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardBalance.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardBalance.kt
new file mode 100644
index 0000000000..cb19b0a2cd
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardBalance.kt
@@ -0,0 +1,8 @@
+package com.tangem.domain.pay.model
+
+import java.math.BigDecimal
+
+data class TangemPayCardBalance(
+    val balance: BigDecimal,
+    val currencyCode: String,
+)
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardDetails.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardDetails.kt
new file mode 100644
index 0000000000..8aaa3e8c61
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/model/TangemPayCardDetails.kt
@@ -0,0 +1,11 @@
+package com.tangem.domain.pay.model
+
+/**
+ * Returned dynamically to show on the UI. Never saved anywhere
+ */
+data class TangemPayCardDetails(
+    val pan: String,
+    val cvv: String,
+    val expirationYear: String,
+    val expirationMonth: String,
+)
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/CardDetailsRepository.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/CardDetailsRepository.kt
new file mode 100644
index 0000000000..39b0e8edfa
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/CardDetailsRepository.kt
@@ -0,0 +1,13 @@
+package com.tangem.domain.pay.repository
+
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
+import com.tangem.domain.pay.model.TangemPayCardBalance
+import com.tangem.domain.pay.model.TangemPayCardDetails
+
+interface CardDetailsRepository {
+
+    suspend fun getCardBalance(): Either<UniversalError, TangemPayCardBalance>
+
+    suspend fun revealCardDetails(): Either<UniversalError, TangemPayCardDetails>
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
index 4838f46c53..5c93a97e19 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
@@ -3,10 +3,18 @@ package com.tangem.domain.pay.repository
 import arrow.core.Either
 import com.tangem.core.error.UniversalError
 import com.tangem.domain.pay.model.CustomerInfo
+import com.tangem.domain.pay.model.MainScreenCustomerInfo
 
 interface OnboardingRepository {
 
     suspend fun validateDeeplink(link: String): Either<UniversalError, Boolean>
 
     suspend fun getCustomerInfo(): Either<UniversalError, CustomerInfo>
+
+    suspend fun createOrder(): Either<UniversalError, Unit>
+
+    /**
+     * Returns only if the user already authorised at least once
+     */
+    suspend fun getMainScreenCustomerInfo(): Either<UniversalError, MainScreenCustomerInfo>
 }
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayIssueOrderUseCase.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayIssueOrderUseCase.kt
new file mode 100644
index 0000000000..6127e5225b
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayIssueOrderUseCase.kt
@@ -0,0 +1,12 @@
+package com.tangem.domain.pay.usecase
+
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
+import com.tangem.domain.pay.repository.OnboardingRepository
+
+class TangemPayIssueOrderUseCase(
+    private val repository: OnboardingRepository,
+) {
+
+    suspend operator fun invoke(): Either<UniversalError, Unit> = repository.createOrder()
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayMainScreenCustomerInfoUseCase.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayMainScreenCustomerInfoUseCase.kt
new file mode 100644
index 0000000000..1f49a481e2
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayMainScreenCustomerInfoUseCase.kt
@@ -0,0 +1,15 @@
+package com.tangem.domain.pay.usecase
+
+import com.tangem.domain.pay.model.MainScreenCustomerInfo
+import com.tangem.domain.pay.repository.OnboardingRepository
+
+/**
+ * Returns tangem pay customer info for the main screen banner
+ * Works only if the user already authorised at least once (won't emit anything otherwise)
+ */
+class TangemPayMainScreenCustomerInfoUseCase(
+    private val repository: OnboardingRepository,
+) {
+
+    suspend operator fun invoke(): MainScreenCustomerInfo? = repository.getMainScreenCustomerInfo().getOrNull()
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryListConfig.kt b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryListConfig.kt
new file mode 100644
index 0000000000..fb61bc2965
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryListConfig.kt
@@ -0,0 +1,3 @@
+package com.tangem.domain.tangempay.model
+
+data class TangemPayTxHistoryListConfig(val customerWalletAddress: String, val shouldRefresh: Boolean)
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryTypeAliases.kt b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryTypeAliases.kt
new file mode 100644
index 0000000000..5f3c7c4d50
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/model/TangemPayTxHistoryTypeAliases.kt
@@ -0,0 +1,9 @@
+package com.tangem.domain.tangempay.model
+
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.pagination.BatchFlow
+import com.tangem.pagination.BatchingContext
+
+typealias TangemPayTxHistoryListBatchingContext = BatchingContext<Int, TangemPayTxHistoryListConfig, Nothing>
+
+typealias TangemPayTxHistoryListBatchFlow = BatchFlow<Int, List<TangemPayTxHistoryItem>, Nothing>
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/repository/TangemPayTxHistoryRepository.kt b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/repository/TangemPayTxHistoryRepository.kt
new file mode 100644
index 0000000000..7915f1b83d
--- /dev/null
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/tangempay/repository/TangemPayTxHistoryRepository.kt
@@ -0,0 +1,11 @@
+package com.tangem.domain.tangempay.repository
+
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListBatchFlow
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListBatchingContext
+
+interface TangemPayTxHistoryRepository {
+    fun getTxHistoryBatchFlow(
+        batchSize: Int,
+        context: TangemPayTxHistoryListBatchingContext,
+    ): TangemPayTxHistoryListBatchFlow
+}
\ No newline at end of file
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/visa/GetVisaTxHistoryUseCase.kt b/domain/visa/src/main/kotlin/com/tangem/domain/visa/GetVisaTxHistoryUseCase.kt
index f0a07ce920..589debf691 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/visa/GetVisaTxHistoryUseCase.kt
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/visa/GetVisaTxHistoryUseCase.kt
@@ -15,7 +15,7 @@ class GetVisaTxHistoryUseCase(
     private val visaRepository: VisaRepository,
 ) {
 
-    suspend operator fun invoke(
+    operator fun invoke(
         userWalletId: UserWalletId,
         pageSize: Int = DEFAULT_PAGE_SIZE,
         isRefresh: Boolean = false,
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/visa/repository/VisaRepository.kt b/domain/visa/src/main/kotlin/com/tangem/domain/visa/repository/VisaRepository.kt
index fb0c17fc47..02c8b0c061 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/visa/repository/VisaRepository.kt
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/visa/repository/VisaRepository.kt
@@ -11,7 +11,7 @@ interface VisaRepository {
 
     suspend fun getVisaCurrency(userWalletId: UserWalletId, isRefresh: Boolean = false): VisaCurrency
 
-    suspend fun getTxHistory(
+    fun getTxHistory(
         userWalletId: UserWalletId,
         pageSize: Int,
         isRefresh: Boolean = false,
diff --git a/domain/wallets/build.gradle.kts b/domain/wallets/build.gradle.kts
index a467663bf5..9091554999 100644
--- a/domain/wallets/build.gradle.kts
+++ b/domain/wallets/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
 
     // region Domain modules
     api(projects.domain.core)
+    api(projects.domain.common)
     implementation(projects.domain.legacy)
     implementation(projects.domain.walletManager)
     implementation(projects.libs.blockchainSdk)
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/delegate/DefaultUserWalletsSyncDelegate.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/delegate/DefaultUserWalletsSyncDelegate.kt
index 403ac7a76b..8af6e7c2ee 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/delegate/DefaultUserWalletsSyncDelegate.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/delegate/DefaultUserWalletsSyncDelegate.kt
@@ -4,13 +4,13 @@ import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.raise.ensure
 import com.tangem.common.CompletionResult
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.wallets.models.UpdateWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.wallets.models.UserWalletRemoteInfo
 import com.tangem.domain.models.wallet.copy
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.wallets.models.UpdateWalletError
+import com.tangem.domain.wallets.models.UserWalletRemoteInfo
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.withContext
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
index 68491232aa..cccba8a293 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManager.kt
@@ -102,21 +102,21 @@ interface UserWalletsListManager {
         /**
          * Indicates that all [UserWallet]s is locked
          *
-         * @see [isLockedSync]
+         * @see [isLocked]
          * @see [UserWallet.isLocked]
          */
-        val isLocked: Flow<Boolean>
+        val lockedState: Flow<Boolean>
 
         /**
          * Indicates that all [UserWallet]s is locked. Sync version.
          *
-         * @see [isLocked]
+         * @see [lockedState]
          * @see [UserWallet.isLocked]
          */
-        val isLockedSync: Boolean
+        val isLocked: Boolean
 
         /**
-         * Receive saved [UserWallet]s, populate [userWallets] flow with it and set [isLocked] as false.
+         * Receive saved [UserWallet]s, populate [userWallets] flow with it and set [lockedState] as false.
          *
          * @param type Defines the behavior of the operation.
          *
@@ -125,7 +125,7 @@ interface UserWalletsListManager {
          */
         suspend fun unlock(type: UnlockType): CompletionResult<UserWallet>
 
-        /** Remove [UserWallet]s from [userWallets] and set [isLocked] as true */
+        /** Remove [UserWallet]s from [userWallets] and set [lockedState] as true */
         fun lock()
 
         /**
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManagerExtensions.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManagerExtensions.kt
index 8436bea168..cb47f21996 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManagerExtensions.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/legacy/UserWalletsListManagerExtensions.kt
@@ -12,20 +12,20 @@ import kotlinx.coroutines.flow.flowOf
  * @return If [UserWalletsListManager] not implements [UserWalletsListManager.Lockable] returns [Flow] which
  * produces only one false value
  *
- * @see UserWalletsListManager.Lockable.isLockedSync
+ * @see UserWalletsListManager.Lockable.isLocked
  * */
 val UserWalletsListManager.isLocked: Flow<Boolean>
-    get() = asLockable()?.isLocked ?: flowOf(false)
+    get() = asLockable()?.lockedState ?: flowOf(false)
 
 /**
  * Indicates that the [UserWalletsListManager] is locked
  *
  * @return If [UserWalletsListManager] not implements [UserWalletsListManager.Lockable] returns false
  *
- * @see UserWalletsListManager.Lockable.isLockedSync
+ * @see UserWalletsListManager.Lockable.isLocked
  * */
 val UserWalletsListManager.isLockedSync: Boolean
-    get() = asLockable()?.isLockedSync == true
+    get() = asLockable()?.isLocked == true
 
 /**
  * Call [UserWalletsListManager.Lockable.unlock] if [UserWalletsListManager] implements [UserWalletsListManager.Lockable]
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
index c3c49c4f7e..22123c07a7 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/DeleteWalletUseCase.kt
@@ -3,10 +3,10 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.raise.either
 import com.tangem.common.doOnFailure
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.error.DeleteWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.DeleteWalletError
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 
 /**
  * Use case for deleting user wallet
@@ -26,7 +26,7 @@ class DeleteWalletUseCase(
      *
      * @param userWalletId ID of user wallet to be deleted.
      *
-     * @return [Either] with [DeleteWalletError] or [Boolean] which indicates that there are still saved wallets.
+     * @return [Either] with [com.tangem.domain.common.wallets.error.DeleteWalletError] or [Boolean] which indicates that there are still saved wallets.
      * */
     suspend operator fun invoke(userWalletId: UserWalletId): Either<DeleteWalletError, Boolean> {
         if (useNewRepository) {
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GenerateWalletNameUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GenerateWalletNameUseCase.kt
index fdc88856e7..696e8dc79f 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GenerateWalletNameUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GenerateWalletNameUseCase.kt
@@ -1,9 +1,9 @@
 package com.tangem.domain.wallets.usecase
 
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.requireUserWalletsSync
 import com.tangem.domain.models.scan.ProductType
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.requireUserWalletsSync
 
 /**
  * Use case for user wallet name generation
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSavedWalletsCountUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSavedWalletsCountUseCase.kt
index 32233cdbf9..2784698845 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSavedWalletsCountUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSavedWalletsCountUseCase.kt
@@ -1,11 +1,14 @@
 package com.tangem.domain.wallets.usecase
 
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.asLockable
 import com.tangem.domain.wallets.legacy.isLockedSync
-import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 
 class GetSavedWalletsCountUseCase(
     private val userWalletsListManager: UserWalletsListManager,
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
index 5b681fb679..549813b0bf 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletSyncUseCase.kt
@@ -3,10 +3,10 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.GetUserWalletError
-import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 
 /**
  * Use case for getting selected wallet.
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
index 57a01d23fb..2f62d3a115 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetSelectedWalletUseCase.kt
@@ -2,10 +2,10 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.raise.either
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.GetUserWalletError
-import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNotNull
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
index 6f4e13f0f0..8ca4292c70 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetUserWalletUseCase.kt
@@ -5,13 +5,13 @@ import arrow.core.left
 import arrow.core.raise.either
 import arrow.core.raise.ensureNotNull
 import arrow.core.right
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.requireUserWalletsSync
 import com.tangem.domain.core.utils.EitherFlow
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.requireUserWalletsSync
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.wallets.models.GetUserWalletError
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.transformLatest
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletNamesUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletNamesUseCase.kt
index 377bf1b152..549644162e 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletNamesUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletNamesUseCase.kt
@@ -1,8 +1,8 @@
 package com.tangem.domain.wallets.usecase
 
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.requireUserWalletsSync
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.requireUserWalletsSync
 
 /**
  * Use case for getting list of user wallets names.
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
index 6635d63099..d92a9a5555 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetWalletsUseCase.kt
@@ -1,8 +1,8 @@
 package com.tangem.domain.wallets.usecase
 
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
index 05d47b70d0..25722fa134 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsNeedToBackupUseCase.kt
@@ -1,10 +1,10 @@
 package com.tangem.domain.wallets.usecase
 
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.scan.CardDTO
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsWalletAlreadySavedUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsWalletAlreadySavedUseCase.kt
index c620ca93ce..86cf920cd5 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsWalletAlreadySavedUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/IsWalletAlreadySavedUseCase.kt
@@ -2,8 +2,8 @@ package com.tangem.domain.wallets.usecase
 
 import arrow.core.Either
 import arrow.core.raise.either
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.SaveWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
index 7e328ae146..354d0b6bc8 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SaveWalletUseCase.kt
@@ -6,8 +6,8 @@ import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.SaveWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.legacy.UserWalletsListError
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
index 21a6a76755..8d416c90e3 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/SelectWalletUseCase.kt
@@ -4,12 +4,12 @@ import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.CompletionResult
-import com.tangem.domain.core.wallets.error.SelectWalletError
-import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SelectWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.redux.ReduxStateHolder
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 
 /**
  * Use case for selecting wallet
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
index 96c2f19f7a..b8204b14fa 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/UpdateWalletUseCase.kt
@@ -3,13 +3,13 @@ package com.tangem.domain.wallets.usecase
 import arrow.core.Either
 import arrow.core.raise.either
 import com.tangem.common.CompletionResult
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
-import com.tangem.domain.wallets.models.UpdateWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.core.wallets.error.SaveWalletError
-import com.tangem.domain.wallets.models.UpdateWalletError.*
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.wallets.models.UpdateWalletError
+import com.tangem.domain.wallets.models.UpdateWalletError.DataError
 
 /**
  * Use case for updating user wallet
@@ -31,7 +31,7 @@ class UpdateWalletUseCase(
         if (useNewRepository) {
             val userWallet = userWalletsListRepository.userWallets.value?.find { it.walletId == userWalletId }
                 ?: return Either.Left(
-                    UpdateWalletError.DataError(IllegalStateException("User wallet with id $userWalletId not found")),
+                    DataError(IllegalStateException("User wallet with id $userWalletId not found")),
                 )
             val updatedWallet = update(userWallet)
             return userWalletsListRepository.saveWithoutLock(updatedWallet, canOverride = true)
@@ -47,7 +47,7 @@ class UpdateWalletUseCase(
 
         return either {
             when (val result = userWalletsListManager.update(userWalletId, update)) {
-                is CompletionResult.Failure -> raise(UpdateWalletError.DataError(result.error))
+                is CompletionResult.Failure -> raise(DataError(result.error))
                 is CompletionResult.Success -> result.data
             }
         }
diff --git a/domain/yield-supply/build.gradle.kts b/domain/yield-supply/build.gradle.kts
index e10c9dba42..bc5d9b6904 100644
--- a/domain/yield-supply/build.gradle.kts
+++ b/domain/yield-supply/build.gradle.kts
@@ -15,15 +15,19 @@ tasks.withType<Test>().configureEach {
 dependencies {
     /** Domain */
     implementation(projects.domain.models)
+    implementation(projects.domain.yieldSupply.models)
     implementation(projects.domain.transaction.models)
     implementation(projects.domain.transaction)
     implementation(projects.domain.legacy)
+    implementation(projects.domain.blockaid.models)
+    implementation(projects.domain.blockaid)
 
     /** Tandem SDK */
     implementation(tangemDeps.blockchain)
 
     /** Other */
     implementation(deps.arrow.core)
+    implementation(deps.timber)
 
     /** tests */
     testImplementation(projects.common.test)
diff --git a/domain/yield-supply/models/build.gradle.kts b/domain/yield-supply/models/build.gradle.kts
new file mode 100644
index 0000000000..83fcc0276e
--- /dev/null
+++ b/domain/yield-supply/models/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    alias(deps.plugins.kotlin.jvm)
+    alias(deps.plugins.kotlin.serialization)
+    id("configuration")
+}
+
+dependencies {
+    // region Domain modules
+    api(projects.domain.models)
+    // endregion
+
+    // region Other libraries
+    implementation(deps.kotlin.serialization)
+}
+
diff --git a/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt
new file mode 100644
index 0000000000..900bb790b2
--- /dev/null
+++ b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketToken.kt
@@ -0,0 +1,20 @@
+package com.tangem.domain.yield.supply.models
+
+import com.tangem.domain.models.serialization.SerializedBigDecimal
+import kotlinx.serialization.Serializable
+
+/**
+ * Domain model representing a token entry in the Yield Markets list.
+ */
+@Serializable
+data class YieldMarketToken(
+    val tokenAddress: String,
+    val chainId: Int,
+    val apy: SerializedBigDecimal,
+    val isActive: Boolean,
+    val backendId: String? = null,
+) {
+
+    val yieldSupplyKey: String
+        get() = "${backendId}_$tokenAddress"
+}
\ No newline at end of file
diff --git a/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketTokenStatus.kt b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketTokenStatus.kt
new file mode 100644
index 0000000000..d7a6eedcf3
--- /dev/null
+++ b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldMarketTokenStatus.kt
@@ -0,0 +1,19 @@
+package com.tangem.domain.yield.supply.models
+
+import com.tangem.domain.models.serialization.SerializedBigDecimal
+import kotlinx.serialization.Serializable
+
+/**
+ * Domain model representing a token entry in the Yield Markets list.
+ */
+@Serializable
+data class YieldMarketTokenStatus(
+    val tokenAddress: String,
+    val tokenSymbol: String,
+    val tokenName: String,
+    val chainId: Int,
+    val apy: SerializedBigDecimal,
+    val isActive: Boolean,
+    val maxFeeNative: String,
+    val maxFeeUSD: String,
+)
\ No newline at end of file
diff --git a/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldSupplyMarketChartData.kt b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldSupplyMarketChartData.kt
new file mode 100644
index 0000000000..20f32a5ee7
--- /dev/null
+++ b/domain/yield-supply/models/src/main/java/com/tangem/domain/yield/supply/models/YieldSupplyMarketChartData.kt
@@ -0,0 +1,10 @@
+package com.tangem.domain.yield.supply.models
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class YieldSupplyMarketChartData(
+    val y: List<Double>,
+    val x: List<Double>,
+    val avr: Double,
+)
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyError.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyError.kt
new file mode 100644
index 0000000000..74e3305a7c
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyError.kt
@@ -0,0 +1,12 @@
+package com.tangem.domain.yield.supply
+
+sealed class YieldSupplyError : Throwable() {
+
+    abstract val code: Int
+
+    data class DataError(
+        val throwable: Throwable,
+    ) : YieldSupplyError() {
+        override val code: Int = -1
+    }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyErrorResolver.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyErrorResolver.kt
new file mode 100644
index 0000000000..c0e1586c15
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyErrorResolver.kt
@@ -0,0 +1,5 @@
+package com.tangem.domain.yield.supply
+
+interface YieldSupplyErrorResolver {
+    fun resolve(throwable: Throwable): YieldSupplyError
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyMarketRepository.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyMarketRepository.kt
new file mode 100644
index 0000000000..5d26c82073
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyMarketRepository.kt
@@ -0,0 +1,38 @@
+package com.tangem.domain.yield.supply
+
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.yield.supply.models.YieldMarketToken
+import com.tangem.domain.yield.supply.models.YieldMarketTokenStatus
+import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
+import kotlinx.coroutines.flow.Flow
+
+interface YieldSupplyMarketRepository {
+
+    /**
+     * Get cached yield markets or null if nothing cached yet.
+     */
+    suspend fun getCachedMarkets(): List<YieldMarketToken>?
+
+    /**
+     * Update markets by fetching from network and cache the result. Returns latest markets.
+     */
+    @Throws
+    suspend fun updateMarkets(): List<YieldMarketToken>
+
+    /**
+     * Observe runtime markets updates.
+     */
+    fun getMarketsFlow(): Flow<List<YieldMarketToken>>
+
+    /**
+     * Get yield token status by contract address.
+     */
+    @Throws
+    suspend fun getTokenStatus(cryptoCurrencyToken: CryptoCurrency.Token): YieldMarketTokenStatus
+
+    /**
+     * Get yield token APY chart by contract address.
+     */
+    @Throws
+    suspend fun getTokenChart(cryptoCurrencyToken: CryptoCurrency.Token): YieldSupplyMarketChartData
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyTransactionRepository.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyTransactionRepository.kt
index 34a17c1905..68982a6e66 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyTransactionRepository.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/YieldSupplyTransactionRepository.kt
@@ -5,19 +5,23 @@ import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.models.yield.supply.YieldSupplyStatus
+import java.math.BigDecimal
 
 interface YieldSupplyTransactionRepository {
 
     suspend fun createEnterTransactions(
         userWalletId: UserWalletId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
+        maxNetworkFee: BigDecimal,
     ): List<TransactionData.Uncompiled>
 
     suspend fun createExitTransaction(
         userWalletId: UserWalletId,
-        cryptoCurrency: CryptoCurrency,
-        yieldSupplyStatus: YieldSupplyStatus,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
         fee: Fee?,
     ): TransactionData.Uncompiled
+
+    suspend fun getYieldContractAddress(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): String?
+
+    suspend fun getProtocolBalance(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency): BigDecimal?
 }
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyFlowUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyFlowUseCase.kt
new file mode 100644
index 0000000000..9efcab1ea6
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyFlowUseCase.kt
@@ -0,0 +1,26 @@
+package com.tangem.domain.yield.supply.usecase
+
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+/**
+ * Emits a map of APY values per token.
+ *
+ * Return map:
+ * - key: token contract address
+ * - value: APY as string
+ */
+class YieldSupplyApyFlowUseCase(
+    private val yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+) {
+
+    operator fun invoke(): Flow<Map<String, String>> {
+        return yieldSupplyMarketRepository.getMarketsFlow()
+            .map { yieldMarketTokenList ->
+                yieldMarketTokenList.filter { it.isActive }.associate { token ->
+                    token.yieldSupplyKey to token.apy.toString()
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyUpdateUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyUpdateUseCase.kt
new file mode 100644
index 0000000000..a3d9200e44
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyApyUpdateUseCase.kt
@@ -0,0 +1,25 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import kotlin.collections.filter
+
+/**
+ * Updates and returns a map of APY values per token.
+ *
+ * Return map:
+ * - key: token contract address
+ * - value: APY as string
+ */
+class YieldSupplyApyUpdateUseCase(
+    private val yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+) {
+
+    suspend operator fun invoke(): Either<Throwable, Map<String, String>> = Either.catch {
+        yieldSupplyMarketRepository.updateMarkets()
+            .filter { it.isActive }
+            .associate {
+                it.tokenAddress to it.apy.toString()
+            }
+    }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyEstimateEnterFeeUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyEstimateEnterFeeUseCase.kt
index 23e3efbe1d..273114f51c 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyEstimateEnterFeeUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyEstimateEnterFeeUseCase.kt
@@ -5,23 +5,85 @@ import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.yieldsupply.providers.ethereum.yield.EthereumYieldSupplyEnterCallData
+import com.tangem.domain.blockaid.BlockAidGasEstimate
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.transaction.FeeRepository
 import com.tangem.domain.transaction.error.FeeErrorResolver
 import com.tangem.domain.transaction.error.GetFeeError
 import com.tangem.utils.extensions.isSingleItem
+import timber.log.Timber
+import java.math.BigInteger
 
 class YieldSupplyEstimateEnterFeeUseCase(
     private val feeRepository: FeeRepository,
     private val feeErrorResolver: FeeErrorResolver,
+    private val blockAidGasEstimate: BlockAidGasEstimate,
 ) {
+
     suspend operator fun invoke(
         userWallet: UserWallet,
         cryptoCurrency: CryptoCurrency,
         transactionDataList: List<TransactionData.Uncompiled>,
     ): Either<GetFeeError, List<TransactionData.Uncompiled>> = Either.catch {
-        val withCalculatedFee = transactionDataList.filter {
+        if (transactionDataList.isSingleItem()) {
+            transactionDataList.map { transaction ->
+                transaction.copy(
+                    fee = feeRepository.calculateFee(
+                        userWallet = userWallet,
+                        cryptoCurrency = cryptoCurrency,
+                        transactionData = transaction,
+                    ).normal,
+                )
+            }
+        } else {
+            val estimatedFees = estimateFeeWithBlockAid(
+                userWallet = userWallet,
+                cryptoCurrency = cryptoCurrency,
+                transactionDataList = transactionDataList,
+            )
+
+            if (estimatedFees.isNullOrEmpty()) {
+                // Fallback in case block aid returns error
+                estimateFeeWithStatic(
+                    userWallet = userWallet,
+                    cryptoCurrency = cryptoCurrency,
+                    transactionDataList = transactionDataList,
+                )
+            } else {
+                estimatedFees
+            }
+        }
+    }.mapLeft(feeErrorResolver::resolve)
+
+    private suspend fun estimateFeeWithBlockAid(
+        userWallet: UserWallet,
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<TransactionData.Uncompiled>,
+    ): List<TransactionData.Uncompiled>? {
+        val estimatedFees = blockAidGasEstimate.getGasEstimation(
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = transactionDataList,
+        ).onLeft(Timber::e).getOrNull() ?: return null
+
+        if (estimatedFees.estimatedGasList.isEmpty()) return null
+
+        val fee = feeRepository.getEthereumFeeWithoutGas(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+        )
+
+        return transactionDataList.zip(estimatedFees.estimatedGasList) { transaction, estimatedGas ->
+            transaction.copy(fee = fee.fixFee(cryptoCurrency, estimatedGas))
+        }
+    }
+
+    private suspend fun estimateFeeWithStatic(
+        userWallet: UserWallet,
+        cryptoCurrency: CryptoCurrency,
+        transactionDataList: List<TransactionData.Uncompiled>,
+    ): List<TransactionData.Uncompiled> {
+        val withCalculatedFees = transactionDataList.filter {
             (it.extras as? EthereumTransactionExtras)?.callData !is EthereumYieldSupplyEnterCallData
         }.map { transaction ->
             transaction.copy(
@@ -33,38 +95,30 @@ class YieldSupplyEstimateEnterFeeUseCase(
             )
         }
 
-        val withEstimatedCalculatedFee = transactionDataList.filter {
+        val calculatedFee = withCalculatedFees.firstOrNull()?.fee ?: error("Must be any calculated fee")
+
+        val withEstimatedFees = transactionDataList.filter {
             (it.extras as? EthereumTransactionExtras)?.callData is EthereumYieldSupplyEnterCallData
         }.map { transaction ->
-            if (transactionDataList.isSingleItem()) {
-                transaction.copy(
-                    fee = feeRepository.calculateFee(
-                        userWallet = userWallet,
-                        cryptoCurrency = cryptoCurrency,
-                        transactionData = transaction,
-                    ).normal,
-                )
-            } else {
-                transaction.copy(fee = withCalculatedFee.firstOrNull()?.fee?.fixFee(cryptoCurrency))
-            }
+            transaction.copy(fee = calculatedFee.fixFee(cryptoCurrency, ETHEREUM_CONSTANT_GAS_LIMIT))
         }
 
-        // Transactions order must be preserved
-        withCalculatedFee + withEstimatedCalculatedFee
-    }.mapLeft(feeErrorResolver::resolve)
+        // First return calculated fees then estimated
+        return withCalculatedFees + withEstimatedFees
+    }
 
-    private fun Fee.fixFee(cryptoCurrency: CryptoCurrency) = when (this) {
+    private fun Fee.fixFee(cryptoCurrency: CryptoCurrency, gasLimit: BigInteger) = when (this) {
         is Fee.Ethereum.Legacy -> copy(
-            gasLimit = ETHEREUM_CONSTANT_GAS_LIMIT,
+            gasLimit = gasLimit,
             amount = amount.copy(
-                value = gasPrice.multiply(ETHEREUM_CONSTANT_GAS_LIMIT)
+                value = gasPrice.multiply(gasLimit)
                     .toBigDecimal().movePointLeft(cryptoCurrency.decimals),
             ),
         )
         is Fee.Ethereum.EIP1559 -> copy(
-            gasLimit = ETHEREUM_CONSTANT_GAS_LIMIT,
+            gasLimit = gasLimit,
             amount = amount.copy(
-                value = maxFeePerGas.multiply(ETHEREUM_CONSTANT_GAS_LIMIT)
+                value = maxFeePerGas.multiply(gasLimit)
                     .toBigDecimal().movePointLeft(cryptoCurrency.decimals),
             ),
         )
@@ -73,6 +127,6 @@ class YieldSupplyEstimateEnterFeeUseCase(
 
     private companion object {
         // Using constant gas limit to avoid fee calculation errors when contract address is not deployed yet
-        val ETHEREUM_CONSTANT_GAS_LIMIT = 350_000.toBigInteger()
+        val ETHEREUM_CONSTANT_GAS_LIMIT = 500_000.toBigInteger()
     }
 }
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetApyUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetApyUseCase.kt
new file mode 100644
index 0000000000..6bb5070262
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetApyUseCase.kt
@@ -0,0 +1,14 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+
+class YieldSupplyGetApyUseCase(
+    private val yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+) {
+
+    suspend operator fun invoke(tokenAddress: String): Either<Throwable, String> = Either.catch {
+        val apys = yieldSupplyMarketRepository.getCachedMarkets() ?: yieldSupplyMarketRepository.updateMarkets()
+        apys.first { it.tokenAddress == tokenAddress }.apy.toString()
+    }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetChartUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetChartUseCase.kt
new file mode 100644
index 0000000000..06cb773d1c
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetChartUseCase.kt
@@ -0,0 +1,16 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
+
+class YieldSupplyGetChartUseCase(
+    private val yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+) {
+
+    suspend operator fun invoke(cryptoCurrency: CryptoCurrency.Token): Either<Throwable, YieldSupplyMarketChartData> =
+        Either.catch {
+            yieldSupplyMarketRepository.getTokenChart(cryptoCurrency)
+        }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetContractAddressUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetContractAddressUseCase.kt
new file mode 100644
index 0000000000..2d12deef9e
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetContractAddressUseCase.kt
@@ -0,0 +1,24 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.yield.supply.YieldSupplyError
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
+import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
+
+class YieldSupplyGetContractAddressUseCase(
+    private val yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+    private val yieldSupplyErrorResolver: YieldSupplyErrorResolver,
+) {
+
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        cryptoCurrency: CryptoCurrency.Token,
+    ): Either<YieldSupplyError, String?> = Either.catch {
+        yieldSupplyTransactionRepository.getYieldContractAddress(
+            userWalletId = userWalletId,
+            cryptoCurrency = cryptoCurrency,
+        )
+    }.mapLeft(yieldSupplyErrorResolver::resolve)
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetProtocolBalanceUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetProtocolBalanceUseCase.kt
new file mode 100644
index 0000000000..a36158a7b6
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetProtocolBalanceUseCase.kt
@@ -0,0 +1,27 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.yield.supply.YieldSupplyError
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
+import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
+import java.math.BigDecimal
+
+class YieldSupplyGetProtocolBalanceUseCase(
+    private val yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+    private val yieldSupplyErrorResolver: YieldSupplyErrorResolver,
+) {
+
+    suspend operator fun invoke(
+        userWalletId: UserWalletId,
+        cryptoCurrency: CryptoCurrency,
+    ): Either<YieldSupplyError, BigDecimal?> = Either.catch {
+        requireNotNull(cryptoCurrency as CryptoCurrency.Token)
+
+        yieldSupplyTransactionRepository.getProtocolBalance(
+            userWalletId = userWalletId,
+            cryptoCurrency = cryptoCurrency,
+        )
+    }.mapLeft(yieldSupplyErrorResolver::resolve)
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetTokenStatusUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetTokenStatusUseCase.kt
new file mode 100644
index 0000000000..3a6d689924
--- /dev/null
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyGetTokenStatusUseCase.kt
@@ -0,0 +1,15 @@
+package com.tangem.domain.yield.supply.usecase
+
+import arrow.core.Either
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.yield.supply.YieldSupplyMarketRepository
+import com.tangem.domain.yield.supply.models.YieldMarketTokenStatus
+
+class YieldSupplyGetTokenStatusUseCase(
+    private val yieldSupplyMarketRepository: YieldSupplyMarketRepository,
+) {
+
+    suspend operator fun invoke(token: CryptoCurrency.Token): Either<Throwable, YieldMarketTokenStatus> = Either.catch {
+        yieldSupplyMarketRepository.getTokenStatus(token)
+    }
+}
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStartEarningUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStartEarningUseCase.kt
index b5e73e680f..9944223759 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStartEarningUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStartEarningUseCase.kt
@@ -4,19 +4,25 @@ import arrow.core.Either
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.yield.supply.YieldSupplyError
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
 import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
+import java.math.BigDecimal
 
 class YieldSupplyStartEarningUseCase(
     private val yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+    private val yieldSupplyErrorResolver: YieldSupplyErrorResolver,
 ) {
 
     suspend operator fun invoke(
         userWalletId: UserWalletId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
-    ): Either<Throwable, List<TransactionData.Uncompiled>> = Either.catch {
+        maxNetworkFee: BigDecimal,
+    ): Either<YieldSupplyError, List<TransactionData.Uncompiled>> = Either.catch {
         yieldSupplyTransactionRepository.createEnterTransactions(
             userWalletId = userWalletId,
             cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = maxNetworkFee,
         )
-    }
+    }.mapLeft(yieldSupplyErrorResolver::resolve)
 }
\ No newline at end of file
diff --git a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStopEarningUseCase.kt b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStopEarningUseCase.kt
index aab058196b..2eb7b8995b 100644
--- a/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStopEarningUseCase.kt
+++ b/domain/yield-supply/src/main/java/com/tangem/domain/yield/supply/usecase/YieldSupplyStopEarningUseCase.kt
@@ -5,25 +5,24 @@ import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.yield.supply.YieldSupplyError
+import com.tangem.domain.yield.supply.YieldSupplyErrorResolver
 import com.tangem.domain.yield.supply.YieldSupplyTransactionRepository
 
 class YieldSupplyStopEarningUseCase(
     private val yieldSupplyTransactionRepository: YieldSupplyTransactionRepository,
+    private val yieldSupplyErrorResolver: YieldSupplyErrorResolver,
 ) {
 
     suspend operator fun invoke(
         userWalletId: UserWalletId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
         fee: Fee?,
-    ): Either<Throwable, TransactionData.Uncompiled> = Either.catch {
-        val yieldTokenStatus = cryptoCurrencyStatus.value.yieldSupplyStatus ?: error("")
-        val cryptoCurrency = cryptoCurrencyStatus.currency
-
+    ): Either<YieldSupplyError, TransactionData.Uncompiled> = Either.catch {
         yieldSupplyTransactionRepository.createExitTransaction(
             userWalletId = userWalletId,
-            cryptoCurrency = cryptoCurrency,
-            yieldSupplyStatus = yieldTokenStatus,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
             fee = null,
         )
-    }
+    }.mapLeft(yieldSupplyErrorResolver::resolve)
 }
\ No newline at end of file
diff --git a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/YieldSupplyEstimateEnterFeeUseCaseTest.kt b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/YieldSupplyEstimateEnterFeeUseCaseTest.kt
index a38b1d1f15..8a2cc75aae 100644
--- a/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/YieldSupplyEstimateEnterFeeUseCaseTest.kt
+++ b/domain/yield-supply/src/test/java/com/tangem/domain/yield/supply/YieldSupplyEstimateEnterFeeUseCaseTest.kt
@@ -1,19 +1,26 @@
 package com.tangem.domain.yield.supply
 
 import arrow.core.Either
+import arrow.core.right
+import com.domain.blockaid.models.transaction.GasEstimationResult
 import com.google.common.truth.Truth
+import com.tangem.blockchain.blockchains.ethereum.EthereumTransactionExtras
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.TransactionExtras
+import com.tangem.blockchain.common.smartcontract.SmartContractCallDataProviderFactory
 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
+import com.tangem.blockchain.yieldsupply.YieldSupplyContractCallDataProviderFactory
+import com.tangem.domain.blockaid.BlockAidGasEstimate
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.transaction.FeeRepository
 import com.tangem.domain.transaction.error.FeeErrorResolver
 import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.yield.supply.usecase.YieldSupplyEstimateEnterFeeUseCase
-import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.mockk
+import io.mockk.*
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
@@ -24,12 +31,17 @@ import java.math.BigInteger
 class YieldSupplyEstimateEnterFeeUseCaseTest {
     private val feeRepository: FeeRepository = mockk()
     private val feeErrorResolver: FeeErrorResolver = mockk()
-    private val useCase = YieldSupplyEstimateEnterFeeUseCase(feeRepository, feeErrorResolver)
+    private val blockAidGasEstimate: BlockAidGasEstimate = mockk()
+    private val useCase = YieldSupplyEstimateEnterFeeUseCase(feeRepository, feeErrorResolver, blockAidGasEstimate)
 
     private val userWallet: UserWallet = mockk()
     private val cryptoCurrency: CryptoCurrency = mockk(relaxed = true) {
         every { decimals } returns 18
     }
+    private val cryptoCurrencyStatus = mockk<CryptoCurrencyStatus>(relaxed = true) {
+        every { currency } returns cryptoCurrency
+        every { value.yieldSupplyStatus } returns null
+    }
 
     private fun ethLegacyFee(
         gasPrice: BigInteger = BigInteger.valueOf(100_000_000_000L),
@@ -37,7 +49,7 @@ class YieldSupplyEstimateEnterFeeUseCaseTest {
     ) = Fee.Ethereum.Legacy(
         gasPrice = gasPrice,
         gasLimit = gasLimit,
-        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrency),
+        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrencyStatus),
     )
 
     private fun ethEip1559Fee(
@@ -47,126 +59,333 @@ class YieldSupplyEstimateEnterFeeUseCaseTest {
         maxFeePerGas = maxFeePerGas,
         priorityFee = BigInteger.ONE,
         gasLimit = gasLimit,
-        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrency),
+        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrencyStatus),
     )
 
-    private fun uncompiled(fee: Fee) = TransactionData.Uncompiled(
+    private fun uncompiled(fee: Fee, extras: TransactionExtras) = TransactionData.Uncompiled(
         fee = fee,
-        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrency),
+        amount = BigDecimal.ONE.convertToSdkAmount(cryptoCurrencyStatus),
         contractAddress = null,
         sourceAddress = "0x1234567890123456789012345678901234567890",
         destinationAddress = "0x1234567890123456789012345678901234567890",
+        extras = extras,
     )
 
     @Test
-    fun `test 1 transaction uses constant gas limit Legacy`() = runTest {
+    fun `test enter transaction uses constant gas limit Legacy`() = runTest {
         val fee = TransactionFee.Single(ethLegacyFee())
-        val tx = uncompiled(ethLegacyFee())
+        val deployTx = getDeployTx()
+        val enterTx = getEnterTx()
 
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
         coEvery { feeRepository.calculateFee(any(), any(), any()) } returns fee
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx))
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, enterTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(1)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
 
-        val lastFee = txs.last().fee as Fee.Ethereum.Legacy
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.Legacy
+        val enterFee = txs.last().fee as Fee.Ethereum.Legacy
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(500_000))
     }
 
     @Test
-    fun `test 2 transactions, only last uses constant gas limit Legacy`() = runTest {
+    fun `test not enter transaction uses gas limit Legacy`() = runTest {
         val fee = TransactionFee.Single(ethLegacyFee())
-        val tx = uncompiled(ethLegacyFee())
+        val deployTx = getDeployTx()
+        val approveTx = getApproveTx()
 
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
         coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee)
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx, tx))
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, approveTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(2)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+            feeRepository.calculateFee(any(), any(), approveTx)
+        }
 
-        val firstFee = txs.first().fee as Fee.Ethereum.Legacy
-        val lastFee = txs.last().fee as Fee.Ethereum.Legacy
-        Truth.assertThat(firstFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.Legacy
+        val approveFee = txs.last().fee as Fee.Ethereum.Legacy
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(approveFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
     }
 
     @Test
-    fun `test 3 transactions, only last uses constant gas limit Legacy`() = runTest {
+    fun `test enter transaction with wrong order uses gas limit Legacy`() = runTest {
         val fee = TransactionFee.Single(ethLegacyFee())
-        val tx = uncompiled(ethLegacyFee())
-        coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee, fee)
+        val enterTx = getEnterTx()
+        val deployTx = getDeployTx()
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx, tx, tx))
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
+        coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee)
+
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(enterTx, deployTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(3)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
 
-        val firstFee = txs[0].fee as Fee.Ethereum.Legacy
-        val secondFee = txs[1].fee as Fee.Ethereum.Legacy
-        val lastFee = txs[2].fee as Fee.Ethereum.Legacy
-        Truth.assertThat(firstFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(secondFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.Legacy
+        val enterFee = txs.last().fee as Fee.Ethereum.Legacy
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(500_000))
     }
 
     @Test
-    fun `test 1 transaction uses constant gas limit Eip1559`() = runTest {
+    fun `test enter transaction uses constant gas limit Eip1559`() = runTest {
         val fee = TransactionFee.Single(ethEip1559Fee())
-        val tx = uncompiled(ethEip1559Fee())
+        val deployTx = getDeployTx()
+        val enterTx = getEnterTx()
 
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
         coEvery { feeRepository.calculateFee(any(), any(), any()) } returns fee
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx))
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, enterTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(1)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
 
-        val lastFee = txs.last().fee as Fee.Ethereum.EIP1559
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.EIP1559
+        val enterFee = txs.last().fee as Fee.Ethereum.EIP1559
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(500_000))
     }
 
     @Test
-    fun `test 2 transactions, only last uses constant gas limit Eip1559`() = runTest {
+    fun `test not enter transaction uses gas limit Eip1559`() = runTest {
         val fee = TransactionFee.Single(ethEip1559Fee())
-        val tx = uncompiled(ethEip1559Fee())
+        val deployTx = getDeployTx()
+        val approveTx = getApproveTx()
 
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
         coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee)
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx, tx))
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, approveTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(2)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+            feeRepository.calculateFee(any(), any(), approveTx)
+        }
 
-        val firstFee = txs.first().fee as Fee.Ethereum.EIP1559
-        val lastFee = txs.last().fee as Fee.Ethereum.EIP1559
-        Truth.assertThat(firstFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.EIP1559
+        val approveFee = txs.last().fee as Fee.Ethereum.EIP1559
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(approveFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
     }
 
     @Test
-    fun `test 3 transactions, only last uses constant gas limit Eip1559`() = runTest {
+    fun `test enter transaction with wrong order uses gas limit Eip1559`() = runTest {
         val fee = TransactionFee.Single(ethEip1559Fee())
-        val tx = uncompiled(ethEip1559Fee())
-        coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee, fee)
+        val enterTx = getEnterTx()
+        val deployTx = getDeployTx()
 
-        val result = useCase(userWallet, cryptoCurrency, listOf(tx, tx, tx))
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
+        coEvery { feeRepository.calculateFee(any(), any(), any()) } returnsMany listOf(fee, fee)
+
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(enterTx, deployTx),
+        )
         Truth.assertThat(result.isRight()).isTrue()
 
-        val txs = (result as Either.Right).value
-        Truth.assertThat(txs.size).isEqualTo(3)
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.calculateFee(any(), any(), deployTx)
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
 
-        val firstFee = txs[0].fee as Fee.Ethereum.EIP1559
-        val secondFee = txs[1].fee as Fee.Ethereum.EIP1559
-        val lastFee = txs[2].fee as Fee.Ethereum.EIP1559
-        Truth.assertThat(firstFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(secondFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
-        Truth.assertThat(lastFee.gasLimit).isEqualTo(BigInteger.valueOf(350_000))
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.EIP1559
+        val enterFee = txs.last().fee as Fee.Ethereum.EIP1559
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(500_000))
     }
+
+    @Test
+    fun `test single transaction with fee Legacy`() = runTest {
+        val fee = TransactionFee.Single(ethLegacyFee())
+        val enterTx = getEnterTx()
+
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(emptyList()).right()
+        coEvery { feeRepository.calculateFee(any(), any(), any()) } returns fee
+
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(enterTx),
+        )
+        Truth.assertThat(result.isRight()).isTrue()
+
+        coVerify(ordering = Ordering.ORDERED) {
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
+        coVerify(inverse = true) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+        }
+
+        val txs = (result as Either.Right).value
+        val enterFee = txs.first().fee as Fee.Ethereum.Legacy
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(21_000))
+    }
+
+    @Test
+    fun `test enter transaction uses block aid Eip1559`() = runTest {
+        val fee = ethEip1559Fee()
+        val deployTx = getDeployTx()
+        val approveTx = getApproveTx()
+        val enterTx = getEnterTx()
+
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(
+            estimatedGasList = listOf(1_000.toBigInteger(), 2_000.toBigInteger(), 3_000.toBigInteger()),
+        ).right()
+        coEvery { feeRepository.calculateFee(any(), any(), any()) } returns mockk()
+        coEvery { feeRepository.getEthereumFeeWithoutGas(any(), any()) } returns fee
+
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, approveTx, enterTx),
+        )
+        Truth.assertThat(result.isRight()).isTrue()
+
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.getEthereumFeeWithoutGas(any(), any())
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), deployTx)
+            feeRepository.calculateFee(any(), any(), approveTx)
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
+
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.EIP1559
+        val approveFee = txs[1].fee as Fee.Ethereum.EIP1559
+        val enterFee = txs.last().fee as Fee.Ethereum.EIP1559
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(1_000))
+        Truth.assertThat(approveFee.gasLimit).isEqualTo(BigInteger.valueOf(2_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(3_000))
+    }
+
+    @Test
+    fun `test enter transaction uses block aid Legacy`() = runTest {
+        val fee = ethLegacyFee()
+        val deployTx = getDeployTx()
+        val approveTx = getApproveTx()
+        val enterTx = getEnterTx()
+
+        coEvery { blockAidGasEstimate.getGasEstimation(any(), any()) } returns GasEstimationResult(
+            estimatedGasList = listOf(1_000.toBigInteger(), 2_000.toBigInteger(), 3_000.toBigInteger()),
+        ).right()
+        coEvery { feeRepository.calculateFee(any(), any(), any()) } returns mockk()
+        coEvery { feeRepository.getEthereumFeeWithoutGas(any(), any()) } returns fee
+
+        val result = useCase(
+            userWallet = userWallet,
+            cryptoCurrency = cryptoCurrency,
+            transactionDataList = listOf(deployTx, approveTx, enterTx),
+        )
+        Truth.assertThat(result.isRight()).isTrue()
+
+        coVerify(ordering = Ordering.ORDERED) {
+            blockAidGasEstimate.getGasEstimation(any(), any())
+            feeRepository.getEthereumFeeWithoutGas(any(), any())
+        }
+        coVerify(inverse = true) {
+            feeRepository.calculateFee(any(), any(), deployTx)
+            feeRepository.calculateFee(any(), any(), approveTx)
+            feeRepository.calculateFee(any(), any(), enterTx)
+        }
+
+        val txs = (result as Either.Right).value
+        val deployFee = txs.first().fee as Fee.Ethereum.Legacy
+        val approveFee = txs[1].fee as Fee.Ethereum.Legacy
+        val enterFee = txs.last().fee as Fee.Ethereum.Legacy
+        Truth.assertThat(deployFee.gasLimit).isEqualTo(BigInteger.valueOf(1_000))
+        Truth.assertThat(approveFee.gasLimit).isEqualTo(BigInteger.valueOf(2_000))
+        Truth.assertThat(enterFee.gasLimit).isEqualTo(BigInteger.valueOf(3_000))
+    }
+
+    private fun getDeployTx() = uncompiled(
+        fee = ethLegacyFee(),
+        extras = EthereumTransactionExtras(
+            YieldSupplyContractCallDataProviderFactory.getDeployCallData(
+                walletAddress = "0x1234567890123456789012345678901234567890",
+                tokenContractAddress = "0x1234567890123456789012345678901234567890",
+                maxNetworkFee = BigDecimal.ONE.convertToSdkAmount(cryptoCurrencyStatus),
+            ),
+        ),
+    )
+
+    private fun getApproveTx() = uncompiled(
+        fee = ethLegacyFee(),
+        extras = EthereumTransactionExtras(
+            SmartContractCallDataProviderFactory.getApprovalCallData(
+                spenderAddress = "0x1234567890123456789012345678901234567890",
+                amount = null,
+                blockchain = Blockchain.EthereumTestnet,
+            ),
+        ),
+    )
+
+    private fun getEnterTx() = uncompiled(
+        fee = ethLegacyFee(),
+        extras = EthereumTransactionExtras(
+            YieldSupplyContractCallDataProviderFactory.getEnterCallData(
+                tokenContractAddress = "0x1234567890123456789012345678901234567890",
+            ),
+        ),
+    )
 }
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 871b050803..17e942ca63 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -19,9 +19,10 @@ platform :android do
 
   desc "Run detekt"
   lane :detekt do
+    FileUtils.cp("../app/src/main/assets/tangem-app-config/android/google-services/dev/google-services.json", "../app")
     FileUtils.cp("../tangem-android-tools/CI/gradle_properties/tests_ci_gradle.properties", "../gradle.properties")
     puts File.read("../gradle.properties")
-    gradle(task: "detekt")
+    gradle(task: "detekt detektGoogleDebug --continue")
   end
 
   desc "Run tests"
@@ -29,7 +30,7 @@ platform :android do
     FileUtils.cp("../app/src/main/assets/tangem-app-config/android/google-services/dev/google-services.json", "../app")
     FileUtils.cp("../tangem-android-tools/CI/gradle_properties/tests_ci_gradle.properties", "../gradle.properties")
     puts File.read("../gradle.properties")
-    gradle(task: "testGoogleDebugUnitTest")
+    gradle(task: "testGoogleDebugUnitTest testDebugUnitTest --continue")
   end
 
   desc "Build internal APK Firebase App Distribution"
diff --git a/features/account/api/build.gradle.kts b/features/account/api/build.gradle.kts
index 5e9cc443b6..6e0c5aeb96 100644
--- a/features/account/api/build.gradle.kts
+++ b/features/account/api/build.gradle.kts
@@ -21,4 +21,5 @@ dependencies {
     implementation(projects.domain.appCurrency.models)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
+    implementation(projects.domain.account)
 }
\ No newline at end of file
diff --git a/features/account/api/src/main/java/com/tangem/features/account/AccountSelectorComponent.kt b/features/account/api/src/main/java/com/tangem/features/account/AccountSelectorComponent.kt
deleted file mode 100644
index 4e751499ed..0000000000
--- a/features/account/api/src/main/java/com/tangem/features/account/AccountSelectorComponent.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.tangem.features.account
-
-import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
-import com.tangem.domain.models.account.Account
-import kotlinx.coroutines.flow.StateFlow
-
-interface AccountSelectorComponent : ComposableBottomSheetComponent {
-
-    data class Params(
-        val onDismiss: () -> Unit,
-        val accountsBalanceFetcher: AccountsBalanceFetcher,
-        val controller: AccountSelectorController,
-    )
-
-    interface Factory {
-        fun create(appComponentContext: AppComponentContext, params: Params): AccountSelectorComponent
-    }
-}
-
-interface AccountSelectorController {
-    val selectedAccount: StateFlow<Account?>
-    fun selectAccount(account: Account?)
-}
\ No newline at end of file
diff --git a/features/account/api/src/main/java/com/tangem/features/account/AccountsBalanceFetcher.kt b/features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt
similarity index 65%
rename from features/account/api/src/main/java/com/tangem/features/account/AccountsBalanceFetcher.kt
rename to features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt
index 77283e9678..0dc73a77b7 100644
--- a/features/account/api/src/main/java/com/tangem/features/account/AccountsBalanceFetcher.kt
+++ b/features/account/api/src/main/java/com/tangem/features/account/PortfolioFetcher.kt
@@ -1,9 +1,9 @@
 package com.tangem.features.account
 
+import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.models.TotalFiatBalance
-import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.tokens.error.TokenListError
@@ -11,7 +11,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 
-interface AccountsBalanceFetcher {
+interface PortfolioFetcher {
 
     val data: Flow<Data>
 
@@ -21,12 +21,15 @@ interface AccountsBalanceFetcher {
     data class Data(
         val appCurrency: AppCurrency,
         val isBalanceHidden: Boolean,
-        val balances: Map<UserWallet, Map<Account, AccountBalance>>,
+        val balances: Map<UserWallet, PortfolioBalance>,
     )
 
-    data class AccountBalance(
-        val balance: Lce<TokenListError, TotalFiatBalance>,
-    )
+    data class PortfolioBalance(
+        val walletBalance: Lce<TokenListError, TotalFiatBalance>,
+        val accountsBalance: AccountStatusList,
+    ) {
+        val userWallet: UserWallet get() = accountsBalance.userWallet
+    }
 
     sealed interface Mode {
         data class All(val onlyMultiCurrency: Boolean) : Mode
@@ -34,6 +37,6 @@ interface AccountsBalanceFetcher {
     }
 
     interface Factory {
-        fun create(mode: Mode, scope: CoroutineScope): AccountsBalanceFetcher
+        fun create(mode: Mode, scope: CoroutineScope): PortfolioFetcher
     }
 }
\ No newline at end of file
diff --git a/features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt b/features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt
new file mode 100644
index 0000000000..7216cd8ad7
--- /dev/null
+++ b/features/account/api/src/main/java/com/tangem/features/account/PortfolioSelectorComponent.kt
@@ -0,0 +1,35 @@
+package com.tangem.features.account
+
+import com.tangem.core.decompose.factory.ComponentFactory
+import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
+import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.wallet.UserWallet
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+
+interface PortfolioSelectorComponent : ComposableBottomSheetComponent, ComposableContentComponent {
+
+    val title: StateFlow<TextReference>
+
+    data class Params(
+        val onDismiss: () -> Unit,
+        val portfolioFetcher: PortfolioFetcher,
+        val controller: PortfolioSelectorController,
+    )
+
+    interface Factory : ComponentFactory<Params, PortfolioSelectorComponent>
+}
+
+/**
+ * if [isAccountMode] is false it's mean [selectedAccount] emit [AccountId] for Main account
+ */
+interface PortfolioSelectorController {
+    val isAccountMode: Flow<Boolean>
+    val selectedAccount: StateFlow<AccountId?>
+
+    fun selectAccount(accountId: AccountId?)
+    fun selectedAccountWithData(portfolioFetcher: PortfolioFetcher): Flow<Pair<UserWallet, AccountStatus>?>
+}
\ No newline at end of file
diff --git a/features/account/impl/build.gradle.kts b/features/account/impl/build.gradle.kts
index 924e0c0cdc..b6439a01c3 100644
--- a/features/account/impl/build.gradle.kts
+++ b/features/account/impl/build.gradle.kts
@@ -14,6 +14,7 @@ android {
 dependencies {
     /** Api */
     implementation(projects.features.account.api)
+    implementation(projects.features.wallet.api)
 
     /** Core modules */
     implementation(projects.core.analytics)
@@ -29,6 +30,7 @@ dependencies {
     /** Domain */
     implementation(projects.domain.models)
     implementation(projects.domain.account)
+    implementation(projects.domain.account.status)
     implementation(projects.domain.core)
     implementation(projects.domain.appCurrency)
     implementation(projects.domain.appCurrency.models)
@@ -39,6 +41,9 @@ dependencies {
     implementation(projects.domain.wallets)
     implementation(projects.domain.wallets.models)
 
+    /** Tangem libraries */
+    implementation(tangemDeps.card.core)
+
     /** Common */
     implementation(projects.common.ui)
     implementation(projects.common.routing)
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/createedit/AccountCreateEditModel.kt b/features/account/impl/src/main/java/com/tangem/features/account/createedit/AccountCreateEditModel.kt
index c7c15c062f..85d4b0d97f 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/createedit/AccountCreateEditModel.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/createedit/AccountCreateEditModel.kt
@@ -1,8 +1,8 @@
 package com.tangem.features.account.createedit
 
+import androidx.annotation.StringRes
 import com.tangem.common.ui.account.AccountNameUM
 import com.tangem.common.ui.account.toDomain
-import androidx.annotation.StringRes
 import com.tangem.common.ui.account.toUM
 import com.tangem.core.analytics.api.AnalyticsExceptionHandler
 import com.tangem.core.analytics.models.ExceptionAnalyticsEvent
@@ -13,11 +13,11 @@ import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.res.R
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.ToastMessage
 import com.tangem.core.ui.utils.showErrorDialog
+import com.tangem.domain.account.models.AccountList
 import com.tangem.domain.account.usecase.AddCryptoPortfolioUseCase
 import com.tangem.domain.account.usecase.GetUnoccupiedAccountIndexUseCase
 import com.tangem.domain.account.usecase.UpdateCryptoPortfolioUseCase
@@ -60,7 +60,7 @@ internal class AccountCreateEditModel @Inject constructor(
     private val umBuilder = AccountCreateEditUMBuilder(params)
 
     val uiState: StateFlow<AccountCreateEditUM>
-    field = MutableStateFlow(value = getInitialState())
+        field = MutableStateFlow(value = getInitialState())
 
     init {
         if (params is AccountCreateEditComponent.Params.Create) {
@@ -75,13 +75,17 @@ internal class AccountCreateEditModel @Inject constructor(
         )
         val firstAction = EventMessageAction(
             title = resourceReference(R.string.account_unsaved_dialog_action_second),
-            warning = true,
+            isWarning = true,
             onClick = { router.pop() },
         )
+        val messageRes = when (params) {
+            is AccountCreateEditComponent.Params.Create -> R.string.account_unsaved_dialog_message_create
+            is AccountCreateEditComponent.Params.Edit -> R.string.account_unsaved_dialog_message_edit
+        }
         messageSender.send(
             DialogMessage(
                 title = resourceReference(R.string.account_unsaved_dialog_title),
-                message = resourceReference(R.string.account_unsaved_dialog_message_create),
+                message = resourceReference(messageRes),
                 firstActionBuilder = { firstAction },
                 secondActionBuilder = { secondAction },
             ),
@@ -110,20 +114,34 @@ internal class AccountCreateEditModel @Inject constructor(
             derivationIndex = derivationIndex,
         )
         uiState.value = uiState.value.toggleProgress(showProgress = false)
+
         result
-            .onLeft { showMessage(it.toString()) }
+            .onLeft(::handleAddAccountError)
             .onRight {
                 showMessage(R.string.account_create_success_message)
                 router.pop()
             }
     }
 
+    private fun handleAddAccountError(error: AddCryptoPortfolioUseCase.Error) {
+        val duplicateAccountNames = (error as? AddCryptoPortfolioUseCase.Error.AccountListRequirementsNotMet)
+            ?.cause is AccountList.Error.DuplicateAccountNames
+        when {
+            duplicateAccountNames -> showAccountNameExist()
+            else -> {
+                showSomethingWrong()
+                logError(error = AccountFeatureError.CreateAccount.FailedToCreateAccount(cause = error))
+            }
+        }
+    }
+
     private suspend fun editCryptoPortfolio(params: AccountCreateEditComponent.Params.Edit) {
         val state = uiState.value
         val name = state.account.name.toDomain().getOrNull() ?: return
         val icon = state.account.portfolioIcon.toDomain()
         val isNewName = name != params.account.accountName
         val isNewIcon = icon != params.account.portfolioIcon
+
         uiState.value = uiState.value.toggleProgress(showProgress = true)
         val result = updateCryptoPortfolioUseCase(
             icon = if (isNewIcon) icon else null,
@@ -131,25 +149,37 @@ internal class AccountCreateEditModel @Inject constructor(
             accountId = params.account.accountId,
         )
         uiState.value = uiState.value.toggleProgress(showProgress = false)
+
         result
-            .onLeft { showMessage(it.toString()) }
+            .onLeft(::handleEditAccountError)
             .onRight {
                 showMessage(R.string.account_edit_success_message)
                 router.pop()
             }
     }
 
+    private fun handleEditAccountError(error: UpdateCryptoPortfolioUseCase.Error) {
+        val duplicateAccountNames = (error as? UpdateCryptoPortfolioUseCase.Error.AccountListRequirementsNotMet)
+            ?.cause is AccountList.Error.DuplicateAccountNames
+        when {
+            duplicateAccountNames -> showAccountNameExist()
+            else -> {
+                showSomethingWrong()
+                logError(error = AccountFeatureError.EditAccount.FailedToEditAccount(cause = error))
+            }
+        }
+    }
+
     private fun showMessage(@StringRes id: Int) {
         val message = resourceReference(id)
         messageSender.send(ToastMessage(message = message))
     }
 
-    private fun showMessage(text: String) {
-        messageSender.send(ToastMessage(message = stringReference(text)))
+    private fun onCloseClick() {
+        val showConfirmDialog = uiState.value.buttonState.isButtonEnabled
+        if (showConfirmDialog) unsaveChangeDialog() else router.pop()
     }
 
-    private fun onCloseClick() = unsaveChangeDialog()
-
     private fun onIconSelect(icon: CryptoPortfolioIcon.Icon) {
         uiState.value = uiState.value
             .updateIconSelect(icon)
@@ -203,33 +233,46 @@ internal class AccountCreateEditModel @Inject constructor(
                     }
                 }
                 .onLeft { cause ->
-                    handleError(
-                        error = AccountFeatureError.CreateAccount.UnableToGetDerivationIndex,
-                        message = cause.toString(),
+                    val error = AccountFeatureError.CreateAccount.UnableToGetDerivationIndex(cause)
+
+                    logError(
+                        error = error,
                         params = mapOf(
                             "userWalletId" to userWalletId.stringValue,
                             "cause" to cause.toString(),
                         ),
                     )
 
+                    messageSender.showErrorDialog(universalError = error, onDismiss = router::pop)
+
                     return@launch
                 }
         }
     }
 
-    private fun handleError(
-        error: AccountFeatureError,
-        message: String? = null,
-        params: Map<String, String> = mapOf(),
-    ) {
-        val exception = IllegalStateException("$error. Cause: $message")
+    private fun logError(error: AccountFeatureError, params: Map<String, String> = mapOf()) {
+        val exception = IllegalStateException(error.toString())
 
         Timber.e(exception)
 
         analyticsExceptionHandler.sendException(
             event = ExceptionAnalyticsEvent(exception = exception, params = params),
         )
+    }
 
-        messageSender.showErrorDialog(universalError = error, onDismiss = router::pop)
+    private fun showSomethingWrong() {
+        val dialogMessage = DialogMessage(
+            title = resourceReference(R.string.common_something_went_wrong),
+            message = resourceReference(R.string.account_could_not_create),
+        )
+        messageSender.send(dialogMessage)
+    }
+
+    private fun showAccountNameExist() {
+        val dialogMessage = DialogMessage(
+            title = resourceReference(R.string.common_something_went_wrong),
+            message = resourceReference(R.string.account_form_name_already_exist_error_description),
+        )
+        messageSender.send(dialogMessage)
     }
 }
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/createedit/error/AccountFeatureError.kt b/features/account/impl/src/main/java/com/tangem/features/account/createedit/error/AccountFeatureError.kt
index 9ab8549fc7..dc12ce1e49 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/createedit/error/AccountFeatureError.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/createedit/error/AccountFeatureError.kt
@@ -1,6 +1,10 @@
 package com.tangem.features.account.createedit.error
 
 import com.tangem.core.error.UniversalError
+import com.tangem.domain.account.usecase.AddCryptoPortfolioUseCase
+import com.tangem.domain.account.usecase.GetUnoccupiedAccountIndexUseCase
+import com.tangem.domain.account.usecase.RecoverCryptoPortfolioUseCase
+import com.tangem.domain.account.usecase.UpdateCryptoPortfolioUseCase
 
 sealed interface AccountFeatureError : UniversalError {
 
@@ -14,16 +18,29 @@ sealed interface AccountFeatureError : UniversalError {
 
         override val subsystemCode: String get() = "001"
 
-        data object UnableToGetDerivationIndex : CreateAccount {
+        data class UnableToGetDerivationIndex(val cause: GetUnoccupiedAccountIndexUseCase.Error) : CreateAccount {
             override val specificErrorCode: String = "001"
         }
+
+        data class FailedToCreateAccount(val cause: AddCryptoPortfolioUseCase.Error) : CreateAccount {
+            override val specificErrorCode: String = "002"
+        }
     }
 
     sealed interface EditAccount : AccountFeatureError {
 
         override val subsystemCode: String get() = "002"
 
-        data object RequiredCryptoPortfolio : EditAccount {
+        data class FailedToEditAccount(val cause: UpdateCryptoPortfolioUseCase.Error) : EditAccount {
+            override val specificErrorCode: String = "001"
+        }
+    }
+
+    sealed interface ArchivedAccountList : AccountFeatureError {
+
+        override val subsystemCode: String get() = "003"
+
+        data class FailedToRecoverAccount(val cause: RecoverCryptoPortfolioUseCase.Error) : ArchivedAccountList {
             override val specificErrorCode: String = "001"
         }
     }
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
index 0e92bc9233..2c7168bc93 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/createedit/ui/AccountCreateEditContent.kt
@@ -19,6 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -30,8 +32,8 @@ import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.SpacerH24
 import com.tangem.core.ui.components.SpacerH8
-import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.components.account.AccountIconSize
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.components.fields.AutoSizeTextField
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
@@ -43,9 +45,11 @@ import kotlinx.collections.immutable.toImmutableList
 
 @Composable
 internal fun AccountCreateEditContent(state: AccountCreateEditUM, modifier: Modifier = Modifier) {
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val focusManager = LocalFocusManager.current
     Column(
         modifier = modifier
-            .background(color = TangemTheme.colors.background.tertiary)
+            .background(color = TangemTheme.colors.background.secondary)
             .fillMaxSize()
             .imePadding()
             .systemBarsPadding(),
@@ -76,6 +80,10 @@ internal fun AccountCreateEditContent(state: AccountCreateEditUM, modifier: Modi
                 color = TangemTheme.colors.text.tertiary,
             )
         }
+        if (state.buttonState.showProgress) {
+            focusManager.clearFocus()
+            keyboardController?.hide()
+        }
         PrimaryButton(
             modifier = Modifier
                 .fillMaxWidth()
@@ -161,6 +169,7 @@ private fun AccountColor(colorsState: AccountCreateEditUM.Colors) {
                     contentAlignment = Alignment.Center,
                     modifier = Modifier
                         .wrapContentSize()
+                        .clip(CircleShape)
                         .clickable(onClick = { colorsState.onColorSelect(color) })
                         .size(48.dp),
                 ) {
@@ -208,6 +217,7 @@ private fun AccountIcons(iconsState: AccountCreateEditUM.Icons) {
                     contentAlignment = Alignment.Center,
                     modifier = Modifier
                         .wrapContentSize()
+                        .clip(CircleShape)
                         .clickable(onClick = { iconsState.onIconSelect(icon) })
                         .size(52.dp),
                 ) {
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/details/AccountDetailsModel.kt b/features/account/impl/src/main/java/com/tangem/features/account/details/AccountDetailsModel.kt
index 29f0f9ad7e..2c0a24413a 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/details/AccountDetailsModel.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/details/AccountDetailsModel.kt
@@ -57,7 +57,7 @@ internal class AccountDetailsModel @Inject constructor(
         )
         val firstAction = EventMessageAction(
             title = resourceReference(R.string.account_details_archive_action),
-            warning = true,
+            isWarning = true,
             onClick = ::archiveCryptoPortfolio,
         )
         messageSender.send(
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt b/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt
new file mode 100644
index 0000000000..67ce3bbd1a
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/di/AccountFeatureModule.kt
@@ -0,0 +1,28 @@
+package com.tangem.features.account.di
+
+import com.tangem.features.account.PortfolioFetcher
+import com.tangem.features.account.PortfolioSelectorComponent
+import com.tangem.features.account.PortfolioSelectorController
+import com.tangem.features.account.fetcher.DefaultPortfolioFetcher
+import com.tangem.features.account.selector.DefaultPortfolioSelectorComponent
+import com.tangem.features.account.selector.DefaultPortfolioSelectorController
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface AccountFeatureModule {
+
+    @Binds
+    fun bindPortfolioFetcherFactory(impl: DefaultPortfolioFetcher.Factory): PortfolioFetcher.Factory
+
+    @Binds
+    fun bindPortfolioSelectorController(impl: DefaultPortfolioSelectorController): PortfolioSelectorController
+
+    @Binds
+    fun bindPortfolioSelectorComponentFactory(
+        impl: DefaultPortfolioSelectorComponent.Factory,
+    ): PortfolioSelectorComponent.Factory
+}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultAccountsBalanceFetcher.kt b/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
similarity index 52%
rename from features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultAccountsBalanceFetcher.kt
rename to features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
index 2d9db0f8a7..e1ae9bce5c 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultAccountsBalanceFetcher.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/fetcher/DefaultPortfolioFetcher.kt
@@ -1,17 +1,16 @@
 package com.tangem.features.account.fetcher
 
-import arrow.core.getOrElse
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
-import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
-import com.tangem.domain.core.lce.Lce
-import com.tangem.domain.models.TotalFiatBalance
-import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.isMultiCurrency
+import com.tangem.domain.tokens.GetWalletTotalBalanceUseCase
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
-import com.tangem.features.account.AccountsBalanceFetcher
-import com.tangem.features.account.AccountsBalanceFetcher.*
+import com.tangem.features.account.PortfolioFetcher
+import com.tangem.features.account.PortfolioFetcher.*
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -20,14 +19,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.*
 
-internal class DefaultAccountsBalanceFetcher @AssistedInject constructor(
+@Suppress("LongParameterList")
+internal class DefaultPortfolioFetcher @AssistedInject constructor(
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
+    private val getWalletTotalBalanceUseCase: GetWalletTotalBalanceUseCase,
+    private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
     private val getWallets: GetWalletsUseCase,
-    private val dispatchers: CoroutineDispatcherProvider,
+    dispatchers: CoroutineDispatcherProvider,
     @Assisted mode: Mode,
     @Assisted private val scope: CoroutineScope,
-) : AccountsBalanceFetcher {
+) : PortfolioFetcher {
 
     private val _mode = MutableStateFlow(mode)
     private val _data = MutableSharedFlow<Data>(
@@ -56,8 +58,8 @@ internal class DefaultAccountsBalanceFetcher @AssistedInject constructor(
             .map { it.filterWallets(mode) }
             .distinctUntilChanged()
             .flatMapLatest { wallets -> balancesForWallets(wallets) },
-        flow2 = appCurrencyFlow(),
-        flow3 = balanceHidingFlow(),
+        flow2 = getSelectedAppCurrencyUseCase.invokeOrDefault(),
+        flow3 = getBalanceHidingSettingsUseCase.isBalanceHidden(),
     ) { balances, appCurrency, isBalanceHiding ->
         Data(
             appCurrency = appCurrency,
@@ -73,48 +75,25 @@ internal class DefaultAccountsBalanceFetcher @AssistedInject constructor(
         }
     }
 
-    private fun balancesForWallets(wallets: List<UserWallet>): Flow<Map<UserWallet, Map<Account, AccountBalance>>> =
-        wallets.asFlow()
-            .map { walletAccountsBalancesFlow(it) }
-            .mapLatest { accountsBalances -> combine(accountsBalances) { pairs -> pairs.toMap() } }
-            .flattenConcat()
-
-    private fun walletAccountsBalancesFlow(wallet: UserWallet): Flow<Pair<UserWallet, Map<Account, AccountBalance>>> =
-        walletAccounts(wallet)
-            .distinctUntilChanged()
-            .map { list -> list.map(::accountBalanceFlow) }
-            .mapLatest { balanceFlows -> combine(balanceFlows) { balances -> balances.toMap() } }
-            .flattenConcat()
-            .map { accountBalance -> wallet to accountBalance }
-
-    private fun walletAccounts(wallet: UserWallet): Flow<List<Account>> = flow {
-        // todo account load accounts
-        val accounts: List<Account> = Account.CryptoPortfolio
-            .createMainAccount(wallet.walletId)
-            .let(::listOf)
-        emit(accounts)
+    private fun balancesForWallets(wallets: List<UserWallet>): Flow<Map<UserWallet, PortfolioBalance>> {
+        val balanceFlows = wallets.map { walletAccountsBalancesFlow(it) }
+        return combine(balanceFlows) { pairs -> pairs.toMap() }
     }
 
-    private fun accountBalanceFlow(account: Account): Flow<Pair<Account, AccountBalance>> = flow {
-        // todo account load balance
-        val balance = AccountBalance(balance = Lce.Content(TotalFiatBalance.Loading))
-        emit(account to balance)
-    }
+    private fun walletAccountsBalancesFlow(wallet: UserWallet): Flow<Pair<UserWallet, PortfolioBalance>> = combine(
+        flow = accountStatusListFlow(wallet),
+        flow2 = getWalletTotalBalanceUseCase(wallet.walletId),
+        transform = { accountStatusList, walletBalance ->
+            val portfolioBalance = PortfolioBalance(walletBalance, accountStatusList)
+            wallet to portfolioBalance
+        },
+    )
 
-    private fun appCurrencyFlow(): Flow<AppCurrency> {
-        return getSelectedAppCurrencyUseCase()
-            .map { it.getOrElse { AppCurrency.Default } }
-            .distinctUntilChanged()
-    }
-
-    private fun balanceHidingFlow(): Flow<Boolean> {
-        return getBalanceHidingSettingsUseCase()
-            .map { it.isBalanceHidden }
-            .distinctUntilChanged()
-    }
+    private fun accountStatusListFlow(wallet: UserWallet): Flow<AccountStatusList> =
+        singleAccountStatusListSupplier(SingleAccountStatusListProducer.Params(wallet.walletId))
 
     @AssistedFactory
-    interface Factory : AccountsBalanceFetcher.Factory {
-        override fun create(mode: Mode, scope: CoroutineScope): DefaultAccountsBalanceFetcher
+    interface Factory : PortfolioFetcher.Factory {
+        override fun create(mode: Mode, scope: CoroutineScope): DefaultPortfolioFetcher
     }
 }
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/AccountSelectorModel.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/AccountSelectorModel.kt
deleted file mode 100644
index 5012e93d14..0000000000
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/AccountSelectorModel.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.tangem.features.account.selector
-
-import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter
-import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.decompose.model.Model
-import com.tangem.core.decompose.model.ParamsContainer
-import com.tangem.core.ui.components.token.state.TokenItemState
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.domain.core.lce.Lce
-import com.tangem.domain.core.utils.getOrElse
-import com.tangem.domain.models.TotalFiatBalance
-import com.tangem.domain.models.account.Account
-import com.tangem.domain.models.wallet.isLocked
-import com.tangem.domain.tokens.error.TokenListError
-import com.tangem.features.account.AccountSelectorComponent
-import com.tangem.features.account.AccountsBalanceFetcher
-import com.tangem.features.account.selector.entity.AccountSelectorItemUM
-import com.tangem.features.account.selector.entity.AccountSelectorUM
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.map
-import javax.inject.Inject
-
-@ModelScoped
-internal class AccountSelectorModel @Inject constructor(
-    paramsContainer: ParamsContainer,
-    override val dispatchers: CoroutineDispatcherProvider,
-) : Model() {
-
-    private val params = paramsContainer.require<AccountSelectorComponent.Params>()
-    private val balanceFetcher get() = params.accountsBalanceFetcher
-    private val selectorController get() = params.controller
-
-    internal val state: StateFlow<AccountSelectorUM>
-    field = MutableStateFlow<AccountSelectorUM>(emptyState())
-
-    init {
-        balanceFetcher.data
-            .map { data ->
-                AccountSelectorUM(
-                    isSingleWallet = balanceFetcher.mode.value is AccountsBalanceFetcher.Mode.Wallet,
-                    items = buildUiList(data).toImmutableList(),
-                )
-            }
-            .launchIn(modelScope)
-    }
-
-    private fun buildUiList(data: AccountsBalanceFetcher.Data) = buildList {
-        fun Account.accountItemState(balance: Lce<TokenListError, TotalFiatBalance>): TokenItemState {
-            val totalFiatBalance = balance.getOrElse(
-                ifError = { TotalFiatBalance.Failed },
-                ifLoading = { TotalFiatBalance.Loading },
-            )
-            return when (this) {
-                is Account.CryptoPortfolio -> AccountCryptoPortfolioItemStateConverter(
-                    appCurrency = data.appCurrency,
-                    account = this,
-                    onItemClick = { selectorController.selectAccount(it) },
-                ).convert(totalFiatBalance)
-            }
-        }
-
-        data.balances.forEach { wallet, accounts ->
-            if (wallet.isLocked) return@forEach
-            AccountSelectorItemUM.Wallet(
-                id = wallet.walletId.stringValue,
-                name = stringReference(wallet.name),
-            ).let(::add)
-
-            accounts.forEach { account, balance ->
-                AccountSelectorItemUM.Account(
-                    account = account.accountItemState(balance.balance),
-                    isBalanceHidden = data.isBalanceHidden,
-                ).let(::add)
-            }
-        }
-    }
-
-    private fun emptyState() = AccountSelectorUM(
-        items = persistentListOf(),
-        balanceFetcher.mode.value is AccountsBalanceFetcher.Mode.Wallet,
-    )
-}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorComponent.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorComponent.kt
deleted file mode 100644
index bc53b7bfb3..0000000000
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorComponent.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.tangem.features.account.selector
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
-import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
-import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheet
-import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.account.AccountSelectorComponent
-import com.tangem.features.account.impl.R
-import com.tangem.features.account.selector.ui.AccountSelectorContent
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-
-internal class DefaultAccountSelectorComponent @AssistedInject constructor(
-    @Assisted appComponentContext: AppComponentContext,
-    @Assisted private val params: AccountSelectorComponent.Params,
-) : AppComponentContext by appComponentContext, AccountSelectorComponent {
-
-    private val model: AccountSelectorModel = getOrCreateModel(params)
-
-    override fun dismiss() {
-        params.onDismiss()
-    }
-
-    @Composable
-    override fun BottomSheet() {
-        val state by model.state.collectAsStateWithLifecycle()
-        TangemModalBottomSheet<TangemBottomSheetConfigContent.Empty>(
-            config = TangemBottomSheetConfig(
-                isShown = true,
-                onDismissRequest = ::dismiss,
-                content = TangemBottomSheetConfigContent.Empty,
-            ),
-            onBack = ::dismiss,
-            containerColor = TangemTheme.colors.background.primary,
-            title = {
-                TangemModalBottomSheetTitle(
-                    title = resourceReference(R.string.common_choose_wallet),
-                    startIconRes = R.drawable.ic_back_24,
-                    onStartClick = ::dismiss,
-                )
-            },
-            content = {
-                AccountSelectorContent(
-                    state = state,
-                    modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
-                )
-            },
-        )
-    }
-
-    @AssistedFactory
-    interface Factory : AccountSelectorComponent.Factory {
-        override fun create(
-            appComponentContext: AppComponentContext,
-            params: AccountSelectorComponent.Params,
-        ): DefaultAccountSelectorComponent
-    }
-}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorController.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorController.kt
deleted file mode 100644
index 9be5ae3197..0000000000
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultAccountSelectorController.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.tangem.features.account.selector
-
-import com.tangem.domain.models.account.Account
-import com.tangem.features.account.AccountSelectorController
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
-import javax.inject.Inject
-
-internal class DefaultAccountSelectorController @Inject constructor() : AccountSelectorController {
-
-    private val _selectedAccount: MutableStateFlow<Account?> = MutableStateFlow(null)
-    override val selectedAccount: StateFlow<Account?> get() = _selectedAccount
-
-    override fun selectAccount(account: Account?) {
-        _selectedAccount.update { account }
-    }
-}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt
new file mode 100644
index 0000000000..7a67a32392
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorComponent.kt
@@ -0,0 +1,59 @@
+package com.tangem.features.account.selector
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.features.account.PortfolioSelectorComponent
+import com.tangem.features.account.selector.ui.PortfolioSelectorBS
+import com.tangem.features.account.selector.ui.PortfolioSelectorContent
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+internal class DefaultPortfolioSelectorComponent @AssistedInject constructor(
+    @Assisted appComponentContext: AppComponentContext,
+    @Assisted private val params: PortfolioSelectorComponent.Params,
+) : AppComponentContext by appComponentContext, PortfolioSelectorComponent {
+
+    private val model: PortfolioSelectorModel = getOrCreateModel(params)
+
+    override val title: StateFlow<TextReference>
+        get() = model.state
+            .map { it.title }
+            .stateIn(componentScope, SharingStarted.Lazily, model.state.value.title)
+
+    override fun dismiss() {
+        params.onDismiss()
+    }
+
+    @Composable
+    override fun BottomSheet() {
+        val state by model.state.collectAsStateWithLifecycle()
+        PortfolioSelectorBS(state, onDismiss = ::dismiss)
+    }
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val state by model.state.collectAsStateWithLifecycle()
+        PortfolioSelectorContent(
+            state = state,
+            modifier = modifier,
+        )
+    }
+
+    @AssistedFactory
+    interface Factory : PortfolioSelectorComponent.Factory {
+        override fun create(
+            appComponentContext: AppComponentContext,
+            params: PortfolioSelectorComponent.Params,
+        ): DefaultPortfolioSelectorComponent
+    }
+}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt
new file mode 100644
index 0000000000..f607006e40
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/DefaultPortfolioSelectorController.kt
@@ -0,0 +1,43 @@
+package com.tangem.features.account.selector
+
+import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.features.account.PortfolioSelectorController
+import com.tangem.features.account.PortfolioFetcher
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+internal class DefaultPortfolioSelectorController @Inject constructor(
+    private val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase,
+) : PortfolioSelectorController {
+
+    private val _selectedAccount: MutableStateFlow<AccountId?> = MutableStateFlow(null)
+
+    override val isAccountMode: Flow<Boolean> by lazy { isAccountsModeEnabledUseCase() }
+
+    override val selectedAccount: StateFlow<AccountId?> get() = _selectedAccount
+
+    override fun selectAccount(accountId: AccountId?) {
+        _selectedAccount.update { accountId }
+    }
+
+    override fun selectedAccountWithData(portfolioFetcher: PortfolioFetcher): Flow<Pair<UserWallet, AccountStatus>?> =
+        combine(
+            flow = _selectedAccount,
+            flow2 = portfolioFetcher.data,
+            transform = { accountId, data ->
+                accountId ?: return@combine null
+                var result: Pair<UserWallet, AccountStatus>? = null
+
+                data.balances.forEach { wallet, balance ->
+                    val accountStatuses = balance.accountsBalance.accountStatuses
+                        .find { accountId == it.account.accountId }
+                    if (accountStatuses != null) result = wallet to accountStatuses
+                }
+
+                return@combine result
+            },
+        )
+}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt
new file mode 100644
index 0000000000..bef9142229
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/PortfolioSelectorModel.kt
@@ -0,0 +1,186 @@
+package com.tangem.features.account.selector
+
+import com.tangem.common.ui.account.AccountPortfolioItemUMConverter
+import com.tangem.common.ui.userwallet.converter.UserWalletItemUMConverter
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.account.PortfolioFetcher
+import com.tangem.features.account.PortfolioSelectorComponent
+import com.tangem.features.account.impl.R
+import com.tangem.features.account.selector.entity.PortfolioSelectorItemUM
+import com.tangem.features.account.selector.entity.PortfolioSelectorUM
+import com.tangem.features.wallet.utils.UserWalletImageFetcher
+import com.tangem.operations.attestation.ArtworkSize
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+@ModelScoped
+internal class PortfolioSelectorModel @Inject constructor(
+    paramsContainer: ParamsContainer,
+    override val dispatchers: CoroutineDispatcherProvider,
+    private val walletImageFetcher: UserWalletImageFetcher,
+    private val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase,
+) : Model() {
+
+    private val params = paramsContainer.require<PortfolioSelectorComponent.Params>()
+    private val balanceFetcher get() = params.portfolioFetcher
+    private val selectorController get() = params.controller
+
+    internal val state: StateFlow<PortfolioSelectorUM>
+        field = MutableStateFlow<PortfolioSelectorUM>(emptyState())
+
+    init {
+        combine(
+            flow = isAccountsModeEnabledUseCase(),
+            flow2 = loadBalanceWithArtwork(),
+            transform = { isAccountsMode, (portfolioData, artworks) ->
+                val uiList = buildUiList(isAccountsMode, portfolioData, artworks)
+                val title = when (isAccountsMode) {
+                    true -> resourceReference(R.string.common_choose_account)
+                    false -> resourceReference(R.string.common_choose_wallet)
+                }
+                state.value = PortfolioSelectorUM(
+                    title = title,
+                    items = uiList.toImmutableList(),
+                )
+            },
+        )
+            .flowOn(dispatchers.default)
+            .launchIn(modelScope)
+    }
+
+    private fun buildUiList(
+        isAccountsMode: Boolean,
+        portfolioData: PortfolioFetcher.Data,
+        artworks: Map<UserWalletId, UserWalletItemUM.ImageState>,
+    ): List<PortfolioSelectorItemUM> = when (isAccountsMode) {
+        true -> buildAccountsList(portfolioData, artworks)
+        false -> buildWalletList(portfolioData, artworks)
+    }
+
+    private fun buildWalletList(
+        portfolioData: PortfolioFetcher.Data,
+        artworks: Map<UserWalletId, UserWalletItemUM.ImageState>,
+    ): List<PortfolioSelectorItemUM> = buildList {
+        val appCurrency = portfolioData.appCurrency
+        val isBalanceHidden = portfolioData.isBalanceHidden
+        val lockedWallets = mutableListOf<PortfolioSelectorItemUM>()
+        portfolioData.balances.forEach { wallet, portfolio ->
+            val balance = portfolio.walletBalance.getOrNull()
+            val walletItemUM = UserWalletItemUMConverter(
+                onClick = {
+                    // todo account
+                    // selectorController.selectAccount(portfolio.accountsBalance.mainAccount)
+                },
+                appCurrency = appCurrency,
+                balance = balance,
+                isBalanceHidden = isBalanceHidden,
+                artwork = artworks[wallet.walletId],
+                isAuthMode = false,
+            ).convert(wallet)
+            if (walletItemUM.isEnabled) {
+                add(PortfolioSelectorItemUM.Portfolio(walletItemUM))
+            } else {
+                lockedWallets.add(PortfolioSelectorItemUM.Portfolio(walletItemUM))
+            }
+        }
+        if (lockedWallets.isNotEmpty()) {
+            val lockedWalletsTitle = PortfolioSelectorItemUM.GroupTitle(
+                id = "lockedWalletsTitleId",
+                name = resourceReference(R.string.common_locked_wallets),
+            )
+            add(lockedWalletsTitle)
+            addAll(lockedWallets)
+        }
+    }
+
+    private fun buildAccountsList(
+        portfolioData: PortfolioFetcher.Data,
+        artworks: Map<UserWalletId, UserWalletItemUM.ImageState>,
+    ): List<PortfolioSelectorItemUM> = buildList {
+        val appCurrency = portfolioData.appCurrency
+        val isBalanceHidden = portfolioData.isBalanceHidden
+        val lockedWallets = mutableListOf<PortfolioSelectorItemUM>()
+        portfolioData.balances.forEach { wallet, portfolio ->
+            val balance = portfolio.walletBalance.getOrNull()
+            val walletItemUM = UserWalletItemUMConverter(
+                onClick = {
+                    // todo account
+                    // selectorController.selectAccount(portfolio.accountsBalance.mainAccount)
+                },
+                appCurrency = appCurrency,
+                balance = balance,
+                isBalanceHidden = isBalanceHidden,
+                artwork = artworks[wallet.walletId],
+                isAuthMode = false,
+            ).convert(wallet)
+            if (!walletItemUM.isEnabled) {
+                lockedWallets.add(PortfolioSelectorItemUM.Portfolio(walletItemUM))
+                return@forEach
+            }
+
+            val walletTitle = PortfolioSelectorItemUM.GroupTitle(
+                id = "GroupTitle ${wallet.walletId.stringValue}",
+                name = stringReference(wallet.name),
+            )
+            add(walletTitle)
+
+            add(PortfolioSelectorItemUM.Portfolio(walletItemUM))
+            portfolio.accountsBalance.accountStatuses.forEach { accountStatus ->
+                val account = accountStatus.account
+                val accountBalance = when (accountStatus) {
+                    is AccountStatus.CryptoPortfolio -> accountStatus.tokenList.totalFiatBalance
+                }
+                val accountItemUM = AccountPortfolioItemUMConverter(
+                    onClick = { selectorController.selectAccount(account.accountId) },
+                    appCurrency = appCurrency,
+                    accountBalance = accountBalance,
+                    isBalanceHidden = isBalanceHidden,
+                ).convert(account)
+                add(PortfolioSelectorItemUM.Portfolio(accountItemUM))
+            }
+        }
+        if (lockedWallets.isNotEmpty()) {
+            val lockedWalletsTitle = PortfolioSelectorItemUM.GroupTitle(
+                id = "lockedWalletsTitleId",
+                name = resourceReference(R.string.common_locked_wallets),
+            )
+            add(lockedWalletsTitle)
+            addAll(lockedWallets)
+        }
+    }
+
+    private fun loadBalanceWithArtwork():
+        Flow<Pair<PortfolioFetcher.Data, Map<UserWalletId, UserWalletItemUM.ImageState>>> {
+        val wallets = Channel<Set<UserWallet>>()
+        val portfolioFlow = balanceFetcher.data
+            .onEach { wallets.trySend(it.balances.keys) }
+
+        val artworksFlow = wallets.receiveAsFlow()
+            .distinctUntilChanged()
+            .flatMapLatest { walletImageFetcher.walletsImage(wallets = it, size = ArtworkSize.SMALL) }
+
+        return combine(
+            flow = portfolioFlow,
+            flow2 = artworksFlow,
+        ) { portfolioData, artworks -> portfolioData to artworks }
+    }
+
+    private fun emptyState() = PortfolioSelectorUM(
+        items = persistentListOf(),
+        title = TextReference.EMPTY,
+    )
+}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/AccountSelectorUM.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/AccountSelectorUM.kt
deleted file mode 100644
index d8d05f0fea..0000000000
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/AccountSelectorUM.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.tangem.features.account.selector.entity
-
-import androidx.compose.runtime.Immutable
-import com.tangem.core.ui.components.token.state.TokenItemState
-import com.tangem.core.ui.extensions.TextReference
-import kotlinx.collections.immutable.ImmutableList
-
-data class AccountSelectorUM(
-    val items: ImmutableList<AccountSelectorItemUM>,
-    val isSingleWallet: Boolean,
-)
-
-@Immutable
-sealed interface AccountSelectorItemUM {
-    val id: String
-
-    data class Wallet(
-        override val id: String,
-        val name: TextReference,
-    ) : AccountSelectorItemUM
-
-    data class Account(
-        val account: TokenItemState,
-        val isBalanceHidden: Boolean,
-    ) : AccountSelectorItemUM {
-        override val id: String = account.id
-    }
-}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt
new file mode 100644
index 0000000000..2fb4321185
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/entity/PortfolioSelectorUM.kt
@@ -0,0 +1,27 @@
+package com.tangem.features.account.selector.entity
+
+import androidx.compose.runtime.Immutable
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
+import com.tangem.core.ui.extensions.TextReference
+import kotlinx.collections.immutable.ImmutableList
+
+data class PortfolioSelectorUM(
+    val title: TextReference,
+    val items: ImmutableList<PortfolioSelectorItemUM>,
+)
+
+@Immutable
+sealed interface PortfolioSelectorItemUM {
+    val id: String
+
+    data class GroupTitle(
+        override val id: String,
+        val name: TextReference,
+    ) : PortfolioSelectorItemUM
+
+    data class Portfolio(
+        val item: UserWalletItemUM,
+    ) : PortfolioSelectorItemUM {
+        override val id: String = item.id.stringValue
+    }
+}
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorContent.kt
deleted file mode 100644
index a8f54b000d..0000000000
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorContent.kt
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.tangem.features.account.selector.ui
-
-import android.content.res.Configuration
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import com.tangem.core.ui.components.token.AccountItemPreviewData
-import com.tangem.core.ui.components.token.TokenItem
-import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.features.account.selector.entity.AccountSelectorItemUM
-import com.tangem.features.account.selector.entity.AccountSelectorUM
-import com.tangem.features.account.selector.ui.AccountSelectorPreviewData.firstList
-import kotlinx.collections.immutable.toImmutableList
-import java.util.UUID
-
-@Composable
-internal fun AccountSelectorContent(
-    state: AccountSelectorUM,
-    modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(),
-) {
-    LazyColumn(
-        modifier = modifier,
-        contentPadding = contentPadding,
-    ) {
-        val items = state.items
-        itemsIndexed(
-            items = items,
-            key = { _, item -> item.id },
-        ) { index, item ->
-            val previewItem = items.getOrNull(index.dec())
-            val offsetModifier = when {
-                previewItem == null -> Modifier
-                state.isSingleWallet -> Modifier.padding(
-                    top = TangemTheme.dimens.spacing16,
-                )
-                item is AccountSelectorItemUM.Wallet -> Modifier.padding(
-                    top = TangemTheme.dimens.spacing16,
-                )
-                else -> Modifier.padding(
-                    top = TangemTheme.dimens.spacing8,
-                )
-            }
-
-            when (item) {
-                is AccountSelectorItemUM.Account -> TokenItem(
-                    state = item.account,
-                    isBalanceHidden = item.isBalanceHidden,
-                    modifier = offsetModifier
-                        .clip(RoundedCornerShape(TangemTheme.dimens.radius14))
-                        .background(color = TangemTheme.colors.background.primary),
-                )
-                is AccountSelectorItemUM.Wallet -> WalletNameRow(
-                    model = item,
-                    modifier = offsetModifier
-                        .fillMaxWidth()
-                        .padding(horizontal = TangemTheme.dimens.spacing16),
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun WalletNameRow(model: AccountSelectorItemUM.Wallet, modifier: Modifier = Modifier) {
-    Text(
-        modifier = modifier,
-        text = model.name.resolveReference(),
-        style = TangemTheme.typography.subtitle2,
-        color = TangemTheme.colors.text.tertiary,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-    )
-}
-
-@Preview(showBackground = true, widthDp = 360)
-@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Composable
-private fun AccountSelectorContentPreview(
-    @PreviewParameter(AccountSelectorPreviewStateProvider::class) params: AccountSelectorUM,
-) {
-    TangemThemePreview {
-        AccountSelectorContent(
-            state = params,
-            modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
-        )
-    }
-}
-
-internal object AccountSelectorPreviewData {
-    val firstList
-        get() = buildList {
-            AccountSelectorItemUM.Wallet(
-                id = UUID.randomUUID().toString(),
-                name = stringReference("Tangem 2.0"),
-            ).let(::add)
-            AccountItemPreviewData.accountItem
-                .let { AccountSelectorItemUM.Account(it, false) }
-                .let(::add)
-            AccountItemPreviewData.accountItem.copy(iconState = AccountItemPreviewData.accountLetterIcon)
-                .let { AccountSelectorItemUM.Account(it, false) }
-                .let(::add)
-            AccountSelectorItemUM.Wallet(
-                id = UUID.randomUUID().toString(),
-                name = stringReference("Tangem White"),
-            ).let(::add)
-            AccountItemPreviewData.accountItem.copy(iconState = AccountItemPreviewData.accountLetterIcon)
-                .let { AccountSelectorItemUM.Account(it, false) }
-                .let(::add)
-        }
-}
-
-internal class AccountSelectorPreviewStateProvider : CollectionPreviewParameterProvider<AccountSelectorUM>(
-    buildList {
-        val secondList = listOf(
-            AccountItemPreviewData.accountItem,
-            AccountItemPreviewData.accountItem.copy(iconState = AccountItemPreviewData.accountLetterIcon),
-        ).map { AccountSelectorItemUM.Account(it, false) }
-
-        val first = AccountSelectorUM(
-            items = firstList.toImmutableList(),
-            isSingleWallet = false,
-        )
-        val second = AccountSelectorUM(
-            items = secondList.toImmutableList(),
-            isSingleWallet = true,
-        )
-        add(first)
-        add(second)
-    },
-)
\ No newline at end of file
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorBS.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt
similarity index 80%
rename from features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorBS.kt
rename to features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt
index ec1cad3c9e..9044bd9845 100644
--- a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/AccountSelectorBS.kt
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorBS.kt
@@ -13,14 +13,13 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
 import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheet
 import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
-import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.features.account.impl.R
-import com.tangem.features.account.selector.entity.AccountSelectorUM
+import com.tangem.features.account.selector.entity.PortfolioSelectorUM
 
 @Composable
-internal fun AccountSelectorBS(state: AccountSelectorUM, onDismiss: () -> Unit, modifier: Modifier = Modifier) {
+internal fun PortfolioSelectorBS(state: PortfolioSelectorUM, onDismiss: () -> Unit, modifier: Modifier = Modifier) {
     TangemModalBottomSheet<TangemBottomSheetConfigContent.Empty>(
         config = TangemBottomSheetConfig(
             isShown = true,
@@ -32,13 +31,13 @@ internal fun AccountSelectorBS(state: AccountSelectorUM, onDismiss: () -> Unit,
         containerColor = TangemTheme.colors.background.secondary,
         title = {
             TangemModalBottomSheetTitle(
-                title = resourceReference(R.string.common_choose_account),
+                title = state.title,
                 startIconRes = R.drawable.ic_back_24,
                 onStartClick = onDismiss,
             )
         },
         content = {
-            AccountSelectorContent(
+            PortfolioSelectorContent(
                 state = state,
                 contentPadding = PaddingValues(bottom = 16.dp),
                 modifier = modifier.padding(horizontal = 16.dp),
@@ -50,9 +49,9 @@ internal fun AccountSelectorBS(state: AccountSelectorUM, onDismiss: () -> Unit,
 @Preview(showBackground = true, widthDp = 360)
 @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
-private fun Preview(@PreviewParameter(AccountSelectorPreviewStateProvider::class) params: AccountSelectorUM) {
+private fun Preview(@PreviewParameter(PortfolioSelectorPreviewStateProvider::class) params: PortfolioSelectorUM) {
     TangemThemePreview {
-        AccountSelectorBS(
+        PortfolioSelectorBS(
             state = params,
             onDismiss = {},
             modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
diff --git a/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt
new file mode 100644
index 0000000000..2bf56e09c3
--- /dev/null
+++ b/features/account/impl/src/main/java/com/tangem/features/account/selector/ui/PortfolioSelectorContent.kt
@@ -0,0 +1,219 @@
+package com.tangem.features.account.selector.ui
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.common.ui.account.AccountIconPreviewData
+import com.tangem.common.ui.userwallet.UserWalletItem
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM.ImageState
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.account.impl.R
+import com.tangem.features.account.selector.entity.PortfolioSelectorItemUM
+import com.tangem.features.account.selector.entity.PortfolioSelectorUM
+import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.firstList
+import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.lockedWalletList
+import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.secondList
+import com.tangem.features.account.selector.ui.PortfolioSelectorPreviewData.walletList
+import kotlinx.collections.immutable.toImmutableList
+import java.util.UUID
+
+private const val DISABLED_WALLET_ALPHA = 0.5f
+
+@Composable
+internal fun PortfolioSelectorContent(
+    state: PortfolioSelectorUM,
+    modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues(),
+) {
+    LazyColumn(
+        modifier = modifier,
+        contentPadding = contentPadding,
+    ) {
+        val items = state.items
+        itemsIndexed(
+            items = items,
+            key = { _, item -> item.id },
+        ) { index, item ->
+            val previewItem = items.getOrNull(index.dec())
+            val offsetModifier = when {
+                previewItem == null -> Modifier
+                item is PortfolioSelectorItemUM.GroupTitle -> Modifier.padding(
+                    top = TangemTheme.dimens.spacing16,
+                )
+                else -> Modifier.padding(
+                    top = TangemTheme.dimens.spacing8,
+                )
+            }
+
+            when (item) {
+                is PortfolioSelectorItemUM.Portfolio -> UserWalletItem(
+                    state = item.item,
+                    modifier = offsetModifier
+                        .clip(RoundedCornerShape(TangemTheme.dimens.radius14))
+                        .background(color = TangemTheme.colors.background.primary)
+                        .let { if (!item.item.isEnabled) it.alpha(DISABLED_WALLET_ALPHA) else it },
+                )
+                is PortfolioSelectorItemUM.GroupTitle -> WalletNameRow(
+                    model = item,
+                    modifier = offsetModifier
+                        .fillMaxWidth()
+                        .padding(horizontal = TangemTheme.dimens.spacing16),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun WalletNameRow(model: PortfolioSelectorItemUM.GroupTitle, modifier: Modifier = Modifier) {
+    Text(
+        modifier = modifier,
+        text = model.name.resolveReference(),
+        style = TangemTheme.typography.subtitle2,
+        color = TangemTheme.colors.text.tertiary,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+    )
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun Preview(@PreviewParameter(PortfolioSelectorPreviewStateProvider::class) params: PortfolioSelectorUM) {
+    TangemThemePreview {
+        PortfolioSelectorContent(
+            state = params,
+            modifier = Modifier.background(color = TangemTheme.colors.background.secondary),
+        )
+    }
+}
+
+internal object PortfolioSelectorPreviewData {
+
+    val accountName get() = stringReference(value = "Portfolio")
+    val walletName get() = stringReference(value = "Tangem 2.0")
+
+    private val accountItem: UserWalletItemUM
+        get() = UserWalletItemUM(
+            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            name = accountName,
+            information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
+            balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
+            isEnabled = true,
+            onClick = { },
+            imageState = ImageState.Account(
+                name = accountName,
+                icon = AccountIconPreviewData.randomAccountIcon(),
+            ),
+            label = null,
+        )
+
+    private val walletItem: UserWalletItemUM
+        get() = UserWalletItemUM(
+            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            name = walletName,
+            information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
+            balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
+            isEnabled = true,
+            onClick = { },
+            imageState = ImageState.MobileWallet,
+            label = null,
+        )
+
+    private val lockedWalletItem: UserWalletItemUM
+        get() = walletItem.copy(isEnabled = false)
+
+    val firstList
+        get() = buildList {
+            PortfolioSelectorItemUM.GroupTitle(
+                id = UUID.randomUUID().toString(),
+                name = stringReference("Tangem 2.0"),
+            ).let(::add)
+            accountItem
+                .let { PortfolioSelectorItemUM.Portfolio(it) }
+                .let(::add)
+            accountItem
+                .let { PortfolioSelectorItemUM.Portfolio(it) }
+                .let(::add)
+            PortfolioSelectorItemUM.GroupTitle(
+                id = UUID.randomUUID().toString(),
+                name = stringReference("Tangem White"),
+            ).let(::add)
+            accountItem.let { PortfolioSelectorItemUM.Portfolio(it) }
+                .let(::add)
+        }
+
+    val secondList
+        get() = firstList + buildList {
+            PortfolioSelectorItemUM.GroupTitle(
+                id = UUID.randomUUID().toString(),
+                name = resourceReference(R.string.common_locked_wallets),
+            ).let(::add)
+            add(PortfolioSelectorItemUM.Portfolio(lockedWalletItem))
+            add(PortfolioSelectorItemUM.Portfolio(lockedWalletItem))
+        }
+
+    val walletList
+        get() = buildList {
+            add(PortfolioSelectorItemUM.Portfolio(walletItem))
+            add(PortfolioSelectorItemUM.Portfolio(walletItem))
+        }
+
+    val lockedWalletList
+        get() = buildList {
+            add(PortfolioSelectorItemUM.Portfolio(walletItem))
+            val title = PortfolioSelectorItemUM.GroupTitle(
+                id = UUID.randomUUID().toString(),
+                name = resourceReference(R.string.common_locked_wallets),
+            )
+            add(title)
+            add(PortfolioSelectorItemUM.Portfolio(lockedWalletItem))
+            add(PortfolioSelectorItemUM.Portfolio(lockedWalletItem))
+        }
+}
+
+internal class PortfolioSelectorPreviewStateProvider : CollectionPreviewParameterProvider<PortfolioSelectorUM>(
+    buildList {
+        val first = PortfolioSelectorUM(
+            title = resourceReference(R.string.common_choose_account),
+            items = firstList.toImmutableList(),
+        )
+        val second = PortfolioSelectorUM(
+            title = resourceReference(R.string.common_choose_account),
+            items = secondList.toImmutableList(),
+        )
+        val walletListUM = PortfolioSelectorUM(
+            title = resourceReference(R.string.common_choose_wallet),
+            items = walletList.toImmutableList(),
+        )
+        val lockedWalletListUM =
+            PortfolioSelectorUM(
+                title = resourceReference(R.string.common_choose_wallet),
+                items = lockedWalletList.toImmutableList(),
+            )
+        add(first)
+        add(second)
+        add(walletListUM)
+        add(lockedWalletListUM)
+    },
+)
\ No newline at end of file
diff --git a/features/biometry/api/src/main/kotlin/com/tangem/features/biometry/AskBiometryComponent.kt b/features/biometry/api/src/main/kotlin/com/tangem/features/biometry/AskBiometryComponent.kt
index b8540bfc50..526a9ddd80 100644
--- a/features/biometry/api/src/main/kotlin/com/tangem/features/biometry/AskBiometryComponent.kt
+++ b/features/biometry/api/src/main/kotlin/com/tangem/features/biometry/AskBiometryComponent.kt
@@ -7,7 +7,7 @@ import com.tangem.core.ui.decompose.ComposableContentComponent
 interface AskBiometryComponent : ComposableContentComponent, ComposableBottomSheetComponent {
 
     data class Params(
-        val bottomSheetVariant: Boolean,
+        val isBottomSheetVariant: Boolean,
         val modelCallbacks: ModelCallbacks,
     )
 
diff --git a/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt b/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
index 0d53779766..faf365c0f3 100644
--- a/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
+++ b/features/biometry/impl/src/main/kotlin/com/tangem/features/biometry/impl/model/AskBiometryModel.kt
@@ -13,7 +13,7 @@ import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.settings.SetAskBiometryShownUseCase
 import com.tangem.domain.settings.repositories.SettingsRepository
@@ -55,7 +55,7 @@ internal class AskBiometryModel @Inject constructor(
 
     private val _uiState = MutableStateFlow(
         AskBiometryUM(
-            bottomSheetVariant = params.bottomSheetVariant,
+            bottomSheetVariant = params.isBottomSheetVariant,
             onAllowClick = ::onAllowClick,
             onDontAllowClick = ::dontAllow,
             onDismiss = ::dismiss,
@@ -160,7 +160,7 @@ internal class AskBiometryModel @Inject constructor(
                     title = resourceReference(R.string.common_cancel),
                     onClick = {},
                 ),
-                dismissOnFirstAction = true,
+                shouldDismissOnFirstAction = true,
             ),
         )
     }
diff --git a/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/CreateWalletSelectionModel.kt b/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/CreateWalletSelectionModel.kt
index d5c27dd004..1225bd8144 100644
--- a/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/CreateWalletSelectionModel.kt
+++ b/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/CreateWalletSelectionModel.kt
@@ -23,8 +23,8 @@ import com.tangem.domain.card.analytics.ParamCardCurrencyConverter
 import com.tangem.domain.card.analytics.Shop
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.SaveWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.wallets.builder.ColdUserWalletBuilder
@@ -61,14 +61,14 @@ internal class CreateWalletSelectionModel @Inject constructor(
 ) : Model() {
 
     internal val uiState: StateFlow<CreateWalletSelectionUM>
-    field = MutableStateFlow(
-        CreateWalletSelectionUM(
-            onBackClick = { router.pop() },
-            onMobileWalletClick = ::onMobileWalletClick,
-            onHardwareWalletClick = ::onHardwareWalletClick,
-            onScanClick = ::onScanClick,
-        ),
-    )
+        field = MutableStateFlow(
+            CreateWalletSelectionUM(
+                onBackClick = { router.pop() },
+                onMobileWalletClick = ::onMobileWalletClick,
+                onHardwareWalletClick = ::onHardwareWalletClick,
+                onScanClick = ::onScanClick,
+            ),
+        )
 
     init {
         showAlreadyHaveWalletWithDelay()
diff --git a/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/ui/CreateWalletSelectionContent.kt b/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/ui/CreateWalletSelectionContent.kt
index cc4e15fb2a..1df0b5eff7 100644
--- a/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/ui/CreateWalletSelectionContent.kt
+++ b/features/create-wallet-selection/impl/src/main/kotlin/com/tangem/features/createwalletselection/ui/CreateWalletSelectionContent.kt
@@ -140,11 +140,11 @@ internal fun CreateWalletSelectionContent(state: CreateWalletSelectionUM, modifi
 
 @Composable
 private fun WalletBlock(
-    modifier: Modifier = Modifier,
     title: String,
     description: String,
-    badge: @Composable () -> Unit,
     onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    badge: @Composable () -> Unit,
 ) {
     Column(
         modifier = modifier
diff --git a/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt b/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
index 7915a2a320..04d7e91736 100644
--- a/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
+++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
@@ -18,11 +18,11 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.domain.card.ScanCardProcessor
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.wallets.builder.ColdUserWalletBuilder
-import com.tangem.domain.core.wallets.error.SaveWalletError
-import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsSyncUseCase
 import com.tangem.features.details.impl.R
diff --git a/features/disclaimer/impl/build.gradle.kts b/features/disclaimer/impl/build.gradle.kts
index b34ba43590..7c72408c05 100644
--- a/features/disclaimer/impl/build.gradle.kts
+++ b/features/disclaimer/impl/build.gradle.kts
@@ -31,6 +31,7 @@ dependencies {
     implementation(projects.core.navigation)
     implementation(projects.core.decompose)
     implementation(projects.common.routing)
+    implementation(projects.common.ui)
 
     /** Domain modules */
     implementation(projects.domain.models)
diff --git a/features/disclaimer/impl/src/main/java/com/tangem/features/disclaimer/impl/model/DisclaimerModel.kt b/features/disclaimer/impl/src/main/java/com/tangem/features/disclaimer/impl/model/DisclaimerModel.kt
index 02d4cd7765..b8b6d574b4 100644
--- a/features/disclaimer/impl/src/main/java/com/tangem/features/disclaimer/impl/model/DisclaimerModel.kt
+++ b/features/disclaimer/impl/src/main/java/com/tangem/features/disclaimer/impl/model/DisclaimerModel.kt
@@ -1,6 +1,7 @@
 package com.tangem.features.disclaimer.impl.model
 
 import com.tangem.common.routing.AppRoute
+import com.tangem.common.ui.notifications.NotificationId
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
@@ -49,6 +50,10 @@ internal class DisclaimerModel @Inject constructor(
             cardRepository.acceptTangemTOS()
             val shouldAskPushPermission = notificationsRepository.shouldShowSubscribeOnNotificationsAfterUpdate()
             if (shouldAskPushPermission) {
+                notificationsRepository.setShouldShowNotifications(
+                    key = NotificationId.EnablePushesReminderNotification.key,
+                    value = false,
+                )
                 router.push(AppRoute.PushNotification(AppRoute.PushNotification.Source.Stories))
             } else {
                 neverToInitiallyAskPermissionUseCase(PUSH_PERMISSION)
diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
index 5c73a404c1..f954397c48 100644
--- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
+++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
@@ -26,8 +26,8 @@ import com.tangem.domain.card.analytics.ParamCardCurrencyConverter
 import com.tangem.domain.card.analytics.Shop
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.SaveWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.settings.repositories.SettingsRepository
@@ -46,14 +46,7 @@ import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.Locale
diff --git a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt
index 3bf071d96a..1056d363be 100644
--- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt
+++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/ui/compose/StoriesAnimation.kt
@@ -95,11 +95,11 @@ fun StoriesTextAnimation(
 
 @Composable
 fun StoriesBottomImageAnimation(
+    firstStepDuration: Int,
+    totalDuration: Int,
     initialScale: Float = 2.5f,
     secondStageScale: Float = SCALE_SWITCH_BARRIER,
     targetScale: Float = 1.0f,
-    firstStepDuration: Int,
-    totalDuration: Int,
     content: @Composable (Modifier) -> Unit,
 ) {
     val secondStepDuration = totalDuration - firstStepDuration
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeComponent.kt
index 62fdd324b1..b3f1b8afa4 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeComponent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeComponent.kt
@@ -25,10 +25,7 @@ internal class AccessCodeComponent @AssistedInject constructor(
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
 
-        if (!state.isConfirmMode) {
-            DisableScreenshotsDisposableEffect()
-        }
-
+        DisableScreenshotsDisposableEffect()
         AccessCode(
             modifier = modifier,
             state = state,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeModel.kt
index 40ef51ebc0..066416eb67 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/AccessCodeModel.kt
@@ -6,10 +6,11 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.ui.UiMessageSender
+import com.tangem.core.ui.components.fields.PinTextColor
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.settings.CanUseBiometryUseCase
@@ -56,10 +57,11 @@ internal class AccessCodeModel @Inject constructor(
     private val params = paramsContainer.require<AccessCodeComponent.Params>()
 
     internal val uiState: StateFlow<AccessCodeUM>
-    field = MutableStateFlow(getInitialState())
+        field = MutableStateFlow(getInitialState())
 
     private fun getInitialState() = AccessCodeUM(
         accessCode = "",
+        accessCodeColor = PinTextColor.Primary,
         onAccessCodeChange = ::onAccessCodeChange,
         isConfirmMode = params.accessCodeToConfirm != null,
         buttonEnabled = false,
@@ -76,6 +78,12 @@ internal class AccessCodeModel @Inject constructor(
                 } else {
                     value.length == uiState.value.accessCodeLength
                 },
+                accessCodeColor = when {
+                    params.accessCodeToConfirm == null -> PinTextColor.Primary
+                    value.length != uiState.value.accessCodeLength -> PinTextColor.Primary
+                    value == params.accessCodeToConfirm -> PinTextColor.Success
+                    else -> PinTextColor.WrongCode
+                },
             )
         }
     }
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/entity/AccessCodeUM.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/entity/AccessCodeUM.kt
index 11eccc1463..be65b51a49 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/entity/AccessCodeUM.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/entity/AccessCodeUM.kt
@@ -1,9 +1,11 @@
 package com.tangem.features.hotwallet.accesscode.entity
 
+import com.tangem.core.ui.components.fields.PinTextColor
 import com.tangem.features.hotwallet.accesscode.ACCESS_CODE_LENGTH
 
 internal data class AccessCodeUM(
     val accessCode: String,
+    val accessCodeColor: PinTextColor,
     val onAccessCodeChange: (String) -> Unit,
     val isConfirmMode: Boolean,
     val buttonEnabled: Boolean,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/ui/AccessCode.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/ui/AccessCode.kt
index 4596985307..87161aa57b 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/ui/AccessCode.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscode/ui/AccessCode.kt
@@ -76,7 +76,7 @@ internal fun AccessCode(state: AccessCodeUM, modifier: Modifier = Modifier) {
                     length = state.accessCodeLength,
                     isPasswordVisual = state.isConfirmMode,
                     value = state.accessCode,
-                    pinTextColor = PinTextColor.Primary,
+                    pinTextColor = state.accessCodeColor,
                     onValueChange = state.onAccessCodeChange,
                 )
             }
@@ -109,6 +109,7 @@ private fun PreviewSet() {
         AccessCode(
             state = AccessCodeUM(
                 accessCode = "",
+                accessCodeColor = PinTextColor.Primary,
                 onAccessCodeChange = {},
                 isConfirmMode = false,
                 buttonEnabled = false,
@@ -127,6 +128,7 @@ private fun PreviewConfirm() {
         AccessCode(
             state = AccessCodeUM(
                 accessCode = "123456",
+                accessCodeColor = PinTextColor.Success,
                 onAccessCodeChange = {},
                 isConfirmMode = true,
                 buttonEnabled = true,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/DefaultHotAccessCodeRequestComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/DefaultHotAccessCodeRequestComponent.kt
index 4dd7d01895..81c6c906cd 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/DefaultHotAccessCodeRequestComponent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/DefaultHotAccessCodeRequestComponent.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.ui.components.FullScreen
+import com.tangem.core.ui.components.DialogFullScreen
 import com.tangem.domain.wallets.hot.HotWalletPasswordRequester
 import com.tangem.features.hotwallet.HotAccessCodeRequestComponent
 import com.tangem.features.hotwallet.accesscoderequest.ui.HotAccessCodeRequestFullScreenContent
@@ -47,7 +47,7 @@ internal class DefaultHotAccessCodeRequestComponent @AssistedInject constructor(
         var isShownIfProxy by remember { mutableStateOf(state.isShown) }
 
         if (isShownIfProxy) {
-            FullScreen(focusable = true, onBackClick = state.onDismiss) {
+            DialogFullScreen(onDismissRequest = state.onDismiss) {
                 HotAccessCodeRequestFullScreenContent(
                     state = state.copy(isShown = isShownProxy),
                     modifier = modifier,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/HotAccessCodeRequestModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/HotAccessCodeRequestModel.kt
index 4a75ad8438..5c9a7148de 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/HotAccessCodeRequestModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/HotAccessCodeRequestModel.kt
@@ -6,10 +6,11 @@ import com.tangem.core.ui.components.fields.PinTextColor
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.hot.HotWalletAccessCodeAttemptsRepository
 import com.tangem.domain.wallets.hot.HotWalletAccessCodeAttemptsRepository.Attempts
+import com.tangem.domain.wallets.hot.HotWalletAccessCodeAttemptsRepository.Companion.MAX_FAST_FORWARD_ATTEMPTS
 import com.tangem.domain.wallets.hot.HotWalletPasswordRequester
 import com.tangem.features.hotwallet.accesscode.ACCESS_CODE_LENGTH
 import com.tangem.features.hotwallet.accesscoderequest.entity.HotAccessCodeRequestUM
@@ -43,7 +44,7 @@ internal class HotAccessCodeRequestModel @Inject constructor(
         )
 
     val uiState: StateFlow<HotAccessCodeRequestUM>
-    field = MutableStateFlow(getInitialState())
+        field = MutableStateFlow(getInitialState())
 
     suspend fun show(attemptRequest: HotWalletPasswordRequester.AttemptRequest) {
         if (userWalletExists(attemptRequest.hotWalletId).not()) {
@@ -82,6 +83,7 @@ internal class HotAccessCodeRequestModel @Inject constructor(
             it.copy(
                 accessCodeColor = PinTextColor.WrongCode,
                 onAccessCodeChange = {},
+                useBiometricVisible = currentRequest.hasBiometry,
             )
         }
         delay(timeMillis = 500) // Delay to show the wrong access code state
@@ -121,7 +123,10 @@ internal class HotAccessCodeRequestModel @Inject constructor(
 
         if (accessCode.length == ACCESS_CODE_LENGTH) {
             uiState.update {
-                it.copy(onAccessCodeChange = {})
+                it.copy(
+                    onAccessCodeChange = {},
+                    useBiometricVisible = false,
+                )
             }
 
             result.value = HotWalletPasswordRequester.Result.EnteredPassword(HotAuth.Password(accessCode.toCharArray()))
@@ -143,7 +148,24 @@ internal class HotAccessCodeRequestModel @Inject constructor(
         suspend fun collectAttempts(attempts: Attempts) {
             when (attempts) {
                 is Attempts.FastForward -> {
-                    /** ignore */
+                    if (attempts.count > 0) {
+                        uiState.update {
+                            it.copy(
+                                wrongAccessCodeText = resourceReference(
+                                    R.string.access_code_check_warining_lock,
+                                    wrappedList(MAX_FAST_FORWARD_ATTEMPTS - attempts.count),
+                                ),
+                                onAccessCodeChange = ::onAccessCodeChange,
+                            )
+                        }
+                    } else {
+                        uiState.update {
+                            it.copy(
+                                wrongAccessCodeText = null,
+                                onAccessCodeChange = ::onAccessCodeChange,
+                            )
+                        }
+                    }
                 }
                 is Attempts.WithDelay -> {
                     uiState.update {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/ui/HotAccessCodeRequestFullScreenContent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/ui/HotAccessCodeRequestFullScreenContent.kt
index 2e3b61e43d..691c5ef55c 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/ui/HotAccessCodeRequestFullScreenContent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/accesscoderequest/ui/HotAccessCodeRequestFullScreenContent.kt
@@ -37,105 +37,110 @@ import com.tangem.features.hotwallet.impl.R
 @Suppress("MagicNumber", "LongMethod")
 @Composable
 internal fun HotAccessCodeRequestFullScreenContent(state: HotAccessCodeRequestUM, modifier: Modifier = Modifier) {
-    AnimatedVisibility(
-        modifier = modifier,
-        visible = state.isShown,
-        enter = fadeIn(),
-        exit = fadeOut(),
-    ) {
-        Column(
-            Modifier
-                .fillMaxSize()
-                .background(TangemTheme.colors.background.primary),
-            horizontalAlignment = Alignment.CenterHorizontally,
+    Box(Modifier.fillMaxSize()) {
+        AnimatedVisibility(
+            modifier = modifier,
+            visible = state.isShown,
+            enter = fadeIn(),
+            exit = fadeOut(),
         ) {
-            TangemTopAppBar(
-                modifier = Modifier
-                    .statusBarsPadding(),
-                startButton = TopAppBarButtonUM.Back(state.onDismiss),
-            )
-
-            SpacerH(68.dp)
-
             Column(
                 Modifier
-                    .weight(1f)
-                    .fillMaxWidth()
-                    .padding(horizontal = 24.dp),
+                    .fillMaxSize()
+                    .background(TangemTheme.colors.background.primary),
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
-                Text(
-                    modifier = Modifier.animateEnterExit(
-                        enter = slideInVertically(
-                            tween(),
-                            initialOffsetY = { it + 200 },
-                        ) + fadeIn(tween()),
-                        exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
-                    ),
-                    text = stringResourceSafe(R.string.access_code_check_title),
-                    style = TangemTheme.typography.h2,
-                    color = TangemTheme.colors.text.primary1,
+                TangemTopAppBar(
+                    modifier = Modifier.statusBarsPadding(),
+                    startButton = TopAppBarButtonUM.Back(state.onDismiss),
                 )
 
-                SpacerH24()
+                SpacerH(68.dp)
 
-                PinTextField(
-                    modifier = Modifier.animateEnterExit(
-                        enter = slideInVertically(
-                            tween(),
-                            initialOffsetY = { it + 200 },
-                        ) + fadeIn(tween()),
-                        exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
-                    ),
-                    length = 6,
-                    isPasswordVisual = true,
-                    value = state.accessCode,
-                    pinTextColor = state.accessCodeColor,
-                    onValueChange = state.onAccessCodeChange,
-                )
+                Column(
+                    Modifier
+                        .weight(1f)
+                        .fillMaxWidth()
+                        .padding(horizontal = 24.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    Text(
+                        modifier = Modifier.animateEnterExit(
+                            enter = slideInVertically(
+                                tween(),
+                                initialOffsetY = { it + 200 },
+                            ) + fadeIn(tween()),
+                            exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
+                        ),
+                        text = stringResourceSafe(R.string.access_code_check_title),
+                        style = TangemTheme.typography.h2,
+                        color = TangemTheme.colors.text.primary1,
+                    )
 
-                SpacerH(20.dp)
+                    SpacerH24()
+
+                    PinTextField(
+                        modifier = Modifier.animateEnterExit(
+                            enter = slideInVertically(
+                                tween(),
+                                initialOffsetY = { it + 200 },
+                            ) + fadeIn(tween()),
+                            exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
+                        ),
+                        length = 6,
+                        isPasswordVisual = true,
+                        value = state.accessCode,
+                        pinTextColor = state.accessCodeColor,
+                        onValueChange = state.onAccessCodeChange,
+                    )
+
+                    SpacerH(20.dp)
+
+                    AnimatedVisibility(
+                        modifier = Modifier.animateEnterExit(
+                            enter = slideInVertically(
+                                tween(),
+                                initialOffsetY = { it + 200 },
+                            ) + fadeIn(tween()),
+                            exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
+                        ),
+                        visible = state.wrongAccessCodeText != null,
+                        enter = fadeIn(),
+                        exit = fadeOut(),
+                    ) {
+                        val wrongAccessCodeText =
+                            state.wrongAccessCodeText ?: return@AnimatedVisibility
+
+                        Text(
+                            text = wrongAccessCodeText.resolveReference(),
+                            textAlign = TextAlign.Center,
+                            style = TangemTheme.typography.caption2.copy(
+                                lineBreak = LineBreak.Heading,
+                            ),
+                            color = TangemTheme.colors.text.warning,
+                        )
+                    }
+                }
 
                 AnimatedVisibility(
-                    modifier = Modifier.animateEnterExit(
-                        enter = slideInVertically(
-                            tween(),
-                            initialOffsetY = { it + 200 },
-                        ) + fadeIn(tween()),
-                        exit = slideOutVertically(tween(300)) { it - 200 } + fadeOut(tween()),
-                    ),
-                    visible = state.wrongAccessCodeText != null,
+                    visible = state.useBiometricVisible,
                     enter = fadeIn(),
                     exit = fadeOut(),
                 ) {
-                    val wrongAccessCodeText =
-                        state.wrongAccessCodeText ?: return@AnimatedVisibility
-
-                    Text(
-                        text = wrongAccessCodeText.resolveReference(),
-                        textAlign = TextAlign.Center,
-                        style = TangemTheme.typography.caption2.copy(
-                            lineBreak = LineBreak.Heading,
+                    SecondaryButton(
+                        modifier = Modifier
+                            .padding(16.dp)
+                            .fillMaxWidth()
+                            .navigationBarsPadding()
+                            .imePadding(),
+                        text = stringResourceSafe(
+                            id = R.string.welcome_unlock,
+                            stringResourceSafe(R.string.common_biometrics),
                         ),
-                        color = TangemTheme.colors.text.warning,
+                        onClick = state.useBiometricClick,
                     )
                 }
             }
-
-            if (state.useBiometricVisible) {
-                SecondaryButton(
-                    modifier = Modifier
-                        .padding(16.dp)
-                        .fillMaxWidth()
-                        .navigationBarsPadding()
-                        .imePadding(),
-                    text = stringResourceSafe(
-                        id = R.string.welcome_unlock,
-                        stringResourceSafe(R.string.common_biometrics),
-                    ),
-                    onClick = state.useBiometricClick,
-                )
-            }
         }
     }
 
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletModel.kt
index 423b382025..925be8bdc1 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletModel.kt
@@ -15,7 +15,6 @@ import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.settings.ShouldAskPermissionUseCase
 import com.tangem.features.hotwallet.addexistingwallet.entry.routing.AddExistingWalletRoute
 import com.tangem.features.hotwallet.addexistingwallet.im.port.AddExistingWalletImportComponent
-import com.tangem.features.hotwallet.addexistingwallet.start.AddExistingWalletStartComponent
 import com.tangem.features.hotwallet.manualbackup.completed.ManualBackupCompletedComponent
 import com.tangem.features.hotwallet.accesscode.AccessCodeComponent
 import com.tangem.features.hotwallet.setupfinished.MobileWalletSetupFinishedComponent
@@ -36,7 +35,6 @@ internal class AddExistingWalletModel @Inject constructor(
 ) : Model() {
 
     val hotWalletStepperComponentModelCallback = HotWalletStepperComponentModelCallback()
-    val addExistingWalletStartModelCallbacks = AddExistingWalletStartModelCallbacks()
     val addExistingWalletImportModelCallbacks = AddExistingWalletImportModelCallbacks()
     val manualBackupCompletedComponentModelCallbacks = ManualBackupCompletedComponentModelCallbacks()
     val accessCodeModelCallbacks = AccessCodeModelCallbacks()
@@ -44,13 +42,12 @@ internal class AddExistingWalletModel @Inject constructor(
     val mobileWalletSetupFinishedComponentModelCallbacks = MobileWalletSetupFinishedComponentModelCallbacks()
 
     val stackNavigation = StackNavigation<AddExistingWalletRoute>()
-    val startRoute = AddExistingWalletRoute.Start
+    val startRoute = AddExistingWalletRoute.Import
     val currentRoute: MutableStateFlow<AddExistingWalletRoute> = MutableStateFlow(startRoute)
 
     fun onChildBack() {
         when (currentRoute.value) {
-            is AddExistingWalletRoute.Start -> router.pop()
-            is AddExistingWalletRoute.Import -> stackNavigation.pop()
+            is AddExistingWalletRoute.Import -> router.pop()
             is AddExistingWalletRoute.BackupCompleted -> Unit
             is AddExistingWalletRoute.SetAccessCode -> Unit
             is AddExistingWalletRoute.ConfirmAccessCode -> stackNavigation.pop()
@@ -87,7 +84,7 @@ internal class AddExistingWalletModel @Inject constructor(
                     title = resourceReference(R.string.access_code_alert_skip_ok),
                     onClick = { navigateToPushNotificationsOrNext() },
                 ),
-                dismissOnFirstAction = true,
+                shouldDismissOnFirstAction = true,
             ),
         )
     }
@@ -102,16 +99,6 @@ internal class AddExistingWalletModel @Inject constructor(
         }
     }
 
-    inner class AddExistingWalletStartModelCallbacks : AddExistingWalletStartComponent.ModelCallbacks {
-        override fun onBackClick() {
-            router.pop()
-        }
-
-        override fun onImportPhraseClick() {
-            stackNavigation.push(AddExistingWalletRoute.Import)
-        }
-    }
-
     inner class AddExistingWalletImportModelCallbacks : AddExistingWalletImportComponent.ModelCallbacks {
         override fun onWalletImported(userWalletId: UserWalletId) {
             stackNavigation.replaceAll(AddExistingWalletRoute.BackupCompleted(userWalletId))
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletStepperStateManager.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletStepperStateManager.kt
index 14eabf9ebc..5d9dab6ae3 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletStepperStateManager.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/AddExistingWalletStepperStateManager.kt
@@ -9,8 +9,6 @@ internal class AddExistingWalletStepperStateManager {
 
     fun getStepperState(route: AddExistingWalletRoute): HotWalletStepperComponent.StepperUM? {
         return when (route) {
-            is AddExistingWalletRoute.Start -> null
-
             is AddExistingWalletRoute.Import -> HotWalletStepperComponent.StepperUM(
                 currentStep = STEP_IMPORT,
                 steps = STEPS_COUNT,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletChildFactory.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletChildFactory.kt
index 6393ff0d6d..729d2a693d 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletChildFactory.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletChildFactory.kt
@@ -5,7 +5,6 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.features.hotwallet.addexistingwallet.entry.AddExistingWalletModel
 import com.tangem.features.hotwallet.addexistingwallet.im.port.AddExistingWalletImportComponent
-import com.tangem.features.hotwallet.addexistingwallet.start.AddExistingWalletStartComponent
 import com.tangem.features.hotwallet.manualbackup.completed.ManualBackupCompletedComponent
 import com.tangem.features.hotwallet.accesscode.AccessCodeComponent
 import com.tangem.features.hotwallet.setupfinished.MobileWalletSetupFinishedComponent
@@ -24,12 +23,6 @@ internal class AddExistingWalletChildFactory @Inject constructor(
         model: AddExistingWalletModel,
     ): ComposableContentComponent {
         return when (route) {
-            is AddExistingWalletRoute.Start -> AddExistingWalletStartComponent(
-                context = childContext,
-                params = AddExistingWalletStartComponent.Params(
-                    callbacks = model.addExistingWalletStartModelCallbacks,
-                ),
-            )
             is AddExistingWalletRoute.Import -> AddExistingWalletImportComponent(
                 context = childContext,
                 params = AddExistingWalletImportComponent.Params(
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletRoute.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletRoute.kt
index c5f3009aac..3ebc679f37 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletRoute.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/entry/routing/AddExistingWalletRoute.kt
@@ -6,9 +6,6 @@ import kotlinx.serialization.Serializable
 
 internal sealed class AddExistingWalletRoute : Route {
 
-    @Serializable
-    object Start : AddExistingWalletRoute()
-
     @Serializable
     object Import : AddExistingWalletRoute()
 
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/AddExistingWalletImportComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/AddExistingWalletImportComponent.kt
index 096bd395a0..0cc5ea65a8 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/AddExistingWalletImportComponent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/AddExistingWalletImportComponent.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.security.DisableScreenshotsDisposableEffect
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.hotwallet.addexistingwallet.im.port.model.AddExistingWalletImportModel
 import com.tangem.features.hotwallet.addexistingwallet.im.port.ui.AddExistingWalletImportContent
@@ -22,6 +23,7 @@ internal class AddExistingWalletImportComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+        DisableScreenshotsDisposableEffect()
         AddExistingWalletImportContent(
             state = state,
             modifier = modifier,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/AddExistingWalletImportModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/AddExistingWalletImportModel.kt
index 60f3305500..7d8156ecd3 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/AddExistingWalletImportModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/AddExistingWalletImportModel.kt
@@ -6,16 +6,12 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.R
-import com.tangem.core.ui.components.bottomsheets.message.MessageBottomSheetUMV2
-import com.tangem.core.ui.components.bottomsheets.message.icon
-import com.tangem.core.ui.components.bottomsheets.message.infoBlock
-import com.tangem.core.ui.components.bottomsheets.message.onClick
-import com.tangem.core.ui.components.bottomsheets.message.secondaryButton
+import com.tangem.core.ui.components.bottomsheets.message.*
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.core.ui.message.bottomSheetMessage
 import com.tangem.crypto.bip39.Mnemonic
-import com.tangem.domain.core.wallets.error.SaveWalletError
+import com.tangem.domain.common.wallets.error.SaveWalletError
 import com.tangem.domain.wallets.builder.HotUserWalletBuilder
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.features.hotwallet.MnemonicRepository
@@ -80,7 +76,7 @@ internal class AddExistingWalletImportModel @Inject constructor(
     }
 
     internal val uiState: StateFlow<AddExistingWalletImportUM>
-    field = MutableStateFlow(importSeedPhraseUiStateBuilder.getState())
+        field = MutableStateFlow(importSeedPhraseUiStateBuilder.getState())
 
     @Suppress("UnusedPrivateMember")
     private fun importWallet(mnemonic: Mnemonic, passphrase: String?) {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/ImportSeedPhraseUiStateBuilder.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/ImportSeedPhraseUiStateBuilder.kt
index 7f89025442..95e7f9c2db 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/ImportSeedPhraseUiStateBuilder.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/im/port/model/ImportSeedPhraseUiStateBuilder.kt
@@ -67,13 +67,17 @@ internal class ImportSeedPhraseUiStateBuilder(
             val text = st.words.text
             val wordsFromText = text.split(" ").filter { it.isNotBlank() }.map { it.trim() }
             val newWords = wordsFromText.dropLast(1) + word
-            val newWordsText = newWords.joinToString(" ")
-            st.copy(
-                words = TextFieldValue(
-                    text = newWordsText,
-                    selection = TextRange(newWordsText.length),
-                ),
+            val newWordsText = newWords.joinToString(" ").plus(" ")
+            val newWordsState = TextFieldValue(
+                text = newWordsText,
+                selection = TextRange(newWordsText.length),
             )
+            st.copy(
+                words = newWordsState,
+            ).also {
+                launchInterceptWords(wordsField = newWordsState)
+                suggestNextWord(newWordsState)
+            }
         }
     }
 
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartComponent.kt
deleted file mode 100644
index 42e01eaf3b..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartComponent.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.tangem.features.hotwallet.addexistingwallet.start
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.features.hotwallet.addexistingwallet.start.ui.AddExistingWalletStartContent
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-
-internal class AddExistingWalletStartComponent @AssistedInject constructor(
-    @Assisted private val context: AppComponentContext,
-    @Assisted private val params: Params,
-) : ComposableContentComponent, AppComponentContext by context {
-    private val model: AddExistingWalletStartModel = getOrCreateModel(params)
-
-    @Composable
-    override fun Content(modifier: Modifier) {
-        val state by model.uiState.collectAsStateWithLifecycle()
-        AddExistingWalletStartContent(
-            state = state,
-            modifier = modifier,
-        )
-    }
-
-    interface ModelCallbacks {
-        fun onBackClick()
-        fun onImportPhraseClick()
-    }
-
-    data class Params(
-        val callbacks: ModelCallbacks,
-    )
-}
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartModel.kt
deleted file mode 100644
index e8d5c52060..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/AddExistingWalletStartModel.kt
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.tangem.features.hotwallet.addexistingwallet.start
-
-import com.tangem.common.core.TangemError
-import com.tangem.common.core.TangemSdkError
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.AppRouter
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.analytics.models.AnalyticsParam
-import com.tangem.core.analytics.models.Basic.SignedIn
-import com.tangem.core.analytics.models.Basic.SignedIn.SignInType
-import com.tangem.core.decompose.di.GlobalUiMessageSender
-import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.decompose.model.Model
-import com.tangem.core.decompose.model.ParamsContainer
-import com.tangem.core.decompose.ui.UiMessageSender
-import com.tangem.core.navigation.url.UrlOpener
-import com.tangem.core.ui.R
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.message.DialogMessage
-import com.tangem.domain.card.ScanCardProcessor
-import com.tangem.domain.card.analytics.IntroductionProcess
-import com.tangem.domain.card.analytics.ParamCardCurrencyConverter
-import com.tangem.domain.card.analytics.Shop
-import com.tangem.domain.card.common.util.cardTypesResolver
-import com.tangem.domain.card.repository.CardSdkConfigRepository
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.SaveWalletError
-import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.domain.wallets.builder.ColdUserWalletBuilder
-import com.tangem.domain.wallets.usecase.GenerateBuyTangemCardLinkUseCase
-import com.tangem.domain.wallets.usecase.SaveWalletUseCase
-import com.tangem.features.hotwallet.addexistingwallet.start.entity.AddExistingWalletStartUM
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-private const val HIDE_PROGRESS_DELAY = 400L
-
-@Suppress("LongParameterList")
-@ModelScoped
-internal class AddExistingWalletStartModel @Inject constructor(
-    paramsContainer: ParamsContainer,
-    override val dispatchers: CoroutineDispatcherProvider,
-    private val saveWalletUseCase: SaveWalletUseCase,
-    private val coldUserWalletBuilderFactory: ColdUserWalletBuilder.Factory,
-    private val generateBuyTangemCardLinkUseCase: GenerateBuyTangemCardLinkUseCase,
-    private val scanCardProcessor: ScanCardProcessor,
-    private val cardSdkConfigRepository: CardSdkConfigRepository,
-    private val settingsRepository: SettingsRepository,
-    private val analyticsEventHandler: AnalyticsEventHandler,
-    private val appRouter: AppRouter,
-    private val urlOpener: UrlOpener,
-    private val userWalletsListRepository: UserWalletsListRepository,
-    @GlobalUiMessageSender private val uiMessageSender: UiMessageSender,
-) : Model() {
-
-    private val params: AddExistingWalletStartComponent.Params = paramsContainer.require()
-
-    internal val uiState: StateFlow<AddExistingWalletStartUM>
-    field = MutableStateFlow(
-        AddExistingWalletStartUM(
-            showWantToPurchaseBlock = false,
-            isScanInProgress = false,
-            onBackClick = params.callbacks::onBackClick,
-            onImportPhraseClick = params.callbacks::onImportPhraseClick,
-            onScanCardClick = ::onScanClick,
-            onBuyCardClick = ::onShopClick,
-        ),
-    )
-
-    init {
-        showWantToPurchaseBlockWithDelay()
-    }
-
-    private fun showWantToPurchaseBlockWithDelay() {
-        modelScope.launch {
-            delay(SHOW_WANT_TO_PURCHASE_BLOCK_DELAY)
-            uiState.update { it.copy(showWantToPurchaseBlock = true) }
-        }
-    }
-
-    private fun onShopClick() {
-        analyticsEventHandler.send(IntroductionProcess.ButtonBuyCards)
-        analyticsEventHandler.send(Shop.ScreenOpened)
-        modelScope.launch {
-            generateBuyTangemCardLinkUseCase.invoke().let { urlOpener.openUrl(it) }
-        }
-    }
-
-    private fun onScanClick() {
-        analyticsEventHandler.send(IntroductionProcess.ButtonScanCard)
-        scanCard()
-    }
-
-    private fun scanCard() {
-        modelScope.launch {
-            setLoading(true)
-
-            val shouldSaveAccessCodes = settingsRepository.shouldSaveAccessCodes()
-            cardSdkConfigRepository.setAccessCodeRequestPolicy(
-                isBiometricsRequestPolicy = shouldSaveAccessCodes,
-            )
-
-            val analyticsSource = AnalyticsParam.ScreensSources.Intro
-
-            scanCardProcessor.scan(
-                analyticsSource = analyticsSource,
-                onProgressStateChange = { showProgress ->
-                    if (!showProgress) {
-                        delay(HIDE_PROGRESS_DELAY)
-                        setLoading(false)
-                    } else {
-                        setLoading(true)
-                    }
-                },
-                onFailure = { error ->
-                    handleScanError(error)
-                    delay(HIDE_PROGRESS_DELAY)
-                    setLoading(false)
-                },
-                onSuccess = { scanResponse ->
-                    proceedWithScanResponse(scanResponse)
-                },
-            )
-        }
-    }
-
-    private suspend fun proceedWithScanResponse(scanResponse: ScanResponse) {
-        val userWallet = coldUserWalletBuilderFactory.create(scanResponse = scanResponse).build()
-
-        if (userWallet == null) {
-            Timber.e("User wallet not created")
-            setLoading(false)
-            return
-        }
-
-        saveWalletUseCase(userWallet).fold(
-            ifLeft = {
-                delay(HIDE_PROGRESS_DELAY)
-                setLoading(false)
-                when (it) {
-                    is SaveWalletError.DataError -> Timber.e(it.toString(), "Unable to save user wallet")
-                    is SaveWalletError.WalletAlreadySaved -> {
-                        userWalletsListRepository.unlock(
-                            userWalletId = userWallet.walletId,
-                            unlockMethod = UserWalletsListRepository.UnlockMethod.Scan(scanResponse),
-                        ).onRight {
-                            appRouter.replaceAll(AppRoute.Wallet)
-                        }
-                    }
-                }
-            },
-            ifRight = {
-                setLoading(false)
-                sendSignedInCardAnalyticsEvent(scanResponse)
-                appRouter.replaceAll(AppRoute.Wallet)
-            },
-        )
-    }
-
-    private suspend fun sendSignedInCardAnalyticsEvent(scanResponse: ScanResponse) {
-        val currency = ParamCardCurrencyConverter().convert(value = scanResponse.cardTypesResolver)
-        if (currency != null) {
-            analyticsEventHandler.send(
-                SignedIn(
-                    currency = currency,
-                    batch = scanResponse.card.batchId,
-                    signInType = SignInType.Card,
-                    walletsCount = userWalletsListRepository.userWalletsSync().size.toString(),
-                    hasBackup = scanResponse.card.backupStatus?.isActive,
-                ),
-            )
-        }
-    }
-
-    private fun setLoading(isLoading: Boolean) {
-        uiState.update { it.copy(isScanInProgress = isLoading) }
-    }
-
-    fun handleScanError(error: TangemError) {
-        when (error) {
-            is TangemSdkError.NfcFeatureIsUnavailable -> handleNfcFeatureUnavailable()
-            is TangemSdkError -> Timber.e(error, "Scan error occurred")
-            else -> Timber.e(error, "Error happened")
-        }
-    }
-
-    private fun handleNfcFeatureUnavailable() {
-        uiMessageSender.send(
-            message = DialogMessage(
-                message = resourceReference(R.string.nfc_error_unavailable),
-                title = resourceReference(id = R.string.common_error),
-            ),
-        )
-    }
-
-    companion object {
-        private const val SHOW_WANT_TO_PURCHASE_BLOCK_DELAY = 3000L
-    }
-}
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/di/AddExistingWalletStartModule.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/di/AddExistingWalletStartModule.kt
deleted file mode 100644
index 7993b375d4..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/di/AddExistingWalletStartModule.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tangem.features.hotwallet.addexistingwallet.start.di
-
-import com.tangem.core.decompose.model.Model
-import com.tangem.features.hotwallet.addexistingwallet.start.AddExistingWalletStartModel
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import dagger.multibindings.ClassKey
-import dagger.multibindings.IntoMap
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal interface AddExistingWalletStartModule {
-
-    @Binds
-    @IntoMap
-    @ClassKey(AddExistingWalletStartModel::class)
-    fun bindAddExistingWalletStartModel(model: AddExistingWalletStartModel): Model
-}
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/entity/AddExistingWalletStartUM.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/entity/AddExistingWalletStartUM.kt
deleted file mode 100644
index c448d2c471..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/entity/AddExistingWalletStartUM.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.tangem.features.hotwallet.addexistingwallet.start.entity
-
-internal data class AddExistingWalletStartUM(
-    val showWantToPurchaseBlock: Boolean,
-    val isScanInProgress: Boolean,
-    val onBackClick: () -> Unit,
-    val onImportPhraseClick: () -> Unit,
-    val onScanCardClick: () -> Unit,
-    val onBuyCardClick: () -> Unit,
-)
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/ui/AddExistingWalletStartContent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/ui/AddExistingWalletStartContent.kt
deleted file mode 100644
index 42588c81de..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/addexistingwallet/start/ui/AddExistingWalletStartContent.kt
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.tangem.features.hotwallet.addexistingwallet.start.ui
-
-import android.content.res.Configuration
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.R
-import com.tangem.core.ui.components.PrimaryButton
-import com.tangem.core.ui.components.appbar.TangemTopAppBar
-import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
-import com.tangem.core.ui.components.buttons.common.TangemButtonSize
-import com.tangem.core.ui.components.buttons.common.TangemButtonsDefaults
-import com.tangem.core.ui.extensions.stringResourceSafe
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.res.TangemThemePreview
-import com.tangem.features.hotwallet.addexistingwallet.start.entity.AddExistingWalletStartUM
-import com.tangem.features.hotwallet.common.ui.OptionBlock
-
-@Suppress("LongMethod")
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-internal fun AddExistingWalletStartContent(state: AddExistingWalletStartUM, modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier
-            .background(TangemTheme.colors.background.primary)
-            .fillMaxSize()
-            .systemBarsPadding(),
-    ) {
-        TangemTopAppBar(
-            modifier = Modifier
-                .statusBarsPadding(),
-            startButton = TopAppBarButtonUM.Back(state.onBackClick),
-            title = "Add existing wallet",
-        )
-        Column(
-            modifier = Modifier
-                .weight(1f)
-                .padding(
-                    start = 16.dp,
-                    top = 24.dp,
-                    end = 16.dp,
-                ),
-        ) {
-            Text(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp),
-                text = stringResourceSafe(R.string.wallet_import_seed_navtitle),
-                style = TangemTheme.typography.h2,
-                color = TangemTheme.colors.text.primary1,
-                textAlign = TextAlign.Center,
-            )
-            OptionBlock(
-                modifier = Modifier
-                    .padding(top = 32.dp),
-                backgroundColor = TangemTheme.colors.background.secondary,
-                title = stringResourceSafe(R.string.wallet_import_seed_title),
-                description = stringResourceSafe(R.string.wallet_import_seed_description),
-                badge = null,
-                onClick = state.onImportPhraseClick,
-                enabled = true,
-            )
-            OptionBlock(
-                modifier = Modifier
-                    .padding(top = 8.dp),
-                backgroundColor = TangemTheme.colors.background.secondary,
-                title = stringResourceSafe(R.string.wallet_import_scan_title),
-                description = stringResourceSafe(R.string.wallet_import_scan_description),
-                badge = {
-                    if (state.isScanInProgress) {
-                        CircularProgressIndicator(
-                            modifier = Modifier
-                                .padding(top = 2.dp)
-                                .size(20.dp)
-                                .padding(2.dp),
-                            color = TangemTheme.colors.text.primary1,
-                            strokeWidth = TangemTheme.dimens.size2,
-                        )
-                    } else {
-                        Icon(
-                            modifier = Modifier
-                                .padding(top = 2.dp)
-                                .size(20.dp),
-                            painter = painterResource(R.drawable.ic_tangem_24),
-                            contentDescription = null,
-                            tint = TangemTheme.colors.icon.secondary,
-                        )
-                    }
-                },
-                onClick = state.onScanCardClick,
-                enabled = true,
-            )
-            OptionBlock(
-                modifier = Modifier
-                    .padding(top = 8.dp),
-                backgroundColor = TangemTheme.colors.background.secondary,
-                title = stringResourceSafe(R.string.wallet_import_google_drive_title),
-                description = stringResourceSafe(R.string.wallet_import_google_drive_description),
-                badge = {
-                    Box(
-                        modifier = Modifier
-                            .padding(horizontal = 4.dp)
-                            .background(
-                                color = TangemTheme.colors.field.focused,
-                                shape = TangemTheme.shapes.roundedCorners8,
-                            )
-                            .padding(horizontal = 8.dp, vertical = 4.dp),
-                    ) {
-                        Text(
-                            text = stringResourceSafe(R.string.common_coming_soon),
-                            style = TangemTheme.typography.caption1,
-                            color = TangemTheme.colors.text.tertiary,
-                        )
-                    }
-                },
-                onClick = null,
-                enabled = false,
-            )
-        }
-        AnimatedVisibility(state.showWantToPurchaseBlock) {
-            BuyTangemWalletBlock(
-                onScanClick = state.onBuyCardClick,
-            )
-        }
-    }
-}
-
-@Composable
-private fun BuyTangemWalletBlock(onScanClick: () -> Unit, modifier: Modifier = Modifier) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(16.dp)
-            .background(
-                color = TangemTheme.colors.field.primary,
-                shape = TangemTheme.shapes.roundedCornersXMedium,
-            )
-            .padding(
-                horizontal = 20.dp,
-                vertical = 16.dp,
-            ),
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        Text(
-            modifier = Modifier
-                .weight(1f)
-                .padding(end = 16.dp),
-            text = stringResourceSafe(R.string.wallet_import_buy_question),
-            style = TangemTheme.typography.button,
-            color = TangemTheme.colors.text.primary1,
-        )
-        PrimaryButton(
-            modifier = Modifier
-                .wrapContentWidth(),
-            text = stringResourceSafe(R.string.wallet_import_buy_title),
-            onClick = onScanClick,
-            size = TangemButtonSize.RoundedAction,
-            colors = TangemButtonsDefaults.secondaryButtonColors,
-            enabled = true,
-        )
-    }
-}
-
-@Preview(showBackground = true, widthDp = 360)
-@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Composable
-private fun PreviewCreateWalletContent() {
-    TangemThemePreview {
-        AddExistingWalletStartContent(
-            state = AddExistingWalletStartUM(
-                showWantToPurchaseBlock = true,
-                isScanInProgress = true,
-                onBackClick = {},
-                onImportPhraseClick = {},
-                onScanCardClick = {},
-                onBuyCardClick = {},
-            ),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/CreateMobileWalletModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/CreateMobileWalletModel.kt
index 0b3261b4f3..5f8dae3197 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/CreateMobileWalletModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/CreateMobileWalletModel.kt
@@ -28,13 +28,18 @@ internal class CreateMobileWalletModel @Inject constructor(
 ) : Model() {
 
     internal val uiState: StateFlow<CreateMobileWalletUM>
-    field = MutableStateFlow(
-        CreateMobileWalletUM(
-            onBackClick = { router.pop() },
-            onCreateClick = ::onCreateClick,
-            createButtonLoading = false,
-        ),
-    )
+        field = MutableStateFlow(
+            CreateMobileWalletUM(
+                onBackClick = { router.pop() },
+                onImportClick = ::onImportClick,
+                onCreateClick = ::onCreateClick,
+                createButtonLoading = false,
+            ),
+        )
+
+    private fun onImportClick() {
+        router.push(AppRoute.AddExistingWallet)
+    }
 
     private fun onCreateClick() {
         modelScope.launch {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/entity/CreateMobileWalletUM.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/entity/CreateMobileWalletUM.kt
index 5d4569e604..3746ece730 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/entity/CreateMobileWalletUM.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/entity/CreateMobileWalletUM.kt
@@ -3,5 +3,6 @@ package com.tangem.features.hotwallet.createmobilewallet.entity
 internal data class CreateMobileWalletUM(
     val createButtonLoading: Boolean,
     val onBackClick: () -> Unit,
+    val onImportClick: () -> Unit,
     val onCreateClick: () -> Unit,
 )
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/ui/CreateMobileWalletContent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/ui/CreateMobileWalletContent.kt
index 08b9a65372..a53d0f587d 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/ui/CreateMobileWalletContent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createmobilewallet/ui/CreateMobileWalletContent.kt
@@ -12,6 +12,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.SecondaryButton
 import com.tangem.core.ui.components.appbar.TangemTopAppBar
 import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
 import com.tangem.core.ui.extensions.TextReference
@@ -80,13 +81,23 @@ internal fun CreateMobileWalletContent(state: CreateMobileWalletUM, modifier: Mo
                 iconRes = R.drawable.ic_settings_24,
             )
         }
+        SecondaryButton(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(
+                    start = 16.dp,
+                    top = 16.dp,
+                    end = 16.dp,
+                ),
+            text = stringResourceSafe(R.string.hw_import_existing_wallet),
+            onClick = state.onImportClick,
+        )
         PrimaryButton(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp),
-            text = stringResourceSafe(R.string.common_create),
+            text = stringResourceSafe(R.string.onboarding_create_wallet_button_create_wallet),
             showProgress = state.createButtonLoading,
-            enabled = true,
             onClick = state.onCreateClick,
         )
     }
@@ -134,6 +145,7 @@ private fun PreviewCreateWalletContent() {
             state = CreateMobileWalletUM(
                 onBackClick = {},
                 createButtonLoading = false,
+                onImportClick = {},
                 onCreateClick = {},
             ),
         )
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
index 8cc687e476..9b0a2821e7 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupModel.kt
@@ -14,7 +14,6 @@ import com.tangem.features.hotwallet.manualbackup.check.ManualBackupCheckCompone
 import com.tangem.features.hotwallet.manualbackup.completed.ManualBackupCompletedComponent
 import com.tangem.features.hotwallet.manualbackup.phrase.ManualBackupPhraseComponent
 import com.tangem.features.hotwallet.manualbackup.start.ManualBackupStartComponent
-import com.tangem.features.hotwallet.stepper.api.HotWalletStepperComponent
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import javax.inject.Inject
@@ -28,7 +27,6 @@ internal class CreateWalletBackupModel @Inject constructor(
 
     val params = paramsContainer.require<CreateWalletBackupComponent.Params>()
 
-    val hotWalletStepperComponentModelCallback = HotWalletStepperComponentModelCallback()
     val manualBackupStartModelCallbacks = ManualBackupStartModelCallbacks()
     val manualBackupPhraseModelCallbacks = ManualBackupPhraseModelCallbacks()
     val manualBackupCheckModelCallbacks = ManualBackupCheckModelCallbacks()
@@ -63,14 +61,6 @@ internal class CreateWalletBackupModel @Inject constructor(
         router.pop()
     }
 
-    inner class HotWalletStepperComponentModelCallback : HotWalletStepperComponent.ModelCallback {
-        override fun onBackClick() {
-            onBack()
-        }
-
-        override fun onSkipClick() = Unit
-    }
-
     inner class ManualBackupStartModelCallbacks : ManualBackupStartComponent.ModelCallbacks {
         override fun onContinueClick() {
             onManualBackupStarted()
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupStepperStateManager.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupStepperStateManager.kt
deleted file mode 100644
index 5b8c3a2e68..0000000000
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/CreateWalletBackupStepperStateManager.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.tangem.features.hotwallet.createwalletbackup
-
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.features.hotwallet.createwalletbackup.routing.CreateWalletBackupRoute
-import com.tangem.features.hotwallet.impl.R
-import com.tangem.features.hotwallet.stepper.api.HotWalletStepperComponent
-import javax.inject.Inject
-
-internal class CreateWalletBackupStepperStateManager @Inject constructor() {
-
-    fun getStepperState(route: CreateWalletBackupRoute): HotWalletStepperComponent.StepperUM? {
-        return when (route) {
-            is CreateWalletBackupRoute.RecoveryPhraseStart -> HotWalletStepperComponent.StepperUM(
-                currentStep = STEP_START,
-                steps = STEPS_COUNT,
-                title = resourceReference(R.string.common_backup),
-                showBackButton = true,
-                showSkipButton = false,
-                showFeedbackButton = true,
-            )
-            is CreateWalletBackupRoute.RecoveryPhrase -> HotWalletStepperComponent.StepperUM(
-                currentStep = STEP_PHRASE,
-                steps = STEPS_COUNT,
-                title = resourceReference(R.string.common_backup),
-                showBackButton = true,
-                showSkipButton = false,
-                showFeedbackButton = true,
-            )
-            is CreateWalletBackupRoute.ConfirmBackup -> HotWalletStepperComponent.StepperUM(
-                currentStep = STEP_CONFIRM,
-                steps = STEPS_COUNT,
-                title = resourceReference(R.string.common_backup),
-                showBackButton = true,
-                showSkipButton = false,
-                showFeedbackButton = true,
-            )
-            is CreateWalletBackupRoute.BackupCompleted -> HotWalletStepperComponent.StepperUM(
-                currentStep = STEP_COMPLETED,
-                steps = STEPS_COUNT,
-                title = resourceReference(R.string.common_done),
-                showBackButton = false,
-                showSkipButton = false,
-                showFeedbackButton = false,
-            )
-        }
-    }
-
-    companion object {
-        private const val STEPS_COUNT = 4
-
-        private const val STEP_START = 1
-        private const val STEP_PHRASE = 2
-        private const val STEP_CONFIRM = 3
-        private const val STEP_COMPLETED = 4
-    }
-}
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/DefaultCreateWalletBackupComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/DefaultCreateWalletBackupComponent.kt
index b13c9193f9..7ac2d2ca7e 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/DefaultCreateWalletBackupComponent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/DefaultCreateWalletBackupComponent.kt
@@ -13,9 +13,8 @@ import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.features.hotwallet.CreateWalletBackupComponent
 import com.tangem.features.hotwallet.createwalletbackup.routing.CreateWalletBackupChildFactory
+import com.tangem.features.hotwallet.createwalletbackup.routing.CreateWalletBackupRoute
 import com.tangem.features.hotwallet.createwalletbackup.ui.CreateWalletBackupContent
-import com.tangem.features.hotwallet.stepper.api.HotWalletStepperComponent
-import com.tangem.features.hotwallet.stepper.impl.DefaultHotWalletStepperComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -24,9 +23,7 @@ import kotlinx.coroutines.launch
 internal class DefaultCreateWalletBackupComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
     @Assisted private val params: CreateWalletBackupComponent.Params,
-    private val stepperStateManager: CreateWalletBackupStepperStateManager,
     createWalletBackupChildFactory: CreateWalletBackupChildFactory,
-    stepperComponentFactory: DefaultHotWalletStepperComponent.Factory,
 ) : CreateWalletBackupComponent, AppComponentContext by appComponentContext {
 
     private val model: CreateWalletBackupModel = getOrCreateModel(params)
@@ -46,14 +43,6 @@ internal class DefaultCreateWalletBackupComponent @AssistedInject constructor(
         },
     )
 
-    private val stepperComponent = stepperComponentFactory.create(
-        context = this,
-        params = HotWalletStepperComponent.Params(
-            initState = HotWalletStepperComponent.StepperUM.initialState(),
-            callback = model.hotWalletStepperComponentModelCallback,
-        ),
-    )
-
     init {
         innerStack.subscribe(
             lifecycle = lifecycle,
@@ -72,13 +61,11 @@ internal class DefaultCreateWalletBackupComponent @AssistedInject constructor(
 
         BackHandler(onBack = model::onBack)
 
-        val stepperState = stepperStateManager.getStepperState(currentRoute)
-        stepperState?.let { stepperComponent.updateState(it) }
-
         CreateWalletBackupContent(
             stackState = stackState,
-            stepperComponent = stepperComponent.takeIf { stepperState != null },
             modifier = modifier,
+            showTopBar = currentRoute !is CreateWalletBackupRoute.BackupCompleted,
+            onBackClick = model::onBack,
         )
     }
 
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/di/CreateWalletBackupModule.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/di/CreateWalletBackupModule.kt
index 5ea687703d..82f617e453 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/di/CreateWalletBackupModule.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/di/CreateWalletBackupModule.kt
@@ -3,11 +3,9 @@ package com.tangem.features.hotwallet.createwalletbackup.di
 import com.tangem.core.decompose.model.Model
 import com.tangem.features.hotwallet.CreateWalletBackupComponent
 import com.tangem.features.hotwallet.createwalletbackup.CreateWalletBackupModel
-import com.tangem.features.hotwallet.createwalletbackup.CreateWalletBackupStepperStateManager
 import com.tangem.features.hotwallet.createwalletbackup.DefaultCreateWalletBackupComponent
 import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.ClassKey
@@ -16,7 +14,7 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-internal interface CreateWalletBackupModuleBinds {
+internal interface CreateWalletBackupModule {
 
     @Binds
     @Singleton
@@ -28,15 +26,4 @@ internal interface CreateWalletBackupModuleBinds {
     @IntoMap
     @ClassKey(CreateWalletBackupModel::class)
     fun bindCreateWalletBackupModel(model: CreateWalletBackupModel): Model
-}
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object CreateWalletBackupModule {
-
-    @Provides
-    @Singleton
-    fun provideCreateWalletBackupStepperStateManager(): CreateWalletBackupStepperStateManager {
-        return CreateWalletBackupStepperStateManager()
-    }
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/ui/CreateWalletBackupContent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/ui/CreateWalletBackupContent.kt
index e6f1e9e732..2ec840a129 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/ui/CreateWalletBackupContent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createwalletbackup/ui/CreateWalletBackupContent.kt
@@ -11,15 +11,19 @@ import com.arkivanov.decompose.extensions.compose.stack.Children
 import com.arkivanov.decompose.extensions.compose.stack.animation.slide
 import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation
 import com.arkivanov.decompose.router.stack.ChildStack
+import com.tangem.features.hotwallet.impl.R
+import com.tangem.core.ui.components.appbar.TangemTopAppBar
+import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
 import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.hotwallet.createwalletbackup.routing.CreateWalletBackupRoute
-import com.tangem.features.hotwallet.stepper.api.HotWalletStepperComponent
 
 @Composable
 internal fun CreateWalletBackupContent(
     stackState: ChildStack<CreateWalletBackupRoute, ComposableContentComponent>,
-    stepperComponent: HotWalletStepperComponent?,
+    showTopBar: Boolean,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -29,7 +33,15 @@ internal fun CreateWalletBackupContent(
             .imePadding()
             .systemBarsPadding(),
     ) {
-        stepperComponent?.Content(Modifier)
+        if (showTopBar) {
+            TangemTopAppBar(
+                modifier = Modifier,
+                startButton = TopAppBarButtonUM.Back(
+                    onBackClicked = onBackClick,
+                ),
+                title = stringResourceSafe(id = R.string.common_backup),
+            )
+        }
 
         Children(
             stack = stackState,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/ManualBackupCheckComponent.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/ManualBackupCheckComponent.kt
index 7f25916f2d..10d919bad7 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/ManualBackupCheckComponent.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/ManualBackupCheckComponent.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.security.DisableScreenshotsDisposableEffect
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.hotwallet.manualbackup.check.model.ManualBackupCheckModel
 import com.tangem.features.hotwallet.manualbackup.check.ui.ManualBackupCheckContent
@@ -22,6 +23,7 @@ internal class ManualBackupCheckComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+        DisableScreenshotsDisposableEffect()
         ManualBackupCheckContent(
             state = state,
             modifier = modifier,
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/model/ManualBackupCheckModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/model/ManualBackupCheckModel.kt
index e0778baa69..b68069c4fe 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/model/ManualBackupCheckModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/check/model/ManualBackupCheckModel.kt
@@ -44,7 +44,7 @@ internal class ManualBackupCheckModel @Inject constructor(
     private val callbacks = params.callbacks
 
     internal val uiState: StateFlow<ManualBackupCheckUM>
-    field = MutableStateFlow(getInitialUIState())
+        field = MutableStateFlow(getInitialUIState())
 
     init {
         modelScope.launch {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/completed/ManualBackupCompletedModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/completed/ManualBackupCompletedModel.kt
index d0fcfe7333..9abbb6caff 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/completed/ManualBackupCompletedModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/completed/ManualBackupCompletedModel.kt
@@ -18,9 +18,9 @@ internal class ManualBackupCompletedModel @Inject constructor(
     private val params: ManualBackupCompletedComponent.Params = paramsContainer.require()
 
     internal val uiState: StateFlow<ManualBackupCompletedUM>
-    field = MutableStateFlow(
-        ManualBackupCompletedUM(
-            onContinueClick = { params.callbacks.onContinueClick(params.userWalletId) },
-        ),
-    )
+        field = MutableStateFlow(
+            ManualBackupCompletedUM(
+                onContinueClick = { params.callbacks.onContinueClick(params.userWalletId) },
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/phrase/model/ManualBackupPhraseModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/phrase/model/ManualBackupPhraseModel.kt
index 0c99cd5606..abb3ea0654 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/phrase/model/ManualBackupPhraseModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/phrase/model/ManualBackupPhraseModel.kt
@@ -35,11 +35,11 @@ internal class ManualBackupPhraseModel @Inject constructor(
     private val callbacks = params.callbacks
 
     internal val uiState: StateFlow<ManualBackupPhraseUM>
-    field = MutableStateFlow(
-        ManualBackupPhraseUM(
-            onContinueClick = callbacks::onContinueClick,
-        ),
-    )
+        field = MutableStateFlow(
+            ManualBackupPhraseUM(
+                onContinueClick = callbacks::onContinueClick,
+            ),
+        )
 
     init {
         modelScope.launch {
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/start/ManualBackupStartModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/start/ManualBackupStartModel.kt
index ef4f85294b..c847e052a6 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/start/ManualBackupStartModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/manualbackup/start/ManualBackupStartModel.kt
@@ -18,9 +18,9 @@ internal class ManualBackupStartModel @Inject constructor(
     private val params: ManualBackupStartComponent.Params = paramsContainer.require()
 
     internal val uiState: StateFlow<ManualBackupStartUM>
-    field = MutableStateFlow(
-        ManualBackupStartUM(
-            onContinueClick = params.callbacks::onContinueClick,
-        ),
-    )
+        field = MutableStateFlow(
+            ManualBackupStartUM(
+                onContinueClick = params.callbacks::onContinueClick,
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/setupfinished/MobileWalletSetupFinishedModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/setupfinished/MobileWalletSetupFinishedModel.kt
index 40ba81c5b3..d94e79c3ce 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/setupfinished/MobileWalletSetupFinishedModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/setupfinished/MobileWalletSetupFinishedModel.kt
@@ -18,9 +18,9 @@ internal class MobileWalletSetupFinishedModel @Inject constructor(
     private val params: MobileWalletSetupFinishedComponent.Params = paramsContainer.require()
 
     internal val uiState: StateFlow<MobileWalletSetupFinishedUM>
-    field = MutableStateFlow(
-        MobileWalletSetupFinishedUM(
-            onContinueClick = params.callbacks::onContinueClick,
-        ),
-    )
+        field = MutableStateFlow(
+            MobileWalletSetupFinishedUM(
+                onContinueClick = params.callbacks::onContinueClick,
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/stepper/impl/HotWalletStepperModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/stepper/impl/HotWalletStepperModel.kt
index ed64c2fb93..513718e705 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/stepper/impl/HotWalletStepperModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/stepper/impl/HotWalletStepperModel.kt
@@ -20,7 +20,7 @@ internal class HotWalletStepperModel @Inject constructor(
     val params = paramsContainer.require<HotWalletStepperComponent.Params>()
 
     val uiState: StateFlow<HotWalletStepperComponent.StepperUM>
-    field = MutableStateFlow(params.initState)
+        field = MutableStateFlow(params.initState)
 
     fun updateState(newState: HotWalletStepperComponent.StepperUM) {
         uiState.value = newState
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/viewphrase/model/ViewPhraseModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/viewphrase/model/ViewPhraseModel.kt
index ede4241680..a0b991c0a4 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/viewphrase/model/ViewPhraseModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/viewphrase/model/ViewPhraseModel.kt
@@ -35,11 +35,11 @@ internal class ViewPhraseModel @Inject constructor(
     private val params = paramsContainer.require<ViewPhraseComponent.Params>()
 
     internal val uiState: StateFlow<ViewPhraseUM>
-    field = MutableStateFlow(
-        ViewPhraseUM(
-            onBackClick = { router.pop() },
-        ),
-    )
+        field = MutableStateFlow(
+            ViewPhraseUM(
+                onBackClick = { router.pop() },
+            ),
+        )
 
     init {
         loadSeedPhrase()
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletactivation/entry/WalletActivationModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletactivation/entry/WalletActivationModel.kt
index e5cd76ac2f..1f151f2514 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletactivation/entry/WalletActivationModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletactivation/entry/WalletActivationModel.kt
@@ -63,7 +63,7 @@ internal class WalletActivationModel @Inject constructor(
             is WalletActivationRoute.ManualBackupCheck -> stackNavigation.pop()
             is WalletActivationRoute.ManualBackupCompleted -> Unit
             is WalletActivationRoute.SetAccessCode -> Unit
-            is WalletActivationRoute.ConfirmAccessCode -> Unit
+            is WalletActivationRoute.ConfirmAccessCode -> stackNavigation.pop()
             is WalletActivationRoute.PushNotifications -> Unit
             is WalletActivationRoute.SetupFinished -> Unit
         }
@@ -97,7 +97,7 @@ internal class WalletActivationModel @Inject constructor(
                     title = resourceReference(R.string.access_code_alert_skip_ok),
                     onClick = { navigateToPushNotificationsOrNext() },
                 ),
-                dismissOnFirstAction = true,
+                shouldDismissOnFirstAction = true,
             ),
         )
     }
diff --git a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModel.kt b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModel.kt
index b7357044d5..19bc899913 100644
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/walletbackup/model/WalletBackupModel.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 @ModelScoped
 internal class WalletBackupModel @Inject constructor(
     paramsContainer: ParamsContainer,
-    private val getWalletUseCase: GetUserWalletUseCase,
+    private val getUserWalletUseCase: GetUserWalletUseCase,
     private val unlockHotWalletContextualUseCase: UnlockHotWalletContextualUseCase,
     override val dispatchers: CoroutineDispatcherProvider,
     private val router: Router,
@@ -33,35 +33,37 @@ internal class WalletBackupModel @Inject constructor(
     private val params: WalletBackupComponent.Params = paramsContainer.require()
 
     val uiState: StateFlow<WalletBackupUM>
-    field = MutableStateFlow(
-        WalletBackupUM(
-            onBackClick = { router.pop() },
-            recoveryPhraseOption = LabelUM(
-                text = resourceReference(R.string.hw_backup_no_backup),
-                style = LabelStyle.WARNING,
+        field = MutableStateFlow(
+            WalletBackupUM(
+                onBackClick = { router.pop() },
+                recoveryPhraseOption = LabelUM(
+                    text = resourceReference(R.string.hw_backup_no_backup),
+                    style = LabelStyle.WARNING,
+                ),
+                googleDriveOption = LabelUM(
+                    text = resourceReference(R.string.common_coming_soon),
+                    style = LabelStyle.REGULAR,
+                ),
+                googleDriveStatus = BackupStatus.ComingSoon,
+                onRecoveryPhraseClick = ::onRecoveryPhraseClick,
+                onGoogleDriveClick = { },
+                onHardwareWalletClick = ::onHardwareWalletClick,
+                backedUp = false,
             ),
-            googleDriveOption = LabelUM(
-                text = resourceReference(R.string.common_coming_soon),
-                style = LabelStyle.REGULAR,
-            ),
-            googleDriveStatus = BackupStatus.ComingSoon,
-            onRecoveryPhraseClick = ::onRecoveryPhraseClick,
-            onGoogleDriveClick = { },
-            onHardwareWalletClick = ::onHardwareWalletClick,
-            backedUp = false,
-        ),
-    )
+        )
 
     init {
-        getWalletUseCase.invoke(params.userWalletId)
-            .fold(
-                ifLeft = {
-                    Timber.e("Error on getting user wallet: $it")
-                },
-                ifRight = {
-                    updateBackupStatuses(it)
-                },
-            )
+        getUserWalletUseCase.invokeFlow(params.userWalletId)
+            .onEach { either ->
+                either.fold(
+                    ifLeft = {
+                        Timber.e("Error on getting user wallet: $it")
+                    },
+                    ifRight = {
+                        updateBackupStatuses(it)
+                    },
+                )
+            }.launchIn(modelScope)
     }
 
     private fun updateBackupStatuses(userWallet: UserWallet) {
@@ -95,7 +97,7 @@ internal class WalletBackupModel @Inject constructor(
 
     private fun onRecoveryPhraseClick() {
         if (uiState.value.backedUp) {
-            getWalletUseCase.invoke(params.userWalletId)
+            getUserWalletUseCase.invoke(params.userWalletId)
                 .fold(
                     ifLeft = {
                         Timber.e("Error on getting user wallet: $it")
diff --git a/features/kyc/api/src/main/kotlin/com/tangem/features/kyc/KycComponent.kt b/features/kyc/api/src/main/kotlin/com/tangem/features/kyc/KycComponent.kt
index 6a18888000..97e2d1f0cc 100644
--- a/features/kyc/api/src/main/kotlin/com/tangem/features/kyc/KycComponent.kt
+++ b/features/kyc/api/src/main/kotlin/com/tangem/features/kyc/KycComponent.kt
@@ -1,12 +1,11 @@
 package com.tangem.features.kyc
 
-import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.factory.ComponentFactory
+import com.tangem.core.ui.decompose.ComposableContentComponent
 
-interface KycComponent {
+interface KycComponent : ComposableContentComponent {
 
-    fun launch()
+    data object Params
 
-    interface Factory {
-        fun create(appComponentContext: AppComponentContext): KycComponent
-    }
+    interface Factory : ComponentFactory<Params, KycComponent>
 }
\ No newline at end of file
diff --git a/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycComponent.kt b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycComponent.kt
index 1be34aa554..76713a61b2 100644
--- a/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycComponent.kt
+++ b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycComponent.kt
@@ -1,45 +1,62 @@
 package com.tangem.features.kyc
 
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.sumsub.sns.core.SNSMobileSDK
 import com.sumsub.sns.core.data.listener.TokenExpirationHandler
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.domain.pay.KycStartInfo
 import com.tangem.features.kyc.theme.TangemSNSIconHandler
 import com.tangem.features.kyc.theme.TangemSNSTheme
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import java.util.Locale
 
 class DefaultKycComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
+    @Assisted params: KycComponent.Params,
 ) : KycComponent, AppComponentContext by appComponentContext {
 
-    private val model: DefaultKycModel = getOrCreateModel()
+    private val model: DefaultKycModel = getOrCreateModel(params)
 
-    override fun launch() {
+    init {
         componentScope.launch {
-            model.uiState.collect {
-                it?.let { startInfo ->
-                    val tokenExpirationHandler = object : TokenExpirationHandler {
-                        override fun onTokenExpired() = ""
-                    }
-                    val snsSdk = SNSMobileSDK.Builder(activity)
-                        .withAccessToken(accessToken = startInfo.token, onTokenExpiration = tokenExpirationHandler)
-                        .withTheme(TangemSNSTheme.theme(activity))
-                        .withIconHandler(TangemSNSIconHandler())
-                        .withLocale(Locale(startInfo.locale))
-                        .build()
-                    snsSdk.launch()
-                }
+            model.uiState.drop(1).collectLatest { startInfo ->
+                startInfo?.let { launchSdk(startInfo) }
+                router.pop()
             }
         }
-        model.getKycToken()
+    }
+
+    private fun launchSdk(startInfo: KycStartInfo) {
+        val tokenExpirationHandler = object : TokenExpirationHandler {
+            /**
+             * We don't refresh this token for f&f release. Assume it lives long enough to finish KYC
+             * [REDACTED_TODO_COMMENT]
+             */
+            override fun onTokenExpired() = ""
+        }
+        val snsSdk = SNSMobileSDK.Builder(activity)
+            .withAccessToken(accessToken = startInfo.token, onTokenExpiration = tokenExpirationHandler)
+            .withTheme(TangemSNSTheme.theme(activity))
+            .withIconHandler(TangemSNSIconHandler())
+            .withLocale(Locale(startInfo.locale))
+            .build()
+        snsSdk.launch()
+    }
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        KycLoadingScreen(router::pop, modifier)
     }
 
     @AssistedFactory
     interface Factory : KycComponent.Factory {
-        override fun create(appComponentContext: AppComponentContext): DefaultKycComponent
+        override fun create(context: AppComponentContext, params: KycComponent.Params): DefaultKycComponent
     }
 }
\ No newline at end of file
diff --git a/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycModel.kt b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycModel.kt
index 21b8e8e9bb..7df782304f 100644
--- a/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycModel.kt
+++ b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/DefaultKycModel.kt
@@ -21,7 +21,7 @@ class DefaultKycModel @Inject constructor(
     private val _uiState: MutableStateFlow<KycStartInfo?> = MutableStateFlow(null)
     val uiState = _uiState.asStateFlow()
 
-    fun getKycToken() {
+    init {
         modelScope.launch {
             kycRepository.getKycStartInfo().getOrNull()?.let { _uiState.emit(it) }
         }
diff --git a/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/KycLoadingScreen.kt b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/KycLoadingScreen.kt
new file mode 100644
index 0000000000..c96c285fc3
--- /dev/null
+++ b/features/kyc/impl/src/main/kotlin/com/tangem/features/kyc/KycLoadingScreen.kt
@@ -0,0 +1,41 @@
+package com.tangem.features.kyc
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.res.TangemTheme
+
+@Composable
+internal fun KycLoadingScreen(onBack: () -> Unit, modifier: Modifier = Modifier) {
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            AppBarWithBackButton(
+                modifier = Modifier.statusBarsPadding(),
+                onBackClick = onBack,
+                iconRes = R.drawable.ic_back_24,
+            )
+        },
+        content = { paddingValues ->
+            Box(
+                modifier = modifier
+                    .padding(paddingValues)
+                    .fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                CircularProgressIndicator(
+                    modifier = Modifier,
+                    color = TangemTheme.colors.icon.primary1,
+                )
+            }
+        },
+    )
+}
\ No newline at end of file
diff --git a/features/kyc/mock/build.gradle.kts b/features/kyc/mock/build.gradle.kts
index a64c1f8a89..2ba00e1182 100644
--- a/features/kyc/mock/build.gradle.kts
+++ b/features/kyc/mock/build.gradle.kts
@@ -15,6 +15,8 @@ dependencies {
     implementation(projects.features.kyc.api)
 
     implementation(projects.core.decompose)
+    implementation(deps.compose.ui)
+    implementation(projects.core.ui)
 
     /** DI */
     implementation(deps.hilt.android)
diff --git a/features/kyc/mock/src/main/kotlin/com/tangem/features/kyc/MockKycComponent.kt b/features/kyc/mock/src/main/kotlin/com/tangem/features/kyc/MockKycComponent.kt
index 71bd1f9b5d..b6965fc720 100644
--- a/features/kyc/mock/src/main/kotlin/com/tangem/features/kyc/MockKycComponent.kt
+++ b/features/kyc/mock/src/main/kotlin/com/tangem/features/kyc/MockKycComponent.kt
@@ -1,5 +1,7 @@
 package com.tangem.features.kyc
 
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import com.tangem.core.decompose.context.AppComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -7,17 +9,19 @@ import dagger.assisted.AssistedInject
 
 /**
  * Mocking it for release/external builds to exclude SumSub dependency
+ * This will never be called if the FT [isTangemPayEnabled] is off
  */
+@Suppress("UnusedPrivateProperty")
 internal class MockKycComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
+    @Assisted params: KycComponent.Params,
 ) : KycComponent, AppComponentContext by appComponentContext {
 
-    override fun launch() {
-        /* no op */
-    }
+    @Composable
+    override fun Content(modifier: Modifier) { /* no op */ }
 
     @AssistedFactory
     interface Factory : KycComponent.Factory {
-        override fun create(appComponentContext: AppComponentContext): MockKycComponent
+        override fun create(context: AppComponentContext, params: KycComponent.Params): MockKycComponent
     }
 }
\ No newline at end of file
diff --git a/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/ChooseManagedTokensComponent.kt b/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/ChooseManagedTokensComponent.kt
index b3616e31a9..2c2ad21bd7 100644
--- a/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/ChooseManagedTokensComponent.kt
+++ b/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/ChooseManagedTokensComponent.kt
@@ -12,7 +12,7 @@ interface ChooseManagedTokensComponent : ComposableContentComponent {
         val initialCurrency: CryptoCurrency,
         val selectedCurrency: CryptoCurrency?,
         val source: Source,
-        val showSendViaSwapNotification: Boolean,
+        val shouldShowSendViaSwapNotification: Boolean,
         val callback: ModelCallback? = null,
         val analyticsCategoryName: String,
     )
diff --git a/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/analytics/CommonManageTokensAnalyticEvents.kt b/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/analytics/CommonManageTokensAnalyticEvents.kt
index eba0758c21..e6cffb244a 100644
--- a/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/analytics/CommonManageTokensAnalyticEvents.kt
+++ b/features/manage-tokens/api/src/main/kotlin/com/tangem/features/managetokens/component/analytics/CommonManageTokensAnalyticEvents.kt
@@ -8,7 +8,7 @@ import com.tangem.core.analytics.models.AnalyticsParam.Key.TOKEN_PARAM
 sealed class CommonManageTokensAnalyticEvents(
     category: String,
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent(category = category, event = event, params = params) {
 
     data class TokenSearchClicked(
@@ -26,8 +26,8 @@ sealed class CommonManageTokensAnalyticEvents(
         event = "Token Searched",
         params = buildMap {
             put(CHOSEN_TOKEN, if (isTokenChosen) "Yes" else "No")
-            token?.let { put(TOKEN_PARAM, token) }
-            blockchain?.let { put(BLOCKCHAIN, blockchain) }
+            if (token != null) { put(TOKEN_PARAM, token) }
+            if (blockchain != null) { put(BLOCKCHAIN, blockchain) }
         },
     )
 }
\ No newline at end of file
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/model/ChooseManagedTokensModel.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/model/ChooseManagedTokensModel.kt
index c7b9296386..a877ba39b6 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/model/ChooseManagedTokensModel.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/model/ChooseManagedTokensModel.kt
@@ -81,7 +81,7 @@ internal class ChooseManagedTokensModel @Inject constructor(
 
     val bottomSheetNavigation: SlotNavigation<ChooseManageTokensBottomSheetConfig> = SlotNavigation()
     val uiState: StateFlow<ChooseManagedTokenUM>
-    field = MutableStateFlow<ChooseManagedTokenUM>(createReadContentModel())
+        field = MutableStateFlow<ChooseManagedTokenUM>(createReadContentModel())
 
     init {
         manageTokensListManager.uiItems
@@ -124,7 +124,7 @@ internal class ChooseManagedTokensModel @Inject constructor(
     }
 
     private fun getNotification(): NotificationUM? {
-        return if (params.source == Source.SendViaSwap && params.showSendViaSwapNotification) {
+        return if (params.source == Source.SendViaSwap && params.shouldShowSendViaSwapNotification) {
             ChooseManagedTokensNotificationUM.SendViaSwap(onCloseClick = ::removeNotification)
         } else {
             null
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/ui/ChooseManagedTokenContent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/ui/ChooseManagedTokenContent.kt
index 615347a07f..d22eaebcff 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/ui/ChooseManagedTokenContent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/choosetoken/ui/ChooseManagedTokenContent.kt
@@ -153,7 +153,7 @@ private fun LazyListScope.contentItems(items: ImmutableList<CurrencyItemUM>) {
                             name = name,
                             type = symbol,
                             icon = icon,
-                            showCustom = false,
+                            shouldShowCustom = false,
                         )
                     },
                     modifier = Modifier
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt
index 9889edc028..59513c7d2e 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewManageTokensComponent.kt
@@ -128,7 +128,7 @@ internal class PreviewManageTokensComponent(
             background = Color.Black,
             topBadgeIconResId = R.drawable.img_eth_22,
             isGrayscale = false,
-            showCustomBadge = true,
+            shouldShowCustomBadge = true,
         ),
         onRemoveClick = {},
     )
@@ -141,7 +141,7 @@ internal class PreviewManageTokensComponent(
             url = null,
             fallbackResId = R.drawable.img_btc_22,
             isGrayscale = false,
-            showCustomBadge = false,
+            shouldShowCustomBadge = false,
         ),
         networks = if (index == 2) {
             CurrencyItemUM.Basic.NetworksUM.Expanded(getCurrencyNetworks(index))
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewOnboardingManageTokensComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewOnboardingManageTokensComponent.kt
index 28da1876e7..790bffdd7c 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewOnboardingManageTokensComponent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewOnboardingManageTokensComponent.kt
@@ -66,7 +66,7 @@ internal class PreviewOnboardingManageTokensComponent(
             background = Color.Black,
             topBadgeIconResId = R.drawable.img_eth_22,
             isGrayscale = false,
-            showCustomBadge = true,
+            shouldShowCustomBadge = true,
         ),
         onRemoveClick = {},
     )
@@ -79,7 +79,7 @@ internal class PreviewOnboardingManageTokensComponent(
             url = null,
             fallbackResId = R.drawable.img_btc_22,
             isGrayscale = false,
-            showCustomBadge = false,
+            shouldShowCustomBadge = false,
         ),
         networks = if (index == 2) {
             CurrencyItemUM.Basic.NetworksUM.Expanded(getCurrencyNetworks())
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenSelectorContent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenSelectorContent.kt
index b7eae1ce2c..37097a8f34 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenSelectorContent.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/CustomTokenSelectorContent.kt
@@ -163,9 +163,9 @@ private fun NetworkItem(model: CurrencyNetworkUM, modifier: Modifier = Modifier)
                     url = null,
                     fallbackResId = model.iconResId,
                     isGrayscale = false,
-                    showCustomBadge = false,
+                    shouldShowCustomBadge = false,
                 ),
-                showCustom = false,
+                shouldShowCustom = false,
             )
         },
         action = {
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt
index 6c1d6a16cc..e7426ae87c 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/ManageTokensScreen.kt
@@ -290,7 +290,7 @@ private fun CustomCurrencyItem(item: CurrencyItemUM.Custom, modifier: Modifier =
                 name = name,
                 type = symbol,
                 icon = icon,
-                showCustom = true,
+                shouldShowCustom = true,
             )
         },
         action = {
@@ -316,7 +316,7 @@ private fun BasicCurrencyItem(item: CurrencyItemUM.Basic, isEditable: Boolean, m
                     name = name,
                     type = symbol,
                     icon = icon,
-                    showCustom = false,
+                    shouldShowCustom = false,
                 )
             },
             action = {
@@ -442,7 +442,7 @@ private class PreviewManageTokensComponentProvider : PreviewParameterProvider<Ma
                 showTangemIcon = true,
                 params = ManageTokensComponent.Params(
                     source = ManageTokensSource.ONBOARDING,
-                    userWalletId = UserWalletId("wallet_id"),
+                    userWalletId = UserWalletId("0x"),
                 ),
             ),
             PreviewManageTokensComponent(
@@ -455,7 +455,7 @@ private class PreviewManageTokensComponentProvider : PreviewParameterProvider<Ma
                 showTangemIcon = false,
                 params = ManageTokensComponent.Params(
                     source = ManageTokensSource.ONBOARDING,
-                    userWalletId = UserWalletId("wallet_id"),
+                    userWalletId = UserWalletId("0x"),
                 ),
             ),
         )
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/dialog/CustomDerivationInputDialog.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/dialog/CustomDerivationInputDialog.kt
index d9cb84c75d..e398c2569a 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/dialog/CustomDerivationInputDialog.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/ui/dialog/CustomDerivationInputDialog.kt
@@ -27,7 +27,7 @@ internal fun CustomDerivationInputDialog(model: CustomDerivationInputUM, onDismi
         fieldValue = value,
         confirmButton = DialogButtonUM(
             title = stringResourceSafe(id = R.string.common_ok),
-            enabled = model.isConfirmEnabled,
+            isEnabled = model.isConfirmEnabled,
             onClick = model.onConfirm,
         ),
         dismissButton = DialogButtonUM(
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
index 23a63a6edd..9398d31472 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensListManager.kt
@@ -83,6 +83,11 @@ internal class ManageTokensListManager @AssistedInject constructor(
         .distinctUntilChanged()
     val uiItems: Flow<ImmutableList<CurrencyItemUM>> = uiManager.items
 
+    /**
+     * Launch pagination flow to get currencies
+     *
+     * @param isCollapsed   set initial display state of networks. !!! WARNING !!! Use `false` flag with cation
+     */
     suspend fun launchPagination(isCollapsed: Boolean) = coroutineScope {
         val loadUserTokensFromRemote = when (mode) {
             is ManageTokensMode.Wallet -> source == ManageTokensSource.ONBOARDING
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensWarningDelegate.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensWarningDelegate.kt
index 037e69b449..cbc53ded2c 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensWarningDelegate.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/list/ManageTokensWarningDelegate.kt
@@ -77,7 +77,7 @@ internal class ManageTokensWarningDelegate @AssistedInject constructor(
             firstActionBuilder = {
                 EventMessageAction(
                     title = resourceReference(R.string.token_details_hide_alert_hide),
-                    warning = true,
+                    isWarning = true,
                     onClick = onConfirm,
                 )
             },
diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/mapper/CurrencyItemMapper.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/mapper/CurrencyItemMapper.kt
index 47a6cfe610..a3114a8d29 100644
--- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/mapper/CurrencyItemMapper.kt
+++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/utils/mapper/CurrencyItemMapper.kt
@@ -32,7 +32,7 @@ private fun ManagedCryptoCurrency.Custom.toUiModel(
                 url = iconUrl,
                 fallbackResId = network.id.getIconRes(isColored = true),
                 isGrayscale = false,
-                showCustomBadge = true,
+                shouldShowCustomBadge = true,
             )
         }
         is ManagedCryptoCurrency.Custom.Token -> {
@@ -44,7 +44,7 @@ private fun ManagedCryptoCurrency.Custom.toUiModel(
                 fallbackTint = getTintForTokenIcon(background),
                 topBadgeIconResId = network.id.getIconRes(isColored = true),
                 isGrayscale = false,
-                showCustomBadge = true,
+                shouldShowCustomBadge = true,
             )
         }
     },
@@ -68,7 +68,7 @@ private fun ManagedCryptoCurrency.Token.toUiModel(
             url = iconUrl,
             topBadgeIconResId = null,
             isGrayscale = if (isEditable) !isAdded else false,
-            showCustomBadge = false,
+            shouldShowCustomBadge = false,
             fallbackTint = getTintForTokenIcon(background),
             fallbackBackground = background,
         ),
diff --git a/features/markets/api/src/main/kotlin/com/tangem/features/markets/details/MarketsTokenDetailsComponent.kt b/features/markets/api/src/main/kotlin/com/tangem/features/markets/details/MarketsTokenDetailsComponent.kt
index 81ecc42dcc..58e368cc07 100644
--- a/features/markets/api/src/main/kotlin/com/tangem/features/markets/details/MarketsTokenDetailsComponent.kt
+++ b/features/markets/api/src/main/kotlin/com/tangem/features/markets/details/MarketsTokenDetailsComponent.kt
@@ -19,7 +19,7 @@ interface MarketsTokenDetailsComponent : ComposableContentComponent {
     data class Params(
         val token: TokenMarketParams,
         val appCurrency: AppCurrency,
-        val showPortfolio: Boolean,
+        val shouldShowPortfolio: Boolean,
         val analyticsParams: AnalyticsParams?,
     )
 
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/deeplink/DefaultMarketsTokenDetailDeepLinkHandler.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/deeplink/DefaultMarketsTokenDetailDeepLinkHandler.kt
index 35b7a3b8d6..b1f7050b8b 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/deeplink/DefaultMarketsTokenDetailDeepLinkHandler.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/deeplink/DefaultMarketsTokenDetailDeepLinkHandler.kt
@@ -62,7 +62,7 @@ internal class DefaultMarketsTokenDetailDeepLinkHandler @AssistedInject construc
                         imageUrl = getTokenIconUrlFromDefaultHost(rawTokenId),
                     ),
                     appCurrency = appCurrency,
-                    showPortfolio = true,
+                    shouldShowPortfolio = true,
                     analyticsParams = null,
                 ),
             )
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/DefaultMarketsTokenDetailsComponent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/DefaultMarketsTokenDetailsComponent.kt
index fe9238e9a2..1210aa9da6 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/DefaultMarketsTokenDetailsComponent.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/DefaultMarketsTokenDetailsComponent.kt
@@ -46,7 +46,7 @@ internal class DefaultMarketsTokenDetailsComponent @AssistedInject constructor(
 
     private val model: MarketsTokenDetailsModel = getOrCreateModel(updatedParams)
 
-    private val portfolioComponent: MarketsPortfolioComponent? = if (updatedParams.showPortfolio) {
+    private val portfolioComponent: MarketsPortfolioComponent? = if (updatedParams.shouldShowPortfolio) {
         portfolioComponentFactory.create(
             context = child("my_portfolio"),
             params = MarketsPortfolioComponent.Params(
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/ExchangeItemStateConverter.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/ExchangeItemStateConverter.kt
index eb55abd9dd..096f0d0430 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/ExchangeItemStateConverter.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/converters/ExchangeItemStateConverter.kt
@@ -27,7 +27,7 @@ internal object ExchangeItemStateConverter : Converter<TokenMarketExchange, Toke
                 url = value.imageUrl,
                 fallbackResId = R.drawable.ic_alert_24,
                 isGrayscale = false,
-                showCustomBadge = false,
+                shouldShowCustomBadge = false,
             ),
             titleState = TokenItemState.TitleState.Content(text = stringReference(value.name)),
             fiatAmountState = TokenItemState.FiatAmountState.Content(
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt
index 6b22d2f6e3..7ffb94a1db 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt
@@ -58,8 +58,8 @@ internal fun MarketsTokenDetailsContent(
     onBackClick: () -> Unit,
     onHeaderSizeChange: (Dp) -> Unit,
     backButtonEnabled: Boolean,
-    portfolioBlock: @Composable ((Modifier) -> Unit)?,
     modifier: Modifier = Modifier,
+    portfolioBlock: @Composable ((Modifier) -> Unit)?,
 ) {
     Content(
         modifier = modifier,
@@ -88,8 +88,8 @@ private fun Content(
     onBackClick: () -> Unit,
     onHeaderSizeChange: (Dp) -> Unit,
     backButtonEnabled: Boolean,
-    portfolioBlock: @Composable ((Modifier) -> Unit)?,
     modifier: Modifier = Modifier,
+    portfolioBlock: @Composable ((Modifier) -> Unit)?,
 ) {
     val density = LocalDensity.current
     val bottomBarHeight = with(density) { WindowInsets.systemBars.getBottom(this).toDp() }
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt
index 8135d641d2..fdbf284dbc 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt
@@ -170,7 +170,7 @@ private class ExchangesBottomSheetContentProvider : CollectionPreviewParameterPr
                         url = null,
                         fallbackResId = R.drawable.ic_facebook_24,
                         isGrayscale = false,
-                        showCustomBadge = false,
+                        shouldShowCustomBadge = false,
                     ),
                     titleState = TokenItemState.TitleState.Content(text = stringReference(value = "OKX")),
                     fiatAmountState = TokenItemState.FiatAmountState.Content(text = "$67.52M"),
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/InfoBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/InfoBottomSheet.kt
index 8081d1a0b8..234468b262 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/InfoBottomSheet.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/InfoBottomSheet.kt
@@ -65,7 +65,7 @@ private fun AdditionalInfoNotification(onClick: () -> Unit, modifier: Modifier =
             subtitle = TextReference.Res(id = R.string.information_generated_with_ai),
             iconResId = R.drawable.ic_magic_28,
             onClick = onClick,
-            showArrowIcon = false,
+            shouldShowArrowIcon = false,
         ),
         modifier = modifier,
         subtitleColor = TangemTheme.colors.text.primary1,
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/DefaultMarketsEntryComponent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/DefaultMarketsEntryComponent.kt
index adc1968208..06f3b26d19 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/DefaultMarketsEntryComponent.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/DefaultMarketsEntryComponent.kt
@@ -79,7 +79,7 @@ internal class DefaultMarketsEntryComponent @AssistedInject constructor(
                 params = MarketsTokenDetailsComponent.Params(
                     token = token,
                     appCurrency = appCurrency,
-                    showPortfolio = true,
+                    shouldShowPortfolio = true,
                     analyticsParams = MarketsTokenDetailsComponent.AnalyticsParams(
                         blockchain = null,
                         source = "Market",
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/analytics/PortfolioAnalyticsEvent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/analytics/PortfolioAnalyticsEvent.kt
index 5f7ff68ab5..9e02ec98a2 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/analytics/PortfolioAnalyticsEvent.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/analytics/PortfolioAnalyticsEvent.kt
@@ -38,6 +38,7 @@ internal class PortfolioAnalyticsEvent(
                     TokenActionsBSContentUM.Action.Buy -> "Button - Buy"
                     TokenActionsBSContentUM.Action.Receive -> "Button - Receive"
                     TokenActionsBSContentUM.Action.Exchange -> "Button - Swap"
+                    TokenActionsBSContentUM.Action.Stake -> "Button - Stake"
                     else -> "error"
                 },
                 params = buildMap {
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/loader/PortfolioDataLoader.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/loader/PortfolioDataLoader.kt
index 950000e443..ff72822f09 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/loader/PortfolioDataLoader.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/loader/PortfolioDataLoader.kt
@@ -1,8 +1,6 @@
 package com.tangem.features.markets.portfolio.impl.loader
 
-import arrow.core.getOrElse
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
-import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.models.TotalFiatBalance
@@ -15,7 +13,6 @@ import com.tangem.domain.tokens.GetWalletTotalBalanceUseCase
 import com.tangem.domain.tokens.error.TokenListError
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
-import timber.log.Timber
 import javax.inject.Inject
 
 /**
@@ -41,8 +38,8 @@ internal class PortfolioDataLoader @Inject constructor(
     fun load(currencyRawId: CryptoCurrency.RawID): Flow<PortfolioData> {
         return combine(
             flow = getAllWalletsCryptoCurrenciesData(currencyRawId = currencyRawId),
-            flow2 = getSelectedAppCurrencyFlow(),
-            flow3 = getBalanceHidingSettingsFlow(),
+            flow2 = getSelectedAppCurrencyUseCase.invokeOrDefault(),
+            flow3 = getBalanceHidingSettingsUseCase.isBalanceHidden(),
         ) { walletsWithCurrencies, appCurrency, isBalanceHidden ->
             PortfolioData(
                 walletsWithCurrencies = walletsWithCurrencies,
@@ -113,23 +110,6 @@ internal class PortfolioDataLoader @Inject constructor(
             .distinctUntilChanged()
     }
 
-    private fun getSelectedAppCurrencyFlow(): Flow<AppCurrency> {
-        return getSelectedAppCurrencyUseCase()
-            .map {
-                it.getOrElse { e ->
-                    Timber.e("Failed to load app currency: $e")
-                    AppCurrency.Default
-                }
-            }
-            .distinctUntilChanged()
-    }
-
-    private fun getBalanceHidingSettingsFlow(): Flow<Boolean> {
-        return getBalanceHidingSettingsUseCase()
-            .map { it.isBalanceHidden }
-            .distinctUntilChanged()
-    }
-
     private fun getWalletsWithTotalBalanceFlow(
         ids: List<UserWalletId>,
     ): Flow<Map<UserWalletId, Lce<TokenListError, TotalFiatBalance>>> {
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt
index cd97aa2c75..e829c57b6b 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt
@@ -23,7 +23,6 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.features.markets.impl.R
 import com.tangem.features.markets.portfolio.impl.loader.PortfolioData
 import com.tangem.features.markets.portfolio.impl.ui.state.TokenActionsBSContentUM
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.utils.Provider
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -42,7 +41,6 @@ internal class TokenActionsHandler @AssistedInject constructor(
     private val isDemoCardUseCase: IsDemoCardUseCase,
     private val messageSender: UiMessageSender,
     private val shareManager: ShareManager,
-    private val sendFeatureToggles: SendFeatureToggles,
 ) {
 
     private val disabledActionsInDemoMode = buildSet {
@@ -159,17 +157,10 @@ internal class TokenActionsHandler @AssistedInject constructor(
     }
 
     private fun onSendClick(cryptoCurrencyData: PortfolioData.CryptoCurrencyData) {
-        val route = if (sendFeatureToggles.isSendWithSwapEnabled) {
-            AppRoute.SendEntryPoint(
-                userWalletId = cryptoCurrencyData.userWallet.walletId,
-                currency = cryptoCurrencyData.status.currency,
-            )
-        } else {
-            AppRoute.Send(
-                userWalletId = cryptoCurrencyData.userWallet.walletId,
-                currency = cryptoCurrencyData.status.currency,
-            )
-        }
+        val route = AppRoute.SendEntryPoint(
+            userWalletId = cryptoCurrencyData.userWallet.walletId,
+            currency = cryptoCurrencyData.status.currency,
+        )
         router.push(route)
     }
 
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/MyPortfolio.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/MyPortfolio.kt
index 615366fd0e..1c88861dac 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/MyPortfolio.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/MyPortfolio.kt
@@ -106,7 +106,7 @@ private fun AddButton(state: AddButtonState, onClick: () -> Unit) {
                     text = resourceReference(R.string.markets_add_token),
                     icon = TangemButtonIconPosition.Start(R.drawable.ic_plus_24),
                     onClick = onClick,
-                    enabled = state == AddButtonState.Available,
+                    isEnabled = state == AddButtonState.Available,
                 ),
             )
         }
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/PortfolioItem.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/PortfolioItem.kt
index f5c13e5165..ac68e930d6 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/PortfolioItem.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/PortfolioItem.kt
@@ -10,6 +10,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
+import com.tangem.core.ui.components.icons.IconTint
 import com.tangem.core.ui.components.token.TokenItem
 import com.tangem.core.ui.components.token.state.TokenItemState
 import com.tangem.core.ui.haptic.TangemHapticEffect
@@ -100,9 +101,9 @@ private class PortfolioTokenUMProvider : CollectionPreviewParameterProvider<Port
             tokenItemState = (tokenUM.tokenItemState as TokenItemState.Content).copy(
                 fiatAmountState = contentFiatAmount.copy(
                     icons = persistentListOf(
-                        TokenItemState.FiatAmountState.Content.IconUM(
+                        TokenFiatAmountState.Content.IconUM(
                             iconRes = R.drawable.ic_staking_24,
-                            useAccentColor = true,
+                            tint = IconTint.Accent,
                         ),
                     ),
                 ),
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/model/TokenMarketBlockModel.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/model/TokenMarketBlockModel.kt
index bb1496cfe6..db7d46227c 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/model/TokenMarketBlockModel.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/model/TokenMarketBlockModel.kt
@@ -44,7 +44,7 @@ internal class TokenMarketBlockModel @Inject constructor(
 
     private val params = paramsContainer.require<TokenMarketBlockComponent.Params>()
 
-    private val priceAndTimePointValuesConverter = PriceAndTimePointValuesConverter(needToFormatAxis = false)
+    private val priceAndTimePointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = false)
 
     private val currentAppCurrency = getSelectedAppCurrencyUseCase()
         .map { maybeAppCurrency ->
@@ -152,7 +152,7 @@ internal class TokenMarketBlockModel @Inject constructor(
             AppRoute.MarketsTokenDetails(
                 token = tokenParam,
                 appCurrency = currentAppCurrency.value,
-                showPortfolio = false,
+                shouldShowPortfolio = false,
                 analyticsParams = AppRoute.MarketsTokenDetails.AnalyticsParams(
                     blockchain = params.cryptoCurrency.network.name,
                     source = "Token",
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/DefaultMarketsTokenListComponent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/DefaultMarketsTokenListComponent.kt
index 76418cb24f..8e6955c9b0 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/DefaultMarketsTokenListComponent.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/DefaultMarketsTokenListComponent.kt
@@ -53,7 +53,7 @@ internal class DefaultMarketsTokenListComponent @AssistedInject constructor(
                         AppRoute.MarketsTokenDetails(
                             token = token.toSerializableParam(),
                             appCurrency = appCurrency,
-                            showPortfolio = true,
+                            shouldShowPortfolio = true,
                             analyticsParams = AnalyticsParams(
                                 blockchain = null,
                                 source = "Market",
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
index 22712a972c..0256ce0fd1 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
@@ -23,7 +23,7 @@ internal class MarketsTokenItemConverter(
     private val appCurrency: AppCurrency,
 ) : Converter<TokenMarket, MarketsListItemUM> {
 
-    private val priceAndTimePointValuesConverter = PriceAndTimePointValuesConverter(needToFormatAxis = false)
+    private val priceAndTimePointValuesConverter = PriceAndTimePointValuesConverter(shouldFormatAxis = false)
 
     override fun convert(value: TokenMarket): MarketsListItemUM {
         return MarketsListItemUM(
diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsBlocksGroup.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsBlocksGroup.kt
index 049d91b0cd..9c81a868da 100644
--- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsBlocksGroup.kt
+++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/details/ui/NFTDetailsBlocksGroup.kt
@@ -185,9 +185,9 @@ internal fun NFTDetailsGroupBlock(
 @Composable
 internal fun NFTBlocksGroupAction(
     text: TextReference,
-    startIcon: @Composable RowScope.() -> Unit,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    startIcon: @Composable RowScope.() -> Unit,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
 
diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/entity/DefaultNFTSendSuccessTrigger.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/entity/DefaultNFTSendSuccessTrigger.kt
index fa1bb86d49..b3f0254a51 100644
--- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/entity/DefaultNFTSendSuccessTrigger.kt
+++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/entity/DefaultNFTSendSuccessTrigger.kt
@@ -17,7 +17,7 @@ interface NFTSendSuccessListener {
 internal class DefaultNFTSendSuccessTrigger @Inject constructor() : NFTSendSuccessTrigger, NFTSendSuccessListener {
 
     override val nftSendSuccessFlow: SharedFlow<Unit>
-    field = MutableSharedFlow<Unit>()
+        field = MutableSharedFlow<Unit>()
 
     override suspend fun triggerSuccessNFTSend() {
         nftSendSuccessFlow.emit(Unit)
diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt
index 91afe47b28..fc0f7c8e99 100644
--- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt
+++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/entity/transformer/UpdateDataStateTransformer.kt
@@ -43,10 +43,10 @@ internal class UpdateDataStateTransformer(
                     url = null,
                     fallbackResId = getActiveIconRes(rawId),
                     isGrayscale = !enabled,
-                    showCustomBadge = custom,
+                    shouldShowCustomBadge = custom,
                 ),
-                showCustom = custom,
-                enabled = enabled,
+                shouldShowCustom = custom,
+                isEnabled = enabled,
             ),
             onItemClick = {
                 onNetworkClick(this, enabled)
diff --git a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt
index 06c8648a94..c7d2c4393b 100644
--- a/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt
+++ b/features/nft/impl/src/main/kotlin/com/tangem/features/nft/receive/ui/NFTReceiveNetworksContent.kt
@@ -140,9 +140,9 @@ private fun Preview_NFTReceiveNetworksUM() {
                                 url = null,
                                 fallbackResId = R.drawable.img_eth_22,
                                 isGrayscale = false,
-                                showCustomBadge = false,
+                                shouldShowCustomBadge = false,
                             ),
-                            showCustom = false,
+                            shouldShowCustom = false,
                         ),
                         onItemClick = { },
                     ),
@@ -155,9 +155,9 @@ private fun Preview_NFTReceiveNetworksUM() {
                                 url = null,
                                 fallbackResId = R.drawable.img_polygon_22,
                                 isGrayscale = false,
-                                showCustomBadge = false,
+                                shouldShowCustomBadge = false,
                             ),
-                            showCustom = false,
+                            shouldShowCustom = false,
                         ),
                         onItemClick = { },
                     ),
@@ -170,9 +170,9 @@ private fun Preview_NFTReceiveNetworksUM() {
                                 url = null,
                                 fallbackResId = R.drawable.img_bsc_22,
                                 isGrayscale = false,
-                                showCustomBadge = false,
+                                shouldShowCustomBadge = false,
                             ),
-                            showCustom = false,
+                            shouldShowCustom = false,
                         ),
                         onItemClick = { },
                     ),
@@ -185,9 +185,9 @@ private fun Preview_NFTReceiveNetworksUM() {
                                 url = null,
                                 fallbackResId = R.drawable.img_avalanche_22,
                                 isGrayscale = false,
-                                showCustomBadge = false,
+                                shouldShowCustomBadge = false,
                             ),
-                            showCustom = false,
+                            shouldShowCustom = false,
                         ),
                         onItemClick = { },
                     ),
@@ -200,9 +200,9 @@ private fun Preview_NFTReceiveNetworksUM() {
                                 url = null,
                                 fallbackResId = R.drawable.img_avalanche_22,
                                 isGrayscale = false,
-                                showCustomBadge = true,
+                                shouldShowCustomBadge = true,
                             ),
-                            showCustom = true,
+                            shouldShowCustom = true,
                         ),
                         onItemClick = { },
                     ),
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/common/ui/Dialogs.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/common/ui/Dialogs.kt
index 7fb5ae3b9b..b19a0dabfa 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/common/ui/Dialogs.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/common/ui/Dialogs.kt
@@ -29,7 +29,7 @@ internal fun interruptBackupDialog(onConfirm: () -> Unit) = DialogMessage(
     message = resourceReference(R.string.onboarding_exit_alert_message),
     firstAction = EventMessageAction(
         title = resourceReference(R.string.common_ok),
-        warning = true,
+        isWarning = true,
         onClick = onConfirm,
     ),
     secondAction = EventMessageAction(
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/model/OnboardingEntryModel.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/model/OnboardingEntryModel.kt
index ff0ace4c4a..3d0f4e7079 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/model/OnboardingEntryModel.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/model/OnboardingEntryModel.kt
@@ -4,7 +4,6 @@ import com.arkivanov.decompose.router.stack.StackNavigation
 import com.arkivanov.decompose.router.stack.replaceAll
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.domain.models.scan.ProductType
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
@@ -13,12 +12,13 @@ import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.card.common.util.cardTypesResolver
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.scan.ProductType
 import com.tangem.domain.models.scan.ScanResponse
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.asLockable
-import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.features.biometry.AskBiometryComponent
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.features.onboarding.v2.TitleProvider
@@ -219,7 +219,7 @@ internal class OnboardingEntryModel @Inject constructor(
 
         // legacy flow
         if (userWalletsListManager.hasUserWallets) {
-            val isLocked = runCatching { userWalletsListManager.asLockable()?.isLockedSync!! }.getOrElse { false }
+            val isLocked = runCatching { userWalletsListManager.asLockable()?.isLocked!! }.getOrElse { false }
 
             if (isLocked) {
                 router.replaceAll(AppRoute.Welcome())
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/routing/OnboardingChildFactory.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/routing/OnboardingChildFactory.kt
index d0e8a13f03..85e1c6dac5 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/routing/OnboardingChildFactory.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/routing/OnboardingChildFactory.kt
@@ -81,7 +81,7 @@ internal class OnboardingChildFactory @Inject constructor(
             is OnboardingRoute.AskBiometry -> askBiometryComponentFactory.create(
                 context = childContext,
                 params = AskBiometryComponent.Params(
-                    bottomSheetVariant = false,
+                    isBottomSheetVariant = false,
                     modelCallbacks = route.modelCallbacks,
                 ),
             )
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt
index c8a1c938fd..c7845cae52 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/entry/impl/ui/OnboardingEntry.kt
@@ -14,8 +14,8 @@ import com.tangem.features.onboarding.v2.entry.impl.routing.OnboardingRoute
 
 @Composable
 internal inline fun OnboardingEntry(
-    modifier: Modifier = Modifier,
     childStack: ChildStack<OnboardingRoute, Any>,
+    modifier: Modifier = Modifier,
     stepperContent: @Composable (Modifier) -> Unit,
 ) {
     Column(
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/backup/ui/MultiWalletBackup.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/backup/ui/MultiWalletBackup.kt
index f82b028c2a..731f1eba98 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/backup/ui/MultiWalletBackup.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/backup/ui/MultiWalletBackup.kt
@@ -44,7 +44,7 @@ fun MultiWalletBackup(state: MultiWalletBackupUM, modifier: Modifier = Modifier)
             dismissButton = if (dialog.cancelText != null && dialog.onCancel != null) {
                 DialogButtonUM(
                     title = dialog.cancelText.resolveReference(),
-                    warning = dialog.warningCancelColor,
+                    isWarning = dialog.warningCancelColor,
                     onClick = dialog.onCancel,
                 )
             } else {
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/createwallet/ui/MultiWalletCreateWallet.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/createwallet/ui/MultiWalletCreateWallet.kt
index 0404814a1f..d687c5ba72 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/createwallet/ui/MultiWalletCreateWallet.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/createwallet/ui/MultiWalletCreateWallet.kt
@@ -7,6 +7,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -19,6 +20,7 @@ import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.test.StoriesScreenTestTags
 import com.tangem.features.onboarding.v2.impl.R
 import com.tangem.features.onboarding.v2.multiwallet.impl.child.createwallet.ui.state.MultiWalletCreateWalletUM
 
@@ -34,7 +36,7 @@ internal fun MultiWalletCreateWallet(state: MultiWalletCreateWalletUM, modifier:
             ),
             dismissButton = DialogButtonUM(
                 title = state.dialog.dismissButtonText.resolveReference(),
-                warning = state.dialog.dismissWarningColor,
+                isWarning = state.dialog.dismissWarningColor,
                 onClick = state.dialog.onDismissButtonClick,
             ),
             onDismissDialog = state.dialog.onDismiss,
@@ -60,7 +62,9 @@ internal fun MultiWalletCreateWallet(state: MultiWalletCreateWalletUM, modifier:
                 style = TangemTheme.typography.h2,
                 color = TangemTheme.colors.text.primary1,
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(top = 16.dp),
+                modifier = Modifier
+                    .padding(top = 16.dp)
+                    .testTag(StoriesScreenTestTags.TITLE),
             )
 
             Text(
@@ -68,7 +72,9 @@ internal fun MultiWalletCreateWallet(state: MultiWalletCreateWalletUM, modifier:
                 style = TangemTheme.typography.body1,
                 color = TangemTheme.colors.text.secondary,
                 textAlign = TextAlign.Center,
-                modifier = Modifier.padding(top = 12.dp),
+                modifier = Modifier
+                    .padding(top = 12.dp)
+                    .testTag(StoriesScreenTestTags.TEXT),
             )
         }
 
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt
index 0fd46b3494..883e831a85 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt
@@ -58,13 +58,17 @@ internal class ImportSeedPhraseUiStateBuilder(
             val text = st.words.text
             val wordsFromText = text.split(" ").filter { it.isNotBlank() }.map { it.trim() }
             val newWords = wordsFromText.dropLast(1) + word
-            val newWordsText = newWords.joinToString(" ")
-            st.copy(
-                words = TextFieldValue(
-                    text = newWordsText,
-                    selection = TextRange(newWordsText.length),
-                ),
+            val newWordsText = newWords.joinToString(" ").plus(" ")
+            val newWordsState = TextFieldValue(
+                text = newWordsText,
+                selection = TextRange(newWordsText.length),
             )
+            st.copy(
+                words = newWordsState,
+            ).also {
+                launchInterceptWords(wordsField = newWordsState)
+                suggestNextWord(newWordsState)
+            }
         }
     }
 
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseImport.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseImport.kt
index 0fc50e414e..8779ab378a 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseImport.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseImport.kt
@@ -46,7 +46,7 @@ internal fun MultiWalletSeedPhraseImport(state: MultiWalletSeedPhraseUM.Import,
             ),
             dismissButton = DialogButtonUM(
                 title = state.dialog.dismissButtonText.resolveReference(),
-                warning = state.dialog.dismissWarningColor,
+                isWarning = state.dialog.dismissWarningColor,
                 onClick = state.dialog.onDismissButtonClick,
             ),
             onDismissDialog = state.dialog.onDismiss,
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseWordsCheck.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseWordsCheck.kt
index dfc2b1cd70..62dffaa3e7 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseWordsCheck.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/ui/MultiWalletSeedPhraseWordsCheck.kt
@@ -45,7 +45,7 @@ internal fun MultiWalletSeedPhraseWordsCheck(
             ),
             dismissButton = DialogButtonUM(
                 title = state.dialog.dismissButtonText.resolveReference(),
-                warning = state.dialog.dismissWarningColor,
+                isWarning = state.dialog.dismissWarningColor,
                 onClick = state.dialog.onDismissButtonClick,
             ),
             onDismissDialog = state.dialog.onDismiss,
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/upgradewallet/ui/MultiWalletUpgradeWallet.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/upgradewallet/ui/MultiWalletUpgradeWallet.kt
index 28ffd8f2f8..1e63f37730 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/upgradewallet/ui/MultiWalletUpgradeWallet.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/upgradewallet/ui/MultiWalletUpgradeWallet.kt
@@ -33,7 +33,7 @@ internal fun MultiWalletUpgradeWallet(state: MultiWalletUpgradeWalletUM, modifie
             ),
             dismissButton = DialogButtonUM(
                 title = state.dialog.dismissButtonText.resolveReference(),
-                warning = state.dialog.dismissWarningColor,
+                isWarning = state.dialog.dismissWarningColor,
                 onClick = state.dialog.onDismissButtonClick,
             ),
             onDismissDialog = state.dialog.onDismiss,
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/accesscode/ui/OnboardingVisaAccessCode.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/accesscode/ui/OnboardingVisaAccessCode.kt
index 67c433d86b..4a0686cae5 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/accesscode/ui/OnboardingVisaAccessCode.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/accesscode/ui/OnboardingVisaAccessCode.kt
@@ -65,7 +65,7 @@ internal fun OnboardingVisaAccessCode(state: OnboardingVisaAccessCodeUM, modifie
                 },
                 onClick = state.onContinue,
                 iconRes = R.drawable.ic_tangem_24,
-                showProgress = state.buttonLoading,
+                shouldShowProgress = state.buttonLoading,
                 isIconVisible = state.step == OnboardingVisaAccessCodeUM.Step.ReEnter,
             ),
         )
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/approve/ui/OnboardingVisaApprove.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/approve/ui/OnboardingVisaApprove.kt
index 106973d0da..ded84b9bbf 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/approve/ui/OnboardingVisaApprove.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/approve/ui/OnboardingVisaApprove.kt
@@ -69,7 +69,7 @@ internal fun OnboardingVisaApprove(state: OnboardingVisaApproveUM, modifier: Mod
                 textReference = resourceReference(R.string.common_approve),
                 iconRes = R.drawable.ic_tangem_24,
                 isIconVisible = true,
-                showProgress = state.approveButtonLoading,
+                shouldShowProgress = state.approveButtonLoading,
                 onClick = state.onApproveClick,
             ),
         )
diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/pincode/ui/OnboardingVisaPinCode.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/pincode/ui/OnboardingVisaPinCode.kt
index 094a37d884..f0d7b4856e 100644
--- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/pincode/ui/OnboardingVisaPinCode.kt
+++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/pincode/ui/OnboardingVisaPinCode.kt
@@ -87,7 +87,7 @@ internal fun OnboardingVisaPinCode(state: OnboardingVisaPinCodeUM, modifier: Mod
             primaryButton = NavigationButton(
                 textReference = resourceReference(R.string.common_submit),
                 onClick = state.onSubmitClick,
-                showProgress = state.submitButtonLoading,
+                shouldShowProgress = state.submitButtonLoading,
                 isEnabled = state.submitButtonEnabled,
             ),
         )
diff --git a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampComponent.kt b/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampComponent.kt
index 3de1a19fb7..66356e9ae5 100644
--- a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampComponent.kt
+++ b/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampComponent.kt
@@ -12,7 +12,7 @@ interface OnrampComponent : ComposableContentComponent {
         val userWalletId: UserWalletId,
         val cryptoCurrency: CryptoCurrency,
         val source: OnrampSource,
-        val launchSepa: Boolean = false,
+        val shouldLaunchSepa: Boolean = false,
     )
 
     interface Factory : ComponentFactory<Params, OnrampComponent>
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/alloffers/ui/PaymentMethodsContent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/alloffers/ui/PaymentMethodsContent.kt
index 49d457c4b2..7c16f78f2e 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/alloffers/ui/PaymentMethodsContent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/alloffers/ui/PaymentMethodsContent.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -25,6 +26,7 @@ import com.tangem.core.ui.components.SpacerW
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.test.SelectPaymentMethodBottomSheetTestTags
 import com.tangem.domain.onramp.model.OnrampPaymentMethod
 import com.tangem.domain.onramp.model.PaymentMethodType
 import com.tangem.features.onramp.alloffers.entity.AllOffersPaymentMethodUM
@@ -74,10 +76,13 @@ private fun PaymentMethod(methodUM: AllOffersPaymentMethodUM, modifier: Modifier
                 end = 12.dp,
                 top = 14.dp,
                 bottom = 12.dp,
-            ),
+            )
+            .testTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD),
     ) {
         PaymentMethodIcon(
-            modifier = Modifier.size(36.dp),
+            modifier = Modifier
+                .size(36.dp)
+                .testTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD_ICON),
             imageUrl = methodUM.methodConfig.method.imageUrl,
         )
 
@@ -111,6 +116,7 @@ private fun PaymentMethodInfoBlock(
             text = paymentMethodName,
             style = TangemTheme.typography.subtitle2,
             color = TangemTheme.colors.text.primary1,
+            modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD_NAME),
         )
         SpacerH(2.dp)
         Row(
@@ -121,12 +127,14 @@ private fun PaymentMethodInfoBlock(
                 text = stringResourceSafe(R.string.onramp_up_to_rate),
                 style = TangemTheme.typography.caption2,
                 color = TangemTheme.colors.text.tertiary,
+                modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.UP_TO_TEXT),
             )
 
             Text(
                 text = rate,
                 style = TangemTheme.typography.subtitle2,
                 color = TangemTheme.colors.text.primary1,
+                modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.TOKEN_AMOUNT),
             )
 
             when {
@@ -134,6 +142,7 @@ private fun PaymentMethodInfoBlock(
                     Image(
                         imageVector = ImageVector.vectorResource(R.drawable.ic_best_rate_12),
                         contentDescription = null,
+                        modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.BEST_RATE_ICON),
                     )
                 }
                 diff != null -> {
@@ -158,7 +167,9 @@ private fun PaymentMethodInfoBlock(
 private fun ProvidersCountBlockInfo(providersCount: Int) {
     BorderedRow {
         Icon(
-            modifier = Modifier.size(10.dp),
+            modifier = Modifier
+                .size(10.dp)
+                .testTag(SelectPaymentMethodBottomSheetTestTags.PROVIDER_COUNT_ICON),
             imageVector = ImageVector.vectorResource(R.drawable.ic_clock_24),
             tint = TangemTheme.colors.icon.informative,
             contentDescription = null,
@@ -172,6 +183,7 @@ private fun ProvidersCountBlockInfo(providersCount: Int) {
             ),
             style = TangemTheme.typography.caption2,
             color = TangemTheme.colors.text.tertiary,
+            modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.PROVIDER_COUNT_TEXT),
         )
     }
 }
@@ -180,7 +192,9 @@ private fun ProvidersCountBlockInfo(providersCount: Int) {
 private fun TimingBlockInfo(speed: PaymentMethodType.PaymentSpeed) {
     BorderedRow {
         Icon(
-            modifier = Modifier.size(10.dp),
+            modifier = Modifier
+                .size(10.dp)
+                .testTag(SelectPaymentMethodBottomSheetTestTags.TIMING_ICON),
             imageVector = ImageVector.vectorResource(R.drawable.ic_staking_24),
             tint = TangemTheme.colors.icon.informative,
             contentDescription = null,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/portfolio/ui/OnrampAddToPortfolioContent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/portfolio/ui/OnrampAddToPortfolioContent.kt
index b507a11e81..db961c1580 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/portfolio/ui/OnrampAddToPortfolioContent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/hottokens/portfolio/ui/OnrampAddToPortfolioContent.kt
@@ -147,7 +147,7 @@ private fun PreviewOnrampAddToPortfolioContent() {
                             fallbackTint = TangemColorPalette.Black,
                             fallbackBackground = TangemColorPalette.Meadow,
                             isGrayscale = false,
-                            showCustomBadge = false,
+                            shouldShowCustomBadge = false,
                         ),
                         addButtonUM = OnrampAddToPortfolioUM.AddButtonUM(
                             isProgress = false,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/OnrampMainComponentUM.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/OnrampMainComponentUM.kt
index ae9041847c..e375c15faf 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/OnrampMainComponentUM.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/OnrampMainComponentUM.kt
@@ -31,7 +31,7 @@ internal sealed interface OnrampMainComponentUM {
             endButtonUM = TopAppBarButtonUM.Icon(
                 iconRes = R.drawable.ic_more_vertical_24,
                 onClicked = openSettings,
-                enabled = false,
+                isEnabled = false,
             ),
         )
 
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
index 09da044da3..02de508683 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt
@@ -39,8 +39,8 @@ internal class OnrampStateFactory(
         val state = currentStateProvider()
 
         val endButton = when (val button = state.topBarConfig.endButtonUM) {
-            is TopAppBarButtonUM.Icon -> button.copy(enabled = true)
-            is TopAppBarButtonUM.Text -> button.copy(enabled = true)
+            is TopAppBarButtonUM.Icon -> button.copy(isEnabled = true)
+            is TopAppBarButtonUM.Text -> button.copy(isEnabled = true)
         }
         return OnrampMainComponentUM.Content(
             topBarConfig = state.topBarConfig.copy(endButtonUM = endButton),
@@ -85,8 +85,8 @@ internal class OnrampStateFactory(
     fun getErrorState(errorCode: String? = null, onRefresh: () -> Unit): OnrampMainComponentUM {
         val state = currentStateProvider()
         val endButton = when (val button = state.topBarConfig.endButtonUM) {
-            is TopAppBarButtonUM.Icon -> button.copy(enabled = true)
-            is TopAppBarButtonUM.Text -> button.copy(enabled = true)
+            is TopAppBarButtonUM.Icon -> button.copy(isEnabled = true)
+            is TopAppBarButtonUM.Text -> button.copy(isEnabled = true)
         }
 
         return when (state) {
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampButtonComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampButtonComponent.kt
index fe7e8c0075..d63b3aa736 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampButtonComponent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampButtonComponent.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -16,7 +15,6 @@ import com.tangem.core.ui.components.PrimaryButton
 import com.tangem.core.ui.extensions.appendColored
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.test.BuyTokenDetailsScreenTestTags
 import com.tangem.features.onramp.impl.R
 import com.tangem.features.onramp.main.entity.OnrampMainComponentUM
 import com.tangem.features.onramp.main.entity.OnrampProviderBlockUM
@@ -79,7 +77,6 @@ private fun OnrampTosText(provider: OnrampProviderBlockUM.Content?) {
                     color = TangemTheme.colors.text.tertiary,
                     textAlign = TextAlign.Center,
                 ),
-                modifier = Modifier.testTag(BuyTokenDetailsScreenTestTags.TOS_BLOCK),
                 onClick = { offset ->
                     clickableAnnotation.getStringAnnotations(
                         tag = TERMS_OF_USE_KEY,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampProviderContent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampProviderContent.kt
index 3693715b68..e13fd96310 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampProviderContent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampProviderContent.kt
@@ -13,14 +13,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import com.tangem.core.ui.extensions.appendSpace
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.test.BuyTokenDetailsScreenTestTags
 import com.tangem.features.onramp.impl.R
 import com.tangem.features.onramp.main.entity.OnrampProviderBlockUM
 import com.tangem.features.onramp.paymentmethod.ui.PaymentMethodIcon
@@ -62,7 +60,6 @@ private fun OnrampProviderBlock(state: OnrampProviderBlockUM.Content, modifier:
                 },
                 color = TangemTheme.colors.text.tertiary,
                 style = TangemTheme.typography.body2,
-                modifier = Modifier.testTag(BuyTokenDetailsScreenTestTags.PROVIDER_TITLE),
             )
             Text(
                 text = buildAnnotatedString {
@@ -72,7 +69,6 @@ private fun OnrampProviderBlock(state: OnrampProviderBlockUM.Content, modifier:
                 },
                 style = TangemTheme.typography.caption2,
                 color = TangemTheme.colors.text.tertiary,
-                modifier = Modifier.testTag(BuyTokenDetailsScreenTestTags.PROVIDER_TEXT),
             )
         }
         AnimatedVisibility(
@@ -112,7 +108,6 @@ private fun OnrampProviderLoading(modifier: Modifier = Modifier) {
             text = stringResourceSafe(id = R.string.express_provider),
             style = TangemTheme.typography.subtitle2,
             color = TangemTheme.colors.text.tertiary,
-            modifier = Modifier.testTag(BuyTokenDetailsScreenTestTags.PROVIDER_LOADING_TITLE),
         )
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -127,7 +122,6 @@ private fun OnrampProviderLoading(modifier: Modifier = Modifier) {
                 text = stringResourceSafe(id = R.string.express_fetch_best_rates),
                 style = TangemTheme.typography.body2,
                 color = TangemTheme.colors.text.tertiary,
-                modifier = Modifier.testTag(BuyTokenDetailsScreenTestTags.PROVIDER_LOADING_TEXT),
             )
         }
     }
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/DefaultOnrampV2MainComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/DefaultOnrampV2MainComponent.kt
index 008cf19772..fe65d540a7 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/DefaultOnrampV2MainComponent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/DefaultOnrampV2MainComponent.kt
@@ -8,6 +8,7 @@ import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import com.arkivanov.decompose.router.slot.childSlot
 import com.arkivanov.decompose.router.slot.dismiss
+import com.arkivanov.essenty.lifecycle.subscribe
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
@@ -32,6 +33,13 @@ internal class DefaultOnrampV2MainComponent @AssistedInject constructor(
 
     private val model: OnrampV2MainComponentModel = getOrCreateModel(params)
 
+    init {
+        lifecycle.subscribe(
+            onStart = model::onStart,
+            onStop = model::onStop,
+        )
+    }
+
     private val bottomSheetSlot = childSlot(
         source = model.bottomSheetNavigation,
         serializer = null,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampOffersStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampOffersStateFactory.kt
index 966893cab7..bb490cc01f 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampOffersStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampOffersStateFactory.kt
@@ -22,7 +22,10 @@ internal class OnrampOffersStateFactory(
         return when (currentState) {
             is OnrampV2MainComponentUM.Content -> {
                 currentState.copy(
-                    offersBlockState = mapOnrampOffersBlockToUM(offers),
+                    offersBlockState = mapOnrampOffersBlockToUM(
+                        offersBlocks = offers,
+                        currentState = currentState,
+                    ),
                 )
             }
             is OnrampV2MainComponentUM.InitialLoading -> {
@@ -31,7 +34,10 @@ internal class OnrampOffersStateFactory(
         }
     }
 
-    private fun mapOnrampOffersBlockToUM(offersBlocks: List<OnrampOffersBlock>): OnrampOffersBlockUM.Content {
+    private fun mapOnrampOffersBlockToUM(
+        offersBlocks: List<OnrampOffersBlock>,
+        currentState: OnrampV2MainComponentUM.Content,
+    ): OnrampOffersBlockUM.Content {
         val allOffersUM = mutableListOf<OnrampOfferUM>()
         offersBlocks.map { block ->
             block.offers.forEach { offer ->
@@ -75,7 +81,7 @@ internal class OnrampOffersStateFactory(
         }
 
         return OnrampOffersBlockUM.Content(
-            isBlockVisible = false,
+            isBlockVisible = currentState.offersBlockState.isBlockVisible,
             recentOffer = allOffersUM.firstOrNull { it.category == OnrampOfferCategoryUM.RecentlyUsed },
             recommended = allOffersUM.filter { it.category == OnrampOfferCategoryUM.Recommended }.toPersistentList(),
             onrampAllOffersButtonConfig = if (offersBlocks.any { it.hasMoreOffers }) {
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2AmountStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2AmountStateFactory.kt
index 0e1dc10b5b..9f08657016 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2AmountStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2AmountStateFactory.kt
@@ -84,7 +84,9 @@ internal class OnrampV2AmountStateFactory(
             amountBlockState = amountState.copy(
                 secondaryFieldModel = OnrampNewAmountSecondaryFieldUM.Loading,
             ),
-            offersBlockState = OnrampOffersBlockUM.Loading(isBlockVisible = false),
+            offersBlockState = OnrampOffersBlockUM.Loading(
+                isBlockVisible = currentState.offersBlockState.isBlockVisible,
+            ),
             continueButtonConfig = currentState.continueButtonConfig.copy(enabled = false),
             errorNotification = null,
             onrampAmountButtonUMState = OnrampV2AmountButtonUMState.None,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2StateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2StateFactory.kt
index e39a2078b2..631c06be7a 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2StateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/entity/factory/OnrampV2StateFactory.kt
@@ -47,7 +47,7 @@ internal class OnrampV2StateFactory(
                 endButtonUM = TopAppBarButtonUM.Icon(
                     iconRes = R.drawable.ic_more_vertical_24,
                     onClicked = openSettings,
-                    enabled = false,
+                    isEnabled = false,
                 ),
             ),
             continueButtonConfig = ContinueButtonUM(
@@ -62,8 +62,8 @@ internal class OnrampV2StateFactory(
         val state = currentStateProvider()
 
         val endButton = when (val button = state.topBarConfig.endButtonUM) {
-            is TopAppBarButtonUM.Icon -> button.copy(enabled = true)
-            is TopAppBarButtonUM.Text -> button.copy(enabled = true)
+            is TopAppBarButtonUM.Icon -> button.copy(isEnabled = true)
+            is TopAppBarButtonUM.Text -> button.copy(isEnabled = true)
         }
 
         val initialAmountBlockState = getInitialAmountBlockState(currency)
@@ -123,8 +123,8 @@ internal class OnrampV2StateFactory(
     fun getErrorState(errorCode: String? = null, onRefresh: () -> Unit): OnrampV2MainComponentUM {
         val state = currentStateProvider()
         val endButton = when (val button = state.topBarConfig.endButtonUM) {
-            is TopAppBarButtonUM.Icon -> button.copy(enabled = true)
-            is TopAppBarButtonUM.Text -> button.copy(enabled = true)
+            is TopAppBarButtonUM.Icon -> button.copy(isEnabled = true)
+            is TopAppBarButtonUM.Text -> button.copy(isEnabled = true)
         }
 
         return when (state) {
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/model/OnrampV2MainComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/model/OnrampV2MainComponentModel.kt
index 834518bbb3..3407fe9696 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/model/OnrampV2MainComponentModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/model/OnrampV2MainComponentModel.kt
@@ -25,8 +25,9 @@ import com.tangem.features.onramp.mainv2.entity.factory.OnrampV2StateFactory
 import com.tangem.features.onramp.utils.sendOnrampErrorEvent
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.PeriodicTask
+import com.tangem.utils.coroutines.SingleTaskScheduler
 import com.tangem.utils.isNullOrZero
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -41,7 +42,7 @@ internal class OnrampV2MainComponentModel @Inject constructor(
     private val getOnrampCountryUseCase: GetOnrampCountryUseCase,
     private val clearOnrampCacheUseCase: ClearOnrampCacheUseCase,
     private val fetchQuotesUseCase: OnrampFetchQuotesUseCase,
-    private val getOnrampQuotesUseCase: GetOnrampQuotesUseCase,
+    private val getOnrampQuotesUseCase: GetOnrampV2QuotesUseCase,
     private val fetchPairsUseCase: OnrampFetchPairsUseCase,
     private val amountInputManager: InputManager,
     private val getOnrampOffersUseCase: GetOnrampOffersUseCase,
@@ -51,8 +52,6 @@ internal class OnrampV2MainComponentModel @Inject constructor(
 
     val params = paramsContainer.require<OnrampV2MainComponent.Params>()
 
-    private var loadQuotesJob: Job? = null
-
     private val lastUpdateState = mutableStateOf<OnrampLastUpdate?>(null)
 
     private val onrampAmountButtonUMStateFactory: OnrampAmountButtonUMStateFactory by lazy(LazyThreadSafetyMode.NONE) {
@@ -88,6 +87,8 @@ internal class OnrampV2MainComponentModel @Inject constructor(
             openSettings = ::openSettings,
         ),
     )
+    private val quotesTaskScheduler = SingleTaskScheduler<Unit>()
+
     val state: StateFlow<OnrampV2MainComponentUM> get() = _state.asStateFlow()
     val bottomSheetNavigation: SlotNavigation<OnrampV2MainBottomSheetConfig> = SlotNavigation()
     val userWallet = getWalletsUseCase.invokeSync().first { it.walletId == params.userWalletId }
@@ -107,7 +108,7 @@ internal class OnrampV2MainComponentModel @Inject constructor(
 
     override fun onDestroy() {
         modelScope.launch { clearOnrampCacheUseCase.invoke() }
-        loadQuotesJob?.cancel()
+        quotesTaskScheduler.cancelTask()
         super.onDestroy()
     }
 
@@ -156,7 +157,6 @@ internal class OnrampV2MainComponentModel @Inject constructor(
                 openSettings = ::openSettings,
             )
         }
-        loadQuotesJob?.cancel()
         modelScope.launch {
             clearOnrampCacheUseCase.invoke()
             checkResidenceCountry()
@@ -170,6 +170,41 @@ internal class OnrampV2MainComponentModel @Inject constructor(
         }
     }
 
+    fun onStart() {
+        quotesTaskScheduler.scheduleTask(
+            scope = modelScope,
+            task = loadQuotesTask(),
+        )
+    }
+
+    fun onStop() {
+        quotesTaskScheduler.cancelTask()
+    }
+
+    private fun startLoadingQuotes() {
+        quotesTaskScheduler.cancelTask()
+        quotesTaskScheduler.scheduleTask(scope = modelScope, task = loadQuotesTask())
+    }
+
+    private fun loadQuotesTask(): PeriodicTask<Unit> {
+        return PeriodicTask(
+            delay = UPDATE_DELAY,
+            task = {
+                runCatching {
+                    val content = state.value as? OnrampV2MainComponentUM.Content ?: return@runCatching
+                    if (content.amountBlockState.amountFieldModel.fiatAmount.value.isNullOrZero()) return@runCatching
+                    fetchQuotesUseCase.invoke(
+                        userWallet = userWallet,
+                        amount = content.amountBlockState.amountFieldModel.fiatAmount,
+                        cryptoCurrency = params.cryptoCurrency,
+                    ).onLeft(::handleOnrampError)
+                }
+            },
+            onSuccess = {},
+            onError = {},
+        )
+    }
+
     private fun checkResidenceCountry() {
         modelScope.launch {
             checkOnrampAvailabilityUseCase(userWallet)
@@ -211,7 +246,7 @@ internal class OnrampV2MainComponentModel @Inject constructor(
             .filter(String::isNotEmpty)
             .collectLatest { _ ->
                 _state.update { amountStateFactory.getAmountSecondaryLoadingState() }
-                loadQuotes()
+                startLoadingQuotes()
             }
     }
 
@@ -302,7 +337,7 @@ internal class OnrampV2MainComponentModel @Inject constructor(
                 ),
             ) ?: it
         }
-        loadQuotes()
+        startLoadingQuotes()
     }
 
     private suspend fun updatePairsAndQuotes() {
@@ -323,22 +358,7 @@ internal class OnrampV2MainComponentModel @Inject constructor(
                 }
             },
         )
-        loadQuotes()
-    }
-
-    private fun loadQuotes() {
-        loadQuotesJob?.cancel()
-        loadQuotesJob = modelScope.launch {
-            runCatching {
-                val content = state.value as? OnrampV2MainComponentUM.Content ?: return@runCatching
-                if (content.amountBlockState.amountFieldModel.fiatAmount.value.isNullOrZero()) return@runCatching
-                fetchQuotesUseCase.invoke(
-                    userWallet = userWallet,
-                    amount = content.amountBlockState.amountFieldModel.fiatAmount,
-                    cryptoCurrency = params.cryptoCurrency,
-                ).onLeft(::handleOnrampError)
-            }
-        }
+        startLoadingQuotes()
     }
 
     private fun handleOnrampError(onrampError: OnrampError) {
@@ -391,4 +411,8 @@ internal class OnrampV2MainComponentModel @Inject constructor(
             ),
         )
     }
+
+    private companion object {
+        const val UPDATE_DELAY = 10_000L
+    }
 }
\ No newline at end of file
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/ui/OnrampOffersContent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/ui/OnrampOffersContent.kt
index 05645f62d0..c39c79a8da 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/ui/OnrampOffersContent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/mainv2/ui/OnrampOffersContent.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -30,6 +31,7 @@ import com.tangem.core.ui.components.buttons.common.TangemButtonSize
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.core.ui.test.OnrampOffersBlockTestTags
 import com.tangem.domain.onramp.model.OnrampPaymentMethod
 import com.tangem.domain.onramp.model.PaymentMethodType
 import com.tangem.features.onramp.impl.R
@@ -156,11 +158,13 @@ private fun OfferHeader(advantage: OnrampOfferAdvantagesUM) {
                     imageVector = ImageVector.vectorResource(R.drawable.ic_best_rate_16),
                     tint = TangemTheme.colors.icon.accent,
                     contentDescription = null,
+                    modifier = Modifier.testTag(OnrampOffersBlockTestTags.BEST_RATE_ICON),
                 )
                 Text(
                     text = stringResourceSafe(R.string.express_provider_best_rate),
                     style = TangemTheme.typography.caption1,
                     color = TangemTheme.colors.icon.accent,
+                    modifier = Modifier.testTag(OnrampOffersBlockTestTags.BEST_RATE_TITLE),
                 )
             }
         }
@@ -194,6 +198,7 @@ private fun RateBlock(rate: String, diff: TextReference?) {
             text = rate,
             style = TangemTheme.typography.subtitle1,
             color = TangemTheme.colors.text.primary1,
+            modifier = Modifier.testTag(OnrampOffersBlockTestTags.OFFER_TOKEN_AMOUNT),
         )
         diff?.let {
             Text(
@@ -215,7 +220,9 @@ private fun RateBlock(rate: String, diff: TextReference?) {
 private fun PaymentBlockInOffer(paymentMethod: OnrampPaymentMethod, providerName: String) {
     Row(verticalAlignment = Alignment.CenterVertically) {
         Icon(
-            modifier = Modifier.size(16.dp),
+            modifier = Modifier
+                .size(16.dp)
+                .testTag(OnrampOffersBlockTestTags.TIMING_ICON),
             imageVector = ImageVector.vectorResource(R.drawable.ic_clock_24),
             tint = TangemTheme.colors.icon.informative,
             contentDescription = null,
@@ -235,6 +242,7 @@ private fun PaymentBlockInOffer(paymentMethod: OnrampPaymentMethod, providerName
             text = providerName,
             style = TangemTheme.typography.caption2,
             color = TangemTheme.colors.text.tertiary,
+            modifier = Modifier.testTag(OnrampOffersBlockTestTags.PROVIDER_NAME),
         )
 
         SpacerWMax()
@@ -243,12 +251,15 @@ private fun PaymentBlockInOffer(paymentMethod: OnrampPaymentMethod, providerName
             text = stringResourceSafe(R.string.onramp_pay_with),
             style = TangemTheme.typography.caption2,
             color = TangemTheme.colors.text.tertiary,
+            modifier = Modifier.testTag(OnrampOffersBlockTestTags.PAY_WITH),
         )
 
         SpacerW(4.dp)
 
         SubcomposeAsyncImage(
-            modifier = Modifier.sizeIn(maxWidth = 38.dp, maxHeight = 16.dp),
+            modifier = Modifier
+                .sizeIn(maxWidth = 38.dp, maxHeight = 16.dp)
+                .testTag(OnrampOffersBlockTestTags.PAYMENT_METHOD_ICON),
             model = ImageRequest.Builder(context = LocalContext.current)
                 .data(paymentMethod.imageUrl)
                 .crossfade(enable = true)
@@ -298,6 +309,7 @@ internal fun TimingBlock(speed: PaymentMethodType.PaymentSpeed) {
         text = timingText,
         style = TangemTheme.typography.caption2,
         color = TangemTheme.colors.text.tertiary,
+        modifier = Modifier.testTag(OnrampOffersBlockTestTags.TIMING_TEXT),
     )
 }
 
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
index ee929788ee..b7e1a4051c 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
@@ -11,13 +11,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.platform.testTag
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.selectedBorder
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.test.SelectPaymentMethodBottomSheetTestTags
 import com.tangem.features.onramp.impl.R
 import com.tangem.features.onramp.paymentmethod.entity.PaymentMethodUM
 import com.tangem.features.onramp.paymentmethod.entity.PaymentMethodsBottomSheetConfig
@@ -51,7 +49,7 @@ private fun SelectPaymentMethodBottomSheetContent(
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(
-        modifier = modifier.testTag(SelectPaymentMethodBottomSheetTestTags.LAZY_LIST),
+        modifier = modifier,
     ) {
         items(
             items = methods,
@@ -90,7 +88,6 @@ private fun PaymentMethodItem(paymentMethod: PaymentMethodUM, isSelected: Boolea
     ) {
         PaymentMethodIcon(
             imageUrl = paymentMethod.imageUrl,
-            modifier = Modifier.testTag(SelectPaymentMethodBottomSheetTestTags.PAYMENT_METHOD_ICON),
         )
         Text(
             text = paymentMethod.name,
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/root/DefaultOnrampComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/root/DefaultOnrampComponent.kt
index b9ff5cb77a..6e28350998 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/root/DefaultOnrampComponent.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/root/DefaultOnrampComponent.kt
@@ -104,7 +104,7 @@ internal class DefaultOnrampComponent @AssistedInject constructor(
                                 ),
                             )
                         },
-                        launchSepa = params.launchSepa,
+                        launchSepa = params.shouldLaunchSepa,
                     ),
                 )
             }
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt
index 18f0ca746d..d62cce58ae 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/swap/availablepairs/model/AvailableSwapPairsModel.kt
@@ -241,8 +241,8 @@ internal class AvailableSwapPairsModel @Inject constructor(
 
     private fun getAppCurrencyAndBalanceHidingFlow(): Flow<Pair<AppCurrency, Boolean>> {
         return combine(
-            flow = getSelectedAppCurrencyUseCase().map { it.getOrElse { AppCurrency.Default } }.distinctUntilChanged(),
-            flow2 = getBalanceHidingSettingsUseCase().map { it.isBalanceHidden }.distinctUntilChanged(),
+            flow = getSelectedAppCurrencyUseCase.invokeOrDefault(),
+            flow2 = getBalanceHidingSettingsUseCase.isBalanceHidden(),
             transform = ::Pair,
         )
     }
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/OnrampOperation.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/OnrampOperation.kt
index dea01060e5..fdeba229d0 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/OnrampOperation.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/tokenlist/entity/OnrampOperation.kt
@@ -9,5 +9,4 @@ internal enum class OnrampOperation {
     BUY,
     SELL,
     SWAP,
-    ;
 }
\ No newline at end of file
diff --git a/features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/analytics/PushNotificationAnalyticEvents.kt b/features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/analytics/PushNotificationAnalyticEvents.kt
index 8ffec6c23c..411fad6ab3 100644
--- a/features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/analytics/PushNotificationAnalyticEvents.kt
+++ b/features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/analytics/PushNotificationAnalyticEvents.kt
@@ -5,7 +5,7 @@ import com.tangem.core.analytics.models.AnalyticsParam
 
 sealed class PushNotificationAnalyticEvents(
     event: String,
-    params: Map<String, String> = mapOf(),
+    params: Map<String, String> = emptyMap(),
 ) : AnalyticsEvent(category = "Push", event = event, params = params) {
 
     data class ButtonAllow(
diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsClickIntents.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsClickIntents.kt
index ad7b69bc71..17ad5e9b9c 100644
--- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsClickIntents.kt
+++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsClickIntents.kt
@@ -3,7 +3,7 @@ package com.tangem.features.pushnotifications.impl.model
 internal interface PushNotificationsClickIntents {
     fun onAllowClick()
 
-    fun onLaterClick()
+    fun onLaterClick(isFromBs: Boolean)
 
     fun onAllowPermission()
 
diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt
index bd3edb7000..4f796a7ad2 100644
--- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt
+++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt
@@ -46,17 +46,18 @@ internal class PushNotificationsModel @Inject constructor(
         modelScope.launch {
             notificationsRepository.setUserAllowToSubscribeOnPushNotifications(true)
         }
-
         analyticHandler.send(PushNotificationAnalyticEvents.ButtonAllow(source))
     }
 
-    override fun onLaterClick() {
+    override fun onLaterClick(isFromBs: Boolean) {
         modelScope.launch {
             notificationsRepository.setUserAllowToSubscribeOnPushNotifications(false)
         }
         analyticHandler.send(PushNotificationAnalyticEvents.ButtonLater(source))
         modelScope.launch {
-            neverRequestPermissionUseCase(PUSH_PERMISSION)
+            if (isFromBs) {
+                neverRequestPermissionUseCase(PUSH_PERMISSION)
+            }
             neverToInitiallyAskPermissionUseCase(PUSH_PERMISSION)
             params.modelCallbacks.onDenySystemPermission()
             if (!params.isBottomSheet) {
diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsBottomSheet.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsBottomSheet.kt
index 07090215d9..c240a0bc72 100644
--- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsBottomSheet.kt
+++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsBottomSheet.kt
@@ -41,7 +41,7 @@ internal fun PushNotificationsBottomSheet(config: TangemBottomSheetConfig, conte
 @Composable
 internal fun PushNotificationsContent(
     onAllowClick: () -> Unit,
-    onLaterClick: () -> Unit,
+    onLaterClick: (isFromBs: Boolean) -> Unit,
     onAllowPermission: () -> Unit,
     onDenyPermission: () -> Unit,
 ) {
@@ -53,20 +53,18 @@ internal fun PushNotificationsContent(
 
     Column(modifier = Modifier.background(TangemTheme.colors.background.primary)) {
         ShowcaseContent(
-            headerIconRes = R.drawable.ic_notifications_unread_24,
+            headerIconRes = R.drawable.ic_notification_56,
             headerText = resourceReference(R.string.user_push_notification_agreement_header),
             showcaseItems = persistentListOf(
                 ShowcaseItemModel(
-                    R.drawable.ic_rocket_launch_24,
-                    resourceReference(R.string.user_push_notification_agreement_argument_one),
+                    iconRes = R.drawable.ic_notification_square_24,
+                    title = resourceReference(R.string.user_push_notification_agreement_argument_one_title),
+                    subTitle = resourceReference(R.string.user_push_notification_agreement_argument_one_subtitle),
                 ),
                 ShowcaseItemModel(
-                    R.drawable.ic_storefront_24,
-                    resourceReference(R.string.user_push_notification_agreement_argument_two),
-                ),
-                ShowcaseItemModel(
-                    R.drawable.ic_notifications_24,
-                    resourceReference(R.string.user_push_notification_agreement_argument_three),
+                    iconRes = R.drawable.ic_stars_24,
+                    title = resourceReference(R.string.user_push_notification_agreement_argument_two_title),
+                    subTitle = resourceReference(R.string.user_push_notification_agreement_argument_two_subtitle),
                 ),
             ),
             modifier = Modifier.padding(top = TangemTheme.dimens.spacing40),
@@ -80,7 +78,7 @@ internal fun PushNotificationsContent(
             },
             secondaryButtonText = resourceReference(R.string.common_later),
             onSecondaryClick = {
-                onLaterClick()
+                onLaterClick(true)
             },
         )
     }
diff --git a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt
index 81ec2b2743..9129169337 100644
--- a/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt
+++ b/features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/presentation/ui/PushNotificationsScreen.kt
@@ -15,7 +15,7 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 internal fun PushNotificationsScreen(
     onAllowClick: () -> Unit,
-    onLaterClick: () -> Unit,
+    onLaterClick: (isFromBs: Boolean) -> Unit,
     onAllowPermission: () -> Unit,
     onDenyPermission: () -> Unit,
 ) {
@@ -26,20 +26,18 @@ internal fun PushNotificationsScreen(
     )
 
     Showcase(
-        headerIconRes = R.drawable.ic_notifications_unread_24,
+        headerIconRes = R.drawable.ic_notification_56,
         headerText = resourceReference(R.string.user_push_notification_agreement_header),
         showcaseItems = persistentListOf(
             ShowcaseItemModel(
-                R.drawable.ic_rocket_launch_24,
-                resourceReference(R.string.user_push_notification_agreement_argument_one),
+                iconRes = R.drawable.ic_notification_square_24,
+                title = resourceReference(R.string.user_push_notification_agreement_argument_one_title),
+                subTitle = resourceReference(R.string.user_push_notification_agreement_argument_one_subtitle),
             ),
             ShowcaseItemModel(
-                R.drawable.ic_storefront_24,
-                resourceReference(R.string.user_push_notification_agreement_argument_two),
-            ),
-            ShowcaseItemModel(
-                R.drawable.ic_notifications_24,
-                resourceReference(R.string.user_push_notification_agreement_argument_three),
+                iconRes = R.drawable.ic_stars_24,
+                title = resourceReference(R.string.user_push_notification_agreement_argument_two_title),
+                subTitle = resourceReference(R.string.user_push_notification_agreement_argument_two_subtitle),
             ),
         ),
         primaryButton = ShowcaseButtonModel(
@@ -52,7 +50,7 @@ internal fun PushNotificationsScreen(
         secondaryButton = ShowcaseButtonModel(
             buttonText = resourceReference(R.string.common_later),
             onClick = {
-                onLaterClick()
+                onLaterClick(false)
             },
         ),
         modifier = Modifier.systemBarsPadding(),
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractor.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractor.kt
index 2b752a2c1d..a673964cf8 100644
--- a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractor.kt
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractor.kt
@@ -1,11 +1,16 @@
 package com.tangem.feature.referral.domain
 
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.feature.referral.domain.models.ReferralData
+import com.tangem.feature.referral.domain.models.TokenData
 
 interface ReferralInteractor {
 
     suspend fun getReferralStatus(userWalletId: UserWalletId): ReferralData
 
-    suspend fun startReferral(userWalletId: UserWalletId): ReferralData
+    suspend fun startReferral(portfolioId: PortfolioId): ReferralData
+
+    suspend fun getCryptoCurrency(userWalletId: UserWalletId, tokenData: TokenData): CryptoCurrency?
 }
\ No newline at end of file
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
index 9520d1847e..0e24966a47 100644
--- a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
@@ -2,9 +2,11 @@ package com.tangem.feature.referral.domain
 
 import arrow.core.getOrElse
 import com.tangem.common.core.TangemSdkError
-import com.tangem.domain.wallets.usecase.DerivePublicKeysUseCase
-import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.tokens.AddCryptoCurrenciesUseCase
+import com.tangem.domain.wallets.usecase.DerivePublicKeysUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.referral.domain.errors.ReferralError
 import com.tangem.feature.referral.domain.models.ReferralData
@@ -31,10 +33,11 @@ internal class ReferralInteractorImpl(
         return referralData
     }
 
-    override suspend fun startReferral(userWalletId: UserWalletId): ReferralData {
+    override suspend fun startReferral(portfolioId: PortfolioId): ReferralData {
         if (tokensForReferral.isEmpty()) error("Tokens for ref is empty")
 
         val tokenData = tokensForReferral.first()
+        val userWalletId = portfolioId.userWalletId
         val userWallet = getUserWalletUseCase(userWalletId).getOrElse {
             error("Failed to get user wallet $userWalletId: $it")
         }
@@ -42,20 +45,27 @@ internal class ReferralInteractorImpl(
         val cryptoCurrency = repository.getCryptoCurrency(userWalletId = userWallet.walletId, tokenData = tokenData)
             ?: error("Failed to create crypto currency")
 
+        // todo account different for account?
         derivePublicKeysUseCase(userWallet.walletId, listOfNotNull(cryptoCurrency)).getOrElse {
             Timber.e("Failed to derive public keys: $it")
             throw it.mapToDomainError()
         }
 
-        addCryptoCurrenciesUseCase(
-            userWalletId = userWallet.walletId,
-            currency = cryptoCurrency,
-        )
+        when (portfolioId) {
+            is PortfolioId.Account -> TODO("account")
+            is PortfolioId.Wallet -> addCryptoCurrenciesUseCase(
+                userWalletId = userWallet.walletId,
+                currency = cryptoCurrency,
+            )
+        }
 
-        val publicAddress = userWalletManager.getWalletAddress(
-            networkId = tokenData.networkId,
-            derivationPath = cryptoCurrency.network.derivationPath.value,
-        )
+        val publicAddress = when (portfolioId) {
+            is PortfolioId.Account -> TODO("account")
+            is PortfolioId.Wallet -> userWalletManager.getWalletAddress(
+                networkId = tokenData.networkId,
+                derivationPath = cryptoCurrency.network.derivationPath.value,
+            )
+        }
 
         return repository.startReferral(
             walletId = userWalletManager.getWalletId(),
@@ -65,6 +75,9 @@ internal class ReferralInteractorImpl(
         )
     }
 
+    override suspend fun getCryptoCurrency(userWalletId: UserWalletId, tokenData: TokenData): CryptoCurrency? =
+        repository.getCryptoCurrency(userWalletId = userWalletId, tokenData = tokenData)
+
     private fun saveReferralTokens(tokens: List<TokenData>) {
         tokensForReferral.clear()
         tokensForReferral.addAll(tokens)
diff --git a/features/referral/impl/build.gradle.kts b/features/referral/impl/build.gradle.kts
index 13e30dd409..1ced33e61d 100644
--- a/features/referral/impl/build.gradle.kts
+++ b/features/referral/impl/build.gradle.kts
@@ -13,6 +13,7 @@ android {
 dependencies {
     /** Api */
     api(projects.features.referral.api)
+    api(projects.features.account.api)
 
     /** Core modules */
     implementation(projects.core.analytics)
@@ -44,10 +45,18 @@ dependencies {
     implementation(projects.domain.card)
     implementation(projects.domain.wallets.models)
     implementation(projects.domain.notifications.models)
+    implementation(projects.domain.account.status)
+    implementation(projects.domain.account)
+    implementation(projects.domain.balanceHiding)
+    implementation(projects.domain.balanceHiding.models)
+    implementation(projects.domain.appCurrency)
+    implementation(projects.domain.appCurrency.models)
     implementation(projects.features.referral.domain)
 
     /** Other libraries */
     implementation(deps.compose.shimmer)
+    implementation(deps.kotlin.immutable.collections)
+    implementation(deps.decompose.ext.compose)
     implementation(deps.compose.accompanist.systemUiController)
     implementation(deps.timber)
 
diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt
index f30cefaab8..bb045bb975 100644
--- a/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt
+++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/DefaultReferralComponent.kt
@@ -1,28 +1,55 @@
 package com.tangem.feature.referral
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import com.arkivanov.decompose.ComponentContext
+import com.arkivanov.decompose.extensions.compose.subscribeAsState
+import com.arkivanov.decompose.router.slot.childSlot
+import com.arkivanov.decompose.router.slot.dismiss
 import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.feature.referral.api.ReferralComponent
 import com.tangem.feature.referral.model.ReferralModel
 import com.tangem.feature.referral.ui.ReferralScreen
+import com.tangem.features.account.PortfolioSelectorComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 
 class DefaultReferralComponent @AssistedInject constructor(
+    private val portfolioSelectorComponentFactory: PortfolioSelectorComponent.Factory,
     @Assisted appComponentContext: AppComponentContext,
     @Assisted params: ReferralComponent.Params,
 ) : ReferralComponent, AppComponentContext by appComponentContext {
 
     private val model: ReferralModel = getOrCreateModel(params)
+    private val bottomSheetSlot = childSlot(
+        source = model.bottomSheetNavigation,
+        serializer = null,
+        handleBackButton = false,
+        childFactory = { configuration, context -> bottomSheetChild(context) },
+    )
 
     @Composable
     override fun Content(modifier: Modifier) {
+        val bottomSheet by bottomSheetSlot.subscribeAsState()
         ReferralScreen(stateHolder = model.uiState)
+        bottomSheet.child?.instance?.BottomSheet()
     }
 
+    private fun bottomSheetChild(componentContext: ComponentContext): ComposableBottomSheetComponent =
+        portfolioSelectorComponentFactory.create(
+            context = childByContext(componentContext),
+            params = PortfolioSelectorComponent.Params(
+                portfolioFetcher = model.portfolioFetcher,
+                controller = model.portfolioSelectorController,
+                onDismiss = model.bottomSheetNavigation::dismiss,
+            ),
+        )
+
     @AssistedFactory
     interface Factory : ReferralComponent.Factory {
         override fun create(context: AppComponentContext, params: ReferralComponent.Params): DefaultReferralComponent
diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/model/AccountAwardConverter.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/AccountAwardConverter.kt
new file mode 100644
index 0000000000..1bcaa44999
--- /dev/null
+++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/AccountAwardConverter.kt
@@ -0,0 +1,66 @@
+package com.tangem.feature.referral.model
+
+import com.tangem.common.ui.account.toUM
+import com.tangem.common.ui.tokens.TokenItemStateConverter.Companion.getFormattedCryptoAmount
+import com.tangem.common.ui.tokens.TokenItemStateConverter.Companion.getFormattedFiatAmount
+import com.tangem.common.ui.tokens.TokenItemStateConverter.Companion.isFlickering
+import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.feature.referral.models.ReferralStateHolder.AccountAward
+import com.tangem.utils.converter.Converter
+
+internal class AccountAwardConverter(
+    private val isBalanceHidden: Boolean,
+    private val appCurrency: AppCurrency,
+    private val awardCryptoCurrency: CryptoCurrency,
+    private val accountAwardToken: CryptoCurrencyStatus?,
+    private val cryptoPortfolio: AccountStatus.CryptoPortfolio,
+    private val onAccountClick: () -> Unit,
+) : Converter<Unit, AccountAward> {
+
+    override fun convert(value: Unit): AccountAward {
+        val tokenState = if (accountAwardToken != null) {
+            val currency = accountAwardToken.currency
+            TokenItemState.Content(
+                id = currency.id.value,
+                iconState = CryptoCurrencyToIconStateConverter().convert(currency),
+                titleState = TokenItemState.TitleState.Content(stringReference(currency.name)),
+                fiatAmountState = TokenItemState.FiatAmountState.Content(
+                    text = accountAwardToken.getFormattedFiatAmount(appCurrency = appCurrency),
+                ),
+                subtitle2State = TokenItemState.Subtitle2State.TextContent(
+                    text = accountAwardToken.getFormattedCryptoAmount(),
+                    isFlickering = accountAwardToken.value.isFlickering(),
+                ),
+                subtitleState = TokenItemState.SubtitleState.TextContent(stringReference(currency.symbol)),
+                onItemClick = null,
+                onItemLongClick = null,
+            )
+        } else {
+            val currency = awardCryptoCurrency
+            TokenItemState.Content(
+                id = currency.id.value,
+                iconState = CryptoCurrencyToIconStateConverter().convert(currency),
+                titleState = TokenItemState.TitleState.Content(stringReference(currency.name)),
+                fiatAmountState = TokenItemState.FiatAmountState.Content(text = ""),
+                subtitle2State = TokenItemState.Subtitle2State.TextContent(text = ""),
+                subtitleState = TokenItemState.SubtitleState.TextContent(stringReference(currency.symbol)),
+                onItemClick = null,
+                onItemLongClick = null,
+            )
+        }
+
+        return AccountAward(
+            accountName = cryptoPortfolio.account.accountName.toUM().value,
+            accountIcon = cryptoPortfolio.account.icon.toUM(),
+            onAccountClick = onAccountClick,
+            isBalanceHidden = isBalanceHidden,
+            tokenState = tokenState,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt
index 91384054bc..b795448a1f 100644
--- a/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt
+++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/model/ReferralModel.kt
@@ -4,6 +4,9 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import arrow.core.getOrElse
+import com.arkivanov.decompose.router.slot.SlotNavigation
+import com.arkivanov.decompose.router.slot.activate
 import com.tangem.common.routing.AppRouter
 import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.analytics.api.AnalyticsEventHandler
@@ -12,8 +15,20 @@ import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.navigation.share.ShareManager
 import com.tangem.core.navigation.url.UrlOpener
+import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.model.AccountCryptoCurrency
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.account.status.usecase.GetAccountCurrencyByAddressUseCase
+import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.demo.IsDemoCardUseCase
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.feature.referral.analytics.ReferralEvents
 import com.tangem.feature.referral.api.ReferralComponent
@@ -24,9 +39,11 @@ import com.tangem.feature.referral.domain.models.ReferralData
 import com.tangem.feature.referral.domain.models.ReferralInfo
 import com.tangem.feature.referral.models.DemoModeException
 import com.tangem.feature.referral.models.ReferralStateHolder
-import com.tangem.feature.referral.models.ReferralStateHolder.ErrorSnackbar
-import com.tangem.feature.referral.models.ReferralStateHolder.ReferralInfoState
+import com.tangem.feature.referral.models.ReferralStateHolder.*
+import com.tangem.features.account.PortfolioFetcher
+import com.tangem.features.account.PortfolioSelectorController
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -42,21 +59,83 @@ internal class ReferralModel @Inject constructor(
     private val urlOpener: UrlOpener,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val isDemoCardUseCase: IsDemoCardUseCase,
+    private val accountsFeatureToggles: AccountsFeatureToggles,
+    private val portfolioFetcherFactory: PortfolioFetcher.Factory,
+    val portfolioSelectorController: PortfolioSelectorController,
+    private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
+    private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
+    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val getAccountCurrencyByAddressUseCase: GetAccountCurrencyByAddressUseCase,
     private val appRouter: AppRouter,
 ) : Model() {
 
     private val params = paramsContainer.require<ReferralComponent.Params>()
+    val bottomSheetNavigation: SlotNavigation<Unit> = SlotNavigation()
+    val portfolioFetcher: PortfolioFetcher by lazy {
+        portfolioFetcherFactory.create(
+            mode = PortfolioFetcher.Mode.Wallet(params.userWalletId),
+            scope = modelScope,
+        )
+    }
 
-    private var lastReferralData: ReferralData? = null
+    private var referralData: MutableStateFlow<ReferralData?> = MutableStateFlow(null)
+    private val lastReferralData get() = referralData.value
 
     var uiState: ReferralStateHolder by mutableStateOf(createInitiallyUiState())
         private set
 
     init {
         analyticsEventHandler.send(ReferralEvents.ReferralScreenOpened)
+        if (accountsFeatureToggles.isFeatureEnabled) {
+            combine(
+                flow = referralData.filterNotNull().onEach(::selectAccount),
+                flow2 = portfolioSelectorController.isAccountMode,
+                transform = { referralData, isAccountMode -> referralData to isAccountMode },
+            ).transformLatest { (referralData, isAccountMode) ->
+                when (isAccountMode) {
+                    false -> showContent(referralData)
+                    true -> combineAccountUI(referralData)
+                        .map { referralData to it }
+                        .collect(::emit)
+                }
+            }
+                .onEach { (referralData, accountAward) -> showContent(referralData, accountAward) }
+                .launchIn(modelScope)
+        } else {
+            referralData.filterNotNull()
+                .onEach(::showContent)
+                .launchIn(modelScope)
+        }
         loadReferralData()
     }
 
+    private fun combineAccountUI(referralData: ReferralData): Flow<AccountAward?> = combine(
+        flow = portfolioSelectorController.selectedAccountWithData(portfolioFetcher),
+        flow2 = getBalanceHidingSettingsFlow(),
+        flow3 = appCurrencyFlow(),
+    ) { a, b, c -> Triple(a, b, c) }.mapLatest { triple ->
+        val (_, selectedAccount) = triple.first ?: return@mapLatest null
+        val isBalanceHidden = triple.second
+        val appCurrency: AppCurrency = triple.third
+        val awardCryptoCurrency = referralInteractor.getCryptoCurrency(
+            userWalletId = params.userWalletId,
+            tokenData = referralData.getToken(),
+        ) ?: return@mapLatest null
+        val cryptoPortfolio = when (selectedAccount) {
+            is AccountStatus.CryptoPortfolio -> selectedAccount
+        }
+        val accountAwardToken = cryptoPortfolio.tokenList.flattenCurrencies()
+            .find { it.currency.id == awardCryptoCurrency.id }
+        return@mapLatest AccountAwardConverter(
+            isBalanceHidden = isBalanceHidden,
+            awardCryptoCurrency = awardCryptoCurrency,
+            accountAwardToken = accountAwardToken,
+            cryptoPortfolio = cryptoPortfolio,
+            appCurrency = appCurrency,
+            onAccountClick = { bottomSheetNavigation.activate(Unit) },
+        ).convert(Unit)
+    }
+
     private fun createInitiallyUiState() = ReferralStateHolder(
         headerState = ReferralStateHolder.HeaderState(
             onBackClicked = appRouter::pop,
@@ -75,10 +154,9 @@ internal class ReferralModel @Inject constructor(
         modelScope.launch {
             runCatching {
                 referralInteractor.getReferralStatus(params.userWalletId).apply {
-                    lastReferralData = this
+                    referralData.value = this
                 }
             }
-                .onSuccess(::showContent)
                 .onFailure(::showErrorSnackbar)
         }
     }
@@ -92,16 +170,19 @@ internal class ReferralModel @Inject constructor(
             analyticsEventHandler.send(ReferralEvents.ClickParticipate)
             uiState = uiState.copy(referralInfoState = ReferralInfoState.Loading)
             modelScope.launch {
-                runCatching { referralInteractor.startReferral(params.userWalletId) }
+                val lastInfoState = uiState.referralInfoState
+                val portfolioId = when (accountsFeatureToggles.isFeatureEnabled) {
+                    true -> PortfolioId(requireNotNull(portfolioSelectorController.selectedAccount.value))
+                    false -> PortfolioId(params.userWalletId)
+                }
+                runCatching { referralInteractor.startReferral(portfolioId) }
                     .onSuccess {
                         analyticsEventHandler.send(ReferralEvents.ParticipateSuccessful)
-                        showContent(it)
+                        referralData.value = it
                     }
                     .onFailure { throwable ->
                         if (throwable is ReferralError.UserCancelledException) {
-                            lastReferralData?.let { referralData ->
-                                showContent(referralData)
-                            }
+                            uiState = uiState.copy(referralInfoState = lastInfoState)
                         } else {
                             showErrorSnackbar(throwable)
                         }
@@ -110,8 +191,8 @@ internal class ReferralModel @Inject constructor(
         }
     }
 
-    private fun showContent(referralData: ReferralData) {
-        uiState = uiState.copy(referralInfoState = referralData.convertToReferralInfoState())
+    private fun showContent(referralData: ReferralData, accountAward: AccountAward? = null) {
+        uiState = uiState.copy(referralInfoState = referralData.convertToReferralInfoState(accountAward))
     }
 
     private fun showErrorSnackbar(throwable: Throwable) {
@@ -136,7 +217,7 @@ internal class ReferralModel @Inject constructor(
         shareManager.shareText(text = text)
     }
 
-    private fun ReferralData.convertToReferralInfoState(): ReferralInfoState = when (this) {
+    private fun ReferralData.convertToReferralInfoState(accountAward: AccountAward?): ReferralInfoState = when (this) {
         is ReferralData.ParticipantData -> ReferralInfoState.ParticipantContent(
             award = getAwardValue(),
             networkName = getNetworkName(),
@@ -147,6 +228,7 @@ internal class ReferralModel @Inject constructor(
             shareLink = referral.shareLink,
             url = tosLink,
             expectedAwards = expectedAwards,
+            accountAward = accountAward,
         )
         is ReferralData.NonParticipantData -> {
             val userWallet = getUserWalletUseCase(params.userWalletId).getOrNull() ?: error("User wallet not found")
@@ -158,6 +240,7 @@ internal class ReferralModel @Inject constructor(
                 url = tosLink,
                 onParticipateClicked = ::participate,
                 participateButtonIcon = walletInterationIcon(userWallet),
+                accountAward = accountAward,
             )
         }
     }
@@ -166,6 +249,39 @@ internal class ReferralModel @Inject constructor(
 
     private fun ReferralData.getNetworkName(): String = getToken().networkId.replaceFirstChar(Char::uppercase)
 
+    private fun walletAccounts(walletId: UserWalletId): Flow<AccountStatusList> = singleAccountStatusListSupplier(
+        SingleAccountStatusListProducer.Params(walletId),
+    )
+
+    private suspend fun findAccountByAddress(address: String): AccountCryptoCurrency? {
+        return getAccountCurrencyByAddressUseCase(address).getOrNull()
+    }
+
+    private suspend fun selectAccount(referralData: ReferralData) {
+        when (referralData) {
+            is ReferralData.NonParticipantData -> if (portfolioSelectorController.selectedAccount.value == null) {
+                portfolioSelectorController.selectAccount(
+                    accountId = walletAccounts(params.userWalletId).first().mainAccount.account.accountId,
+                )
+            }
+            is ReferralData.ParticipantData -> portfolioSelectorController.selectAccount(
+                accountId = findAccountByAddress(referralData.referral.address)?.account?.accountId,
+            )
+        }
+    }
+
+    private fun getBalanceHidingSettingsFlow(): Flow<Boolean> {
+        return getBalanceHidingSettingsUseCase()
+            .map { it.isBalanceHidden }
+            .distinctUntilChanged()
+    }
+
+    private fun appCurrencyFlow(): Flow<AppCurrency> {
+        return getSelectedAppCurrencyUseCase()
+            .map { it.getOrElse { AppCurrency.Default } }
+            .distinctUntilChanged()
+    }
+
     @Suppress("MagicNumber")
     private fun ReferralInfo.getAddressValue(): String {
         check(address.length > 5) { "Invalid address" }
diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
index 3631e0c996..616e7715ab 100644
--- a/features/referral/impl/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
+++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
@@ -1,6 +1,9 @@
 package com.tangem.feature.referral.models
 
 import androidx.annotation.DrawableRes
+import com.tangem.common.ui.account.CryptoPortfolioIconUM
+import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.feature.referral.domain.models.ExpectedAwards
 
 internal data class ReferralStateHolder(
@@ -17,6 +20,7 @@ internal data class ReferralStateHolder(
         val networkName: String
         val discount: String
         val url: String
+        val accountAward: AccountAward?
     }
 
     sealed interface ReferralInfoState {
@@ -29,6 +33,7 @@ internal data class ReferralStateHolder(
             val code: String,
             val shareLink: String,
             override val url: String,
+            override val accountAward: AccountAward? = null,
             val expectedAwards: ExpectedAwards?,
         ) : ReferralInfoState, ReferralInfoContentState
 
@@ -37,6 +42,7 @@ internal data class ReferralStateHolder(
             override val networkName: String,
             override val discount: String,
             override val url: String,
+            override val accountAward: AccountAward? = null,
             @DrawableRes val participateButtonIcon: Int?,
             val onParticipateClicked: () -> Unit,
         ) : ReferralInfoState, ReferralInfoContentState
@@ -54,4 +60,12 @@ internal data class ReferralStateHolder(
         val onCopyClicked: () -> Unit,
         val onShareClicked: (String) -> Unit,
     )
+
+    data class AccountAward(
+        val tokenState: TokenItemState,
+        val isBalanceHidden: Boolean,
+        val accountName: TextReference,
+        val accountIcon: CryptoPortfolioIconUM,
+        val onAccountClick: () -> Unit,
+    )
 }
\ No newline at end of file
diff --git a/features/referral/impl/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt b/features/referral/impl/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
index fcda66f563..3c1f14d3fc 100644
--- a/features/referral/impl/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
+++ b/features/referral/impl/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
@@ -22,17 +22,29 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.tangem.common.ui.account.AccountIcon
+import com.tangem.common.ui.account.AccountIconPreviewData
 import com.tangem.core.res.getStringSafe
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.components.SpacerH24
 import com.tangem.core.ui.components.SpacerH32
+import com.tangem.core.ui.components.account.AccountIconSize
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.snackbar.CopiedTextSnackbar
 import com.tangem.core.ui.components.snackbar.TangemSnackbar
+import com.tangem.core.ui.components.token.TokenItem
+import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.components.token.state.TokenItemState.FiatAmountState
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.ReferralProgramScreenTestTags
@@ -43,6 +55,7 @@ import com.tangem.feature.referral.models.ReferralStateHolder
 import com.tangem.feature.referral.models.ReferralStateHolder.*
 import com.tangem.feature.referral.presentation.R
 import kotlinx.coroutines.launch
+import java.util.UUID
 
 /**
  * Referral program screen for participant and non-participant
@@ -179,7 +192,13 @@ private fun ReferralInfo(
 
         is ReferralInfoState.NonParticipantContent -> {
             Conditions(state = state)
-            Spacer(modifier = Modifier.height(TangemTheme.dimens.spacing44))
+            if (state.accountAward != null) {
+                SpacerH16()
+                NonParticipateAccountAwardBlock(state.accountAward)
+                SpacerH24()
+            } else {
+                Spacer(modifier = Modifier.height(TangemTheme.dimens.spacing44))
+            }
             NonParticipateBottomBlock(
                 onAgreementClick = onAgreementClick,
                 onParticipateClick = state.onParticipateClicked,
@@ -366,6 +385,80 @@ private fun ShimmerInfo() {
     }
 }
 
+@Composable
+private fun NonParticipateAccountAwardBlock(accountAward: AccountAward) {
+    Column(
+        modifier = Modifier
+            .padding(horizontal = TangemTheme.dimens.spacing16)
+            .background(
+                color = TangemTheme.colors.background.primary,
+                shape = RoundedCornerShape(TangemTheme.dimens.spacing16),
+            ),
+    ) {
+        Text(
+            modifier = Modifier.padding(
+                start = TangemTheme.dimens.spacing16,
+                end = TangemTheme.dimens.spacing16,
+                top = TangemTheme.dimens.spacing12,
+            ),
+            text = stringResourceSafe(R.string.referral_address_for_rewards),
+            style = TangemTheme.typography.subtitle2,
+            color = TangemTheme.colors.text.tertiary,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+        )
+
+        TokenItem(
+            state = accountAward.tokenState,
+            isBalanceHidden = accountAward.isBalanceHidden,
+        )
+
+        HorizontalDivider(
+            thickness = 0.5.dp,
+            color = TangemTheme.colors.stroke.primary,
+            modifier = Modifier.padding(horizontal = 12.dp),
+        )
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(TangemTheme.dimens.spacing12),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(
+                modifier = Modifier.weight(1f),
+                text = stringResourceSafe(R.string.account_details_title),
+                style = TangemTheme.typography.body1,
+                color = TangemTheme.colors.text.primary1,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            AccountIcon(
+                name = accountAward.accountName,
+                icon = accountAward.accountIcon,
+                size = AccountIconSize.Small,
+            )
+
+            Text(
+                modifier = Modifier.padding(horizontal = 4.dp),
+                text = accountAward.accountName.resolveReference(),
+                style = TangemTheme.typography.body1,
+                color = TangemTheme.colors.text.primary1,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Icon(
+                modifier = Modifier.size(width = 18.dp, height = 24.dp),
+                painter = painterResource(id = R.drawable.ic_select_18_24),
+                contentDescription = null,
+                tint = TangemTheme.colors.icon.informative,
+            )
+        }
+    }
+}
+
 private fun Resources.getMessageForErrorSnackbar(throwable: Throwable): String {
     return when {
         throwable is DemoModeException -> getStringSafe(R.string.alert_demo_feature_disabled)
@@ -479,6 +572,60 @@ private fun Preview_ReferralScreen_NonParticipant() {
     }
 }
 
+@Preview(widthDp = 360, showBackground = true)
+@Preview(widthDp = 360, showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun Preview_ReferralScreen_NonParticipantAccount() {
+    TangemThemePreview {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.NonParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    discount = "10%",
+                    url = "",
+                    onParticipateClicked = {},
+                    participateButtonIcon = R.drawable.ic_tangem_24,
+                    accountAward = AccountAward(
+                        onAccountClick = {},
+                        accountIcon = AccountIconPreviewData.randomAccountIcon(),
+                        accountName = stringReference("Main Account"),
+                        isBalanceHidden = false,
+                        tokenState = TokenItemState.Content(
+                            id = UUID.randomUUID().toString(),
+                            iconState = CurrencyIconState.TokenIcon(
+                                url = null,
+                                topBadgeIconResId = R.drawable.img_tron_22,
+                                fallbackTint = TangemColorPalette.Black,
+                                fallbackBackground = TangemColorPalette.Meadow,
+                                isGrayscale = false,
+                                shouldShowCustomBadge = false,
+                            ),
+                            titleState = TokenItemState.TitleState.Content(
+                                text = stringReference(value = "Tether"),
+                            ),
+                            fiatAmountState = FiatAmountState.Content(
+                                text = "129,65 $",
+                            ),
+                            subtitle2State = TokenItemState.Subtitle2State.TextContent(text = "129,65 USDT"),
+                            subtitleState = TokenItemState.SubtitleState.TextContent(value = stringReference("USDT")),
+                            onItemClick = {},
+                            onItemLongClick = {},
+                        ),
+                    ),
+                ),
+                errorSnackbar = null,
+                analytics = Analytics(
+                    onAgreementClicked = {},
+                    onCopyClicked = {},
+                    onShareClicked = {},
+                ),
+            ),
+        )
+    }
+}
+
 @Preview(widthDp = 360, showBackground = true)
 @Preview(widthDp = 360, showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/SendFeatureToggles.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/SendFeatureToggles.kt
index 294674ae19..4dbf452662 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/SendFeatureToggles.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/SendFeatureToggles.kt
@@ -1,8 +1,3 @@
 package com.tangem.features.send.v2.api
 
-interface SendFeatureToggles {
-
-    val isSendRedesignEnabled: Boolean
-    val isNFTSendRedesignEnabled: Boolean
-    val isSendWithSwapEnabled: Boolean
-}
\ No newline at end of file
+interface SendFeatureToggles
\ No newline at end of file
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/analytics/CommonSendAnalyticEvents.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/analytics/CommonSendAnalyticEvents.kt
index 00230df78d..799c657659 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/analytics/CommonSendAnalyticEvents.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/analytics/CommonSendAnalyticEvents.kt
@@ -18,22 +18,50 @@ sealed class CommonSendAnalyticEvents(
     /** Recipient address screen opened */
     data class AddressScreenOpened(
         val categoryName: String,
-    ) : CommonSendAnalyticEvents(category = categoryName, event = "Address Screen Opened")
+        val source: CommonSendSource,
+    ) : CommonSendAnalyticEvents(
+        category = categoryName,
+        event = "Address Screen Opened",
+        params = mapOf(
+            SOURCE to source.analyticsName,
+        ),
+    )
 
     /** Amount screen opened */
     data class AmountScreenOpened(
         val categoryName: String,
-    ) : CommonSendAnalyticEvents(category = categoryName, event = "Amount Screen Opened")
+        val source: CommonSendSource,
+    ) : CommonSendAnalyticEvents(
+        category = categoryName,
+        event = "Amount Screen Opened",
+        params = mapOf(
+            SOURCE to source.analyticsName,
+        ),
+    )
 
     /** Fee screen opened */
     data class FeeScreenOpened(
         val categoryName: String,
-    ) : CommonSendAnalyticEvents(category = categoryName, event = "Fee Screen Opened")
+        val source: CommonSendSource,
+    ) : CommonSendAnalyticEvents(
+        category = categoryName,
+        event = "Fee Screen Opened",
+        params = mapOf(
+            SOURCE to source.analyticsName,
+        ),
+    )
 
     /** Confirmation screen opened */
     data class ConfirmationScreenOpened(
         val categoryName: String,
-    ) : CommonSendAnalyticEvents(category = categoryName, event = "Confirm Screen Opened")
+        val source: CommonSendSource,
+    ) : CommonSendAnalyticEvents(
+        category = categoryName,
+        event = "Confirm Screen Opened",
+        params = mapOf(
+            SOURCE to source.analyticsName,
+        ),
+    )
 
     /** If transaction delays notification is present */
     data class NoticeTransactionDelays(
@@ -142,4 +170,11 @@ sealed class CommonSendAnalyticEvents(
         Fee,
         Confirm,
     }
+
+    enum class CommonSendSource(val analyticsName: String) {
+        Send("Send"),
+        SendWithSwap("Send&Swap"),
+        WalletConnect("WalletConnect"),
+        NFT("NFT"),
+    }
 }
\ No newline at end of file
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/params/FeeSelectorParams.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/params/FeeSelectorParams.kt
index 80914b0ce9..2c1ae24ec6 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/params/FeeSelectorParams.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/params/FeeSelectorParams.kt
@@ -6,6 +6,7 @@ import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.transaction.error.GetFeeError
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.callbacks.FeeSelectorModelCallback
 import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 
@@ -17,6 +18,7 @@ sealed class FeeSelectorParams {
     abstract val feeStateConfiguration: FeeStateConfiguration
     abstract val feeDisplaySource: FeeDisplaySource
     abstract val analyticsCategoryName: String
+    abstract val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource
 
     data class FeeSelectorBlockParams(
         override val state: FeeSelectorUM,
@@ -26,6 +28,7 @@ sealed class FeeSelectorParams {
         override val feeStateConfiguration: FeeStateConfiguration,
         override val feeDisplaySource: FeeDisplaySource,
         override val analyticsCategoryName: String,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
     ) : FeeSelectorParams()
 
     data class FeeSelectorDetailsParams(
@@ -36,6 +39,7 @@ sealed class FeeSelectorParams {
         override val feeStateConfiguration: FeeStateConfiguration,
         override val feeDisplaySource: FeeDisplaySource,
         override val analyticsCategoryName: String,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val callback: FeeSelectorModelCallback,
     ) : FeeSelectorParams()
 
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/amount/analytics/CommonSendAmountAnalyticEvents.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/amount/analytics/CommonSendAmountAnalyticEvents.kt
index b3dbf385fb..5cc038b0cb 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/amount/analytics/CommonSendAmountAnalyticEvents.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/amount/analytics/CommonSendAmountAnalyticEvents.kt
@@ -2,8 +2,10 @@ package com.tangem.features.send.v2.api.subcomponents.amount.analytics
 
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam.Key.BLOCKCHAIN
+import com.tangem.core.analytics.models.AnalyticsParam.Key.SOURCE
 import com.tangem.core.analytics.models.AnalyticsParam.Key.TOKEN_PARAM
 import com.tangem.core.analytics.models.AnalyticsParam.Key.TYPE
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 
 sealed class CommonSendAmountAnalyticEvents(
     category: String,
@@ -26,12 +28,14 @@ sealed class CommonSendAmountAnalyticEvents(
         val categoryName: String,
         val token: String,
         val blockchain: String,
+        val source: CommonSendAnalyticEvents.CommonSendSource,
     ) : CommonSendAmountAnalyticEvents(
         category = categoryName,
         event = "Max Amount Taped",
         params = mapOf(
             TOKEN_PARAM to token,
             BLOCKCHAIN to blockchain,
+            SOURCE to source.analyticsName,
         ),
     )
 
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/SendDestinationComponentParams.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/SendDestinationComponentParams.kt
index d87ee8379f..267b5c896f 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/SendDestinationComponentParams.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/SendDestinationComponentParams.kt
@@ -3,6 +3,7 @@ package com.tangem.features.send.v2.api.subcomponents.destination
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import kotlinx.coroutines.flow.Flow
@@ -12,12 +13,14 @@ sealed class SendDestinationComponentParams {
 
     abstract val state: DestinationUM
     abstract val analyticsCategoryName: String
+    abstract val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource
     abstract val userWalletId: UserWalletId
     abstract val cryptoCurrency: CryptoCurrency
 
     data class DestinationParams(
         override val state: DestinationUM,
         override val analyticsCategoryName: String,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         override val cryptoCurrency: CryptoCurrency,
         override val userWalletId: UserWalletId,
         val title: TextReference,
@@ -29,6 +32,7 @@ sealed class SendDestinationComponentParams {
     data class DestinationBlockParams(
         override val state: DestinationUM,
         override val analyticsCategoryName: String,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         override val userWalletId: UserWalletId,
         override val cryptoCurrency: CryptoCurrency,
         val blockClickEnableFlow: StateFlow<Boolean>,
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/entity/DestinationUM.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/entity/DestinationUM.kt
index ed79e08793..b8fa5480a5 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/entity/DestinationUM.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/destination/entity/DestinationUM.kt
@@ -17,7 +17,6 @@ sealed class DestinationUM {
         val networkName: String,
         val isValidating: Boolean = false,
         val isInitialized: Boolean = false,
-        val isRedesignEnabled: Boolean = false,
         val isRecentHidden: Boolean,
     ) : DestinationUM()
 
diff --git a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/feeSelector/analytics/CommonSendFeeAnalyticEvents.kt b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/feeSelector/analytics/CommonSendFeeAnalyticEvents.kt
index 579c005570..500e8b4f69 100644
--- a/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/feeSelector/analytics/CommonSendFeeAnalyticEvents.kt
+++ b/features/send-v2/api/src/main/java/com/tangem/features/send/v2/api/subcomponents/feeSelector/analytics/CommonSendFeeAnalyticEvents.kt
@@ -2,6 +2,9 @@ package com.tangem.features.send.v2.api.subcomponents.feeSelector.analytics
 
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.AnalyticsParam.Key.FEE_TYPE
+import com.tangem.core.analytics.models.AnalyticsParam.Key.SOURCE
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents.CommonSendSource
 
 sealed class CommonSendFeeAnalyticEvents(
     category: String,
@@ -15,10 +18,14 @@ sealed class CommonSendFeeAnalyticEvents(
     data class SelectedFee(
         override val categoryName: String,
         val feeType: AnalyticsParam.FeeType,
+        val source: CommonSendSource,
     ) : CommonSendFeeAnalyticEvents(
         category = categoryName,
         event = "Fee Selected",
-        params = mapOf("Fee Type" to feeType.value),
+        params = mapOf(
+            FEE_TYPE to feeType.value,
+            SOURCE to source.analyticsName,
+        ),
     )
 
     /** Custom fee selected */
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/DefaultSendFeatureToggles.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/DefaultSendFeatureToggles.kt
index d73b45c69b..f85c289e04 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/DefaultSendFeatureToggles.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/DefaultSendFeatureToggles.kt
@@ -1,15 +1,5 @@
 package com.tangem.features.send.v2
 
-import com.tangem.core.configtoggle.feature.FeatureTogglesManager
 import com.tangem.features.send.v2.api.SendFeatureToggles
 
-internal class DefaultSendFeatureToggles(
-    private val featureToggles: FeatureTogglesManager,
-) : SendFeatureToggles {
-    override val isSendRedesignEnabled: Boolean
-        get() = featureToggles.isFeatureEnabled("SEND_REDESIGN_ENABLED")
-    override val isNFTSendRedesignEnabled: Boolean
-        get() = featureToggles.isFeatureEnabled("NFT_SEND_REDESIGN_ENABLED")
-    override val isSendWithSwapEnabled: Boolean
-        get() = featureToggles.isFeatureEnabled("SEND_VIA_SWAP_ENABLED")
-}
\ No newline at end of file
+internal class DefaultSendFeatureToggles : SendFeatureToggles
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/CommonSendRoute.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/CommonSendRoute.kt
index ed717d0c97..eb7fddfc66 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/CommonSendRoute.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/CommonSendRoute.kt
@@ -32,9 +32,4 @@ internal sealed class CommonSendRoute : Route {
     data class Amount(
         override val isEditMode: Boolean,
     ) : CommonSendRoute()
-
-    @Serializable
-    data object Fee : CommonSendRoute() {
-        override val isEditMode: Boolean = true
-    }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/SendContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/SendContent.kt
index 610020a85c..cd6bfb3235 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/SendContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/common/ui/SendContent.kt
@@ -1,5 +1,6 @@
 package com.tangem.features.send.v2.common.ui
 
+import androidx.compose.animation.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
@@ -11,17 +12,22 @@ import com.arkivanov.decompose.extensions.compose.stack.animation.fade
 import com.arkivanov.decompose.extensions.compose.stack.animation.slide
 import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation
 import com.arkivanov.decompose.router.stack.ChildStack
+import com.tangem.common.ui.footers.SendingText
 import com.tangem.common.ui.navigationButtons.NavigationButtonsBlockV2
 import com.tangem.common.ui.navigationButtons.NavigationUM
+import com.tangem.core.ui.components.Fade
 import com.tangem.core.ui.components.appbar.AppBarWithBackButtonAndIcon
 import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.send.v2.common.CommonSendRoute
+import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 
 @Composable
 internal fun SendContent(
     navigationUM: NavigationUM,
+    confirmUM: ConfirmUM,
     stackState: ChildStack<CommonSendRoute, ComposableContentComponent>,
 ) {
     Column(
@@ -44,17 +50,35 @@ internal fun SendContent(
             },
             modifier = Modifier.weight(1f),
         ) {
-            it.instance.Content(Modifier.weight(1f))
+            Box(modifier = Modifier.fillMaxHeight()) {
+                it.instance.Content(Modifier.fillMaxSize(1f))
+
+                if (stackState.active.configuration != CommonSendRoute.ConfirmSuccess) {
+                    Fade(
+                        backgroundColor = TangemTheme.colors.background.tertiary,
+                        modifier = Modifier.align(Alignment.BottomCenter),
+                    )
+                }
+            }
         }
         if (stackState.active.configuration != CommonSendRoute.ConfirmSuccess) {
-            NavigationButtonsBlockV2(
-                navigationUM = navigationUM,
-                modifier = Modifier.padding(
-                    start = 16.dp,
-                    end = 16.dp,
-                    bottom = 16.dp,
-                ),
-            )
+            Column {
+                AnimatedVisibility(
+                    visible = stackState.active.configuration == CommonSendRoute.Confirm,
+                    enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
+                    exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
+                ) {
+                    SendingText(footerText = (confirmUM as? ConfirmUM.Content)?.sendingFooter ?: TextReference.EMPTY)
+                }
+                NavigationButtonsBlockV2(
+                    navigationUM = navigationUM,
+                    modifier = Modifier.padding(
+                        start = 16.dp,
+                        end = 16.dp,
+                        bottom = 16.dp,
+                    ),
+                )
+            }
         }
     }
 }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/CommonSendModelModule.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/CommonSendModelModule.kt
index bb0fc819ab..c5543d91fe 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/CommonSendModelModule.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/CommonSendModelModule.kt
@@ -4,7 +4,6 @@ import com.tangem.core.decompose.di.ModelComponent
 import com.tangem.core.decompose.model.Model
 import com.tangem.features.send.v2.subcomponents.amount.model.SendAmountModel
 import com.tangem.features.send.v2.subcomponents.destination.model.SendDestinationModel
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeModel
 import com.tangem.features.send.v2.subcomponents.notifications.model.NotificationsModel
 import dagger.Binds
 import dagger.Module
@@ -26,11 +25,6 @@ internal interface CommonSendModelModule {
     @ClassKey(SendDestinationModel::class)
     fun provideSendDestinationModel(model: SendDestinationModel): Model
 
-    @Binds
-    @IntoMap
-    @ClassKey(SendFeeModel::class)
-    fun provideSendFeeModel(model: SendFeeModel): Model
-
     @Binds
     @IntoMap
     @ClassKey(NotificationsModel::class)
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/SendFeatureModule.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/SendFeatureModule.kt
index a4078c9cca..16b42fd31b 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/SendFeatureModule.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/di/SendFeatureModule.kt
@@ -1,6 +1,5 @@
 package com.tangem.features.send.v2.di
 
-import com.tangem.core.configtoggle.feature.FeatureTogglesManager
 import com.tangem.features.send.v2.DefaultSendFeatureToggles
 import com.tangem.features.send.v2.api.*
 import com.tangem.features.send.v2.entrypoint.DefaultSendEntryPointComponent
@@ -19,8 +18,8 @@ import javax.inject.Singleton
 internal object SendFeatureModule {
 
     @Provides
-    fun provideSendFeatureToggles(featureTogglesManager: FeatureTogglesManager): SendFeatureToggles {
-        return DefaultSendFeatureToggles(featureTogglesManager)
+    fun provideSendFeatureToggles(): SendFeatureToggles {
+        return DefaultSendFeatureToggles()
     }
 }
 
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/entrypoint/DefaultSendEntryPointComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/entrypoint/DefaultSendEntryPointComponent.kt
index 67396045c9..fb1684acf2 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/entrypoint/DefaultSendEntryPointComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/entrypoint/DefaultSendEntryPointComponent.kt
@@ -125,7 +125,7 @@ internal class DefaultSendEntryPointComponent @AssistedInject constructor(
                 initialCurrency = params.cryptoCurrency,
                 source = ChooseManagedTokensComponent.Source.SendViaSwap,
                 selectedCurrency = null,
-                showSendViaSwapNotification = showSendViaSwapNotification,
+                shouldShowSendViaSwapNotification = showSendViaSwapNotification,
                 callback = model,
                 analyticsCategoryName = CommonSendAnalyticEvents.SEND_CATEGORY,
             ),
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
index 5cb0f113e0..dd4e3c17dd 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorBlockComponent.kt
@@ -51,6 +51,7 @@ internal class DefaultFeeSelectorBlockComponent @AssistedInject constructor(
                     feeStateConfiguration = params.feeStateConfiguration,
                     feeDisplaySource = FeeSelectorParams.FeeDisplaySource.Screen,
                     analyticsCategoryName = params.analyticsCategoryName,
+                    analyticsSendSource = params.analyticsSendSource,
                 ),
                 onDismiss = {
                     model.feeSelectorBottomSheet.dismiss()
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorReloadTrigger.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorReloadTrigger.kt
index 71b251f889..6d082b2615 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorReloadTrigger.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/DefaultFeeSelectorReloadTrigger.kt
@@ -18,16 +18,16 @@ internal class DefaultFeeSelectorReloadTrigger @Inject constructor() :
     FeeSelectorCheckReloadListener {
 
     override val reloadTriggerFlow: SharedFlow<FeeSelectorData>
-    field = MutableSharedFlow()
+        field = MutableSharedFlow()
 
     override val loadingStateTriggerFlow: SharedFlow<Unit>
-    field = MutableSharedFlow()
+        field = MutableSharedFlow()
 
     override val checkReloadTriggerFlow: SharedFlow<Unit>
-    field = MutableSharedFlow()
+        field = MutableSharedFlow()
 
     override val checkReloadResultFlow: SharedFlow<Boolean>
-    field = MutableSharedFlow()
+        field = MutableSharedFlow()
 
     override suspend fun triggerUpdate(feeData: FeeSelectorData) {
         reloadTriggerFlow.emit(feeData)
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
index 8b04dae993..ba91d7d75e 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
@@ -29,6 +29,7 @@ import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorRelo
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.analytics.CommonSendFeeAnalyticEvents
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.analytics.CommonSendFeeAnalyticEvents.GasPriceInserter
 import com.tangem.features.send.v2.feeselector.model.transformers.*
+import com.tangem.utils.TangemBlogUrlBuilder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.transformer.update
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -36,7 +37,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import java.util.Locale
 import javax.inject.Inject
 
 @Suppress("LongParameterList")
@@ -62,7 +62,7 @@ internal class FeeSelectorModel @Inject constructor(
     val feeSelectorBottomSheet = SlotNavigation<Unit>()
 
     val uiState: StateFlow<FeeSelectorUM>
-    field = MutableStateFlow<FeeSelectorUM>(params.state)
+        field = MutableStateFlow<FeeSelectorUM>(params.state)
 
     init {
         initAppCurrency()
@@ -77,13 +77,7 @@ internal class FeeSelectorModel @Inject constructor(
     }
 
     fun onReadMoreClicked() {
-        val locale = if (Locale.getDefault().language == RU_LOCALE) RU_LOCALE else EN_LOCALE
-        val url = buildString {
-            append(FEE_READ_MORE_URL_FIRST_PART)
-            append(locale)
-            append(FEE_READ_MORE_URL_SECOND_PART)
-        }
-        urlOpener.openUrl(url)
+        urlOpener.openUrl(TangemBlogUrlBuilder.FEE_BLOG_LINK)
     }
 
     private fun initAppCurrency() {
@@ -156,6 +150,7 @@ internal class FeeSelectorModel @Inject constructor(
             CommonSendFeeAnalyticEvents.SelectedFee(
                 categoryName = params.analyticsCategoryName,
                 feeType = feeSelectorUM.toAnalyticType(),
+                source = params.analyticsSendSource,
             ),
         )
         val isCustomFeeEdited = feeSelectorUM.selectedFeeItem.fee.amount.value != feeSelectorUM.fees.normal.amount.value
@@ -182,7 +177,10 @@ internal class FeeSelectorModel @Inject constructor(
 
     fun showFeeSelector() {
         analyticsEventHandler.send(
-            CommonSendAnalyticEvents.FeeScreenOpened(categoryName = params.analyticsCategoryName),
+            CommonSendAnalyticEvents.FeeScreenOpened(
+                categoryName = params.analyticsCategoryName,
+                source = params.analyticsSendSource,
+            ),
         )
         analyticsEventHandler.send(
             CommonSendAnalyticEvents.ScreenReopened(
@@ -245,11 +243,4 @@ internal class FeeSelectorModel @Inject constructor(
             )
         }
     }
-
-    private companion object {
-        const val RU_LOCALE = "ru"
-        const val EN_LOCALE = "en"
-        const val FEE_READ_MORE_URL_FIRST_PART = "https://tangem.com/"
-        const val FEE_READ_MORE_URL_SECOND_PART = "/blog/post/what-is-a-transaction-fee-and-why-do-we-need-it/"
-    }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/DefaultSendComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/DefaultSendComponent.kt
index c1fc30f253..f30c3fa513 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/DefaultSendComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/DefaultSendComponent.kt
@@ -38,8 +38,6 @@ import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponent
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponentParams
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -93,6 +91,7 @@ internal class DefaultSendComponent @AssistedInject constructor(
                         analyticsEventHandler.send(
                             CommonSendAnalyticEvents.ConfirmationScreenOpened(
                                 categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
                             ),
                         )
                         if (model.currentRoute.value.isEditMode) {
@@ -101,21 +100,22 @@ internal class DefaultSendComponent @AssistedInject constructor(
                     }
                     is SendAmountComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.AmountScreenOpened(categoryName = model.analyticCategoryName),
+                            CommonSendAnalyticEvents.AmountScreenOpened(
+                                categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
+                            ),
                         )
                         activeComponent.updateState(model.uiState.value.amountUM)
                     }
                     is DefaultSendDestinationComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.AddressScreenOpened(categoryName = model.analyticCategoryName),
+                            CommonSendAnalyticEvents.AddressScreenOpened(
+                                categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
+                            ),
                         )
                         activeComponent.updateState(model.uiState.value.destinationUM)
                     }
-                    is SendFeeComponent -> {
-                        analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.FeeScreenOpened(categoryName = model.analyticCategoryName),
-                        )
-                    }
                 }
                 model.currentRoute.emit(stack.active.configuration)
             }
@@ -134,6 +134,7 @@ internal class DefaultSendComponent @AssistedInject constructor(
         )
         SendContent(
             navigationUM = state.navigationUM,
+            confirmUM = state.confirmUM,
             stackState = stackState,
         )
     }
@@ -142,7 +143,6 @@ internal class DefaultSendComponent @AssistedInject constructor(
         CommonSendRoute.Empty -> getStubComponent()
         is CommonSendRoute.Destination -> getDestinationComponent(factoryContext)
         is CommonSendRoute.Amount -> getAmountComponent(factoryContext)
-        is CommonSendRoute.Fee -> getFeeComponent(factoryContext)
         is CommonSendRoute.Confirm -> getConfirmComponent(factoryContext)
         is CommonSendRoute.ConfirmSuccess -> getConfirmSuccessComponent(factoryContext)
     }
@@ -155,6 +155,7 @@ internal class DefaultSendComponent @AssistedInject constructor(
                 currentRoute = model.currentRoute.filterIsInstance<CommonSendRoute.Destination>(),
                 isBalanceHidingFlow = model.isBalanceHiddenFlow,
                 analyticsCategoryName = model.analyticCategoryName,
+                analyticsSendSource = model.analyticsSendSource,
                 title = resourceReference(R.string.common_address),
                 userWalletId = params.userWalletId,
                 cryptoCurrency = params.currency,
@@ -176,42 +177,11 @@ internal class DefaultSendComponent @AssistedInject constructor(
                 cryptoCurrencyStatusFlow = model.cryptoCurrencyStatusFlow,
                 callback = model,
                 predefinedValues = model.predefinedValues,
-                isRedesignEnabled = model.uiState.value.isRedesignEnabled,
+                analyticsSendSource = model.analyticsSendSource,
             ),
         )
     }
 
-    @Suppress("ComplexCondition")
-    private fun getFeeComponent(factoryContext: AppComponentContext): ComposableContentComponent {
-        val state = model.uiState.value
-        val sendAmount = (state.amountUM as? AmountState.Data)?.amountTextField?.cryptoAmount?.value
-        val destinationAddress = (state.destinationUM as? DestinationUM.Content)?.addressTextField?.actualAddress
-        val cryptoCurrencyStatus = model.cryptoCurrencyStatusFlow.value
-        val feeCryptoCurrencyStatus = model.feeCryptoCurrencyStatusFlow.value
-
-        return if (sendAmount != null && destinationAddress != null) {
-            SendFeeComponent(
-                appComponentContext = factoryContext,
-                params = SendFeeComponentParams.FeeParams(
-                    state = model.uiState.value.feeUM,
-                    currentRoute = model.currentRoute.filterIsInstance<CommonSendRoute.Fee>(),
-                    analyticsCategoryName = model.analyticCategoryName,
-                    userWallet = model.userWallet,
-                    cryptoCurrencyStatus = cryptoCurrencyStatus,
-                    feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-                    appCurrency = model.appCurrency,
-                    onLoadFee = model::loadFee,
-                    sendAmount = sendAmount,
-                    destinationAddress = destinationAddress,
-                    callback = model,
-                ),
-            )
-        } else {
-            model.showAlertError()
-            getStubComponent()
-        }
-    }
-
     private fun getConfirmComponent(factoryContext: AppComponentContext): ComposableContentComponent {
         val cryptoCurrencyStatus = model.cryptoCurrencyStatusFlow.value
         val feeCryptoCurrencyStatus = model.feeCryptoCurrencyStatusFlow.value
@@ -238,6 +208,7 @@ internal class DefaultSendComponent @AssistedInject constructor(
                     onSendTransaction = {
                         innerRouter.replaceAll(CommonSendRoute.ConfirmSuccess)
                     },
+                    analyticsSendSource = model.analyticsSendSource,
                 ),
                 feeSelectorComponentFactory = feeSelectorComponentFactory,
             )
@@ -268,6 +239,7 @@ internal class DefaultSendComponent @AssistedInject constructor(
                 params = SendDestinationComponentParams.DestinationBlockParams(
                     state = model.uiState.value.destinationUM,
                     analyticsCategoryName = model.analyticCategoryName,
+                    analyticsSendSource = model.analyticsSendSource,
                     userWalletId = model.userWallet.walletId,
                     cryptoCurrency = cryptoCurrencyStatus.currency,
                     blockClickEnableFlow = MutableStateFlow(true),
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/analytics/SendAnalyticHelper.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/analytics/SendAnalyticHelper.kt
index ab9490ce77..e629937e0d 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/analytics/SendAnalyticHelper.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/analytics/SendAnalyticHelper.kt
@@ -5,11 +5,11 @@ import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.send.ui.state.SendUM
+import com.tangem.features.send.v2.api.entity.FeeNonce
+import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationTextFieldUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
+import com.tangem.features.send.v2.send.ui.state.SendUM
 import javax.inject.Inject
 
 @ModelScoped
@@ -19,15 +19,14 @@ internal class SendAnalyticHelper @Inject constructor(
 
     fun sendSuccessAnalytics(cryptoCurrency: CryptoCurrency, sendUM: SendUM) {
         val destinationUM = sendUM.destinationUM as? DestinationUM.Content
-        val feeUM = sendUM.feeUM as? FeeUM.Content
-        val feeSelectorUM = feeUM?.feeSelectorUM as? FeeSelectorUM.Content ?: return
-        val feeType = feeSelectorUM.selectedType.toAnalyticType(feeSelectorUM)
+        val feeSelectorUM = sendUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
+        val feeType = feeSelectorUM.toAnalyticType()
         analyticsEventHandler.send(
             SendAnalyticEvents.TransactionScreenOpened(
                 token = cryptoCurrency.symbol,
                 feeType = feeType,
                 blockchain = cryptoCurrency.network.name,
-                nonceNotEmpty = feeSelectorUM.nonce != null,
+                nonceNotEmpty = feeSelectorUM.feeNonce is FeeNonce.Nonce,
             ),
         )
         analyticsEventHandler.send(
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/SendConfirmComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/SendConfirmComponent.kt
index cd417bc2f5..154ab7e564 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/SendConfirmComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/SendConfirmComponent.kt
@@ -17,6 +17,7 @@ import com.tangem.domain.transaction.error.GetFeeError
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent.Params.NotificationData
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.params.FeeSelectorParams
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams
@@ -28,8 +29,6 @@ import com.tangem.features.send.v2.send.ui.state.SendUM
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountBlockComponent
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponentParams
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
 import com.tangem.features.send.v2.subcomponents.notifications.DefaultSendNotificationsComponent
 import com.tangem.utils.extensions.orZero
 import kotlinx.coroutines.flow.*
@@ -37,7 +36,7 @@ import kotlinx.coroutines.flow.*
 internal class SendConfirmComponent(
     appComponentContext: AppComponentContext,
     params: Params,
-    private val feeSelectorComponentFactory: FeeSelectorBlockComponent.Factory,
+    feeSelectorComponentFactory: FeeSelectorBlockComponent.Factory,
 ) : ComposableContentComponent, AppComponentContext by appComponentContext {
 
     private val model: SendConfirmModel = getOrCreateModel(params = params)
@@ -50,6 +49,7 @@ internal class SendConfirmComponent(
             params = DestinationBlockParams(
                 state = model.uiState.value.destinationUM,
                 analyticsCategoryName = params.analyticsCategoryName,
+                analyticsSendSource = params.analyticsSendSource,
                 userWalletId = params.userWallet.walletId,
                 cryptoCurrency = params.cryptoCurrencyStatus.currency,
                 blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
@@ -68,34 +68,16 @@ internal class SendConfirmComponent(
             appCurrency = params.appCurrency,
             blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
             predefinedValues = params.predefinedValues,
-            isRedesignEnabled = model.uiState.value.isRedesignEnabled,
             userWalletId = params.userWallet.walletId,
             cryptoCurrency = params.cryptoCurrencyStatus.currency,
             cryptoCurrencyStatusFlow = params.cryptoCurrencyStatusFlow,
             isBalanceHidingFlow = params.isBalanceHidingFlow,
+            analyticsSendSource = params.analyticsSendSource,
         ),
         onResult = model::onAmountResult,
         onClick = model::showEditAmount,
     )
 
-    private val feeBlockComponent = SendFeeBlockComponent(
-        appComponentContext = child("sendConfirmFeeBlock"),
-        params = SendFeeComponentParams.FeeBlockParams(
-            state = model.uiState.value.feeUM,
-            analyticsCategoryName = params.analyticsCategoryName,
-            userWallet = params.userWallet,
-            cryptoCurrencyStatus = params.cryptoCurrencyStatus,
-            feeCryptoCurrencyStatus = params.feeCryptoCurrencyStatus,
-            appCurrency = params.appCurrency,
-            sendAmount = model.confirmData.enteredAmount.orZero(),
-            destinationAddress = model.confirmData.enteredDestination.orEmpty(),
-            blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
-            onLoadFee = params.onLoadFee,
-        ),
-        onResult = model::onFeeResult,
-        onClick = model::showEditFee,
-    )
-
     private val feeSelectorBlockComponent = feeSelectorComponentFactory.create(
         context = appComponentContext,
         params = FeeSelectorParams.FeeSelectorBlockParams(
@@ -106,6 +88,7 @@ internal class SendConfirmComponent(
             feeStateConfiguration = model.feeStateConfiguration,
             feeDisplaySource = FeeSelectorParams.FeeDisplaySource.Screen,
             analyticsCategoryName = params.analyticsCategoryName,
+            analyticsSendSource = params.analyticsSendSource,
         ),
         onResult = model::onFeeResult,
     )
@@ -141,7 +124,6 @@ internal class SendConfirmComponent(
     fun updateState(state: SendUM) {
         destinationBlockComponent.updateState(state.destinationUM)
         amountBlockComponent.updateState(state.amountUM)
-        feeBlockComponent.updateState(state.feeUM)
         feeSelectorBlockComponent.updateState(state.feeSelectorUM)
         model.updateState(state)
     }
@@ -155,7 +137,6 @@ internal class SendConfirmComponent(
             sendUM = state,
             destinationBlockComponent = destinationBlockComponent,
             amountBlockComponent = amountBlockComponent,
-            feeBlockComponent = feeBlockComponent,
             feeSelectorBlockComponent = feeSelectorBlockComponent,
             notificationsComponent = notificationsComponent,
             notificationsUM = notificationState,
@@ -165,6 +146,7 @@ internal class SendConfirmComponent(
     data class Params(
         val state: SendUM,
         val analyticsCategoryName: String,
+        val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val userWallet: UserWallet,
         val cryptoCurrencyStatus: CryptoCurrencyStatus,
         val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmClickIntents.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmClickIntents.kt
index 929fae6819..6fa9dd0c23 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmClickIntents.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmClickIntents.kt
@@ -6,8 +6,6 @@ internal interface SendConfirmClickIntents {
 
     fun showEditAmount()
 
-    fun showEditFee()
-
     fun onSendClick()
 
     fun onExploreClick()
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt
index 2a22a8c5b6..414a66531b 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt
@@ -20,7 +20,6 @@ import com.tangem.core.navigation.share.ShareManager
 import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
 import com.tangem.domain.feedback.SaveBlockchainErrorUseCase
@@ -47,6 +46,7 @@ import com.tangem.features.send.v2.api.subcomponents.destination.entity.Destinat
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorReloadTrigger
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateListener
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateTrigger
 import com.tangem.features.send.v2.common.CommonSendRoute
@@ -56,22 +56,20 @@ import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.impl.R
 import com.tangem.features.send.v2.send.analytics.SendAnalyticHelper
 import com.tangem.features.send.v2.send.confirm.SendConfirmComponent
-import com.tangem.features.send.v2.send.confirm.model.transformers.*
+import com.tangem.features.send.v2.send.confirm.model.transformers.SendConfirmInitialStateTransformer
+import com.tangem.features.send.v2.send.confirm.model.transformers.SendConfirmSendingStateTransformer
+import com.tangem.features.send.v2.send.confirm.model.transformers.SendConfirmSentStateTransformer
+import com.tangem.features.send.v2.send.confirm.model.transformers.SendConfirmationNotificationsTransformerV2
 import com.tangem.features.send.v2.send.ui.state.SendUM
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountReduceTrigger
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadListener
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadTrigger
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeData
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeReloadTrigger
-import com.tangem.features.send.v2.subcomponents.fee.model.checkAndCalculateSubtractedAmount
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.extensions.orZero
 import com.tangem.utils.extensions.stripZeroPlainString
 import com.tangem.utils.transformer.update
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.math.BigDecimal
 import javax.inject.Inject
@@ -96,8 +94,6 @@ internal class SendConfirmModel @Inject constructor(
     private val addCryptoCurrenciesUseCase: AddCryptoCurrenciesUseCase,
     private val getExplorerTransactionUrlUseCase: GetExplorerTransactionUrlUseCase,
     private val isAmountSubtractAvailableUseCase: IsAmountSubtractAvailableUseCase,
-    private val sendFeeCheckReloadTrigger: SendFeeCheckReloadTrigger,
-    private val sendFeeCheckReloadListener: SendFeeCheckReloadListener,
     private val feeSelectorCheckReloadListener: FeeSelectorCheckReloadListener,
     private val feeSelectorCheckReloadTrigger: FeeSelectorCheckReloadTrigger,
     private val notificationsUpdateTrigger: SendNotificationsUpdateTrigger,
@@ -107,7 +103,6 @@ internal class SendConfirmModel @Inject constructor(
     private val urlOpener: UrlOpener,
     private val shareManager: ShareManager,
     private val feeSelectorReloadTrigger: FeeSelectorReloadTrigger,
-    private val feeReloadTrigger: SendFeeReloadTrigger,
     private val sendAmountReduceTrigger: SendAmountReduceTrigger,
     private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
     sendBalanceUpdaterFactory: SendBalanceUpdater.Factory,
@@ -127,16 +122,12 @@ internal class SendConfirmModel @Inject constructor(
     val uiState = _uiState.asStateFlow()
 
     val isBalanceHiddenFlow: StateFlow<Boolean>
-    field = MutableStateFlow(false)
+        field = MutableStateFlow(false)
 
     private val amountState
         get() = uiState.value.amountUM as? AmountState.Data
     private val destinationUM
         get() = uiState.value.destinationUM as? DestinationUM.Content
-    private val feeUM
-        get() = uiState.value.feeUM as? FeeUM.Content
-    private val feeSelectorUM
-        get() = feeUM?.feeSelectorUM as? FeeSelectorUM.Content
     private val feeUMV2
         get() = uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Content
 
@@ -147,16 +138,8 @@ internal class SendConfirmModel @Inject constructor(
             reduceAmountBy = amountState?.reduceAmountBy.orZero(),
             isIgnoreReduce = amountState?.isIgnoreReduce == true,
             enteredDestination = destinationUM?.addressTextField?.actualAddress,
-            fee = if (uiState.value.isRedesignEnabled) {
-                feeUMV2?.selectedFeeItem?.fee
-            } else {
-                feeSelectorUM?.selectedFee
-            },
-            feeError = if (uiState.value.isRedesignEnabled) {
-                (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Error)?.error
-            } else {
-                (feeUM?.feeSelectorUM as? FeeSelectorUM.Error)?.error
-            },
+            fee = feeUMV2?.selectedFeeItem?.fee,
+            feeError = (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Error)?.error,
         )
 
     private var sendIdleTimer: Long = 0L
@@ -181,12 +164,6 @@ internal class SendConfirmModel @Inject constructor(
         updateConfirmNotifications()
     }
 
-    fun onFeeResult(feeUM: FeeUM) {
-        sendIdleTimer = SystemClock.elapsedRealtime()
-        _uiState.update { it.copy(feeUM = feeUM) }
-        updateConfirmNotifications()
-    }
-
     fun onAmountResult(amountUM: AmountState) {
         _uiState.update { it.copy(amountUM = amountUM) }
         updateConfirmNotifications()
@@ -199,16 +176,7 @@ internal class SendConfirmModel @Inject constructor(
 
     override fun onFeeReload() {
         modelScope.launch {
-            if (uiState.value.isRedesignEnabled) {
-                feeSelectorReloadTrigger.triggerUpdate()
-            } else {
-                feeReloadTrigger.triggerUpdate(
-                    feeData = SendFeeData(
-                        amount = confirmData.enteredAmount,
-                        destinationAddress = confirmData.enteredDestination,
-                    ),
-                )
-            }
+            feeSelectorReloadTrigger.triggerUpdate()
         }
     }
 
@@ -261,30 +229,13 @@ internal class SendConfirmModel @Inject constructor(
         }
     }
 
-    override fun showEditFee() {
-        modelScope.launch {
-            neverShowTapHelpUseCase()
-            analyticsEventHandler.send(
-                CommonSendAnalyticEvents.ScreenReopened(
-                    categoryName = analyticsCategoryName,
-                    source = SendScreenSource.Fee,
-                ),
-            )
-            router.push(CommonSendRoute.Fee)
-        }
-    }
-
     override fun onSendClick() {
         _uiState.update(SendConfirmSendingStateTransformer(isSending = true))
         if (SystemClock.elapsedRealtime() - sendIdleTimer < CHECK_FEE_UPDATE_DELAY) {
             verifyAndSendTransaction()
         } else {
             modelScope.launch {
-                if (uiState.value.isRedesignEnabled) {
-                    feeSelectorCheckReloadTrigger.triggerCheckUpdate()
-                } else {
-                    sendFeeCheckReloadTrigger.triggerCheckUpdate()
-                }
+                feeSelectorCheckReloadTrigger.triggerCheckUpdate()
             }
         }
     }
@@ -317,7 +268,7 @@ internal class SendConfirmModel @Inject constructor(
             null
         }
 
-        val amount = receivingAmount?.convertToSdkAmount(cryptoCurrency)
+        val amount = receivingAmount?.convertToSdkAmount(cryptoCurrencyStatus)
 
         saveBlockchainErrorUseCase(
             error = BlockchainErrorInfo(
@@ -331,7 +282,7 @@ internal class SendConfirmModel @Inject constructor(
                     ""
                 },
                 amount = amount?.value?.stripZeroPlainString() ?: "unknown",
-                fee = feeValue?.convertToSdkAmount(cryptoCurrency)
+                fee = feeValue?.convertToSdkAmount(cryptoCurrencyStatus)
                     ?.value?.stripZeroPlainString() ?: "unknown",
             ),
         )
@@ -376,22 +327,12 @@ internal class SendConfirmModel @Inject constructor(
         notificationsUpdateListener.hasErrorFlow
             .onEach { hasError ->
                 _uiState.update {
-                    if (_uiState.value.isRedesignEnabled) {
-                        val feeUM = it.feeSelectorUM as? FeeSelectorUMRedesigned.Content
-                        it.copy(
-                            confirmUM = (it.confirmUM as? ConfirmUM.Content)?.copy(
-                                isPrimaryButtonEnabled = !hasError && feeUM != null,
-                            ) ?: it.confirmUM,
-                        )
-                    } else {
-                        val feeUM = it.feeUM as? FeeUM.Content
-                        val feeSelectorUM = feeUM?.feeSelectorUM as? FeeSelectorUM.Content
-                        it.copy(
-                            confirmUM = (it.confirmUM as? ConfirmUM.Content)?.copy(
-                                isPrimaryButtonEnabled = !hasError && feeSelectorUM != null,
-                            ) ?: it.confirmUM,
-                        )
-                    }
+                    val feeUM = it.feeSelectorUM as? FeeSelectorUMRedesigned.Content
+                    it.copy(
+                        confirmUM = (it.confirmUM as? ConfirmUM.Content)?.copy(
+                            isPrimaryButtonEnabled = !hasError && feeUM != null,
+                        ) ?: it.confirmUM,
+                    )
                 }
             }
             .launchIn(modelScope)
@@ -401,17 +342,8 @@ internal class SendConfirmModel @Inject constructor(
         val amountValue = amountState?.amountTextField?.cryptoAmount?.value ?: return
         val destination = destinationUM?.addressTextField?.actualAddress ?: return
         val memo = destinationUM?.memoTextField?.value
-        val isRedesignEnabled = uiState.value.isRedesignEnabled
-        val fee = if (isRedesignEnabled) {
-            feeUMV2?.selectedFeeItem?.fee
-        } else {
-            feeSelectorUM?.selectedFee
-        }
-        val nonce = if (isRedesignEnabled) {
-            (feeUMV2?.feeNonce as? FeeNonce.Nonce)?.nonce
-        } else {
-            feeSelectorUM?.nonce
-        }
+        val fee = feeUMV2?.selectedFeeItem?.fee
+        val nonce = (feeUMV2?.feeNonce as? FeeNonce.Nonce)?.nonce
         val feeValue = fee?.amount?.value ?: return
 
         val receivingAmount = checkAndCalculateSubtractedAmount(
@@ -424,7 +356,7 @@ internal class SendConfirmModel @Inject constructor(
 
         modelScope.launch {
             createTransferTransactionUseCase(
-                amount = receivingAmount.convertToSdkAmount(cryptoCurrency),
+                amount = receivingAmount.convertToSdkAmount(cryptoCurrencyStatus),
                 fee = fee,
                 memo = memo,
                 nonce = nonce,
@@ -478,10 +410,8 @@ internal class SendConfirmModel @Inject constructor(
                 addTokenToWalletIfNeeded()
                 sendBalanceUpdater.scheduleUpdates()
                 sendAnalyticHelper.sendSuccessAnalytics(cryptoCurrency, uiState.value)
-                if (uiState.value.isRedesignEnabled) {
-                    params.callback.onResult(uiState.value)
-                    params.onSendTransaction()
-                }
+                params.callback.onResult(uiState.value)
+                params.onSendTransaction()
             },
         )
     }
@@ -497,12 +427,14 @@ internal class SendConfirmModel @Inject constructor(
         val userWalletId = receivingUserWallet.userWalletId ?: return
         val network = receivingUserWallet.network ?: return
 
-        modelScope.launch {
-            addCryptoCurrenciesUseCase(
-                userWalletId = userWalletId,
-                cryptoCurrency = cryptoCurrency,
-                network = network,
-            )
+        modelScope.launch(dispatchers.default) {
+            withContext(NonCancellable) {
+                addCryptoCurrenciesUseCase(
+                    userWalletId = userWalletId,
+                    cryptoCurrency = cryptoCurrency,
+                    network = network,
+                )
+            }
         }
     }
 
@@ -515,15 +447,6 @@ internal class SendConfirmModel @Inject constructor(
     }
 
     private fun subscribeOnCheckFeeResultUpdates() {
-        sendFeeCheckReloadListener.checkReloadResultFlow.onEach { isFeeResultSuccess ->
-            sendIdleTimer = SystemClock.elapsedRealtime()
-            if (isFeeResultSuccess) {
-                _uiState.update(SendConfirmSendingStateTransformer(isSending = true))
-                verifyAndSendTransaction()
-            } else {
-                _uiState.update(SendConfirmSendingStateTransformer(isSending = false))
-            }
-        }.launchIn(modelScope)
         feeSelectorCheckReloadListener.checkReloadResultFlow.onEach { isFeeResultSuccess ->
             sendIdleTimer = SystemClock.elapsedRealtime()
             if (isFeeResultSuccess) {
@@ -560,25 +483,14 @@ internal class SendConfirmModel @Inject constructor(
             )
             _uiState.update {
                 it.copy(
-                    confirmUM = if (uiState.value.isRedesignEnabled) {
-                        SendConfirmationNotificationsTransformerV2(
-                            feeSelectorUM = uiState.value.feeSelectorUM,
-                            amountUM = uiState.value.amountUM,
-                            analyticsEventHandler = analyticsEventHandler,
-                            cryptoCurrency = cryptoCurrencyStatus.currency,
-                            appCurrency = appCurrency,
-                            analyticsCategoryName = params.analyticsCategoryName,
-                        ).transform(uiState.value.confirmUM)
-                    } else {
-                        SendConfirmationNotificationsTransformer(
-                            feeUM = uiState.value.feeUM,
-                            amountUM = uiState.value.amountUM,
-                            analyticsEventHandler = analyticsEventHandler,
-                            cryptoCurrency = cryptoCurrencyStatus.currency,
-                            appCurrency = appCurrency,
-                            analyticsCategoryName = params.analyticsCategoryName,
-                        ).transform(uiState.value.confirmUM)
-                    },
+                    confirmUM = SendConfirmationNotificationsTransformerV2(
+                        feeSelectorUM = uiState.value.feeSelectorUM,
+                        amountUM = uiState.value.amountUM,
+                        analyticsEventHandler = analyticsEventHandler,
+                        cryptoCurrency = cryptoCurrencyStatus.currency,
+                        appCurrency = appCurrency,
+                        analyticsCategoryName = params.analyticsCategoryName,
+                    ).transform(uiState.value.confirmUM),
                 )
             }
         }
@@ -593,31 +505,15 @@ internal class SendConfirmModel @Inject constructor(
         ).filter {
             it.second is CommonSendRoute.Confirm
         }.onEach { (state, _) ->
-            val amountUM = state.amountUM as? AmountState.Data
             val confirmUM = state.confirmUM
             params.callback.onResult(
                 state.copy(
                     navigationUM = NavigationUM.Content(
-                        title = if (state.isRedesignEnabled) {
-                            resourceReference(id = R.string.common_send)
-                        } else {
-                            resourceReference(
-                                id = R.string.send_summary_title,
-                                formatArgs = wrappedList(params.cryptoCurrencyStatus.currency.name),
-                            )
-                        },
-                        subtitle = if (uiState.value.isRedesignEnabled) {
-                            null
-                        } else {
-                            amountUM?.title
-                        },
-                        backIconRes = if (state.isRedesignEnabled) {
-                            when (confirmUM) {
-                                is ConfirmUM.Success -> R.drawable.ic_close_24
-                                else -> R.drawable.ic_back_24
-                            }
-                        } else {
-                            R.drawable.ic_close_24
+                        title = resourceReference(id = R.string.common_send),
+                        subtitle = null,
+                        backIconRes = when (confirmUM) {
+                            is ConfirmUM.Success -> R.drawable.ic_close_24
+                            else -> R.drawable.ic_back_24
                         },
                         backIconClick = {
                             analyticsEventHandler.send(
@@ -628,11 +524,7 @@ internal class SendConfirmModel @Inject constructor(
                                     isValid = confirmUM.isPrimaryButtonEnabled,
                                 ),
                             )
-                            if (state.isRedesignEnabled) {
-                                router.pop()
-                            } else {
-                                appRouter.pop()
-                            }
+                            router.pop()
                         },
                         primaryButton = primaryButtonUM(),
                         prevButton = null,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformer.kt
deleted file mode 100644
index 98b863e56e..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformer.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.tangem.features.send.v2.send.confirm.model.transformers
-
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.amountScreen.models.AmountState
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.format.bigdecimal.fiat
-import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
-import com.tangem.features.send.v2.api.utils.formatFooterFiatFee
-import com.tangem.features.send.v2.api.utils.getTronTokenFeeSendingText
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkIfFeeTooHigh
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-import kotlinx.collections.immutable.toPersistentList
-
-internal class SendConfirmationNotificationsTransformer(
-    private val feeUM: FeeUM,
-    private val amountUM: AmountState,
-    private val analyticsEventHandler: AnalyticsEventHandler,
-    private val cryptoCurrency: CryptoCurrency,
-    private val appCurrency: AppCurrency,
-    private val analyticsCategoryName: String,
-) : Transformer<ConfirmUM> {
-    override fun transform(prevState: ConfirmUM): ConfirmUM {
-        val state = prevState as? ConfirmUM.Content ?: return prevState
-        val feeUM = feeUM as? FeeUM.Content ?: return prevState
-        return state.copy(
-            sendingFooter = getSendingFooterText(),
-            notifications = buildList {
-                addTooHighNotification(feeUM.feeSelectorUM)
-                addTooLowNotification(feeUM)
-            }.toPersistentList(),
-        )
-    }
-
-    private fun MutableList<NotificationUM>.addTooLowNotification(feeUM: FeeUM.Content) {
-        val feeSelectorUM = feeUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
-        val multipleFees = feeSelectorUM.fees as? TransactionFee.Choosable ?: return
-        val minimumValue = multipleFees.minimum.amount.value ?: return
-        val customAmount = feeSelectorUM.customValues.firstOrNull() ?: return
-        val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals)
-        if (feeSelectorUM.selectedType == FeeType.Custom && minimumValue > customValue) {
-            add(NotificationUM.Warning.FeeTooLow)
-            analyticsEventHandler.send(
-                CommonSendAnalyticEvents.NoticeTransactionDelays(
-                    categoryName = analyticsCategoryName,
-                    token = cryptoCurrency.symbol,
-                ),
-            )
-        }
-    }
-
-    private fun MutableList<NotificationUM>.addTooHighNotification(feeSelectorUM: FeeSelectorUM) {
-        if (feeSelectorUM !is FeeSelectorUM.Content) return
-
-        val (isFeeTooHigh, diff) = checkIfFeeTooHigh(feeSelectorUM)
-        if (isFeeTooHigh) {
-            add(NotificationUM.Warning.TooHigh(diff))
-        }
-    }
-
-    private fun getSendingFooterText(): TextReference {
-        val feeUM = feeUM as? FeeUM.Content
-        val amountUM = amountUM as? AmountState.Data
-        val fee = (feeUM?.feeSelectorUM as? FeeSelectorUM.Content)?.selectedFee
-
-        if (fee == null || amountUM == null) return TextReference.EMPTY
-
-        val fiatAmountValue = amountUM.amountTextField.fiatAmount.value
-        val fiatFeeValue = feeUM.rate?.let { fee.amount.value?.multiply(it) }
-
-        val fiatSendingValue = if (feeUM.isFeeConvertibleToFiat) {
-            fiatFeeValue?.let { fiatAmountValue?.plus(it) }
-        } else {
-            fiatAmountValue
-        }
-
-        val fiatSending = fiatSendingValue.format {
-            fiat(
-                fiatCurrencyCode = appCurrency.code,
-                fiatCurrencySymbol = appCurrency.symbol,
-            )
-        }
-        val fiatFee = formatFooterFiatFee(
-            amount = fee.amount.copy(value = fiatFeeValue),
-            isFeeConvertibleToFiat = feeUM.isFeeConvertibleToFiat,
-            isFeeApproximate = feeUM.isFeeApproximate,
-            appCurrency = appCurrency,
-        )
-
-        return if (feeUM.isTronToken && fee is Fee.Tron) {
-            getTronTokenFeeSendingText(
-                fee = fee,
-                fiatFee = fiatFee,
-                fiatSending = stringReference(fiatSending),
-            )
-        } else {
-            resourceReference(
-                id = if (feeUM.isFeeConvertibleToFiat) {
-                    R.string.send_summary_transaction_description
-                } else {
-                    R.string.send_summary_transaction_description_no_fiat_fee
-                },
-                formatArgs = wrappedList(fiatSending, fiatFee),
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/ui/SendConfirmContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/ui/SendConfirmContent.kt
index 7f7c70235b..d617e88182 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/ui/SendConfirmContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/ui/SendConfirmContent.kt
@@ -1,6 +1,5 @@
 package com.tangem.features.send.v2.send.confirm.ui
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,27 +8,18 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.tangem.common.ui.footers.SendingText
 import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.ui.components.transactions.TransactionDoneTitle
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.utils.DateTimeFormatters
-import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.common.ui.tapHelp
-import com.tangem.features.send.v2.impl.R
 import com.tangem.features.send.v2.send.ui.state.SendUM
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountBlockComponent
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
 import com.tangem.features.send.v2.subcomponents.notifications
 import com.tangem.features.send.v2.subcomponents.notifications.DefaultSendNotificationsComponent
 import kotlinx.collections.immutable.ImmutableList
@@ -42,7 +32,6 @@ internal fun SendConfirmContent(
     sendUM: SendUM,
     destinationBlockComponent: DefaultSendDestinationBlockComponent,
     amountBlockComponent: SendAmountBlockComponent,
-    feeBlockComponent: SendFeeBlockComponent,
     feeSelectorBlockComponent: FeeSelectorBlockComponent,
     notificationsComponent: DefaultSendNotificationsComponent,
     notificationsUM: ImmutableList<NotificationUM>,
@@ -58,10 +47,8 @@ internal fun SendConfirmContent(
                 .padding(horizontal = TangemTheme.dimens.spacing16),
         ) {
             blocks(
-                uiState = sendUM,
                 destinationBlockComponent = destinationBlockComponent,
                 amountBlockComponent = amountBlockComponent,
-                feeBlockComponent = feeBlockComponent,
                 feeSelectorBlockComponent = feeSelectorBlockComponent,
             )
             if (confirmUM != null) {
@@ -77,55 +64,27 @@ internal fun SendConfirmContent(
                     isClickDisabled = confirmUM.isSending,
                 )
             }
-        }
-        SendingText(footerText = confirmUM?.sendingFooter ?: TextReference.EMPTY)
-    }
-}
-
-private fun LazyListScope.blocks(
-    uiState: SendUM,
-    destinationBlockComponent: DefaultSendDestinationBlockComponent,
-    amountBlockComponent: SendAmountBlockComponent,
-    feeBlockComponent: SendFeeBlockComponent,
-    feeSelectorBlockComponent: FeeSelectorBlockComponent,
-) {
-    item(key = BLOCKS_KEY) {
-        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-            if (uiState.isRedesignEnabled) {
-                amountBlockComponent.Content(modifier = Modifier)
-                destinationBlockComponent.Content(modifier = Modifier)
-                feeSelectorBlockComponent.Content(
-                    modifier = Modifier
-                        .clip(TangemTheme.shapes.roundedCornersXMedium)
-                        .background(TangemTheme.colors.background.action),
-                )
-            } else {
-                TransactionDoneTitleAnimated(uiState)
-                destinationBlockComponent.Content(modifier = Modifier)
-                amountBlockComponent.Content(modifier = Modifier)
-                feeBlockComponent.Content(modifier = Modifier)
+            item("SPACER_KEY") {
+                SpacerH(16.dp)
             }
         }
     }
 }
 
-@Composable
-internal fun TransactionDoneTitleAnimated(uiState: SendUM) {
-    AnimatedVisibility(
-        visible = uiState.confirmUM is ConfirmUM.Success,
-        modifier = Modifier.padding(vertical = 12.dp),
-    ) {
-        val wrappedConfirmUM = remember(this) { uiState.confirmUM as ConfirmUM.Success }
-        TransactionDoneTitle(
-            title = resourceReference(R.string.sent_transaction_sent_title),
-            subtitle = resourceReference(
-                R.string.send_date_format,
-                wrappedList(
-                    wrappedConfirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
-                    wrappedConfirmUM.transactionDate.toTimeFormat(),
-                ),
-            ),
-            modifier = Modifier.padding(vertical = 12.dp),
-        )
+private fun LazyListScope.blocks(
+    destinationBlockComponent: DefaultSendDestinationBlockComponent,
+    amountBlockComponent: SendAmountBlockComponent,
+    feeSelectorBlockComponent: FeeSelectorBlockComponent,
+) {
+    item(key = BLOCKS_KEY) {
+        Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            amountBlockComponent.Content(modifier = Modifier)
+            destinationBlockComponent.Content(modifier = Modifier)
+            feeSelectorBlockComponent.Content(
+                modifier = Modifier
+                    .clip(TangemTheme.shapes.roundedCornersXMedium)
+                    .background(TangemTheme.colors.background.action),
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/model/SendModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/model/SendModel.kt
index a6fec59187..141773d3c7 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/model/SendModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/model/SendModel.kt
@@ -39,7 +39,6 @@ import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.domain.wallets.models.GetUserWalletError
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.features.send.v2.api.SendComponent
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents.SendScreenSource
 import com.tangem.features.send.v2.api.entity.FeeSelectorUM
@@ -57,8 +56,6 @@ import com.tangem.features.send.v2.send.ui.state.SendUM
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponent
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountUpdateTrigger
 import com.tangem.features.send.v2.subcomponents.destination.model.transformers.SendDestinationInitialStateTransformer
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponent
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
@@ -70,7 +67,6 @@ import kotlin.properties.Delegates
 
 internal interface SendComponentCallback :
     SendAmountComponent.ModelCallback,
-    SendFeeComponent.ModelCallback,
     SendDestinationComponent.ModelCallback,
     SendConfirmComponent.ModelCallback,
     SendConfirmSuccessComponent.ModelCallback
@@ -96,7 +92,6 @@ internal class SendModel @Inject constructor(
     private val createTransferTransactionUseCase: CreateTransferTransactionUseCase,
     private val getFeeUseCase: GetFeeUseCase,
     private val sendAmountUpdateTrigger: SendAmountUpdateTrigger,
-    private val sendFeatureToggles: SendFeatureToggles,
     private val analyticsEventHandler: AnalyticsEventHandler,
 ) : Model(), SendComponentCallback {
 
@@ -104,19 +99,16 @@ internal class SendModel @Inject constructor(
     private val cryptoCurrency = params.currency
 
     val analyticCategoryName = CommonSendAnalyticEvents.SEND_CATEGORY
+    val analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.Send
 
     val uiState: StateFlow<SendUM>
-    field = MutableStateFlow(initialState())
+        field = MutableStateFlow(initialState())
 
     val isBalanceHiddenFlow: StateFlow<Boolean>
-    field = MutableStateFlow(false)
+        field = MutableStateFlow(false)
 
     val initialRoute = if (params.amount == null) {
-        if (uiState.value.isRedesignEnabled) {
-            Amount(isEditMode = false)
-        } else {
-            Destination(isEditMode = false)
-        }
+        Amount(isEditMode = false)
     } else {
         Empty
     }
@@ -166,19 +158,13 @@ internal class SendModel @Inject constructor(
         uiState.update { it.copy(amountUM = amountUM) }
     }
 
-    override fun onFeeResult(feeUM: FeeUM) {
-        uiState.update { it.copy(feeUM = feeUM) }
-    }
-
     override fun onResult(sendUM: SendUM) {
         uiState.update { sendUM }
     }
 
     override fun onBackClick() {
-        val isRedesignEnabled = uiState.value.isRedesignEnabled
-
         when (val route = currentRoute.value) {
-            is Amount -> if (isRedesignEnabled && !route.isEditMode) {
+            is Amount -> if (!route.isEditMode) {
                 analyticsEventHandler.send(
                     CommonSendAnalyticEvents.CloseButtonClicked(
                         categoryName = analyticCategoryName,
@@ -188,7 +174,7 @@ internal class SendModel @Inject constructor(
                     ),
                 )
             }
-            is Destination -> if (isRedesignEnabled && !route.isEditMode) {
+            is Destination -> if (!route.isEditMode) {
                 analyticsEventHandler.send(
                     CommonSendAnalyticEvents.CloseButtonClicked(
                         categoryName = analyticCategoryName,
@@ -205,21 +191,12 @@ internal class SendModel @Inject constructor(
     }
 
     override fun onNextClick() {
-        val isRedesignEnabled = uiState.value.isRedesignEnabled
         if (currentRoute.value.isEditMode) {
             onBackClick()
         } else {
             when (currentRoute.value) {
-                is Amount -> if (isRedesignEnabled) {
-                    router.push(Destination(isEditMode = false))
-                } else {
-                    router.push(Confirm)
-                }
-                is Destination -> if (isRedesignEnabled) {
-                    router.push(Confirm)
-                } else {
-                    router.push(Amount(isEditMode = false))
-                }
+                is Amount -> router.push(Destination(isEditMode = false))
+                is Destination -> router.push(Confirm)
                 Confirm -> router.push(ConfirmSuccess)
                 else -> onBackClick()
             }
@@ -241,9 +218,7 @@ internal class SendModel @Inject constructor(
             it.copy(
                 destinationUM = SendDestinationInitialStateTransformer(
                     cryptoCurrency = cryptoCurrency,
-                    isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
                 ).transform(DestinationUM.Empty()),
-                feeUM = FeeUM.Empty(),
                 feeSelectorUM = FeeSelectorUM.Loading,
                 confirmUM = ConfirmUM.Empty,
                 confirmData = null,
@@ -260,10 +235,11 @@ internal class SendModel @Inject constructor(
 
     suspend fun loadFee(): Either<GetFeeError, TransactionFee> {
         val predefinedValues = predefinedValues
+        val cryptoCurrencyStatus = cryptoCurrencyStatusFlow.value
         val transferTransaction = if (predefinedValues is PredefinedValues.Content.Deeplink) {
-            val predefinedAmount = predefinedValues.amount.parseBigDecimalOrNull()?.convertToSdkAmount(cryptoCurrency)
+            val predefinedAmount = predefinedValues.amount.parseBigDecimalOrNull()
             createTransferTransactionUseCase(
-                amount = predefinedAmount ?: error("Invalid amount"),
+                amount = predefinedAmount?.convertToSdkAmount(cryptoCurrencyStatus) ?: error("Invalid amount"),
                 memo = predefinedValues.memo,
                 destination = predefinedValues.address,
                 userWalletId = userWallet.walletId,
@@ -277,7 +253,7 @@ internal class SendModel @Inject constructor(
             val enteredAmount = amountUM.amountTextField.cryptoAmount.value ?: error("Invalid amount")
 
             createTransferTransactionUseCase(
-                amount = enteredAmount.convertToSdkAmount(cryptoCurrency),
+                amount = enteredAmount.convertToSdkAmount(cryptoCurrencyStatus),
                 memo = enteredMemo,
                 destination = enteredDestinationAddress,
                 userWalletId = userWallet.walletId,
@@ -478,15 +454,12 @@ internal class SendModel @Inject constructor(
     }
 
     private fun initialState(): SendUM = SendUM(
-        amountUM = AmountState.Empty(isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled),
+        amountUM = AmountState.Empty(isRedesignEnabled = true),
         destinationUM = SendDestinationInitialStateTransformer(
             cryptoCurrency = cryptoCurrency,
-            isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
         ).transform(DestinationUM.Empty()),
-        feeUM = FeeUM.Empty(),
         confirmUM = ConfirmUM.Empty,
         navigationUM = NavigationUM.Empty,
-        isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
         confirmData = null,
         feeSelectorUM = FeeSelectorUM.Loading,
     )
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/model/SendConfirmSuccessModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/model/SendConfirmSuccessModel.kt
index 87680abfc2..0d6a56bba6 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/model/SendConfirmSuccessModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/model/SendConfirmSuccessModel.kt
@@ -81,10 +81,10 @@ internal class SendConfirmSuccessModel @Inject constructor(
                             iconRes = R.drawable.ic_web_24,
                             onClick = ::onExploreClick,
                         ) to NavigationButton(
-                                textReference = resourceReference(R.string.common_share),
-                                iconRes = R.drawable.ic_share_24,
-                                onClick = ::onShareClick,
-                            )).takeIf { params.txUrl.isNotEmpty() },
+                            textReference = resourceReference(R.string.common_share),
+                            iconRes = R.drawable.ic_share_24,
+                            onClick = ::onShareClick,
+                        )).takeIf { params.txUrl.isNotEmpty() },
                     ),
                 ),
             )
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/ui/SendConfirmSuccessContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/ui/SendConfirmSuccessContent.kt
index 179b28552f..fbd5a692d6 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/ui/SendConfirmSuccessContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/success/ui/SendConfirmSuccessContent.kt
@@ -11,7 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.amountScreen.ui.AmountBlock
 import com.tangem.common.ui.navigationButtons.NavigationButtonsBlockV2
-import com.tangem.core.ui.components.BottomFade
+import com.tangem.core.ui.components.Fade
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.transactions.TransactionDoneTitle
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
@@ -45,54 +46,70 @@ internal fun SendConfirmSuccessContent(sendUM: SendUM, destinationBlockComponent
         exit = slideOutVertically().plus(fadeOut()),
         label = "Animate success content",
     ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(TangemTheme.colors.background.tertiary),
-        ) {
-            Column(
+        Column {
+            Box(
                 modifier = Modifier
-                    .padding(horizontal = TangemTheme.dimens.spacing16)
-                    .verticalScroll(rememberScrollState()),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
+                    .weight(1f)
+                    .background(TangemTheme.colors.background.tertiary),
             ) {
-                if (sendUM.confirmUM is ConfirmUM.Success) {
-                    TransactionDoneTitle(
-                        title = resourceReference(R.string.sent_transaction_sent_title),
-                        subtitle = resourceReference(
-                            R.string.send_date_format,
-                            wrappedList(
-                                sendUM.confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
-                                sendUM.confirmUM.transactionDate.toTimeFormat(),
-                            ),
-                        ),
-                        modifier = Modifier.padding(vertical = 12.dp),
-                    )
-                }
-                AmountBlock(
-                    amountState = sendUM.amountUM,
-                    isClickDisabled = true,
-                    isEditingDisabled = true,
-                    onClick = {},
+                SuccessContent(
+                    sendUM = sendUM,
+                    destinationBlockComponent = destinationBlockComponent,
+                    modifier = Modifier.fillMaxHeight(),
+                )
+                Fade(
+                    modifier = Modifier.align(Alignment.BottomCenter),
+                    backgroundColor = TangemTheme.colors.background.tertiary,
                 )
-                destinationBlockComponent.Content(modifier = Modifier)
-                FeeBlock(feeSelectorUM = sendUM.feeSelectorUM)
-                Spacer(Modifier.height(128.dp))
             }
-            BottomFade(Modifier.align(Alignment.BottomCenter), TangemTheme.colors.background.tertiary)
             NavigationButtonsBlockV2(
                 navigationUM = sendUM.navigationUM,
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .padding(
-                        start = 16.dp,
-                        end = 16.dp,
-                        bottom = 16.dp,
-                    ),
+                modifier = Modifier.padding(
+                    start = 16.dp,
+                    end = 16.dp,
+                    bottom = 16.dp,
+                ),
             )
         }
     }
 }
 
+@Composable
+private fun SuccessContent(
+    sendUM: SendUM,
+    destinationBlockComponent: SendDestinationBlockComponent,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .padding(horizontal = 16.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        if (sendUM.confirmUM is ConfirmUM.Success) {
+            TransactionDoneTitle(
+                title = resourceReference(R.string.sent_transaction_sent_title),
+                subtitle = resourceReference(
+                    R.string.send_date_format,
+                    wrappedList(
+                        sendUM.confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
+                        sendUM.confirmUM.transactionDate.toTimeFormat(),
+                    ),
+                ),
+                modifier = Modifier.padding(vertical = 12.dp),
+            )
+        }
+        AmountBlock(
+            amountState = sendUM.amountUM,
+            isClickDisabled = true,
+            isEditingDisabled = true,
+            onClick = {},
+        )
+        destinationBlockComponent.Content(modifier = Modifier)
+        FeeBlock(feeSelectorUM = sendUM.feeSelectorUM)
+        SpacerH(16.dp)
+    }
+}
+
 private const val ANIMATION_DELAY = 600L
 private val ANIMATION_OFFSET = (-40).dp
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/ui/state/SendUM.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/ui/state/SendUM.kt
index 3599e91e56..7beee9b121 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/ui/state/SendUM.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/ui/state/SendUM.kt
@@ -6,15 +6,12 @@ import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.send.confirm.model.ConfirmData
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 
 internal data class SendUM(
     val amountUM: AmountState,
     val destinationUM: DestinationUM,
-    val feeUM: FeeUM,
     val feeSelectorUM: FeeSelectorUM,
     val confirmUM: ConfirmUM,
     val navigationUM: NavigationUM,
-    val isRedesignEnabled: Boolean,
     val confirmData: ConfirmData?,
 )
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/DefaultNFTSendComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/DefaultNFTSendComponent.kt
index f12e8292a3..13d6256eed 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/DefaultNFTSendComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/DefaultNFTSendComponent.kt
@@ -21,7 +21,6 @@ import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.features.send.v2.api.NFTSendComponent
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationComponentParams
-import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import com.tangem.features.send.v2.common.CommonSendRoute
 import com.tangem.features.send.v2.common.ui.SendContent
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
@@ -30,14 +29,11 @@ import com.tangem.features.send.v2.sendnft.confirm.NFTSendConfirmComponent
 import com.tangem.features.send.v2.sendnft.model.NFTSendModel
 import com.tangem.features.send.v2.sendnft.success.NFTSendSuccessComponent
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.launch
-import java.math.BigDecimal
 
 internal class DefaultNFTSendComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
@@ -49,6 +45,7 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
 
     private val stackNavigation = StackNavigation<CommonSendRoute>()
     private val analyticsCategoryName = CommonSendAnalyticEvents.NFT_SEND_CATEGORY
+    private val analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.NFT
 
     private val innerRouter = InnerRouter<CommonSendRoute>(
         stackNavigation = stackNavigation,
@@ -83,7 +80,10 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
                 when (val activeComponent = stack.active.instance) {
                     is NFTSendConfirmComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.ConfirmationScreenOpened(categoryName = analyticsCategoryName),
+                            CommonSendAnalyticEvents.ConfirmationScreenOpened(
+                                categoryName = analyticsCategoryName,
+                                source = analyticsSendSource,
+                            ),
                         )
                         if (model.currentRouteFlow.value.isEditMode) {
                             activeComponent.updateState(model.uiState.value)
@@ -91,15 +91,13 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
                     }
                     is DefaultSendDestinationComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.AddressScreenOpened(categoryName = analyticsCategoryName),
+                            CommonSendAnalyticEvents.AddressScreenOpened(
+                                categoryName = analyticsCategoryName,
+                                source = analyticsSendSource,
+                            ),
                         )
                         activeComponent.updateState(model.uiState.value.destinationUM)
                     }
-                    is SendFeeComponent -> {
-                        analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.FeeScreenOpened(categoryName = analyticsCategoryName),
-                        )
-                    }
                 }
                 model.currentRouteFlow.emit(stack.active.configuration)
             }
@@ -114,13 +112,13 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
         BackHandler(onBack = model::onBackClick)
         SendContent(
             navigationUM = state.navigationUM,
+            confirmUM = state.confirmUM,
             stackState = stackState,
         )
     }
 
     private fun createChild(route: CommonSendRoute, factoryContext: AppComponentContext) = when (route) {
         is CommonSendRoute.Destination -> getDestinationComponent(factoryContext)
-        is CommonSendRoute.Fee -> getFeeComponent(factoryContext)
         CommonSendRoute.Confirm -> getConfirmComponent(factoryContext)
         CommonSendRoute.ConfirmSuccess -> getSuccessComponent(factoryContext)
         else -> getStubComponent()
@@ -135,37 +133,13 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
                 isBalanceHidingFlow = model.isBalanceHiddenFlow,
                 title = resourceReference(R.string.nft_send),
                 analyticsCategoryName = analyticsCategoryName,
+                analyticsSendSource = analyticsSendSource,
                 userWalletId = params.userWalletId,
                 cryptoCurrency = model.cryptoCurrency,
                 callback = model,
             ),
         )
 
-    private fun getFeeComponent(factoryContext: AppComponentContext): ComposableContentComponent {
-        val state = model.uiState.value
-        val destinationAddress = (state.destinationUM as? DestinationUM.Content)?.addressTextField?.actualAddress
-        return if (destinationAddress != null) {
-            SendFeeComponent(
-                appComponentContext = factoryContext,
-                params = SendFeeComponentParams.FeeParams(
-                    state = model.uiState.value.feeUM,
-                    currentRoute = model.currentRouteFlow.filterIsInstance<CommonSendRoute.Fee>(),
-                    analyticsCategoryName = analyticsCategoryName,
-                    userWallet = model.userWallet,
-                    cryptoCurrencyStatus = model.cryptoCurrencyStatus,
-                    feeCryptoCurrencyStatus = model.feeCryptoCurrencyStatus,
-                    appCurrency = model.appCurrency,
-                    sendAmount = BigDecimal.ZERO,
-                    onLoadFee = model::loadFee,
-                    destinationAddress = destinationAddress,
-                    callback = model,
-                ),
-            )
-        } else {
-            getStubComponent()
-        }
-    }
-
     private fun getConfirmComponent(factoryContext: AppComponentContext) = nftSendConfirmComponentFactory.create(
         appComponentContext = factoryContext,
         params = NFTSendConfirmComponent.Params(
@@ -181,6 +155,7 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
             currentRoute = model.currentRouteFlow.filterIsInstance<CommonSendRoute.Confirm>(),
             isBalanceHidingFlow = model.isBalanceHiddenFlow,
             onLoadFee = model::loadFee,
+            analyticsSendSource = analyticsSendSource,
             onSendTransaction = { innerRouter.replaceAll(CommonSendRoute.ConfirmSuccess) },
         ),
     )
@@ -198,6 +173,7 @@ internal class DefaultNFTSendComponent @AssistedInject constructor(
             params = NFTSendSuccessComponent.Params(
                 nftSendUMFlow = model.uiState,
                 analyticsCategoryName = analyticsCategoryName,
+                analyticsSendSource = analyticsSendSource,
                 userWallet = model.userWallet,
                 cryptoCurrencyStatus = model.cryptoCurrencyStatus,
                 nftAsset = params.nftAsset,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/analytics/NFTSendAnalyticHelper.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/analytics/NFTSendAnalyticHelper.kt
index b57e306719..c25e1fc99a 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/analytics/NFTSendAnalyticHelper.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/analytics/NFTSendAnalyticHelper.kt
@@ -6,11 +6,11 @@ import com.tangem.core.analytics.models.Basic
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents.Companion.NFT_SEND_CATEGORY
+import com.tangem.features.send.v2.api.entity.FeeNonce
+import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationTextFieldUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import com.tangem.features.send.v2.sendnft.ui.state.NFTSendUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 import javax.inject.Inject
 
 @ModelScoped
@@ -20,15 +20,14 @@ internal class NFTSendAnalyticHelper @Inject constructor(
 
     fun nftSendSuccessAnalytics(cryptoCurrency: CryptoCurrency, nftSendUM: NFTSendUM) {
         val destinationUM = nftSendUM.destinationUM as? DestinationUM.Content
-        val feeUM = nftSendUM.feeUM as? FeeUM.Content
-        val feeSelectorUM = feeUM?.feeSelectorUM as? FeeSelectorUM.Content ?: return
-        val feeType = feeSelectorUM.selectedType.toAnalyticType(feeSelectorUM)
+        val feeSelectorUM = nftSendUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
+        val feeType = feeSelectorUM.toAnalyticType()
         analyticsEventHandler.send(
             NFTSendAnalyticEvents.TransactionScreenOpened(
                 token = cryptoCurrency.symbol,
                 feeType = feeType,
                 blockchain = cryptoCurrency.network.name,
-                nonceNotEmpty = feeSelectorUM.nonce != null,
+                nonceNotEmpty = feeSelectorUM.feeNonce is FeeNonce.Nonce,
             ),
         )
         analyticsEventHandler.send(
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/NFTSendConfirmComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/NFTSendConfirmComponent.kt
index d2fd5670b1..851eb6cbd5 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/NFTSendConfirmComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/NFTSendConfirmComponent.kt
@@ -20,6 +20,7 @@ import com.tangem.domain.transaction.error.GetFeeError
 import com.tangem.features.nft.component.NFTDetailsBlockComponent
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.params.FeeSelectorParams
 import com.tangem.features.send.v2.api.params.FeeSelectorParams.FeeStateConfiguration
@@ -31,8 +32,6 @@ import com.tangem.features.send.v2.sendnft.confirm.model.NFTSendConfirmModel
 import com.tangem.features.send.v2.sendnft.confirm.ui.NFTSendConfirmContent
 import com.tangem.features.send.v2.sendnft.ui.state.NFTSendUM
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
 import com.tangem.features.send.v2.subcomponents.notifications.DefaultSendNotificationsComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -57,6 +56,7 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
             params = DestinationBlockParams(
                 state = model.uiState.value.destinationUM,
                 analyticsCategoryName = params.analyticsCategoryName,
+                analyticsSendSource = params.analyticsSendSource,
                 userWalletId = params.userWallet.walletId,
                 cryptoCurrency = params.cryptoCurrencyStatus.currency,
                 blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
@@ -66,24 +66,6 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
             onClick = model::showEditDestination,
         )
 
-    private val feeBlockComponent = SendFeeBlockComponent(
-        appComponentContext = child("NFTSendConfirmFeeBlock"),
-        params = SendFeeComponentParams.FeeBlockParams(
-            state = model.uiState.value.feeUM,
-            analyticsCategoryName = params.analyticsCategoryName,
-            userWallet = params.userWallet,
-            cryptoCurrencyStatus = params.cryptoCurrencyStatus,
-            feeCryptoCurrencyStatus = params.feeCryptoCurrencyStatus,
-            appCurrency = params.appCurrency,
-            sendAmount = BigDecimal.ZERO,
-            onLoadFee = params.onLoadFee,
-            destinationAddress = model.confirmData.enteredDestination.orEmpty(),
-            blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
-        ),
-        onResult = model::onFeeResult,
-        onClick = model::showEditFee,
-    )
-
     private val feeSelectorBlockComponent = feeSelectorComponentFactory.create(
         context = child("NFTSendConfirmFeeSelectorBlock"),
         params = FeeSelectorParams.FeeSelectorBlockParams(
@@ -94,6 +76,7 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
             feeStateConfiguration = FeeStateConfiguration.None,
             feeDisplaySource = FeeSelectorParams.FeeDisplaySource.Screen,
             analyticsCategoryName = params.analyticsCategoryName,
+            analyticsSendSource = params.analyticsSendSource,
         ),
         onResult = model::onFeeResult,
     )
@@ -139,7 +122,6 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
 
     fun updateState(state: NFTSendUM) {
         destinationBlockComponent.updateState(state.destinationUM)
-        feeBlockComponent.updateState(state.feeUM)
         model.updateState(state)
     }
 
@@ -151,7 +133,6 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
         NFTSendConfirmContent(
             nftSendUM = state,
             destinationBlockComponent = destinationBlockComponent,
-            feeBlockComponent = feeBlockComponent,
             feeSelectorBlockComponent = feeSelectorBlockComponent,
             nftDetailsBlockComponent = nftDetailsBlockComponent,
             notificationsComponent = notificationsComponent,
@@ -162,6 +143,7 @@ internal class NFTSendConfirmComponent @AssistedInject constructor(
     data class Params(
         val state: NFTSendUM,
         val analyticsCategoryName: String,
+        val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val userWallet: UserWallet,
         val appCurrency: AppCurrency,
         val nftAsset: NFTAsset,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmClickIntents.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmClickIntents.kt
index 292d62c6c0..ed9122b058 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmClickIntents.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmClickIntents.kt
@@ -4,8 +4,6 @@ internal interface NFTSendConfirmClickIntents {
 
     fun showEditDestination()
 
-    fun showEditFee()
-
     fun onSendClick()
 
     fun onExploreClick()
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmModel.kt
index 7204187015..aab81e8c77 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/NFTSendConfirmModel.kt
@@ -36,6 +36,7 @@ import com.tangem.features.send.v2.api.callbacks.FeeSelectorModelCallback
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener
 import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.FeeSelectorReloadTrigger
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateListener
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateTrigger
 import com.tangem.features.send.v2.common.CommonSendRoute
@@ -47,15 +48,8 @@ import com.tangem.features.send.v2.sendnft.analytics.NFTSendAnalyticHelper
 import com.tangem.features.send.v2.sendnft.confirm.NFTSendConfirmComponent
 import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmInitialStateTransformer
 import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmSendingStateTransformer
-import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformer
 import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformerV2
 import com.tangem.features.send.v2.sendnft.ui.state.NFTSendUM
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadListener
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadTrigger
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeData
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeReloadTrigger
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.extensions.stripZeroPlainString
 import com.tangem.utils.transformer.update
@@ -83,8 +77,6 @@ internal class NFTSendConfirmModel @Inject constructor(
     private val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase,
     private val notificationsUpdateTrigger: SendNotificationsUpdateTrigger,
     private val notificationsUpdateListener: SendNotificationsUpdateListener,
-    private val sendFeeCheckReloadTrigger: SendFeeCheckReloadTrigger,
-    private val sendFeeCheckReloadListener: SendFeeCheckReloadListener,
     private val feeSelectorCheckReloadTrigger: FeeSelectorCheckReloadTrigger,
     private val feeSelectorCheckReloadListener: FeeSelectorCheckReloadListener,
     private val alertFactory: SendConfirmAlertFactory,
@@ -93,7 +85,7 @@ internal class NFTSendConfirmModel @Inject constructor(
     private val analyticsEventHandler: AnalyticsEventHandler,
     private val nftSendAnalyticHelper: NFTSendAnalyticHelper,
     private val nftSendSuccessTrigger: NFTSendSuccessTrigger,
-    private val sendFeeReloadTrigger: SendFeeReloadTrigger,
+    private val feeSelectorReloadTrigger: FeeSelectorReloadTrigger,
     sendBalanceUpdaterFactory: SendBalanceUpdater.Factory,
 ) : Model(), NFTSendConfirmClickIntents, SendNotificationsComponent.ModelCallback, FeeSelectorModelCallback {
 
@@ -114,25 +106,13 @@ internal class NFTSendConfirmModel @Inject constructor(
 
     private val destinationUM
         get() = uiState.value.destinationUM as? DestinationUM.Content
-    private val feeUM
-        get() = uiState.value.feeUM as? FeeUM.Content
-    private val feeSelectorUM
-        get() = feeUM?.feeSelectorUM as? FeeSelectorUM.Content
 
     val confirmData: ConfirmData
         get() = ConfirmData(
             enteredDestination = destinationUM?.addressTextField?.actualAddress,
             enteredMemo = destinationUM?.memoTextField?.value,
-            fee = if (uiState.value.isRedesignEnabled) {
-                (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Content)?.selectedFeeItem?.fee
-            } else {
-                feeSelectorUM?.selectedFee
-            },
-            feeError = if (uiState.value.isRedesignEnabled) {
-                (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Error)?.error
-            } else {
-                (feeUM?.feeSelectorUM as? FeeSelectorUM.Error)?.error
-            },
+            fee = (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Content)?.selectedFeeItem?.fee,
+            feeError = (uiState.value.feeSelectorUM as? FeeSelectorUMRedesigned.Error)?.error,
         )
 
     private var sendIdleTimer: Long = 0L
@@ -150,12 +130,6 @@ internal class NFTSendConfirmModel @Inject constructor(
         updateConfirmNotifications()
     }
 
-    fun onFeeResult(feeUM: FeeUM) {
-        sendIdleTimer = SystemClock.elapsedRealtime()
-        _uiState.update { it.copy(feeUM = feeUM) }
-        updateConfirmNotifications()
-    }
-
     override fun onFeeResult(feeSelectorUM: FeeSelectorUMRedesigned) {
         sendIdleTimer = SystemClock.elapsedRealtime()
         _uiState.update { it.copy(feeSelectorUM = feeSelectorUM) }
@@ -169,13 +143,7 @@ internal class NFTSendConfirmModel @Inject constructor(
 
     override fun onFeeReload() {
         modelScope.launch {
-            sendFeeReloadTrigger.triggerUpdate(
-                // For now transfer one nft asset at a time
-                feeData = SendFeeData(
-                    amount = BigDecimal.ZERO,
-                    destinationAddress = confirmData.enteredDestination,
-                ),
-            )
+            feeSelectorReloadTrigger.triggerUpdate()
         }
     }
 
@@ -192,30 +160,13 @@ internal class NFTSendConfirmModel @Inject constructor(
         }
     }
 
-    override fun showEditFee() {
-        modelScope.launch {
-            neverShowTapHelpUseCase()
-            analyticsEventHandler.send(
-                CommonSendAnalyticEvents.ScreenReopened(
-                    categoryName = analyticsCategoryName,
-                    source = SendScreenSource.Fee,
-                ),
-            )
-            router.push(CommonSendRoute.Fee)
-        }
-    }
-
     override fun onSendClick() {
         _uiState.update(NFTSendConfirmSendingStateTransformer(isSending = true))
         if (SystemClock.elapsedRealtime() - sendIdleTimer < CHECK_FEE_UPDATE_DELAY) {
             verifyAndSendTransaction()
         } else {
             modelScope.launch {
-                if (uiState.value.isRedesignEnabled) {
-                    feeSelectorCheckReloadTrigger.triggerCheckUpdate()
-                } else {
-                    sendFeeCheckReloadTrigger.triggerCheckUpdate()
-                }
+                feeSelectorCheckReloadTrigger.triggerCheckUpdate()
             }
         }
     }
@@ -257,11 +208,7 @@ internal class NFTSendConfirmModel @Inject constructor(
 
     private fun initialState() {
         val confirmUM = uiState.value.confirmUM
-        val isEmptyFee = if (uiState.value.isRedesignEnabled) {
-            uiState.value.feeSelectorUM !is FeeSelectorUMRedesigned.Content
-        } else {
-            uiState.value.feeUM is FeeUM.Empty
-        }
+        val isEmptyFee = uiState.value.feeSelectorUM !is FeeSelectorUMRedesigned.Content
 
         modelScope.launch {
             val isShowTapHelp = isSendTapHelpEnabledUseCase.invokeSync().getOrElse { false }
@@ -293,13 +240,7 @@ internal class NFTSendConfirmModel @Inject constructor(
         notificationsUpdateListener.hasErrorFlow
             .onEach { hasError ->
                 _uiState.update {
-                    val isFeeNotNull = if (uiState.value.isRedesignEnabled) {
-                        it.feeSelectorUM is FeeSelectorUMRedesigned.Content
-                    } else {
-                        val feeUM = it.feeUM as? FeeUM.Content
-                        val feeSelectorUM = feeUM?.feeSelectorUM as? FeeSelectorUM.Content
-                        feeSelectorUM != null
-                    }
+                    val isFeeNotNull = it.feeSelectorUM is FeeSelectorUMRedesigned.Content
 
                     it.copy(
                         confirmUM = (it.confirmUM as? ConfirmUM.Content)?.copy(
@@ -372,24 +313,13 @@ internal class NFTSendConfirmModel @Inject constructor(
                 updateTransactionStatus(txData)
                 sendBalanceUpdater.scheduleUpdates()
                 nftSendAnalyticHelper.nftSendSuccessAnalytics(cryptoCurrency, uiState.value)
-                if (uiState.value.isRedesignEnabled) {
-                    params.callback.onResult(uiState.value)
-                    params.onSendTransaction()
-                }
+                params.callback.onResult(uiState.value)
+                params.onSendTransaction()
             },
         )
     }
 
     private fun subscribeOnCheckFeeResultUpdates() {
-        sendFeeCheckReloadListener.checkReloadResultFlow.onEach { isFeeResultSuccess ->
-            sendIdleTimer = SystemClock.elapsedRealtime()
-            if (isFeeResultSuccess) {
-                _uiState.update(NFTSendConfirmSendingStateTransformer(isSending = true))
-                verifyAndSendTransaction()
-            } else {
-                _uiState.update(NFTSendConfirmSendingStateTransformer(isSending = false))
-            }
-        }.launchIn(modelScope)
         feeSelectorCheckReloadListener.checkReloadResultFlow.onEach { isFeeResultSuccess ->
             sendIdleTimer = SystemClock.elapsedRealtime()
             if (isFeeResultSuccess) {
@@ -425,23 +355,13 @@ internal class NFTSendConfirmModel @Inject constructor(
         }
         _uiState.update {
             it.copy(
-                confirmUM = if (uiState.value.isRedesignEnabled) {
-                    NFTSendConfirmationNotificationsTransformerV2(
-                        feeSelectorUM = uiState.value.feeSelectorUM,
-                        analyticsEventHandler = analyticsEventHandler,
-                        cryptoCurrency = cryptoCurrencyStatus.currency,
-                        appCurrency = params.appCurrency,
-                        analyticsCategoryName = analyticsCategoryName,
-                    )
-                } else {
-                    NFTSendConfirmationNotificationsTransformer(
-                        feeUM = uiState.value.feeUM,
-                        analyticsEventHandler = analyticsEventHandler,
-                        cryptoCurrency = cryptoCurrencyStatus.currency,
-                        analyticsCategoryName = analyticsCategoryName,
-                        appCurrency = params.appCurrency,
-                    )
-                }.transform(uiState.value.confirmUM),
+                confirmUM = NFTSendConfirmationNotificationsTransformerV2(
+                    feeSelectorUM = uiState.value.feeSelectorUM,
+                    analyticsEventHandler = analyticsEventHandler,
+                    cryptoCurrency = cryptoCurrencyStatus.currency,
+                    appCurrency = params.appCurrency,
+                    analyticsCategoryName = analyticsCategoryName,
+                ).transform(uiState.value.confirmUM),
             )
         }
     }
@@ -453,23 +373,14 @@ internal class NFTSendConfirmModel @Inject constructor(
             transform = { state, route -> state to route },
         ).onEach { (state, _) ->
             val confirmUM = state.confirmUM
-            val confirmUMContent = confirmUM as? ConfirmUM.Content
             params.callback.onResult(
                 state.copy(
                     navigationUM = NavigationUM.Content(
                         title = resourceReference(R.string.nft_send),
-                        subtitle = if (uiState.value.isRedesignEnabled) {
-                            null
-                        } else {
-                            confirmUMContent?.walletName
-                        },
-                        backIconRes = if (state.isRedesignEnabled) {
-                            when (confirmUM) {
-                                is ConfirmUM.Success -> R.drawable.ic_close_24
-                                else -> R.drawable.ic_back_24
-                            }
-                        } else {
-                            R.drawable.ic_close_24
+                        subtitle = null,
+                        backIconRes = when (confirmUM) {
+                            is ConfirmUM.Success -> R.drawable.ic_close_24
+                            else -> R.drawable.ic_back_24
                         },
                         backIconClick = {
                             analyticsEventHandler.send(
@@ -480,11 +391,7 @@ internal class NFTSendConfirmModel @Inject constructor(
                                     isValid = confirmUM.isPrimaryButtonEnabled,
                                 ),
                             )
-                            if (state.isRedesignEnabled) {
-                                router.pop()
-                            } else {
-                                appRouter.pop()
-                            }
+                            router.pop()
                         },
                         primaryButton = primaryButtonUM(),
                         prevButton = null,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformer.kt
deleted file mode 100644
index b5bd158810..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformer.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.tangem.features.send.v2.sendnft.confirm.model.transformers
-
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
-import com.tangem.features.send.v2.api.utils.formatFooterFiatFee
-import com.tangem.features.send.v2.api.utils.getTronTokenFeeSendingText
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkIfFeeTooHigh
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-import kotlinx.collections.immutable.toPersistentList
-
-internal class NFTSendConfirmationNotificationsTransformer(
-    private val feeUM: FeeUM,
-    private val analyticsEventHandler: AnalyticsEventHandler,
-    private val cryptoCurrency: CryptoCurrency,
-    private val analyticsCategoryName: String,
-    private val appCurrency: AppCurrency,
-) : Transformer<ConfirmUM> {
-    override fun transform(prevState: ConfirmUM): ConfirmUM {
-        val state = prevState as? ConfirmUM.Content ?: return prevState
-        val feeUM = feeUM as? FeeUM.Content ?: return prevState
-        return state.copy(
-            sendingFooter = getSendingFooterText(),
-            notifications = buildList {
-                addTooHighNotification(feeUM.feeSelectorUM)
-                addTooLowNotification(feeUM)
-            }.toPersistentList(),
-        )
-    }
-
-    private fun MutableList<NotificationUM>.addTooLowNotification(feeUM: FeeUM.Content) {
-        val feeSelectorUM = feeUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
-        val multipleFees = feeSelectorUM.fees as? TransactionFee.Choosable ?: return
-        val minimumValue = multipleFees.minimum.amount.value ?: return
-        val customAmount = feeSelectorUM.customValues.firstOrNull() ?: return
-        val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals)
-        if (feeSelectorUM.selectedType == FeeType.Custom && minimumValue > customValue) {
-            add(NotificationUM.Warning.FeeTooLow)
-            analyticsEventHandler.send(
-                CommonSendAnalyticEvents.NoticeTransactionDelays(
-                    categoryName = analyticsCategoryName,
-                    token = cryptoCurrency.symbol,
-                ),
-            )
-        }
-    }
-
-    private fun getSendingFooterText(): TextReference {
-        val feeUM = feeUM as? FeeUM.Content
-        val fee = (feeUM?.feeSelectorUM as? FeeSelectorUM.Content)?.selectedFee ?: return TextReference.EMPTY
-
-        val fiatFeeValue = feeUM.rate?.let { fee.amount.value?.multiply(it) }
-
-        val fiatFee = formatFooterFiatFee(
-            amount = fee.amount.copy(value = fiatFeeValue),
-            isFeeConvertibleToFiat = feeUM.isFeeConvertibleToFiat,
-            isFeeApproximate = feeUM.isFeeApproximate,
-            appCurrency = appCurrency,
-        )
-
-        return if (feeUM.isTronToken && fee is Fee.Tron) {
-            getTronTokenFeeSendingText(
-                fee = fee,
-                fiatFee = fiatFee,
-                fiatSending = resourceReference(R.string.common_nft),
-            )
-        } else {
-            resourceReference(
-                id = if (feeUM.isFeeConvertibleToFiat) {
-                    R.string.send_summary_transaction_description
-                } else {
-                    R.string.send_summary_transaction_description_no_fiat_fee
-                },
-                formatArgs = wrappedList(
-                    resourceReference(R.string.common_nft),
-                    fiatFee,
-                ),
-            )
-        }
-    }
-
-    private fun MutableList<NotificationUM>.addTooHighNotification(feeSelectorUM: FeeSelectorUM) {
-        if (feeSelectorUM !is FeeSelectorUM.Content) return
-
-        val (isFeeTooHigh, diff) = checkIfFeeTooHigh(feeSelectorUM)
-        if (isFeeTooHigh) {
-            add(NotificationUM.Warning.TooHigh(diff))
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/ui/NFTSendConfirmContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/ui/NFTSendConfirmContent.kt
index 9ff84edfb4..3f93769f0e 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/ui/NFTSendConfirmContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/confirm/ui/NFTSendConfirmContent.kt
@@ -1,6 +1,5 @@
 package com.tangem.features.send.v2.sendnft.confirm.ui
 
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -8,28 +7,17 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
-import com.tangem.common.ui.footers.SendingText
 import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.ui.components.SpacerHMax
-import com.tangem.core.ui.components.transactions.TransactionDoneTitle
-import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.utils.DateTimeFormatters
-import com.tangem.core.ui.utils.toTimeFormat
 import com.tangem.features.nft.component.NFTDetailsBlockComponent
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.common.ui.tapHelp
-import com.tangem.features.send.v2.impl.R
 import com.tangem.features.send.v2.sendnft.ui.state.NFTSendUM
 import com.tangem.features.send.v2.subcomponents.destination.DefaultSendDestinationBlockComponent
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeBlockComponent
 import com.tangem.features.send.v2.subcomponents.notifications
 import com.tangem.features.send.v2.subcomponents.notifications.DefaultSendNotificationsComponent
 import kotlinx.collections.immutable.ImmutableList
@@ -42,87 +30,50 @@ internal fun NFTSendConfirmContent(
     nftSendUM: NFTSendUM,
     destinationBlockComponent: DefaultSendDestinationBlockComponent,
     nftDetailsBlockComponent: NFTDetailsBlockComponent,
-    feeBlockComponent: SendFeeBlockComponent,
     feeSelectorBlockComponent: FeeSelectorBlockComponent,
     notificationsComponent: DefaultSendNotificationsComponent,
     notificationsUM: ImmutableList<NotificationUM>,
 ) {
     val confirmUM = nftSendUM.confirmUM as? ConfirmUM.Content
 
-    Column {
-        LazyColumn(
-            modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
-        ) {
-            blocks(
-                nftSendUM = nftSendUM,
-                destinationBlockComponent = destinationBlockComponent,
-                nftDetailsBlockComponent = nftDetailsBlockComponent,
-                feeBlockComponent = feeBlockComponent,
-                feeSelectorBlockComponent = feeSelectorBlockComponent,
-            )
-            if (confirmUM != null) {
-                tapHelp(isDisplay = confirmUM.showTapHelp)
-                with(notificationsComponent) {
-                    content(
-                        state = notificationsUM,
-                        isClickDisabled = confirmUM.isSending,
-                    )
-                }
-                notifications(
-                    notifications = confirmUM.notifications,
+    LazyColumn(
+        modifier = Modifier.padding(horizontal = 16.dp),
+    ) {
+        blocks(
+            destinationBlockComponent = destinationBlockComponent,
+            nftDetailsBlockComponent = nftDetailsBlockComponent,
+            feeSelectorBlockComponent = feeSelectorBlockComponent,
+        )
+        if (confirmUM != null) {
+            tapHelp(isDisplay = confirmUM.showTapHelp)
+            with(notificationsComponent) {
+                content(
+                    state = notificationsUM,
                     isClickDisabled = confirmUM.isSending,
                 )
             }
+            notifications(
+                notifications = confirmUM.notifications,
+                isClickDisabled = confirmUM.isSending,
+            )
         }
-        SpacerHMax()
-        SendingText(footerText = confirmUM?.sendingFooter ?: TextReference.EMPTY)
     }
 }
 
 private fun LazyListScope.blocks(
-    nftSendUM: NFTSendUM,
     destinationBlockComponent: DefaultSendDestinationBlockComponent,
     nftDetailsBlockComponent: NFTDetailsBlockComponent,
-    feeBlockComponent: SendFeeBlockComponent,
     feeSelectorBlockComponent: FeeSelectorBlockComponent,
 ) {
     item(key = BLOCKS_KEY) {
         Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-            if (nftSendUM.isRedesignEnabled) {
-                nftDetailsBlockComponent.Content(modifier = Modifier)
-                destinationBlockComponent.Content(modifier = Modifier)
-                feeSelectorBlockComponent.Content(
-                    modifier = Modifier
-                        .clip(TangemTheme.shapes.roundedCornersXMedium)
-                        .background(TangemTheme.colors.background.action),
-                )
-            } else {
-                TransactionDoneTitleAnimated(nftSendUM = nftSendUM)
-                destinationBlockComponent.Content(modifier = Modifier)
-                nftDetailsBlockComponent.Content(modifier = Modifier)
-                feeBlockComponent.Content(modifier = Modifier)
-            }
+            nftDetailsBlockComponent.Content(modifier = Modifier)
+            destinationBlockComponent.Content(modifier = Modifier)
+            feeSelectorBlockComponent.Content(
+                modifier = Modifier
+                    .clip(TangemTheme.shapes.roundedCornersXMedium)
+                    .background(TangemTheme.colors.background.action),
+            )
         }
     }
-}
-
-@Composable
-private fun TransactionDoneTitleAnimated(nftSendUM: NFTSendUM) {
-    AnimatedVisibility(
-        visible = nftSendUM.confirmUM is ConfirmUM.Success,
-        modifier = Modifier.padding(vertical = 12.dp),
-    ) {
-        val wrappedConfirmUM = remember(this) { nftSendUM.confirmUM as ConfirmUM.Success }
-        TransactionDoneTitle(
-            title = resourceReference(R.string.sent_transaction_sent_title),
-            subtitle = resourceReference(
-                R.string.send_date_format,
-                wrappedList(
-                    wrappedConfirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
-                    wrappedConfirmUM.transactionDate.toTimeFormat(),
-                ),
-            ),
-            modifier = Modifier.padding(vertical = 12.dp),
-        )
-    }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/model/NFTSendModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/model/NFTSendModel.kt
index 9660b61db5..277b66f0a2 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/model/NFTSendModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/model/NFTSendModel.kt
@@ -32,7 +32,6 @@ import com.tangem.domain.transaction.usecase.GetFeeUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.features.nft.entity.NFTSendSuccessTrigger
 import com.tangem.features.send.v2.api.NFTSendComponent
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationComponent
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
@@ -43,8 +42,6 @@ import com.tangem.features.send.v2.common.ui.state.ConfirmUM
 import com.tangem.features.send.v2.sendnft.confirm.NFTSendConfirmComponent
 import com.tangem.features.send.v2.sendnft.success.NFTSendSuccessComponent
 import com.tangem.features.send.v2.sendnft.ui.state.NFTSendUM
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponent
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -52,7 +49,6 @@ import javax.inject.Inject
 import kotlin.properties.Delegates
 
 internal interface SendNFTComponentCallback :
-    SendFeeComponent.ModelCallback,
     SendDestinationComponent.ModelCallback,
     NFTSendConfirmComponent.ModelCallback
 
@@ -74,7 +70,6 @@ internal class NFTSendModel @Inject constructor(
     private val getWalletMetaInfoUseCase: GetWalletMetaInfoUseCase,
     private val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase,
     private val alertFactory: SendConfirmAlertFactory,
-    private val sendFeatureToggles: SendFeatureToggles,
     private val nftSendSuccessTrigger: NFTSendSuccessTrigger,
 ) : Model(), SendNFTComponentCallback, NFTSendSuccessComponent.ModelCallback {
 
@@ -88,10 +83,10 @@ internal class NFTSendModel @Inject constructor(
     private val nftAsset = params.nftAsset
 
     val uiState: StateFlow<NFTSendUM>
-    field = MutableStateFlow(initialState())
+        field = MutableStateFlow(initialState())
 
     val isBalanceHiddenFlow: StateFlow<Boolean>
-    field = MutableStateFlow(false)
+        field = MutableStateFlow(false)
 
     var cryptoCurrency: CryptoCurrency by Delegates.notNull()
     var userWallet: UserWallet by Delegates.notNull()
@@ -116,10 +111,6 @@ internal class NFTSendModel @Inject constructor(
         uiState.update { it.copy(destinationUM = destinationUM) }
     }
 
-    override fun onFeeResult(feeUM: FeeUM) {
-        uiState.update { it.copy(feeUM = feeUM) }
-    }
-
     override fun onBackClick() {
         if (currentRouteFlow.value == ConfirmSuccess) {
             modelScope.launch {
@@ -254,10 +245,8 @@ internal class NFTSendModel @Inject constructor(
 
     private fun initialState(): NFTSendUM = NFTSendUM(
         destinationUM = DestinationUM.Empty(),
-        feeUM = FeeUM.Empty(),
         feeSelectorUM = FeeSelectorUM.Loading,
         confirmUM = ConfirmUM.Empty,
         navigationUM = NavigationUM.Empty,
-        isRedesignEnabled = sendFeatureToggles.isNFTSendRedesignEnabled,
     )
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/NFTSendSuccessComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/NFTSendSuccessComponent.kt
index e651f4f298..a1647cd8b5 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/NFTSendSuccessComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/NFTSendSuccessComponent.kt
@@ -14,6 +14,7 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.nft.models.NFTAsset
 import com.tangem.features.nft.component.NFTDetailsBlockComponent
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationBlockComponent
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams
@@ -54,6 +55,7 @@ internal class NFTSendSuccessComponent @AssistedInject constructor(
         params = DestinationBlockParams(
             state = model.uiState.value.destinationUM,
             analyticsCategoryName = params.analyticsCategoryName,
+            analyticsSendSource = params.analyticsSendSource,
             userWalletId = params.userWallet.walletId,
             cryptoCurrency = params.cryptoCurrencyStatus.currency,
             blockClickEnableFlow = MutableStateFlow(false),
@@ -77,6 +79,7 @@ internal class NFTSendSuccessComponent @AssistedInject constructor(
     data class Params(
         val nftSendUMFlow: StateFlow<NFTSendUM>,
         val analyticsCategoryName: String,
+        val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val currentRoute: Flow<CommonSendRoute>,
         val cryptoCurrencyStatus: CryptoCurrencyStatus,
         val userWallet: UserWallet,
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/ui/NFTSendSuccessContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/ui/NFTSendSuccessContent.kt
index 5efe65012c..c90b4429e3 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/ui/NFTSendSuccessContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/success/ui/NFTSendSuccessContent.kt
@@ -2,16 +2,16 @@ package com.tangem.features.send.v2.sendnft.success.ui
 
 import androidx.compose.animation.*
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.navigationButtons.NavigationButtonsBlockV2
-import com.tangem.core.ui.components.BottomFade
+import com.tangem.core.ui.components.Fade
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.transactions.TransactionDoneTitle
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
@@ -52,52 +52,67 @@ internal fun NFTSendSuccessContent(
         label = "Animate success content",
         modifier = modifier,
     ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(TangemTheme.colors.background.tertiary),
-        ) {
-            Column(
+        Column {
+            Box(
                 modifier = Modifier
-                    .padding(horizontal = TangemTheme.dimens.spacing16)
-                    .scrollable(
-                        state = rememberScrollState(),
-                        orientation = Orientation.Vertical,
-                    ),
-                verticalArrangement = Arrangement.spacedBy(12.dp),
+                    .weight(1f)
+                    .background(TangemTheme.colors.background.tertiary),
             ) {
-                if (nftSendUM.confirmUM is ConfirmUM.Success) {
-                    TransactionDoneTitle(
-                        title = resourceReference(R.string.sent_transaction_sent_title),
-                        subtitle = resourceReference(
-                            R.string.send_date_format,
-                            wrappedList(
-                                nftSendUM.confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
-                                nftSendUM.confirmUM.transactionDate.toTimeFormat(),
-                            ),
-                        ),
-                        modifier = Modifier.padding(vertical = 12.dp),
-                    )
-                }
-                nftDetailsBlockComponent.Content(modifier = Modifier)
-                destinationBlockComponent.Content(modifier = Modifier)
-                FeeBlock(feeSelectorUM = nftSendUM.feeSelectorUM)
-                Spacer(Modifier.height(128.dp))
+                SuccessContent(
+                    nftSendUM = nftSendUM,
+                    nftDetailsBlockComponent = nftDetailsBlockComponent,
+                    destinationBlockComponent = destinationBlockComponent,
+                    modifier = Modifier.fillMaxHeight(),
+                )
+                Fade(
+                    modifier = Modifier.align(Alignment.BottomCenter),
+                    backgroundColor = TangemTheme.colors.background.tertiary,
+                )
             }
-            BottomFade(Modifier.align(Alignment.BottomCenter), TangemTheme.colors.background.tertiary)
             NavigationButtonsBlockV2(
                 navigationUM = nftSendUM.navigationUM,
-                modifier = Modifier
-                    .align(Alignment.BottomCenter)
-                    .padding(
-                        start = 16.dp,
-                        end = 16.dp,
-                        bottom = 16.dp,
-                    ),
+                modifier = Modifier.padding(
+                    start = 16.dp,
+                    end = 16.dp,
+                    bottom = 16.dp,
+                ),
             )
         }
     }
 }
 
+@Composable
+private fun SuccessContent(
+    nftSendUM: NFTSendUM,
+    destinationBlockComponent: SendDestinationBlockComponent,
+    nftDetailsBlockComponent: NFTDetailsBlockComponent,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .padding(horizontal = 16.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        if (nftSendUM.confirmUM is ConfirmUM.Success) {
+            TransactionDoneTitle(
+                title = resourceReference(R.string.sent_transaction_sent_title),
+                subtitle = resourceReference(
+                    R.string.send_date_format,
+                    wrappedList(
+                        nftSendUM.confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
+                        nftSendUM.confirmUM.transactionDate.toTimeFormat(),
+                    ),
+                ),
+                modifier = Modifier.padding(vertical = 12.dp),
+            )
+        }
+        nftDetailsBlockComponent.Content(modifier = Modifier)
+        destinationBlockComponent.Content(modifier = Modifier)
+        FeeBlock(feeSelectorUM = nftSendUM.feeSelectorUM)
+        SpacerH(16.dp)
+    }
+}
+
 private const val ANIMATION_DELAY = 600L
 private val ANIMATION_OFFSET = (-40).dp
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/ui/state/NFTSendUM.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/ui/state/NFTSendUM.kt
index 45287e3c6e..f0b22e8e61 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/ui/state/NFTSendUM.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/sendnft/ui/state/NFTSendUM.kt
@@ -4,13 +4,10 @@ import com.tangem.common.ui.navigationButtons.NavigationUM
 import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.subcomponents.destination.entity.DestinationUM
 import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
 
 internal data class NFTSendUM(
     val destinationUM: DestinationUM,
-    val feeUM: FeeUM,
     val feeSelectorUM: FeeSelectorUM,
     val confirmUM: ConfirmUM,
     val navigationUM: NavigationUM,
-    val isRedesignEnabled: Boolean,
 )
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountBlockComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountBlockComponent.kt
index 09397bdece..5226c68467 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountBlockComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountBlockComponent.kt
@@ -5,7 +5,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.common.ui.amountScreen.models.AmountState
-import com.tangem.common.ui.amountScreen.ui.AmountBlock
 import com.tangem.common.ui.amountScreen.ui.AmountBlockV2
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
@@ -38,21 +37,12 @@ internal class SendAmountBlockComponent(
         val state by model.uiState.collectAsStateWithLifecycle()
         val isClickEnabled by params.blockClickEnableFlow.collectAsStateWithLifecycle()
 
-        if (params.isRedesignEnabled) {
-            AmountBlockV2(
-                amountState = state,
-                isClickDisabled = !isClickEnabled,
-                isEditingDisabled = params.predefinedValues is PredefinedValues.Content.Deeplink,
-                onClick = onClick,
-                modifier = modifier,
-            )
-        } else {
-            AmountBlock(
-                amountState = state,
-                isClickDisabled = !isClickEnabled,
-                isEditingDisabled = params.predefinedValues is PredefinedValues.Content.Deeplink,
-                onClick = onClick,
-            )
-        }
+        AmountBlockV2(
+            amountState = state,
+            isClickDisabled = !isClickEnabled,
+            isEditingDisabled = params.predefinedValues is PredefinedValues.Content.Deeplink,
+            onClick = onClick,
+            modifier = modifier,
+        )
     }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountComponentParams.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountComponentParams.kt
index 14a25b17b7..408453631d 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountComponentParams.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountComponentParams.kt
@@ -6,6 +6,7 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.common.CommonSendRoute
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponent.ModelCallback
@@ -15,10 +16,10 @@ internal sealed class SendAmountComponentParams {
 
     abstract val state: AmountState
     abstract val analyticsCategoryName: String
+    abstract val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource
     abstract val userWalletId: UserWalletId
     abstract val appCurrency: AppCurrency
     abstract val predefinedValues: PredefinedValues
-    abstract val isRedesignEnabled: Boolean
     abstract val cryptoCurrency: CryptoCurrency
     abstract val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
     abstract val isBalanceHidingFlow: StateFlow<Boolean>
@@ -29,10 +30,10 @@ internal sealed class SendAmountComponentParams {
         override val userWalletId: UserWalletId,
         override val appCurrency: AppCurrency,
         override val predefinedValues: PredefinedValues,
-        override val isRedesignEnabled: Boolean,
         override val cryptoCurrency: CryptoCurrency,
         override val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
         override val isBalanceHidingFlow: StateFlow<Boolean>,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val callback: ModelCallback,
         val currentRoute: StateFlow<CommonSendRoute>,
     ) : SendAmountComponentParams()
@@ -43,10 +44,10 @@ internal sealed class SendAmountComponentParams {
         override val appCurrency: AppCurrency,
         override val userWalletId: UserWalletId,
         override val predefinedValues: PredefinedValues,
-        override val isRedesignEnabled: Boolean,
         override val cryptoCurrency: CryptoCurrency,
         override val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
         override val isBalanceHidingFlow: StateFlow<Boolean>,
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val userWallet: UserWallet,
         val blockClickEnableFlow: StateFlow<Boolean>,
     ) : SendAmountComponentParams()
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt
index 3a215bc03b..4d3ac6848c 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt
@@ -16,7 +16,6 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
-import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.WrappedList
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
@@ -29,7 +28,6 @@ import com.tangem.domain.tokens.GetMinimumTransactionAmountSyncUseCase
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.subcomponents.amount.analytics.CommonSendAmountAnalyticEvents
 import com.tangem.features.send.v2.api.subcomponents.amount.analytics.CommonSendAmountAnalyticEvents.SelectedCurrencyType
@@ -39,8 +37,6 @@ import com.tangem.features.send.v2.impl.R
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountComponentParams
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountReduceListener
 import com.tangem.features.send.v2.subcomponents.amount.SendAmountUpdateListener
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeData
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeReloadTrigger
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.extensions.orZero
 import com.tangem.utils.isNullOrZero
@@ -60,9 +56,7 @@ internal class SendAmountModel @Inject constructor(
     private val sendAmountReduceListener: SendAmountReduceListener,
     private val sendAmountUpdateListener: SendAmountUpdateListener,
     private val analyticsEventHandler: AnalyticsEventHandler,
-    private val sendFeatureToggles: SendFeatureToggles,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
-    private val feeReloadTrigger: SendFeeReloadTrigger,
     private val feeSelectorReloadTrigger: FeeSelectorReloadTrigger,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val rampStateManager: RampStateManager,
@@ -79,7 +73,7 @@ internal class SendAmountModel @Inject constructor(
 
     private var isAvailableForSwap: Boolean = false
     val isSendWithSwapAvailable: StateFlow<Boolean>
-    field = MutableStateFlow(false)
+        field = MutableStateFlow(false)
 
     private val analyticsCategoryName = params.analyticsCategoryName
     private var cryptoCurrencyStatus: CryptoCurrencyStatus = CryptoCurrencyStatus(
@@ -129,7 +123,6 @@ internal class SendAmountModel @Inject constructor(
                     cryptoCurrencyStatus = cryptoCurrencyStatus,
                     maxEnterAmount = maxAmountBoundary,
                     appCurrency = appCurrency,
-                    isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
                     isBalanceHidden = params.isBalanceHidingFlow.value,
                 ),
             )
@@ -166,7 +159,6 @@ internal class SendAmountModel @Inject constructor(
                         cryptoCurrencyStatus = cryptoCurrencyStatus,
                         maxEnterAmount = maxAmountBoundary,
                         appCurrency = appCurrency,
-                        isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
                         isBalanceHidden = params.isBalanceHidingFlow.value,
                     ),
                 )
@@ -186,7 +178,6 @@ internal class SendAmountModel @Inject constructor(
                     cryptoCurrencyStatus = cryptoCurrencyStatus,
                     maxEnterAmount = maxAmountBoundary,
                     iconStateConverter = CryptoCurrencyToIconStateConverter(),
-                    isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
                     isBalanceHidden = params.isBalanceHidingFlow.value,
                 ).convert(
                     AmountParameters(
@@ -246,6 +237,7 @@ internal class SendAmountModel @Inject constructor(
                 categoryName = analyticsCategoryName,
                 token = params.cryptoCurrency.symbol,
                 blockchain = params.cryptoCurrency.network.name,
+                source = params.analyticsSendSource,
             ),
         )
     }
@@ -311,14 +303,7 @@ internal class SendAmountModel @Inject constructor(
                         value = reduceTo,
                     ),
                 )
-                val amountValue = (uiState.value as? AmountState.Data)?.amountTextField?.cryptoAmount?.value
-                if (uiState.value.isRedesignEnabled) {
-                    feeSelectorReloadTrigger.triggerUpdate()
-                } else {
-                    feeReloadTrigger.triggerUpdate(
-                        feeData = SendFeeData(amount = amountValue),
-                    )
-                }
+                feeSelectorReloadTrigger.triggerUpdate()
             }
             .launchIn(modelScope)
     }
@@ -333,15 +318,7 @@ internal class SendAmountModel @Inject constructor(
                         value = reduceByData,
                     ),
                 )
-
-                val amountValue = (uiState.value as? AmountState.Data)?.amountTextField?.cryptoAmount?.value
-                if (uiState.value.isRedesignEnabled) {
-                    feeSelectorReloadTrigger.triggerUpdate()
-                } else {
-                    feeReloadTrigger.triggerUpdate(
-                        feeData = SendFeeData(amount = amountValue),
-                    )
-                }
+                feeSelectorReloadTrigger.triggerUpdate()
             }
             .launchIn(modelScope)
     }
@@ -383,7 +360,7 @@ internal class SendAmountModel @Inject constructor(
                 NavigationUM.Content(
                     title = resourceReference(R.string.send_amount_label),
                     subtitle = null,
-                    backIconRes = if (route.isEditMode || params.isRedesignEnabled) {
+                    backIconRes = if (route.isEditMode) {
                         R.drawable.ic_back_24
                     } else {
                         R.drawable.ic_close_24
@@ -401,20 +378,6 @@ internal class SendAmountModel @Inject constructor(
                             params.callback.onNextClick()
                         },
                     ),
-                    prevButton = if (params.isRedesignEnabled) {
-                        null
-                    } else {
-                        NavigationButton(
-                            textReference = TextReference.EMPTY,
-                            iconRes = R.drawable.ic_back_24,
-                            isEnabled = true,
-                            onClick = {
-                                saveResult()
-                                params.callback.onBackClick()
-                            },
-                        ).takeIf { route.isEditMode.not() }
-                    },
-                    secondaryPairButtonsUM = null,
                 ),
             )
         }.launchIn(modelScope)
@@ -427,7 +390,7 @@ internal class SendAmountModel @Inject constructor(
         // Allowed only on networks without tx extras (e.i. memo and destination tag)
         val isExtrasSupported = cryptoCurrencyStatus.currency.network.transactionExtrasType.isTxExtrasSupported()
         isSendWithSwapAvailable.update {
-            isAvailableForSwap && isMultiCurrency && sendFeatureToggles.isSendWithSwapEnabled && !isExtrasSupported
+            isAvailableForSwap && isMultiCurrency && !isExtrasSupported
         }
     }
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/ui/SendAmountContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/ui/SendAmountContent.kt
index c3fc5fffa3..b72232c3d4 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/ui/SendAmountContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/ui/SendAmountContent.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp
 import com.tangem.common.ui.amountScreen.AmountScreenContent
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.preview.AmountStatePreviewData
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
@@ -39,12 +40,13 @@ fun SendAmountContent(
             amountState = amountState,
             isBalanceHidden = isBalanceHidden,
             clickIntents = clickIntents,
+            extraContent = {
+                SendConvertTokenButton(
+                    onConvertToAnother = clickIntents::onConvertToAnotherToken,
+                ).takeIf { isSendWithSwapAvailable }
+            },
         )
-        if (isSendWithSwapAvailable) {
-            SendConvertTokenButton(
-                onConvertToAnother = clickIntents::onConvertToAnotherToken,
-            )
-        }
+        SpacerH(16.dp)
     }
 }
 
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/DefaultSendDestinationBlockComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/DefaultSendDestinationBlockComponent.kt
index 829a28873d..05767a931c 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/DefaultSendDestinationBlockComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/DefaultSendDestinationBlockComponent.kt
@@ -44,7 +44,6 @@ internal class DefaultSendDestinationBlockComponent @AssistedInject constructor(
             destinationUM = state,
             isClickDisabled = !isClickEnabled,
             isEditingDisabled = params.predefinedValues is PredefinedValues.Content.Deeplink,
-            isRedesignEnabled = (params.state as? DestinationUM.Content)?.isRedesignEnabled ?: false,
             onClick = onClick,
         )
     }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/analytics/SendDestinationAnalyticEvents.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/analytics/SendDestinationAnalyticEvents.kt
index 84c52b4907..39191837d0 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/analytics/SendDestinationAnalyticEvents.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/analytics/SendDestinationAnalyticEvents.kt
@@ -3,6 +3,7 @@ package com.tangem.features.send.v2.subcomponents.destination.analytics
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam.Key.SOURCE
 import com.tangem.core.analytics.models.AnalyticsParam.Key.VALIDATION
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 
 internal sealed class SendDestinationAnalyticEvents(
     category: String,
@@ -15,13 +16,15 @@ internal sealed class SendDestinationAnalyticEvents(
     /** Address to send entered */
     data class AddressEntered(
         override val categoryName: String,
-        val source: EnterAddressSource,
+        val method: EnterAddressSource,
         val isValid: Boolean,
+        val source: CommonSendAnalyticEvents.CommonSendSource,
     ) : SendDestinationAnalyticEvents(
         category = categoryName,
         event = "Address Entered",
         params = mapOf(
-            SOURCE to source.name,
+            SOURCE to source.analyticsName,
+            "Method" to method.name,
             VALIDATION to if (isValid) "Success" else "Fail",
         ),
     )
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt
index c4385c59d6..713ea50d93 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt
@@ -25,7 +25,6 @@ import com.tangem.domain.transaction.usecase.ValidateWalletAddressUseCase
 import com.tangem.domain.transaction.usecase.ValidateWalletMemoUseCase
 import com.tangem.domain.txhistory.usecase.GetFixedTxHistoryItemsUseCase
 import com.tangem.domain.wallets.usecase.GetWalletsUseCase
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents.SendScreenSource
 import com.tangem.features.send.v2.api.entity.PredefinedValues
@@ -66,7 +65,6 @@ internal class SendDestinationModel @Inject constructor(
     private val listenToQrScanningUseCase: ListenToQrScanningUseCase,
     private val parseQrCodeUseCase: ParseQrCodeUseCase,
     private val analyticsEventHandler: AnalyticsEventHandler,
-    private val sendFeatureToggles: SendFeatureToggles,
 ) : Model(), SendDestinationClickIntents {
     private val params: SendDestinationComponentParams = paramsContainer.require()
 
@@ -92,7 +90,6 @@ internal class SendDestinationModel @Inject constructor(
             _uiState.update(
                 SendDestinationInitialStateTransformer(
                     cryptoCurrency = cryptoCurrency,
-                    isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled,
                     isInitialized = true,
                 ),
             )
@@ -223,7 +220,7 @@ internal class SendDestinationModel @Inject constructor(
                     async {
                         val addresses = if (!wallet.isMultiCurrency) {
                             getCryptoCurrencyUseCase(wallet.walletId).getOrNull()?.let {
-                                if (it.network.id == cryptoCurrencyNetwork.id) {
+                                if (it.network.rawId == cryptoCurrencyNetwork.rawId) {
                                     getNetworkAddressesUseCase.invokeSync(
                                         userWalletId = wallet.walletId,
                                         networkRawId = it.network.id.rawId,
@@ -275,7 +272,8 @@ internal class SendDestinationModel @Inject constructor(
                 analyticsEventHandler.send(
                     SendDestinationAnalyticEvents.AddressEntered(
                         categoryName = analyticsCategoryName,
-                        source = it,
+                        source = params.analyticsSendSource,
+                        method = it,
                         isValid = addressValidationResult.isRight(),
                     ),
                 )
@@ -300,12 +298,11 @@ internal class SendDestinationModel @Inject constructor(
             flow2 = params.currentRoute,
             transform = { state, route -> state to route },
         ).onEach { (state, route) ->
-            val isRedesignEnabled = sendFeatureToggles.isSendRedesignEnabled
             params.callback.onNavigationResult(
                 NavigationUM.Content(
                     title = params.title,
                     subtitle = null,
-                    backIconRes = if (route.isEditMode || isRedesignEnabled) {
+                    backIconRes = if (route.isEditMode) {
                         R.drawable.ic_back_24
                     } else {
                         R.drawable.ic_close_24
@@ -324,16 +321,6 @@ internal class SendDestinationModel @Inject constructor(
                         }
                         params.callback.onBackClick()
                     },
-                    additionalIconRes = if (isRedesignEnabled) {
-                        null
-                    } else {
-                        R.drawable.ic_qrcode_scan_24
-                    },
-                    additionalIconClick = if (isRedesignEnabled) {
-                        null
-                    } else {
-                        ::onQrCodeScanClick
-                    },
                     primaryButton = NavigationButton(
                         textReference = if (route.isEditMode) {
                             resourceReference(R.string.common_continue)
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationInitialStateTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationInitialStateTransformer.kt
index e1ee0f98fe..d90eeef6ee 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationInitialStateTransformer.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationInitialStateTransformer.kt
@@ -13,7 +13,6 @@ import com.tangem.utils.transformer.Transformer
 
 internal class SendDestinationInitialStateTransformer(
     val cryptoCurrency: CryptoCurrency,
-    val isRedesignEnabled: Boolean,
     val isInitialized: Boolean = false,
 ) : Transformer<DestinationUM> {
     override fun transform(prevState: DestinationUM): DestinationUM {
@@ -59,7 +58,6 @@ internal class SendDestinationInitialStateTransformer(
             recent = loadingListState(RECENT_KEY_TAG, RECENT_DEFAULT_COUNT),
             networkName = cryptoCurrency.network.name,
             isValidating = false,
-            isRedesignEnabled = isRedesignEnabled,
             isRecentHidden = false,
         )
     }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
index f4e4cb31b7..134fbad1fb 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/DestinationBlock.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -17,7 +16,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.tangem.core.ui.components.icons.identicon.IdentIcon
 import com.tangem.core.ui.extensions.TextReference
-import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
@@ -33,7 +31,6 @@ internal fun DestinationBlock(
     destinationUM: DestinationUM,
     isClickDisabled: Boolean,
     isEditingDisabled: Boolean,
-    isRedesignEnabled: Boolean,
     onClick: () -> Unit,
 ) {
     if (destinationUM !is DestinationUM.Content) return
@@ -46,72 +43,9 @@ internal fun DestinationBlock(
             .clickable(enabled = !isClickDisabled && !isEditingDisabled, onClick = onClick)
             .padding(TangemTheme.dimens.spacing12),
     ) {
-        if (isRedesignEnabled) {
-            AddressWithMemoBlock(
-                address = destinationUM.addressTextField,
-                memo = destinationUM.memoTextField,
-            )
-        } else {
-            AddressBlock(destinationUM.addressTextField)
-            MemoBlock(destinationUM.memoTextField)
-        }
-    }
-}
-
-@Composable
-private fun AddressBlock(address: DestinationTextFieldUM.RecipientAddress) {
-    Text(
-        text = address.label.resolveReference(),
-        style = TangemTheme.typography.subtitle2,
-        color = TangemTheme.colors.text.tertiary,
-    )
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
-        modifier = Modifier.padding(top = TangemTheme.dimens.spacing8),
-    ) {
-        IdentIcon(
-            address = address.value,
-            modifier = Modifier
-                .size(TangemTheme.dimens.size36)
-                .clip(RoundedCornerShape(TangemTheme.dimens.radius18))
-                .background(TangemTheme.colors.background.tertiary),
-        )
-        Column(modifier = Modifier.weight(1f)) {
-            Text(
-                text = address.value,
-                style = TangemTheme.typography.body2,
-                color = TangemTheme.colors.text.primary1,
-            )
-            val blockchainAddress = address.briefBlockchainAddress
-            if (!blockchainAddress.isNullOrBlank()) {
-                Text(
-                    text = blockchainAddress,
-                    style = TangemTheme.typography.caption2,
-                    color = TangemTheme.colors.text.tertiary,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun MemoBlock(memo: DestinationTextFieldUM.RecipientMemo?) {
-    if (memo != null && memo.value.isNotBlank()) {
-        HorizontalDivider(
-            color = TangemTheme.colors.icon.inactive,
-            modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing12),
-        )
-        Text(
-            text = memo.label.resolveReference(),
-            style = TangemTheme.typography.subtitle2,
-            color = TangemTheme.colors.text.tertiary,
-        )
-        Text(
-            text = memo.value,
-            style = TangemTheme.typography.body2,
-            color = TangemTheme.colors.text.primary1,
-            modifier = Modifier.padding(top = TangemTheme.dimens.spacing8),
+        AddressWithMemoBlock(
+            address = destinationUM.addressTextField,
+            memo = destinationUM.memoTextField,
         )
     }
 }
@@ -176,7 +110,6 @@ private fun DestinationBlockPreview(
             destinationUM = state,
             isClickDisabled = false,
             isEditingDisabled = false,
-            isRedesignEnabled = state.isRedesignEnabled,
             onClick = {},
         )
     }
@@ -210,7 +143,6 @@ private class DestinationBlockPreviewProvider : PreviewParameterProvider<Destina
         networkName = "Ethereum",
         isValidating = false,
         isInitialized = true,
-        isRedesignEnabled = false,
         isRecentHidden = false,
     )
 
@@ -223,13 +155,11 @@ private class DestinationBlockPreviewProvider : PreviewParameterProvider<Destina
                     blockchainAddress = "0x34B4492A412D84A6E606288f3Bd714b89135D4dE",
                 ),
             ),
-            previewItem.copy(isRedesignEnabled = true),
             previewItem.copy(
                 addressTextField = previewItem.addressTextField.copy(
                     value = "vitalik.eth",
                     blockchainAddress = "0x34B4492A412D84A6E606288f3Bd714b89135D4dE",
                 ),
-                isRedesignEnabled = true,
             ),
         )
 }
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/SendDestinationContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/SendDestinationContent.kt
index 841793e7a6..2b1b2e0033 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/SendDestinationContent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/SendDestinationContent.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.containers.FooterContainer
 import com.tangem.core.ui.components.inputrow.InputRowRecipient
 import com.tangem.core.ui.extensions.*
@@ -52,11 +53,7 @@ internal fun SendDestinationContent(
     LazyColumn(
         modifier = Modifier // Do not put fillMaxSize() in here
             .background(TangemTheme.colors.background.tertiary)
-            .padding(
-                start = 16.dp,
-                end = 16.dp,
-                bottom = 16.dp,
-            ),
+            .padding(horizontal = 16.dp),
     ) {
         addressItem(
             address = address,
@@ -65,12 +62,10 @@ internal fun SendDestinationContent(
             isValidating = isValidating,
             onAddressChange = clickIntents::onRecipientAddressValueChange,
             onQrCodeClick = clickIntents::onQrCodeScanClick,
-            isRedesignEnabled = state.isRedesignEnabled,
         )
         memoField(
             memoField = memoField,
             onMemoChange = clickIntents::onRecipientMemoValueChange,
-            isRedesignEnabled = state.isRedesignEnabled,
         )
         listHeaderItem(
             titleRes = R.string.send_recipient_wallets_title,
@@ -106,6 +101,9 @@ internal fun SendDestinationContent(
                 )
             },
         )
+        item("SPACER_KEY") {
+            SpacerH(16.dp)
+        }
     }
 }
 
@@ -117,7 +115,6 @@ private fun LazyListScope.addressItem(
     isValidating: Boolean,
     onAddressChange: (String, EnterAddressSource) -> Unit,
     onQrCodeClick: () -> Unit,
-    isRedesignEnabled: Boolean,
 ) {
     item(key = ADDRESS_FIELD_KEY) {
         FooterContainer(
@@ -130,7 +127,6 @@ private fun LazyListScope.addressItem(
                 onValueChange = { onAddressChange(it, EnterAddressSource.InputField) },
                 onPasteClick = { onAddressChange(it, EnterAddressSource.PasteButton) },
                 onQrCodeClick = onQrCodeClick,
-                isRedesignEnabled = isRedesignEnabled,
                 isError = isError,
                 isLoading = isValidating,
                 error = address.error,
@@ -149,7 +145,6 @@ private fun LazyListScope.addressItem(
 private fun LazyListScope.memoField(
     memoField: DestinationTextFieldUM.RecipientMemo?,
     onMemoChange: (String, Boolean) -> Unit,
-    isRedesignEnabled: Boolean,
 ) {
     if (memoField != null) {
         item(key = MEMO_FIELD_KEY) {
@@ -158,24 +153,20 @@ private fun LazyListScope.memoField(
                 value = memoField.value,
                 label = memoField.label,
                 placeholder = placeholder,
-                footer = if (isRedesignEnabled) {
-                    annotatedReference(
-                        buildAnnotatedString {
-                            append(stringResourceSafe(R.string.send_recipient_memo_footer_v2))
-                            append("\n")
-                            withStyle(SpanStyle(fontWeight = FontWeight.Medium)) {
-                                appendColored(
-                                    text = stringResourceSafe(
-                                        R.string.send_recipient_memo_footer_v2_highlighted,
-                                    ),
-                                    color = TangemTheme.colors.text.secondary,
-                                )
-                            }
-                        },
-                    )
-                } else {
-                    resourceReference(R.string.send_recipient_memo_footer)
-                },
+                footer = annotatedReference(
+                    buildAnnotatedString {
+                        append(stringResourceSafe(R.string.send_recipient_memo_footer_v2))
+                        append("\n")
+                        withStyle(SpanStyle(fontWeight = FontWeight.Medium)) {
+                            appendColored(
+                                text = stringResourceSafe(
+                                    R.string.send_recipient_memo_footer_v2_highlighted,
+                                ),
+                                color = TangemTheme.colors.text.secondary,
+                            )
+                        }
+                    },
+                ),
                 onValueChange = { onMemoChange(it, false) },
                 onPasteClick = { onMemoChange(it, true) },
                 modifier = Modifier.padding(top = 20.dp),
@@ -184,7 +175,6 @@ private fun LazyListScope.memoField(
                 error = memoField.error,
                 isReadOnly = !memoField.isEnabled,
                 isValuePasted = memoField.isValuePasted,
-                isRedesignEnabled = isRedesignEnabled,
             )
         }
     }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/TextFieldWithPaste.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/TextFieldWithPaste.kt
index 2c2fe6de6a..d8071c89c0 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/TextFieldWithPaste.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/ui/TextFieldWithPaste.kt
@@ -28,7 +28,6 @@ internal fun TextFieldWithPaste(
     label: TextReference,
     onValueChange: (String) -> Unit,
     onPasteClick: (String) -> Unit,
-    isRedesignEnabled: Boolean,
     modifier: Modifier = Modifier,
     footer: TextReference? = null,
     labelStyle: TextStyle = TangemTheme.typography.body2,
@@ -98,16 +97,8 @@ internal fun TextFieldWithPaste(
                 PasteButton(
                     isPasteButtonVisible = value.isBlank(),
                     onClick = onPasteClick,
-                    backgroundColorEnabled = if (isRedesignEnabled) {
-                        TangemTheme.colors.button.secondary
-                    } else {
-                        TangemTheme.colors.button.primary
-                    },
-                    textColor = if (isRedesignEnabled) {
-                        TangemTheme.colors.text.primary1
-                    } else {
-                        TangemTheme.colors.text.primary2
-                    },
+                    backgroundColorEnabled = TangemTheme.colors.button.secondary,
+                    textColor = TangemTheme.colors.text.primary1,
                     modifier = Modifier
                         .padding(start = TangemTheme.dimens.spacing8),
                 )
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeBlockComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeBlockComponent.kt
deleted file mode 100644
index 4190c4a79d..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeBlockComponent.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.features.send.v2.subcomponents.fee.ui.FeeBlock
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeModel
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-
-internal class SendFeeBlockComponent(
-    appComponentContext: AppComponentContext,
-    private val params: SendFeeComponentParams.FeeBlockParams,
-    val onResult: (FeeUM) -> Unit,
-    val onClick: () -> Unit,
-) : ComposableContentComponent, AppComponentContext by appComponentContext {
-
-    private val model: SendFeeModel = getOrCreateModel(params = params)
-
-    init {
-        model.uiState.onEach {
-            onResult(it)
-        }.launchIn(componentScope)
-    }
-
-    fun updateState(state: FeeUM) = model.updateState(state)
-
-    @Composable
-    override fun Content(modifier: Modifier) {
-        val state = model.uiState.collectAsStateWithLifecycle()
-        val isClickEnabled = params.blockClickEnableFlow.collectAsStateWithLifecycle()
-        FeeBlock(
-            feeUM = state.value,
-            isClickEnabled = isClickEnabled.value,
-            onClick = onClick,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponent.kt
deleted file mode 100644
index 1bb9d9cf1c..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponent.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.tangem.common.ui.navigationButtons.NavigationModelCallback
-import com.tangem.core.decompose.context.AppComponentContext
-import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeModel
-import com.tangem.features.send.v2.subcomponents.fee.ui.SendFeeContent
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-
-internal class SendFeeComponent(
-    appComponentContext: AppComponentContext,
-    params: SendFeeComponentParams.FeeParams,
-) : ComposableContentComponent, AppComponentContext by appComponentContext {
-
-    private val model: SendFeeModel = getOrCreateModel(params = params)
-
-    @Composable
-    override fun Content(modifier: Modifier) {
-        val state = model.uiState.collectAsStateWithLifecycle()
-
-        SendFeeContent(state = state.value, clickIntents = model)
-    }
-
-    interface ModelCallback : NavigationModelCallback {
-        fun onFeeResult(feeUM: FeeUM)
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponentParams.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponentParams.kt
deleted file mode 100644
index dcd8c7ca34..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeComponentParams.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee
-
-import arrow.core.Either
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.domain.models.wallet.UserWallet
-import com.tangem.domain.transaction.error.GetFeeError
-import com.tangem.features.send.v2.common.CommonSendRoute
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.StateFlow
-import java.math.BigDecimal
-
-internal sealed class SendFeeComponentParams {
-
-    abstract val state: FeeUM
-    abstract val analyticsCategoryName: String
-    abstract val userWallet: UserWallet
-    abstract val cryptoCurrencyStatus: CryptoCurrencyStatus
-    abstract val feeCryptoCurrencyStatus: CryptoCurrencyStatus
-    abstract val appCurrency: AppCurrency
-    abstract val sendAmount: BigDecimal
-    abstract val destinationAddress: String
-    abstract val onLoadFee: suspend () -> Either<GetFeeError, TransactionFee>
-
-    data class FeeParams(
-        override val state: FeeUM,
-        override val analyticsCategoryName: String,
-        override val userWallet: UserWallet,
-        override val cryptoCurrencyStatus: CryptoCurrencyStatus,
-        override val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-        override val appCurrency: AppCurrency,
-        override val sendAmount: BigDecimal,
-        override val destinationAddress: String,
-        override val onLoadFee: suspend () -> Either<GetFeeError, TransactionFee>,
-        val currentRoute: Flow<CommonSendRoute.Fee>,
-        val callback: SendFeeComponent.ModelCallback,
-    ) : SendFeeComponentParams()
-
-    data class FeeBlockParams(
-        override val state: FeeUM,
-        override val analyticsCategoryName: String,
-        override val userWallet: UserWallet,
-        override val cryptoCurrencyStatus: CryptoCurrencyStatus,
-        override val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-        override val appCurrency: AppCurrency,
-        override val sendAmount: BigDecimal,
-        override val destinationAddress: String,
-        override val onLoadFee: suspend () -> Either<GetFeeError, TransactionFee>,
-        val blockClickEnableFlow: StateFlow<Boolean>,
-    ) : SendFeeComponentParams()
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeData.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeData.kt
deleted file mode 100644
index 7db1e3d289..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeData.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee
-
-import java.math.BigDecimal
-
-data class SendFeeData(
-    val amount: BigDecimal?,
-    val destinationAddress: String? = null,
-)
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeReloadTrigger.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeReloadTrigger.kt
deleted file mode 100644
index 369baf924e..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/SendFeeReloadTrigger.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-interface SendFeeReloadTrigger {
-
-    /** Trigger fee update */
-    suspend fun triggerUpdate(feeData: SendFeeData)
-}
-
-interface SendFeeReloadListener {
-    /** Flow triggers fee reload */
-    val reloadTriggerFlow: Flow<SendFeeData>
-}
-
-interface SendFeeCheckReloadTrigger {
-    /** Trigger return callback with check result */
-    suspend fun callbackCheckResult(isSuccess: Boolean)
-
-    /** Trigger fee check reload */
-    suspend fun triggerCheckUpdate()
-}
-
-interface SendFeeCheckReloadListener {
-    /**
-     * Flow triggers fee check reload before transaction.
-     * Usually after significant time after fee was updated last time
-     */
-    val checkReloadTriggerFlow: Flow<Unit>
-
-    /** Flow return result of fee check update */
-    val checkReloadResultFlow: Flow<Boolean>
-}
-
-@Singleton
-internal class DefaultSendFeeReloadTrigger @Inject constructor() :
-    SendFeeReloadTrigger,
-    SendFeeReloadListener,
-    SendFeeCheckReloadTrigger,
-    SendFeeCheckReloadListener {
-
-    private val _reloadTriggerFlow = MutableSharedFlow<SendFeeData>()
-    override val reloadTriggerFlow = _reloadTriggerFlow.asSharedFlow()
-
-    private val _checkReloadTriggerFlow = MutableSharedFlow<Unit>()
-    override val checkReloadTriggerFlow = _checkReloadTriggerFlow.asSharedFlow()
-
-    private val _checkReloadResultFlow = MutableSharedFlow<Boolean>()
-    override val checkReloadResultFlow = _checkReloadResultFlow.asSharedFlow()
-
-    override suspend fun triggerUpdate(feeData: SendFeeData) {
-        _reloadTriggerFlow.emit(feeData)
-    }
-
-    override suspend fun triggerCheckUpdate() {
-        _checkReloadTriggerFlow.emit(Unit)
-    }
-
-    override suspend fun callbackCheckResult(isSuccess: Boolean) {
-        _checkReloadResultFlow.emit(isSuccess)
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/di/SendFeeModule.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/di/SendFeeModule.kt
deleted file mode 100644
index 53f687dcea..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/di/SendFeeModule.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.di
-
-import com.tangem.features.send.v2.subcomponents.fee.*
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@InstallIn(SingletonComponent::class)
-@Module
-internal interface SendFeeModule {
-
-    @Binds
-    @Singleton
-    fun provideSendFeeReloadTrigger(impl: DefaultSendFeeReloadTrigger): SendFeeReloadTrigger
-
-    @Binds
-    @Singleton
-    fun provideSendFeeReloadListener(impl: DefaultSendFeeReloadTrigger): SendFeeReloadListener
-
-    @Binds
-    @Singleton
-    fun provideSendFeeCheckReloadTrigger(impl: DefaultSendFeeReloadTrigger): SendFeeCheckReloadTrigger
-
-    @Binds
-    @Singleton
-    fun provideSendFeeCheckReloadListener(impl: DefaultSendFeeReloadTrigger): SendFeeCheckReloadListener
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/FeeCalculation.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/FeeCalculation.kt
deleted file mode 100644
index 11d3e108d9..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/FeeCalculation.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model
-
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.core.ui.utils.parseBigDecimal
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.utils.extensions.isZero
-import java.math.BigDecimal
-import java.math.RoundingMode
-
-private val FEE_MAX_DIFF = BigDecimal("5")
-
-/**
- * Check and calculates subtracted amount
- */
-internal fun checkAndCalculateSubtractedAmount(
-    isAmountSubtractAvailable: Boolean,
-    cryptoCurrencyStatus: CryptoCurrencyStatus,
-    amountValue: BigDecimal,
-    feeValue: BigDecimal,
-    reduceAmountBy: BigDecimal,
-): BigDecimal {
-    val balance = cryptoCurrencyStatus.value.amount ?: return amountValue
-    val isFeeCoverage = checkFeeCoverage(
-        isSubtractAvailable = isAmountSubtractAvailable,
-        balance = balance,
-        amountValue = amountValue,
-        feeValue = feeValue,
-        reduceAmountBy = reduceAmountBy,
-    )
-    return if (isFeeCoverage) {
-        balance.minus(reduceAmountBy).minus(feeValue)
-    } else {
-        amountValue
-    }
-}
-
-/**
- * Check if custom fee is too high
- */
-internal fun checkIfFeeTooHigh(feeSelectorState: FeeSelectorUM.Content): Pair<Boolean, String> {
-    val defaultResult = false to ""
-    val multipleFees = feeSelectorState.fees as? TransactionFee.Choosable ?: return defaultResult
-    val highValue = multipleFees.priority.amount.value ?: return defaultResult
-    val customAmount = feeSelectorState.customValues.firstOrNull() ?: return defaultResult
-    val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals)
-    val diff = if (highValue > BigDecimal.ZERO) {
-        customValue / highValue
-    } else {
-        BigDecimal.ZERO
-    }
-    val isFeeTooHigh = feeSelectorState.selectedType == FeeType.Custom && diff > FEE_MAX_DIFF
-    return isFeeTooHigh to diff.parseBigDecimal(0, RoundingMode.HALF_UP)
-}
-
-/**
- * Check if custom fee is too low
- */
-internal fun checkIfFeeTooLow(feeSelectorUM: FeeSelectorUM.Content): Boolean {
-    val multipleFees = feeSelectorUM.fees as? TransactionFee.Choosable ?: return false
-    val minimumValue = multipleFees.minimum.amount.value ?: return false
-    val customAmount = feeSelectorUM.customValues.firstOrNull() ?: return false
-    val customValue = customAmount.value.parseToBigDecimal(customAmount.decimals)
-
-    return feeSelectorUM.selectedType == FeeType.Custom && minimumValue > customValue
-}
-
-/**
- * Checks if sending amount with fee is greater than balance
- */
-internal fun checkFeeCoverage(
-    isSubtractAvailable: Boolean,
-    balance: BigDecimal,
-    amountValue: BigDecimal,
-    feeValue: BigDecimal,
-    reduceAmountBy: BigDecimal?,
-): Boolean {
-    if (!isSubtractAvailable) return false
-    val reducedBy = balance - (reduceAmountBy ?: BigDecimal.ZERO)
-    return reducedBy < amountValue + feeValue && reducedBy > feeValue && reducedBy >= amountValue
-}
-
-/**
- * Checks if fee exceeds fee paid currency balance
- */
-fun checkExceedBalance(feeBalance: BigDecimal?, feeAmount: BigDecimal?): Boolean {
-    return feeAmount == null || feeBalance == null || feeAmount.isZero() || feeAmount > feeBalance
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeAlertFactory.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeAlertFactory.kt
deleted file mode 100644
index 4f227ac46c..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeAlertFactory.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model
-
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.decompose.ui.UiMessageSender
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.message.DialogMessage
-import com.tangem.core.ui.message.EventMessageAction
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import java.math.BigDecimal
-import javax.inject.Inject
-
-@ModelScoped
-internal class SendFeeAlertFactory @Inject constructor(
-    private val messageSender: UiMessageSender,
-) {
-
-    fun checkAndShowAlerts(feeSelectorUM: FeeSelectorUM.Content, onConfirmClick: () -> Unit) {
-        val showFeeTooLow = checkAndShowFeeTooLow(feeSelectorUM, onConfirmClick)
-        val showFeeTooHigh = checkAndShowFeeTooHigh(feeSelectorUM, onConfirmClick)
-
-        if (!showFeeTooLow && !showFeeTooHigh) {
-            onConfirmClick()
-        }
-    }
-
-    /**
-     * Check if custom fee is too low
-     */
-    private fun checkAndShowFeeTooLow(feeSelectorUM: FeeSelectorUM.Content, onConfirmClick: () -> Unit): Boolean {
-        val isFeeTooLow = checkIfFeeTooLow(feeSelectorUM)
-        if (isFeeTooLow) {
-            messageSender.send(
-                DialogMessage(
-                    message = resourceReference(id = R.string.send_alert_fee_too_low_text),
-                    dismissOnFirstAction = true,
-                    firstActionBuilder = {
-                        EventMessageAction(
-                            title = resourceReference(R.string.common_continue),
-                            onClick = onConfirmClick,
-                        )
-                    },
-                    secondActionBuilder = { cancelAction() },
-                ),
-            )
-        }
-        return isFeeTooLow
-    }
-
-    /**
-     * Check if custom fee is too high
-     */
-    private fun checkAndShowFeeTooHigh(feeSelectorUM: FeeSelectorUM.Content, onConfirmClick: () -> Unit): Boolean {
-        val (isFeeTooHigh, diff) = checkIfFeeTooHigh(feeSelectorUM)
-        if (isFeeTooHigh) {
-            messageSender.send(
-                DialogMessage(
-                    message = resourceReference(
-                        id = R.string.send_alert_fee_too_high_text,
-                        formatArgs = wrappedList(diff),
-                    ),
-                    dismissOnFirstAction = true,
-                    firstActionBuilder = {
-                        EventMessageAction(
-                            title = resourceReference(R.string.common_continue),
-                            onClick = onConfirmClick,
-                        )
-                    },
-                    secondActionBuilder = { cancelAction() },
-                ),
-            )
-        }
-        return isFeeTooHigh
-    }
-
-    fun getFeeUpdatedAlert(newFee: TransactionFee, feeUM: FeeUM, proceedAction: () -> Unit, stopAction: () -> Unit) {
-        if (feeUM !is FeeUM.Content) return
-        val feeSelectorUM = feeUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
-        val newFee = when (newFee) {
-            is TransactionFee.Single -> newFee.normal
-            is TransactionFee.Choosable -> {
-                when (feeSelectorUM.selectedType) {
-                    FeeType.Slow -> newFee.minimum
-                    FeeType.Market -> newFee.normal
-                    FeeType.Fast -> newFee.priority
-                    FeeType.Custom -> return
-                }
-            }
-        }
-
-        val newFeeValue = newFee.amount.value ?: BigDecimal.ZERO
-        val oldFeeValue = feeSelectorUM.selectedFee?.amount?.value ?: BigDecimal.ZERO
-
-        if (newFeeValue > oldFeeValue) {
-            messageSender.send(
-                DialogMessage(
-                    message = resourceReference(id = R.string.send_notification_high_fee_title),
-                    dismissOnFirstAction = true,
-                    onDismissRequest = { stopAction() },
-                    firstActionBuilder = {
-                        EventMessageAction(
-                            title = resourceReference(R.string.common_understand),
-                            onClick = { stopAction(); onDismissRequest() },
-                        )
-                    },
-                ),
-            )
-        } else {
-            proceedAction()
-        }
-    }
-
-    fun getFeeUnreachableErrorState(onFeeReload: () -> Unit) {
-        messageSender.send(
-            DialogMessage(
-                title = resourceReference(R.string.send_fee_unreachable_error_title),
-                message = resourceReference(R.string.send_fee_unreachable_error_text),
-                dismissOnFirstAction = true,
-                firstActionBuilder = {
-                    EventMessageAction(
-                        title = resourceReference(R.string.warning_button_refresh),
-                        onClick = onFeeReload,
-                    )
-                },
-            ),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeClickIntents.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeClickIntents.kt
deleted file mode 100644
index bffe9c81a2..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeClickIntents.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model
-
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-
-internal interface SendFeeClickIntents {
-
-    fun feeReload()
-
-    fun onFeeSelectorClick(feeType: FeeType)
-
-    fun onCustomFeeValueChange(index: Int, value: String)
-
-    fun onNonceChange(value: String)
-
-    fun onReadMoreClick()
-
-    fun onNextClick()
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt
deleted file mode 100644
index 5cad0c8511..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model
-
-import androidx.compose.runtime.Stable
-import com.tangem.blockchain.common.AmountType
-import com.tangem.common.ui.navigationButtons.NavigationButton
-import com.tangem.common.ui.navigationButtons.NavigationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.core.decompose.model.Model
-import com.tangem.core.decompose.model.ParamsContainer
-import com.tangem.core.navigation.url.UrlOpener
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.transaction.usecase.IsFeeApproximateUseCase
-import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
-import com.tangem.features.send.v2.api.subcomponents.feeSelector.analytics.CommonSendFeeAnalyticEvents
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadListener
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeCheckReloadTrigger
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeComponentParams
-import com.tangem.features.send.v2.subcomponents.fee.SendFeeReloadListener
-import com.tangem.features.send.v2.subcomponents.fee.model.transformers.*
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import com.tangem.utils.coroutines.JobHolder
-import com.tangem.utils.coroutines.saveIn
-import com.tangem.utils.transformer.update
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import java.util.Locale
-import javax.inject.Inject
-
-@Suppress("LongParameterList")
-@Stable
-@ModelScoped
-internal class SendFeeModel @Inject constructor(
-    paramsContainer: ParamsContainer,
-    override val dispatchers: CoroutineDispatcherProvider,
-    private val isFeeApproximateUseCase: IsFeeApproximateUseCase,
-    private val urlOpener: UrlOpener,
-    private val analyticsEventHandler: AnalyticsEventHandler,
-    private val sendFeeAlertFactory: SendFeeAlertFactory,
-    private val feeReloadListener: SendFeeReloadListener,
-    private val feeCheckReloadListener: SendFeeCheckReloadListener,
-    private val feeCheckReloadTrigger: SendFeeCheckReloadTrigger,
-) : Model(), SendFeeClickIntents {
-
-    private val params: SendFeeComponentParams = paramsContainer.require()
-
-    private val _uiState = MutableStateFlow(params.state)
-    val uiState = _uiState.asStateFlow()
-
-    private val analyticsCategoryName = params.analyticsCategoryName
-    private val appCurrency = params.appCurrency
-    private val cryptoCurrencyStatus = params.cryptoCurrencyStatus
-    private val feeCryptoCurrencyStatus = params.feeCryptoCurrencyStatus
-
-    private var feeJobHolder = JobHolder()
-
-    init {
-        configFeeNavigation()
-        subscribeOnFeeReloadTriggerUpdates()
-        subscribeOnFeeCheckReloadTriggerUpdates()
-        initialState()
-        feeReload()
-    }
-
-    fun updateState(state: FeeUM) {
-        _uiState.value = state
-    }
-
-    override fun feeReload() {
-        modelScope.launch {
-            val isShowLoading = (uiState.value as? FeeUM.Content)?.feeSelectorUM !is FeeSelectorUM.Content
-            if (isShowLoading) {
-                _uiState.update(SendFeeLoadingTransformer)
-            }
-            params.onLoadFee().fold(
-                ifRight = {
-                    _uiState.update(
-                        SendFeeLoadedTransformer(
-                            fees = it,
-                            clickIntents = this@SendFeeModel,
-                            appCurrency = appCurrency,
-                            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-                            isFeeApproximate = isFeeApproximate(it.normal.amount.type),
-                        ),
-                    )
-                    updateFeeNotifications()
-                },
-                ifLeft = { feeError ->
-                    if (isShowLoading) {
-                        _uiState.update(SendFeeFailedTransformer(feeError))
-                    }
-                    updateFeeNotifications()
-                },
-            )
-        }.saveIn(feeJobHolder)
-    }
-
-    override fun onFeeSelectorClick(feeType: FeeType) {
-        _uiState.update(
-            SendFeeSelectTransformer(
-                feeType = feeType,
-                clickIntents = this@SendFeeModel,
-                appCurrency = appCurrency,
-                feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            ),
-        )
-        updateFeeNotifications()
-        if (feeType == FeeType.Custom) {
-            analyticsEventHandler.send(
-                CommonSendFeeAnalyticEvents.CustomFeeButtonClicked(categoryName = analyticsCategoryName),
-            )
-        }
-    }
-
-    override fun onCustomFeeValueChange(index: Int, value: String) {
-        _uiState.update(
-            SendFeeCustomValueChangeTransformer(
-                index = index,
-                value = value,
-                clickIntents = this@SendFeeModel,
-                appCurrency = appCurrency,
-                feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            ),
-        )
-        updateFeeNotifications()
-    }
-
-    override fun onNonceChange(value: String) {
-        _uiState.update(
-            SendFeeNonceChangeTransformer(value = value),
-        )
-    }
-
-    override fun onReadMoreClick() {
-        val locale = if (Locale.getDefault().language == RU_LOCALE) RU_LOCALE else EN_LOCALE
-        val url = buildString {
-            append(FEE_READ_MORE_URL_FIRST_PART)
-            append(locale)
-            append(FEE_READ_MORE_URL_SECOND_PART)
-        }
-        urlOpener.openUrl(url)
-    }
-
-    override fun onNextClick() {
-        val feeUM = uiState.value as? FeeUM.Content
-        val feeSelectorUM = feeUM?.feeSelectorUM as? FeeSelectorUM.Content
-
-        if (feeSelectorUM != null) {
-            sendFeeAlertFactory.checkAndShowAlerts(feeSelectorUM) {
-                val isCustomFeeEdited =
-                    feeSelectorUM.selectedFee?.amount?.value != feeSelectorUM.fees.normal.amount.value
-                if (feeSelectorUM.selectedType == FeeType.Custom && isCustomFeeEdited) {
-                    analyticsEventHandler.send(
-                        CommonSendFeeAnalyticEvents.GasPriceInserter(categoryName = analyticsCategoryName),
-                    )
-                }
-                analyticsEventHandler.send(
-                    CommonSendFeeAnalyticEvents.SelectedFee(
-                        categoryName = analyticsCategoryName,
-                        feeType = feeSelectorUM.selectedType.toAnalyticType(feeSelectorUM),
-                    ),
-                )
-
-                if (feeSelectorUM.nonce != null) {
-                    analyticsEventHandler.send(
-                        CommonSendAnalyticEvents.NonceInserted(
-                            categoryName = analyticsCategoryName,
-                            token = cryptoCurrencyStatus.currency.symbol,
-                            blockchain = cryptoCurrencyStatus.currency.network.name,
-                        ),
-                    )
-                }
-
-                saveResult()
-            }
-        }
-    }
-
-    private fun initialState() {
-        if (uiState.value is FeeUM.Empty) {
-            _uiState.update(
-                SendFeeInitialStateTransformer(
-                    cryptoCurrencyStatus = cryptoCurrencyStatus,
-                    feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-                    appCurrency = appCurrency,
-                ),
-            )
-        }
-    }
-
-    private fun subscribeOnFeeReloadTriggerUpdates() {
-        feeReloadListener.reloadTriggerFlow
-            .onEach { feeReload() }
-            .launchIn(modelScope)
-    }
-
-    private fun subscribeOnFeeCheckReloadTriggerUpdates() {
-        feeCheckReloadListener.checkReloadTriggerFlow
-            .onEach { checkLoadFee() }
-            .launchIn(modelScope)
-    }
-
-    private fun saveResult() {
-        _uiState.update(
-            SendFeeCustomAutoFixTransformer(
-                clickIntents = this@SendFeeModel,
-                appCurrency = appCurrency,
-                feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            ),
-        )
-        val params = params as? SendFeeComponentParams.FeeParams ?: return
-        params.callback.onFeeResult(uiState.value)
-        params.callback.onNextClick()
-    }
-
-    private fun checkLoadFee() {
-        modelScope.launch {
-            params.onLoadFee().fold(
-                ifRight = {
-                    sendFeeAlertFactory.getFeeUpdatedAlert(
-                        newFee = it,
-                        feeUM = uiState.value,
-                        proceedAction = {
-                            modelScope.launch {
-                                feeCheckReloadTrigger.callbackCheckResult(true)
-                            }
-                        },
-                        stopAction = {
-                            modelScope.launch {
-                                feeCheckReloadTrigger.callbackCheckResult(false)
-                            }
-                        },
-                    )
-                    _uiState.update(
-                        SendFeeLoadedTransformer(
-                            fees = it,
-                            clickIntents = this@SendFeeModel,
-                            appCurrency = appCurrency,
-                            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-                            isFeeApproximate = isFeeApproximate(it.normal.amount.type),
-                        ),
-                    )
-                    updateFeeNotifications()
-                },
-                ifLeft = { feeError ->
-                    feeCheckReloadTrigger.callbackCheckResult(false)
-                    _uiState.update(SendFeeFailedTransformer(feeError))
-                    sendFeeAlertFactory.getFeeUnreachableErrorState(::feeReload)
-                    updateFeeNotifications()
-                },
-            )
-        }.saveIn(feeJobHolder)
-    }
-
-    private fun isFeeApproximate(amountType: AmountType): Boolean {
-        val networkId = feeCryptoCurrencyStatus.currency.network.id
-        return isFeeApproximateUseCase(
-            networkId = networkId,
-            amountType = amountType,
-        )
-    }
-
-    private fun updateFeeNotifications() {
-        _uiState.update(
-            SendFeeNotificationsTransformer(
-                cryptoCurrencyName = cryptoCurrencyStatus.currency.name,
-                onFeeReload = ::feeReload,
-            ),
-        )
-    }
-
-    private fun configFeeNavigation() {
-        val params = params as? SendFeeComponentParams.FeeParams ?: return
-        combine(
-            flow = uiState,
-            flow2 = params.currentRoute,
-            transform = { state, route -> state to route },
-        ).onEach { (state, _) ->
-            params.callback.onNavigationResult(
-                NavigationUM.Content(
-                    title = resourceReference(R.string.common_fee_selector_title),
-                    subtitle = null,
-                    backIconRes = R.drawable.ic_back_24,
-                    backIconClick = params.callback::onNextClick,
-                    primaryButton = NavigationButton(
-                        textReference = resourceReference(R.string.common_continue),
-                        isEnabled = state.isPrimaryButtonEnabled,
-                        onClick = ::onNextClick,
-                    ),
-                    prevButton = null,
-                    secondaryPairButtonsUM = null,
-                ),
-            )
-        }.launchIn(modelScope)
-    }
-
-    private companion object {
-        const val RU_LOCALE = "ru"
-        const val EN_LOCALE = "en"
-        const val FEE_READ_MORE_URL_FIRST_PART = "https://tangem.com/"
-        const val FEE_READ_MORE_URL_SECOND_PART = "/blog/post/what-is-a-transaction-fee-and-why-do-we-need-it/"
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/FeeConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/FeeConverter.kt
deleted file mode 100644
index 7891a1fd2c..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/FeeConverter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.converters
-
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.utils.converter.Converter
-import kotlinx.collections.immutable.ImmutableList
-
-internal class FeeConverter(
-    clickIntents: SendFeeClickIntents,
-    appCurrency: AppCurrency,
-    feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-    private val fees: TransactionFee,
-) : Converter<FeeConverter.Data, Fee> {
-
-    private val customFeeConverter = SendFeeCustomFieldConverter(
-        clickIntents = clickIntents,
-        appCurrency = appCurrency,
-        feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        normalFee = fees.normal,
-    )
-
-    override fun convert(value: Data): Fee {
-        return when (fees) {
-            is TransactionFee.Choosable -> {
-                when (value.feeType) {
-                    FeeType.Slow -> fees.minimum
-                    FeeType.Market -> fees.normal
-                    FeeType.Fast -> fees.priority
-                    FeeType.Custom -> customFeeConverter.convertBack(value.customValues)
-                }
-            }
-            is TransactionFee.Single ->
-                when (value.feeType) {
-                    FeeType.Market -> fees.normal
-                    FeeType.Custom -> customFeeConverter.convertBack(value.customValues)
-                    else -> fees.normal
-                }
-        }
-    }
-
-    data class Data(
-        val customValues: ImmutableList<CustomFeeFieldUM>,
-        val feeType: FeeType,
-    )
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/SendFeeCustomFieldConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/SendFeeCustomFieldConverter.kt
deleted file mode 100644
index 344269f818..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/SendFeeCustomFieldConverter.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.converters
-
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.bitcoin.BitcoinCustomFeeConverter
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.kaspa.KaspaCustomFeeConverter
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.utils.converter.TwoWayConverter
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-
-internal class SendFeeCustomFieldConverter(
-    private val clickIntents: SendFeeClickIntents,
-    private val appCurrency: AppCurrency,
-    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-    private val normalFee: Fee,
-) : TwoWayConverter<Fee, ImmutableList<CustomFeeFieldUM>> {
-
-    private val ethereumCustomFeeConverter by lazy(LazyThreadSafetyMode.NONE) {
-        EthereumCustomFeeConverter(
-            onCustomFeeValueChange = clickIntents::onCustomFeeValueChange,
-            onNextClick = clickIntents::onNextClick,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        )
-    }
-
-    private val bitcoinCustomFeeConverter by lazy(LazyThreadSafetyMode.NONE) {
-        BitcoinCustomFeeConverter(
-            onCustomFeeValueChange = clickIntents::onCustomFeeValueChange,
-            onNextClick = clickIntents::onNextClick,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        )
-    }
-
-    private val kaspaCustomFeeConverter by lazy(LazyThreadSafetyMode.NONE) {
-        KaspaCustomFeeConverter(
-            onCustomFeeValueChange = clickIntents::onCustomFeeValueChange,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        )
-    }
-
-    override fun convert(value: Fee): ImmutableList<CustomFeeFieldUM> {
-        return when (value) {
-            is Fee.Ethereum -> ethereumCustomFeeConverter.convert(value)
-            is Fee.Bitcoin -> bitcoinCustomFeeConverter.convert(value)
-            is Fee.Kaspa -> kaspaCustomFeeConverter.convert(value)
-            else -> persistentListOf()
-        }
-    }
-
-    override fun convertBack(value: ImmutableList<CustomFeeFieldUM>): Fee {
-        return if (value.isEmpty()) {
-            normalFee
-        } else {
-            when (normalFee) {
-                is Fee.Ethereum -> ethereumCustomFeeConverter.convertBack(normalFee = normalFee, value = value)
-                is Fee.Bitcoin -> bitcoinCustomFeeConverter.convertBack(normalFee = normalFee, value = value)
-                is Fee.Kaspa -> kaspaCustomFeeConverter.convertBack(normalFee = normalFee, value = value)
-                else -> {
-                    val customFee = value.firstOrNull()
-                    Fee.Common(
-                        normalFee.amount.copy(
-                            value = customFee?.value?.parseToBigDecimal(customFee.decimals),
-                        ),
-                    )
-                }
-            }
-        }
-    }
-
-    fun onValueChange(feeSelectorState: FeeSelectorUM.Content, index: Int, value: String) =
-        when (val fee = feeSelectorState.fees.normal) {
-            is Fee.Ethereum -> ethereumCustomFeeConverter.onValueChange(
-                feeValue = fee,
-                customValues = feeSelectorState.customValues,
-                index = index,
-                value = value,
-            )
-            is Fee.Bitcoin -> bitcoinCustomFeeConverter.onValueChange(
-                customValues = feeSelectorState.customValues,
-                index = index,
-                value = value,
-                txSize = fee.txSize,
-            )
-            is Fee.Kaspa -> kaspaCustomFeeConverter.onValueChange(
-                customValues = feeSelectorState.customValues,
-                index = index,
-                value = value,
-            )
-            else -> feeSelectorState.customValues
-        }
-
-    fun tryAutoFixValue(feeSelectorState: FeeSelectorUM.Content) = when (feeSelectorState.fees) {
-        is TransactionFee.Choosable -> feeSelectorState.fees.minimum
-        is TransactionFee.Single -> feeSelectorState.fees.normal
-    }.let {
-        when (it) {
-            is Fee.Kaspa -> kaspaCustomFeeConverter.tryAutoFixValue(
-                minimumFee = it,
-                customValues = feeSelectorState.customValues,
-            )
-            else -> feeSelectorState.customValues
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt
index 821aac24fc..169610ae98 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt
@@ -12,8 +12,8 @@ import com.tangem.core.ui.utils.parseToBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance
 import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkExceedBalance
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.CustomFeeConverter
 import com.tangem.lib.crypto.BlockchainUtils
 import kotlinx.collections.immutable.ImmutableList
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt
index 85cea0393c..1467aada51 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt
@@ -11,8 +11,8 @@ import com.tangem.core.ui.utils.parseBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance
 import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkExceedBalance
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt
index 3147b5eabc..0c172c3aa7 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt
@@ -12,8 +12,8 @@ import com.tangem.core.ui.utils.parseToBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance
 import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkExceedBalance
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.ETHEREUM_GAS_UNIT
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.FEE_AMOUNT
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.GAS_DECIMALS
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt
index de65e73033..f2033a8a95 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt
@@ -12,8 +12,8 @@ import com.tangem.core.ui.utils.parseToBigDecimal
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance
 import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.model.checkExceedBalance
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.ETHEREUM_GAS_UNIT
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.FEE_AMOUNT
 import com.tangem.features.send.v2.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter.Companion.GAS_DECIMALS
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomAutoFixTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomAutoFixTransformer.kt
deleted file mode 100644
index 495efa22af..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomAutoFixTransformer.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.SendFeeCustomFieldConverter
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-
-internal class SendFeeCustomAutoFixTransformer(
-    private val clickIntents: SendFeeClickIntents,
-    private val appCurrency: AppCurrency,
-    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-        val feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content ?: return state
-
-        val customFeeConverter = SendFeeCustomFieldConverter(
-            clickIntents = clickIntents,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            normalFee = feeSelectorUM.fees.normal,
-        )
-
-        return when (feeSelectorUM.selectedType) {
-            FeeType.Slow,
-            FeeType.Market,
-            FeeType.Fast,
-            -> state
-            FeeType.Custom -> {
-                val updatedCustomValues = customFeeConverter.tryAutoFixValue(feeSelectorUM)
-                state.copy(
-                    feeSelectorUM = feeSelectorUM.copy(
-                        customValues = updatedCustomValues,
-                        selectedFee = customFeeConverter.convertBack(updatedCustomValues),
-                    ),
-                )
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomValueChangeTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomValueChangeTransformer.kt
deleted file mode 100644
index 1569cd7d3b..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeCustomValueChangeTransformer.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.SendFeeCustomFieldConverter
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-
-internal class SendFeeCustomValueChangeTransformer(
-    private val index: Int,
-    private val value: String,
-    private val clickIntents: SendFeeClickIntents,
-    private val appCurrency: AppCurrency,
-    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-        val feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content ?: return state
-
-        val customFeeConverter = SendFeeCustomFieldConverter(
-            clickIntents = clickIntents,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            normalFee = feeSelectorUM.fees.normal,
-        )
-
-        val updatedCustomValues = customFeeConverter.onValueChange(feeSelectorUM, index, value)
-
-        return state.copy(
-            feeSelectorUM = feeSelectorUM.copy(
-                customValues = updatedCustomValues,
-                selectedFee = customFeeConverter.convertBack(updatedCustomValues),
-            ),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeFailedTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeFailedTransformer.kt
deleted file mode 100644
index e3f728dd23..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeFailedTransformer.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.domain.transaction.error.GetFeeError
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-
-internal class SendFeeFailedTransformer(
-    private val error: GetFeeError,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-
-        return state.copy(
-            feeSelectorUM = FeeSelectorUM.Error(error),
-            isPrimaryButtonEnabled = false,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeInitialStateTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeInitialStateTransformer.kt
deleted file mode 100644
index 498ced2b6b..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeInitialStateTransformer.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.lib.crypto.BlockchainUtils.isTron
-import com.tangem.utils.transformer.Transformer
-import kotlinx.collections.immutable.persistentListOf
-
-internal class SendFeeInitialStateTransformer(
-    cryptoCurrencyStatus: CryptoCurrencyStatus,
-    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-    private val appCurrency: AppCurrency,
-) : Transformer<FeeUM> {
-
-    private val cryptoCurrency = cryptoCurrencyStatus.currency
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        return FeeUM.Content(
-            isPrimaryButtonEnabled = false,
-            feeSelectorUM = FeeSelectorUM.Loading,
-            notifications = persistentListOf(),
-            rate = feeCryptoCurrencyStatus.value.fiatRate,
-            appCurrency = appCurrency,
-            isFeeApproximate = false,
-            isCustomSelected = false,
-            isFeeConvertibleToFiat = feeCryptoCurrencyStatus.currency.network.hasFiatFeeRate,
-            isTronToken = cryptoCurrency is CryptoCurrency.Token &&
-                isTron(cryptoCurrency.network.rawId),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadedTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadedTransformer.kt
deleted file mode 100644
index 3c16c06146..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadedTransformer.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.FeeConverter
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.SendFeeCustomFieldConverter
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-
-internal class SendFeeLoadedTransformer(
-    clickIntents: SendFeeClickIntents,
-    appCurrency: AppCurrency,
-    feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-    private val fees: TransactionFee,
-    private val isFeeApproximate: Boolean,
-) : Transformer<FeeUM> {
-
-    private val customFeeFieldConverter = SendFeeCustomFieldConverter(
-        clickIntents = clickIntents,
-        appCurrency = appCurrency,
-        feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        normalFee = fees.normal,
-    )
-
-    private val feeConverter = FeeConverter(
-        clickIntents = clickIntents,
-        appCurrency = appCurrency,
-        feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-        fees = fees,
-    )
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-        val feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content
-
-        val updatedFeeSelector = if (feeSelectorUM == null) {
-            FeeSelectorUM.Content(
-                fees = fees,
-                customValues = customFeeFieldConverter.convert(fees.normal),
-                selectedFee = fees.normal,
-                nonce = prevState.nonce,
-            )
-        } else {
-            FeeSelectorUM.Content(
-                fees = fees,
-                customValues = feeSelectorUM.customValues,
-                selectedType = feeSelectorUM.selectedType,
-                selectedFee = feeConverter.convert(
-                    FeeConverter.Data(
-                        feeType = feeSelectorUM.selectedType,
-                        customValues = feeSelectorUM.customValues,
-                    ),
-                ),
-                nonce = prevState.nonce,
-            )
-        }
-
-        return state.copy(
-            feeSelectorUM = updatedFeeSelector,
-            isFeeApproximate = isFeeApproximate,
-            displayNonceInput = fees.normal is Fee.Ethereum,
-            nonce = prevState.nonce,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadingTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadingTransformer.kt
deleted file mode 100644
index 96c3e3d00a..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeLoadingTransformer.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-import kotlinx.collections.immutable.persistentListOf
-
-internal object SendFeeLoadingTransformer : Transformer<FeeUM> {
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-        return state.copy(
-            feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content ?: FeeSelectorUM.Loading,
-            notifications = persistentListOf(),
-            isPrimaryButtonEnabled = false,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNonceChangeTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNonceChangeTransformer.kt
deleted file mode 100644
index 8b453ed2d3..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNonceChangeTransformer.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-import java.math.BigInteger
-
-internal class SendFeeNonceChangeTransformer(
-    private val value: String,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-
-        if (value.isEmpty()) {
-            return state.copy(nonce = null)
-        }
-
-        return try {
-            val nonce = BigInteger(value)
-            state.copy(
-                nonce = nonce,
-                feeSelectorUM = when (val feeSelectorUM = state.feeSelectorUM) {
-                    is FeeSelectorUM.Loading,
-                    is FeeSelectorUM.Error,
-                    -> feeSelectorUM
-                    is FeeSelectorUM.Content -> feeSelectorUM.copy(
-                        nonce = nonce,
-                    )
-                },
-            )
-        } catch (e: NumberFormatException) {
-            state
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNotificationsTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNotificationsTransformer.kt
deleted file mode 100644
index d8416e2718..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeNotificationsTransformer.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.common.ui.notifications.NotificationsFactory.addFeeUnreachableNotification
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.extensions.isZero
-import com.tangem.utils.transformer.Transformer
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
-
-internal class SendFeeNotificationsTransformer(
-    private val cryptoCurrencyName: String,
-    private val onFeeReload: () -> Unit,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-
-        val notifications = state.getNotifications()
-        return state.copy(
-            notifications = notifications,
-            isPrimaryButtonEnabled = state.isPrimaryButtonEnabled(notifications),
-        )
-    }
-
-    private fun FeeUM.Content.getNotifications() = buildList {
-        addFeeUnreachableNotification(
-            feeError = (feeSelectorUM as? FeeSelectorUM.Error)?.error,
-            tokenName = cryptoCurrencyName,
-            onReload = onFeeReload,
-        )
-    }.toImmutableList()
-
-    private fun FeeUM.Content.isPrimaryButtonEnabled(notifications: ImmutableList<NotificationUM>): Boolean {
-        val feeSelectorState = feeSelectorUM as? FeeSelectorUM.Content ?: return false
-        val customValue = feeSelectorState.customValues.firstOrNull()
-
-        val isNotCustom = feeSelectorState.selectedType != FeeType.Custom
-        val isNotEmptyCustom = if (customValue != null) {
-            !customValue.value.parseToBigDecimal(customValue.decimals).isZero() && !isNotCustom
-        } else {
-            false
-        }
-        val noErrors = notifications.none { it is NotificationUM.Error }
-
-        return noErrors && (isNotEmptyCustom || isNotCustom)
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeSelectTransformer.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeSelectTransformer.kt
deleted file mode 100644
index 853aff08fe..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/transformers/SendFeeSelectTransformer.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.model.transformers
-
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrencyStatus
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.fee.model.converters.FeeConverter
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.utils.transformer.Transformer
-
-internal class SendFeeSelectTransformer(
-    private val feeType: FeeType,
-    private val clickIntents: SendFeeClickIntents,
-    private val appCurrency: AppCurrency,
-    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
-) : Transformer<FeeUM> {
-
-    override fun transform(prevState: FeeUM): FeeUM {
-        val state = prevState as? FeeUM.Content ?: return prevState
-        val feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content ?: return state
-
-        val feeConverter = FeeConverter(
-            clickIntents = clickIntents,
-            appCurrency = appCurrency,
-            feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
-            fees = feeSelectorUM.fees,
-        )
-
-        val updatedFeeSelectorState = feeSelectorUM.copy(
-            selectedType = feeType,
-            selectedFee = feeConverter.convert(
-                FeeConverter.Data(
-                    customValues = feeSelectorUM.customValues,
-                    feeType = feeType,
-                ),
-            ),
-        )
-
-        val isCustomFeeWasSelected = state.isCustomSelected || updatedFeeSelectorState.selectedType == FeeType.Custom
-        return state.copy(
-            isCustomSelected = isCustomFeeWasSelected,
-            feeSelectorUM = updatedFeeSelectorState,
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt
deleted file mode 100644
index 5aae6a80e5..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/FeeBlock.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui
-
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.amountScreen.utils.getFiatReference
-import com.tangem.core.ui.components.RectangleShimmer
-import com.tangem.core.ui.components.rows.SelectorRowItem
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.extensions.stringResourceSafe
-import com.tangem.core.ui.format.bigdecimal.BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
-import com.tangem.core.ui.format.bigdecimal.crypto
-import com.tangem.core.ui.format.bigdecimal.fee
-import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-
-@Composable
-internal fun FeeBlock(feeUM: FeeUM, isClickEnabled: Boolean, onClick: () -> Unit) {
-    val feeUM = feeUM as? FeeUM.Content ?: return
-    val feeSelectorUM = feeUM.feeSelectorUM as? FeeSelectorUM.Content
-    val isEditingDisabled = feeSelectorUM?.fees is TransactionFee.Single
-
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(TangemTheme.shapes.roundedCornersXMedium)
-            .background(TangemTheme.colors.background.action)
-            .clickable(enabled = isClickEnabled && !isEditingDisabled, onClick = onClick)
-            .padding(12.dp),
-    ) {
-        Text(
-            text = stringResourceSafe(R.string.common_network_fee_title),
-            style = TangemTheme.typography.subtitle1,
-            color = TangemTheme.colors.text.secondary,
-        )
-
-        Box(
-            modifier = Modifier.padding(top = 8.dp),
-        ) {
-            val feeSelectorUM = feeUM.feeSelectorUM
-            val feeAmount = (feeSelectorUM as? FeeSelectorUM.Content)?.selectedFee?.amount
-            val (title, icon) = if (feeSelectorUM is FeeSelectorUM.Content) {
-                when (feeSelectorUM.selectedType) {
-                    FeeType.Slow -> R.string.common_fee_selector_option_slow to R.drawable.ic_tortoise_24
-                    FeeType.Market -> R.string.common_fee_selector_option_market to R.drawable.ic_bird_24
-                    FeeType.Fast -> R.string.common_fee_selector_option_fast to R.drawable.ic_hare_24
-                    FeeType.Custom -> R.string.common_custom to R.drawable.ic_edit_24
-                }
-            } else {
-                R.string.common_fee_selector_option_market to R.drawable.ic_bird_24
-            }
-            SelectorRowItem(
-                title = resourceReference(title),
-                iconRes = icon,
-                preDot = remember {
-                    stringReference(
-                        feeAmount?.value.format {
-                            crypto(
-                                symbol = feeAmount?.currencySymbol.orEmpty(),
-                                decimals = feeAmount?.decimals ?: 0,
-                            ).fee(canBeLower = feeUM.isFeeApproximate)
-                        },
-                    )
-                },
-                postDot = remember {
-                    if (feeUM.isFeeConvertibleToFiat) {
-                        getFiatReference(feeAmount?.value, feeUM.rate, feeUM.appCurrency)
-                    } else {
-                        null
-                    }
-                },
-                ellipsizeOffset = feeAmount?.currencySymbol?.length,
-                isSelected = true,
-                showDivider = false,
-                showSelectedAppearance = false,
-                paddingValues = PaddingValues(),
-            )
-            FeeLoading(feeSelectorUM)
-            FeeError(feeSelectorUM)
-        }
-    }
-}
-
-@Composable
-private fun BoxScope.FeeLoading(feeSelectorUM: FeeSelectorUM) {
-    AnimatedContent(
-        targetState = feeSelectorUM,
-        label = "Fee Loading State Change",
-        modifier = Modifier.align(Alignment.CenterEnd),
-    ) {
-        if (it == FeeSelectorUM.Loading) {
-            RectangleShimmer(
-                radius = 3.dp,
-                modifier = Modifier.size(
-                    height = 12.dp,
-                    width = 90.dp,
-                ),
-            )
-        }
-    }
-}
-
-@Composable
-private fun BoxScope.FeeError(feeSelectorUM: FeeSelectorUM) {
-    AnimatedContent(
-        targetState = feeSelectorUM,
-        label = "Fee Error State Change",
-        modifier = Modifier.align(Alignment.CenterEnd),
-    ) {
-        if (it is FeeSelectorUM.Error) {
-            Text(
-                text = EMPTY_BALANCE_SIGN,
-                color = TangemTheme.colors.text.primary1,
-                style = TangemTheme.typography.body2,
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendCustomFee.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendCustomFee.kt
deleted file mode 100644
index 577020369e..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendCustomFee.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui
-
-import androidx.compose.animation.*
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.containers.FooterContainer
-import com.tangem.core.ui.components.inputrow.InputRowEnter
-import com.tangem.core.ui.components.inputrow.InputRowEnterAmount
-import com.tangem.core.ui.components.inputrow.InputRowEnterInfoAmount
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import kotlinx.collections.immutable.ImmutableList
-
-@Suppress("LongParameterList")
-@Composable
-internal fun SendCustomFee(
-    customValues: ImmutableList<CustomFeeFieldUM>,
-    selectedFee: FeeType,
-    hasNotifications: Boolean,
-    onValueChange: (Int, String) -> Unit,
-    onNonceChange: (String) -> Unit,
-    displayNonceInput: Boolean,
-    nonce: String?,
-    modifier: Modifier = Modifier,
-) {
-    AnimatedVisibility(
-        visible = selectedFee == FeeType.Custom && customValues.isNotEmpty(),
-        label = "Custom Fee Selected Animation",
-        enter = expandVertically().plus(fadeIn()),
-        exit = shrinkVertically().plus(fadeOut()),
-    ) {
-        val bottomPadding = if (hasNotifications) 12.dp else 0.dp
-        Column(
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            modifier = modifier.padding(bottom = bottomPadding),
-        ) {
-            repeat(customValues.size) { index ->
-                val value = customValues[index]
-                FooterContainer(
-                    footer = value.footer,
-                ) {
-                    if (value.label != null) {
-                        InputRowEnterInfoAmount(
-                            text = value.value,
-                            decimals = value.decimals,
-                            symbol = value.symbol,
-                            title = value.title,
-                            info = value.label,
-                            keyboardOptions = value.keyboardOptions,
-                            keyboardActions = value.keyboardActions,
-                            onValueChange = { onValueChange(index, it) },
-                            showDivider = false,
-                            isReadOnly = value.isReadonly,
-                            modifier = Modifier
-                                .background(
-                                    color = TangemTheme.colors.background.action,
-                                    shape = TangemTheme.shapes.roundedCornersXMedium,
-                                ),
-                        )
-                    } else {
-                        InputRowEnterAmount(
-                            text = value.value,
-                            decimals = value.decimals,
-                            title = value.title,
-                            symbol = value.symbol,
-                            onValueChange = { onValueChange(index, it) },
-                            keyboardOptions = value.keyboardOptions,
-                            keyboardActions = value.keyboardActions,
-                            showDivider = false,
-                            modifier = Modifier
-                                .background(
-                                    color = TangemTheme.colors.background.action,
-                                    shape = TangemTheme.shapes.roundedCornersXMedium,
-                                ),
-                        )
-                    }
-                }
-            }
-            if (displayNonceInput) {
-                Nonce(
-                    onNonceChange = onNonceChange,
-                    nonce = nonce,
-                )
-            }
-        }
-    }
-}
-
-@Composable
-private fun Nonce(onNonceChange: (String) -> Unit, nonce: String?) {
-    FooterContainer(
-        footer = resourceReference(R.string.send_nonce_footer),
-        modifier = Modifier.padding(bottom = 12.dp),
-    ) {
-        InputRowEnter(
-            text = nonce.orEmpty(),
-            title = resourceReference(R.string.send_nonce),
-            onValueChange = onNonceChange,
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
-            placeholder = resourceReference(R.string.send_nonce_hint),
-            showDivider = false,
-            modifier = Modifier
-                .background(
-                    color = TangemTheme.colors.background.action,
-                    shape = TangemTheme.shapes.roundedCornersXMedium,
-                ),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendFeeContent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendFeeContent.kt
deleted file mode 100644
index ff60febdfa..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendFeeContent.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-import com.tangem.features.send.v2.subcomponents.notifications
-
-private const val FEE_SELECTOR_KEY = "FEE_SELECTOR_KEY"
-private const val FEE_CUSTOM_KEY = "FEE_CUSTOM_KEY"
-
-@Composable
-internal fun SendFeeContent(state: FeeUM, clickIntents: SendFeeClickIntents) {
-    if (state !is FeeUM.Content) return
-
-    val notifications = state.notifications
-    val feeSelectorUM = state.feeSelectorUM as? FeeSelectorUM.Content
-    val isCustomSelected = feeSelectorUM?.selectedType == FeeType.Custom
-    val hasNotifications = notifications.isNotEmpty()
-    LazyColumn(
-        modifier = Modifier // Do not put fillMaxSize() in here
-            .background(TangemTheme.colors.background.tertiary)
-            .padding(
-                start = 16.dp,
-                end = 16.dp,
-                bottom = 16.dp,
-            ),
-    ) {
-        feeSelector(state, clickIntents)
-        if (feeSelectorUM != null) {
-            customFee(
-                feeSelectorUM = feeSelectorUM,
-                onValueChange = clickIntents::onCustomFeeValueChange,
-                onNonceChange = clickIntents::onNonceChange,
-                displayNonceInput = state.displayNonceInput,
-                nonce = state.nonce?.toString().orEmpty(),
-                hasNotifications = hasNotifications,
-            )
-        }
-        notifications(notifications = notifications, hasPaddingAbove = isCustomSelected)
-    }
-}
-
-private fun LazyListScope.feeSelector(state: FeeUM.Content, clickIntents: SendFeeClickIntents) {
-    item(key = FEE_SELECTOR_KEY) {
-        SendSpeedSelector(
-            state = state,
-            clickIntents = clickIntents,
-            modifier = Modifier.animateItem(),
-        )
-    }
-}
-
-@Suppress("LongParameterList")
-internal fun LazyListScope.customFee(
-    feeSelectorUM: FeeSelectorUM.Content,
-    hasNotifications: Boolean,
-    onValueChange: (Int, String) -> Unit,
-    onNonceChange: (String) -> Unit,
-    displayNonceInput: Boolean,
-    nonce: String?,
-    modifier: Modifier = Modifier,
-) {
-    item(key = FEE_CUSTOM_KEY) {
-        SendCustomFee(
-            customValues = feeSelectorUM.customValues,
-            selectedFee = feeSelectorUM.selectedType,
-            hasNotifications = hasNotifications,
-            onValueChange = onValueChange,
-            onNonceChange = onNonceChange,
-            displayNonceInput = displayNonceInput,
-            nonce = nonce,
-            modifier = modifier
-                .fillMaxWidth()
-                .animateItem()
-                .background(TangemTheme.colors.background.tertiary)
-                .padding(top = 12.dp),
-        )
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelector.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelector.kt
deleted file mode 100644
index 0437760435..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelector.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.extensions.stringResourceSafe
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.send.v2.impl.R
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import com.tangem.features.send.v2.subcomponents.fee.model.SendFeeClickIntents
-
-@Suppress("LongMethod")
-@Composable
-internal fun SendSpeedSelector(
-    state: FeeUM.Content,
-    clickIntents: SendFeeClickIntents,
-    modifier: Modifier = Modifier,
-) {
-    Column(modifier = modifier) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clip(TangemTheme.shapes.roundedCornersXMedium)
-                .background(TangemTheme.colors.background.action),
-        ) {
-            SendSpeedSelectorItem(
-                titleRes = R.string.common_fee_selector_option_slow,
-                iconRes = R.drawable.ic_tortoise_24,
-                feeType = FeeType.Slow,
-                state = state,
-                onSelect = { clickIntents.onFeeSelectorClick(FeeType.Slow) },
-            )
-            SendSpeedSelectorItem(
-                titleRes = R.string.common_fee_selector_option_market,
-                iconRes = R.drawable.ic_bird_24,
-                feeType = FeeType.Market,
-                state = state,
-                onSelect = { clickIntents.onFeeSelectorClick(FeeType.Market) },
-            )
-            SendSpeedSelectorItem(
-                titleRes = R.string.common_fee_selector_option_fast,
-                iconRes = R.drawable.ic_hare_24,
-                feeType = FeeType.Fast,
-                state = state,
-                onSelect = { clickIntents.onFeeSelectorClick(FeeType.Fast) },
-            )
-            SendSpeedSelectorItem(
-                titleRes = R.string.common_custom,
-                iconRes = R.drawable.ic_edit_24,
-                feeType = FeeType.Custom,
-                state = state,
-                onSelect = { clickIntents.onFeeSelectorClick(FeeType.Custom) },
-            )
-        }
-        FooterText(clickIntents::onReadMoreClick)
-    }
-}
-
-@Composable
-private fun FooterText(onReadMoreClick: () -> Unit) {
-    val linkText = stringResourceSafe(R.string.common_read_more)
-    val fullString = stringResourceSafe(R.string.common_fee_selector_footer, linkText)
-    val linkTextPosition = fullString.length - linkText.length
-    val defaultStyle = TangemTheme.colors.text.tertiary
-    val linkStyle = TangemTheme.colors.text.accent
-    val annotatedString = remember(defaultStyle, linkStyle) {
-        buildAnnotatedString {
-            withStyle(SpanStyle(defaultStyle)) {
-                append(fullString.substring(0, linkTextPosition))
-            }
-            withStyle(SpanStyle(linkStyle)) {
-                append(fullString.substring(linkTextPosition, fullString.length))
-            }
-        }
-    }
-
-    val click = { i: Int ->
-        val readMoreStyle = requireNotNull(annotatedString.spanStyles.getOrNull(1))
-        if (i in readMoreStyle.start..readMoreStyle.end) {
-            onReadMoreClick()
-        }
-    }
-
-    ClickableText(
-        text = annotatedString,
-        style = TangemTheme.typography.caption2.copy(textAlign = TextAlign.Start),
-        modifier = Modifier.padding(top = 8.dp),
-        onClick = click,
-    )
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelectorItem.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelectorItem.kt
deleted file mode 100644
index 09ae784965..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/SendSpeedSelectorItem.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.compose.animation.*
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.amountScreen.utils.getFiatReference
-import com.tangem.core.ui.components.RectangleShimmer
-import com.tangem.core.ui.components.SpacerWMax
-import com.tangem.core.ui.components.rows.SelectorRowItem
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.format.bigdecimal.BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
-import com.tangem.core.ui.format.bigdecimal.crypto
-import com.tangem.core.ui.format.bigdecimal.fee
-import com.tangem.core.ui.format.bigdecimal.format
-import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.utils.parseToBigDecimal
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-
-@Composable
-internal fun SendSpeedSelectorItem(
-    @StringRes titleRes: Int,
-    @DrawableRes iconRes: Int,
-    feeType: FeeType,
-    state: FeeUM.Content,
-    onSelect: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val feeSelectorState = state.feeSelectorUM
-    val content = feeSelectorState as? FeeSelectorUM.Content
-    val amount = content?.getAmount(feeType)
-    val (showDivider, isVisible) = content.getDividerAndVisibility(feeType)
-    AnimatedVisibility(
-        visible = isVisible,
-        label = "Fee Selector Visibility Animation",
-        enter = expandVertically().plus(fadeIn()),
-        exit = shrinkVertically().plus(fadeOut()),
-    ) {
-        Box(
-            modifier = modifier
-                .fillMaxWidth()
-                .clickable { onSelect() },
-        ) {
-            SelectorRowItem(
-                title = resourceReference(titleRes),
-                iconRes = iconRes,
-                onSelect = onSelect,
-                modifier = modifier,
-                preDot = stringReference(
-                    amount?.value.format {
-                        crypto(
-                            symbol = amount?.currencySymbol.orEmpty(),
-                            decimals = amount?.decimals ?: 0,
-                        ).fee(canBeLower = state.isFeeApproximate)
-                    },
-                ),
-                postDot = if (state.isFeeConvertibleToFiat) {
-                    getFiatReference(amount?.value, state.rate, state.appCurrency)
-                } else {
-                    null
-                },
-                ellipsizeOffset = amount?.currencySymbol?.length,
-                isSelected = content?.selectedType == feeType,
-                showDivider = showDivider,
-            )
-            FeeLoading(feeSelectorState)
-            FeeError(feeSelectorState)
-        }
-    }
-}
-
-@Composable
-private fun FeeLoading(feeSelectorState: FeeSelectorUM) {
-    Row {
-        SpacerWMax()
-        AnimatedVisibility(
-            visible = feeSelectorState == FeeSelectorUM.Loading,
-            label = "Fee Loading State Change",
-            modifier = Modifier.align(Alignment.CenterVertically),
-        ) {
-            RectangleShimmer(
-                radius = 3.dp,
-                modifier = Modifier
-                    .padding(
-                        vertical = 18.dp,
-                        horizontal = 12.dp,
-                    )
-                    .size(
-                        height = 12.dp,
-                        width = 90.dp,
-                    ),
-            )
-        }
-    }
-}
-
-@Composable
-private fun FeeError(feeSelectorState: FeeSelectorUM) {
-    Row {
-        SpacerWMax()
-        AnimatedVisibility(
-            visible = feeSelectorState is FeeSelectorUM.Error,
-            label = "Fee Error State Change",
-            modifier = Modifier.align(Alignment.CenterVertically),
-        ) {
-            Text(
-                text = EMPTY_BALANCE_SIGN,
-                color = TangemTheme.colors.text.primary1,
-                style = TangemTheme.typography.body2,
-                modifier = Modifier
-                    .padding(
-                        vertical = 14.dp,
-                        horizontal = 12.dp,
-                    ),
-            )
-        }
-    }
-}
-
-private fun FeeSelectorUM.Content.getAmount(feeType: FeeType): Amount? {
-    val choosableFees = fees as? TransactionFee.Choosable
-    val decimals = fees.normal.amount.decimals
-    val customValue = this.customValues.firstOrNull()?.value?.parseToBigDecimal(decimals)
-    val customAmount = fees.normal.amount.copy(value = customValue)
-    return when (feeType) {
-        FeeType.Slow -> choosableFees?.minimum?.amount
-        FeeType.Market -> fees.normal.amount
-        FeeType.Fast -> choosableFees?.priority?.amount
-        FeeType.Custom -> customAmount
-    }
-}
-
-private fun FeeSelectorUM.Content?.getDividerAndVisibility(feeType: FeeType): Pair<Boolean, Boolean> {
-    val hasCustomValues = !this?.customValues.isNullOrEmpty()
-    val isNotSingle = this?.fees !is TransactionFee.Single
-    return when (feeType) {
-        FeeType.Slow -> true to isNotSingle
-        FeeType.Market -> (isNotSingle || hasCustomValues) to true
-        FeeType.Fast -> hasCustomValues to isNotSingle
-        FeeType.Custom -> false to hasCustomValues
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeSelectorUM.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeSelectorUM.kt
deleted file mode 100644
index 563ef43c17..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeSelectorUM.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui.state
-
-import androidx.compose.runtime.Stable
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.core.analytics.models.AnalyticsParam
-import com.tangem.domain.transaction.error.GetFeeError
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import java.math.BigInteger
-
-@Stable
-internal sealed class FeeSelectorUM {
-
-    data class Content(
-        val fees: TransactionFee,
-        val selectedType: FeeType = FeeType.Market,
-        val selectedFee: Fee?,
-        val customValues: ImmutableList<CustomFeeFieldUM> = persistentListOf(),
-        val nonce: BigInteger? = null,
-    ) : FeeSelectorUM()
-
-    data object Loading : FeeSelectorUM()
-
-    data class Error(
-        val error: GetFeeError,
-    ) : FeeSelectorUM()
-}
-
-internal enum class FeeType {
-    Slow,
-    Market,
-    Fast,
-    Custom,
-    ;
-
-    fun toAnalyticType(feeSelectorUM: FeeSelectorUM.Content): AnalyticsParam.FeeType = when (feeSelectorUM.fees) {
-        is TransactionFee.Single -> AnalyticsParam.FeeType.Fixed
-        is TransactionFee.Choosable -> when (feeSelectorUM.selectedType) {
-            Slow -> AnalyticsParam.FeeType.Min
-            Market -> AnalyticsParam.FeeType.Normal
-            Fast -> AnalyticsParam.FeeType.Max
-            Custom -> AnalyticsParam.FeeType.Custom
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeUM.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeUM.kt
deleted file mode 100644
index 1b98e4c5de..0000000000
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/ui/state/FeeUM.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.tangem.features.send.v2.subcomponents.fee.ui.state
-
-import androidx.compose.runtime.Stable
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.persistentListOf
-import java.math.BigDecimal
-import java.math.BigInteger
-
-@Stable
-internal sealed class FeeUM {
-
-    abstract val isPrimaryButtonEnabled: Boolean
-
-    data class Content(
-        override val isPrimaryButtonEnabled: Boolean,
-        val feeSelectorUM: FeeSelectorUM,
-        val rate: BigDecimal?,
-        val appCurrency: AppCurrency,
-        val isFeeConvertibleToFiat: Boolean,
-        val isFeeApproximate: Boolean,
-        val isCustomSelected: Boolean,
-        val isTronToken: Boolean,
-        val customValues: ImmutableList<CustomFeeFieldUM> = persistentListOf(),
-        val displayNonceInput: Boolean = false,
-        val nonce: BigInteger? = null,
-        val notifications: ImmutableList<NotificationUM>,
-        val isEditingDisabled: Boolean = false,
-    ) : FeeUM()
-
-    data class Empty(
-        override val isPrimaryButtonEnabled: Boolean = false,
-    ) : FeeUM()
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/notifications/model/NotificationsModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/notifications/model/NotificationsModel.kt
index 37519c11bd..73649cccf8 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/notifications/model/NotificationsModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/notifications/model/NotificationsModel.kt
@@ -36,10 +36,10 @@ import com.tangem.domain.transaction.usecase.ValidateTransactionUseCase
 import com.tangem.domain.utils.convertToSdkAmount
 import com.tangem.features.send.v2.api.SendNotificationsComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent.Params.NotificationData
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount
+import com.tangem.features.send.v2.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkFeeCoverage
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateListener
 import com.tangem.features.send.v2.api.subcomponents.notifications.SendNotificationsUpdateTrigger
-import com.tangem.features.send.v2.subcomponents.fee.model.checkAndCalculateSubtractedAmount
-import com.tangem.features.send.v2.subcomponents.fee.model.checkFeeCoverage
 import com.tangem.features.send.v2.subcomponents.notifications.analytics.NotificationsAnalyticEvents
 import com.tangem.lib.crypto.BlockchainUtils
 import com.tangem.lib.crypto.BlockchainUtils.isTron
@@ -287,7 +287,7 @@ internal class NotificationsModel @Inject constructor(
     ) {
         val validationError = validateTransactionUseCase(
             userWalletId = userWalletId,
-            amount = enteredAmount.convertToSdkAmount(currency),
+            amount = enteredAmount.convertToSdkAmount(cryptoCurrencyStatus),
             fee = fee,
             memo = memo,
             destination = destinationAddress,
diff --git a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmNotificationsTransformersComparisonTest.kt b/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmNotificationsTransformersComparisonTest.kt
deleted file mode 100644
index 1fea9dd3ae..0000000000
--- a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmNotificationsTransformersComparisonTest.kt
+++ /dev/null
@@ -1,822 +0,0 @@
-package com.tangem.features.send.v2.send.confirm.model.transformers
-
-import com.google.common.truth.Truth.assertThat
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.entity.*
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformer
-import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformerV2
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Test
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.util.Locale
-import com.tangem.features.send.v2.api.entity.FeeSelectorUM as FeeSelectorUMV2
-
-class NFTSendConfirmNotificationsTransformersComparisonTest {
-
-    private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
-    private val cryptoCurrency: CryptoCurrency = mockk(relaxed = true)
-    private val appCurrency = AppCurrency(name = "US Dollar", code = "USD", symbol = "$")
-    private val analyticsCategoryName = "test_category"
-
-    @Test
-    fun `GIVEN equivalent input data WHEN both transformers transform THEN they produce equal ConfirmUM`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-
-        val feeUM = createTestFeeUM()
-        val feeSelectorUMV2 = createTestFeeSelectorUMV2()
-
-        // WHEN
-        val transformerV1 = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = NFTSendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.notifications.size).isEqualTo(contentV2.notifications.size)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.isSending).isEqualTo(contentV2.isSending)
-        assertThat(contentV1.showTapHelp).isEqualTo(contentV2.showTapHelp)
-    }
-
-    @Test
-    fun `GIVEN fee too low WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-
-        val feeUM = createFeeTooLowUM()
-        val feeSelectorUMV2 = createFeeTooLowUMV2()
-
-        // WHEN
-        val transformerV1 = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = NFTSendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV1.notifications).hasSize(1)
-        assertThat(contentV2.notifications).hasSize(1)
-        assertThat(contentV1.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        assertThat(contentV2.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-
-        // Verify analytics event was sent for both transformers
-        verify(exactly = 2) { analyticsEventHandler.send(any()) }
-    }
-
-    @Test
-    fun `GIVEN fee too high WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-
-        val feeUM = createFeeTooHighUM()
-        val feeSelectorUMV2 = createFeeTooHighUMV2()
-
-        // WHEN
-        val transformerV1 = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = NFTSendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV1.notifications).hasSize(1)
-        assertThat(contentV2.notifications).hasSize(1)
-        assertThat(contentV1.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-        assertThat(contentV2.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-
-        val tooHighV1 = contentV1.notifications.first() as NotificationUM.Warning.TooHigh
-        val tooHighV2 = contentV2.notifications.first() as NotificationUM.Warning.TooHigh
-        assertThat(tooHighV1.value).isEqualTo(tooHighV2.value)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-    }
-
-    @Test
-    fun `GIVEN fee both too high and too low WHEN both transformers transform THEN they produce equal notifications`() =
-        runTest {
-            // GIVEN
-            val initialConfirmUM = createTestConfirmUM()
-
-            val feeUM = createFeeTooHighAndTooLowUM()
-            val feeSelectorUMV2 = createFeeTooHighAndTooLowUMV2()
-
-            // WHEN
-            val transformerV1 = NFTSendConfirmationNotificationsTransformer(
-                feeUM = feeUM,
-                analyticsEventHandler = analyticsEventHandler,
-                cryptoCurrency = cryptoCurrency,
-                appCurrency = appCurrency,
-                analyticsCategoryName = analyticsCategoryName,
-            )
-
-            val transformerV2 = NFTSendConfirmationNotificationsTransformerV2(
-                feeSelectorUM = feeSelectorUMV2,
-                analyticsEventHandler = analyticsEventHandler,
-                cryptoCurrency = cryptoCurrency,
-                appCurrency = appCurrency,
-                analyticsCategoryName = analyticsCategoryName,
-            )
-
-            val resultV1 = transformerV1.transform(initialConfirmUM)
-            val resultV2 = transformerV2.transform(initialConfirmUM)
-
-            // THEN
-            assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-            assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-            val contentV1 = resultV1 as ConfirmUM.Content
-            val contentV2 = resultV2 as ConfirmUM.Content
-
-            assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-            assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-            assertThat(contentV1.notifications).hasSize(2)
-            assertThat(contentV2.notifications).hasSize(2)
-
-            assertThat(contentV1.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-            assertThat(contentV1.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-            assertThat(contentV2.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-            assertThat(contentV2.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-
-            assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-
-            verify(exactly = 2) { analyticsEventHandler.send(any()) }
-        }
-
-    @Test
-    fun `GIVEN normal fee WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-
-        val feeUM = createNormalFeeUM()
-        val feeSelectorUMV2 = createNormalFeeSelectorUMV2()
-
-        // WHEN
-        val transformerV1 = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = NFTSendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.notifications).isEmpty()
-        assertThat(contentV2.notifications).isEmpty()
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-    }
-
-    private fun createTestConfirmUM(): ConfirmUM.Content {
-        return ConfirmUM.Content(
-            isPrimaryButtonEnabled = true,
-            walletName = mockk(relaxed = true),
-            isSending = false,
-            showTapHelp = false,
-            sendingFooter = mockk(relaxed = true),
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createTestFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createTestFeeSelectorUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Market(fee),
-            ),
-            selectedFeeItem = FeeItem.Market(fee),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooLowUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooLowUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = fee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.0001",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooHighUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighUMV2(): FeeSelectorUMV2.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = customFee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.01",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUMV2(): FeeSelectorUMV2.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = customFee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.008",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createNormalFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createNormalFeeSelectorUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Market(fee),
-            ),
-            selectedFeeItem = FeeItem.Market(fee),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    companion object {
-        @JvmStatic
-        @BeforeAll
-        fun setUpLocale() {
-            Locale.setDefault(Locale.US)
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerTest.kt b/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerTest.kt
deleted file mode 100644
index e7f065638a..0000000000
--- a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerTest.kt
+++ /dev/null
@@ -1,381 +0,0 @@
-package com.tangem.features.send.v2.send.confirm.model.transformers
-
-import com.google.common.truth.Truth.assertThat
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformer
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Test
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.util.Locale
-
-class NFTSendConfirmationNotificationsTransformerTest {
-
-    private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
-    private val cryptoCurrency: CryptoCurrency = mockk(relaxed = true)
-    private val appCurrency = AppCurrency(name = "US Dollar", code = "USD", symbol = "$")
-    private val analyticsCategoryName = "test_category"
-
-    @Test
-    fun `GIVEN non content state WHEN transform THEN returns original state`() = runTest {
-        // GIVEN
-        val feeUM: FeeUM = mockk(relaxed = true)
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState: ConfirmUM = ConfirmUM.Empty
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isEqualTo(initialState)
-    }
-
-    @Test
-    fun `GIVEN fee UM not content WHEN transform THEN returns original state`() = runTest {
-        // GIVEN
-        val feeUM: FeeUM = FeeUM.Empty()
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState: ConfirmUM.Content = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isEqualTo(initialState)
-    }
-
-    @Test
-    fun `GIVEN normal fee WHEN transform THEN returns state with footer and no notifications`() = runTest {
-        // GIVEN
-        val feeUM = createNormalFeeUM()
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).isEmpty()
-        assertThat(content.sendingFooter).isNotEqualTo(initialState.sendingFooter)
-    }
-
-    @Test
-    fun `GIVEN fee too high WHEN transform THEN returns state with too high notification`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooHighUM()
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(1)
-        assertThat(content.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-    }
-
-    @Test
-    fun `GIVEN fee too low WHEN transform THEN returns state with too low notification`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooLowUM()
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(1)
-        assertThat(content.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        verify { analyticsEventHandler.send(any()) }
-    }
-
-    @Test
-    fun `GIVEN both fee too high and too low WHEN transform THEN returns state with both notifications`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooHighAndTooLowUM()
-        val transformer = NFTSendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(2)
-        assertThat(content.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-        assertThat(content.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-    }
-
-    private fun createTestConfirmUM(): ConfirmUM.Content {
-        return ConfirmUM.Content(
-            isPrimaryButtonEnabled = true,
-            walletName = mockk(relaxed = true),
-            isSending = false,
-            showTapHelp = false,
-            sendingFooter = mockk(relaxed = true),
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createNormalFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooLowUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    companion object {
-        @JvmStatic
-        @BeforeAll
-        fun setUpLocale() {
-            Locale.setDefault(Locale.US)
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmNotificationsTransformersComparisonTest.kt b/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmNotificationsTransformersComparisonTest.kt
deleted file mode 100644
index 929e59f708..0000000000
--- a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmNotificationsTransformersComparisonTest.kt
+++ /dev/null
@@ -1,885 +0,0 @@
-package com.tangem.features.send.v2.send.confirm.model.transformers
-
-import com.google.common.truth.Truth.assertThat
-import com.tangem.blockchain.common.Amount
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.amountScreen.models.AmountFieldModel
-import com.tangem.common.ui.amountScreen.models.AmountState
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.entity.*
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Test
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.util.Locale
-import com.tangem.domain.tokens.model.Amount as DomainAmount
-import com.tangem.features.send.v2.api.entity.FeeSelectorUM as FeeSelectorUMV2
-
-class SendConfirmNotificationsTransformersComparisonTest {
-
-    private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
-    private val cryptoCurrency: CryptoCurrency = mockk(relaxed = true)
-    private val appCurrency = AppCurrency(name = "US Dollar", code = "USD", symbol = "$")
-    private val analyticsCategoryName = "test_category"
-
-    @Test
-    fun `GIVEN equivalent input data WHEN both transformers transform THEN they produce equal ConfirmUM`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-        val amountUM = createTestAmountUM()
-
-        val feeUM = createTestFeeUM()
-        val feeSelectorUMV2 = createTestFeeSelectorUMV2()
-
-        // WHEN
-        val transformerV1 = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = SendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.notifications.size).isEqualTo(contentV2.notifications.size)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.isSending).isEqualTo(contentV2.isSending)
-        assertThat(contentV1.showTapHelp).isEqualTo(contentV2.showTapHelp)
-    }
-
-    @Test
-    fun `GIVEN fee too low WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-        val amountUM = createTestAmountUM()
-
-        val feeUM = createFeeTooLowUM()
-        val feeSelectorUMV2 = createFeeTooLowUMV2()
-
-        // WHEN
-        val transformerV1 = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = SendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV1.notifications).hasSize(1)
-        assertThat(contentV2.notifications).hasSize(1)
-        assertThat(contentV1.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        assertThat(contentV2.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-
-        // Verify analytics event was sent for both transformers
-        verify(exactly = 2) { analyticsEventHandler.send(any()) }
-    }
-
-    @Test
-    fun `GIVEN fee too high WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-        val amountUM = createTestAmountUM()
-
-        val feeUM = createFeeTooHighUM()
-        val feeSelectorUMV2 = createFeeTooHighUMV2()
-
-        // WHEN
-        val transformerV1 = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = SendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-        assertThat(contentV1.notifications).hasSize(1)
-        assertThat(contentV2.notifications).hasSize(1)
-        assertThat(contentV1.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-        assertThat(contentV2.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-
-        val tooHighV1 = contentV1.notifications.first() as NotificationUM.Warning.TooHigh
-        val tooHighV2 = contentV2.notifications.first() as NotificationUM.Warning.TooHigh
-        assertThat(tooHighV1.value).isEqualTo(tooHighV2.value)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-    }
-
-    @Test
-    fun `GIVEN fee both too high and too low WHEN both transformers transform THEN they produce equal notifications`() =
-        runTest {
-            // GIVEN
-            val initialConfirmUM = createTestConfirmUM()
-            val amountUM = createTestAmountUM()
-
-            val feeUM = createFeeTooHighAndTooLowUM()
-            val feeSelectorUMV2 = createFeeTooHighAndTooLowUMV2()
-
-            // WHEN
-            val transformerV1 = SendConfirmationNotificationsTransformer(
-                feeUM = feeUM,
-                amountUM = amountUM,
-                analyticsEventHandler = analyticsEventHandler,
-                cryptoCurrency = cryptoCurrency,
-                appCurrency = appCurrency,
-                analyticsCategoryName = analyticsCategoryName,
-            )
-
-            val transformerV2 = SendConfirmationNotificationsTransformerV2(
-                feeSelectorUM = feeSelectorUMV2,
-                amountUM = amountUM,
-                analyticsEventHandler = analyticsEventHandler,
-                cryptoCurrency = cryptoCurrency,
-                appCurrency = appCurrency,
-                analyticsCategoryName = analyticsCategoryName,
-            )
-
-            val resultV1 = transformerV1.transform(initialConfirmUM)
-            val resultV2 = transformerV2.transform(initialConfirmUM)
-
-            // THEN
-            assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-            assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-            val contentV1 = resultV1 as ConfirmUM.Content
-            val contentV2 = resultV2 as ConfirmUM.Content
-
-            assertThat(contentV1.isPrimaryButtonEnabled).isTrue()
-            assertThat(contentV2.isPrimaryButtonEnabled).isTrue()
-            assertThat(contentV1.notifications).hasSize(2)
-            assertThat(contentV2.notifications).hasSize(2)
-
-            assertThat(contentV1.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-            assertThat(contentV1.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-            assertThat(contentV2.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-            assertThat(contentV2.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-
-            assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-
-            verify(exactly = 2) { analyticsEventHandler.send(any()) }
-        }
-
-    @Test
-    fun `GIVEN normal fee WHEN both transformers transform THEN they produce equal notifications`() = runTest {
-        // GIVEN
-        val initialConfirmUM = createTestConfirmUM()
-        val amountUM = createTestAmountUM()
-
-        val feeUM = createNormalFeeUM()
-        val feeSelectorUMV2 = createNormalFeeSelectorUMV2()
-
-        // WHEN
-        val transformerV1 = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val transformerV2 = SendConfirmationNotificationsTransformerV2(
-            feeSelectorUM = feeSelectorUMV2,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-
-        val resultV1 = transformerV1.transform(initialConfirmUM)
-        val resultV2 = transformerV2.transform(initialConfirmUM)
-
-        // THEN
-        assertThat(resultV1).isInstanceOf(ConfirmUM.Content::class.java)
-        assertThat(resultV2).isInstanceOf(ConfirmUM.Content::class.java)
-
-        val contentV1 = resultV1 as ConfirmUM.Content
-        val contentV2 = resultV2 as ConfirmUM.Content
-
-        assertThat(contentV1.notifications).isEmpty()
-        assertThat(contentV2.notifications).isEmpty()
-        assertThat(contentV1.isPrimaryButtonEnabled).isEqualTo(contentV2.isPrimaryButtonEnabled)
-        assertThat(contentV1.sendingFooter).isEqualTo(contentV2.sendingFooter)
-    }
-
-    private fun createTestConfirmUM(): ConfirmUM.Content {
-        return ConfirmUM.Content(
-            isPrimaryButtonEnabled = true,
-            walletName = mockk(relaxed = true),
-            isSending = false,
-            showTapHelp = false,
-            sendingFooter = mockk(relaxed = true),
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createTestAmountUM(): AmountState.Data {
-        val cryptoAmount = DomainAmount(
-            currencySymbol = "TST",
-            value = BigDecimal("1.5"),
-            decimals = 8,
-        )
-        val fiatAmount = DomainAmount(
-            currencySymbol = "USD",
-            value = BigDecimal("50.00"),
-            decimals = 2,
-        )
-
-        return AmountState.Data(
-            isPrimaryButtonEnabled = true,
-            isRedesignEnabled = false,
-            title = mockk(relaxed = true),
-            availableBalance = mockk(relaxed = true),
-            availableBalanceCrypto = mockk(relaxed = true),
-            availableBalanceFiat = mockk(relaxed = true),
-            tokenName = mockk(relaxed = true),
-            tokenIconState = mockk(relaxed = true),
-            segmentedButtonConfig = persistentListOf(),
-            selectedButton = 0,
-            isSegmentedButtonsEnabled = false,
-            amountTextField = AmountFieldModel(
-                value = "1.5",
-                onValueChange = {},
-                keyboardOptions = mockk(relaxed = true),
-                keyboardActions = mockk(relaxed = true),
-                cryptoAmount = cryptoAmount,
-                fiatAmount = fiatAmount,
-                isFiatValue = false,
-                fiatValue = "50.00",
-                isFiatUnavailable = false,
-                isValuePasted = false,
-                onValuePastedTriggerDismiss = {},
-                isError = false,
-                isWarning = false,
-                error = mockk(relaxed = true),
-            ),
-            appCurrency = appCurrency,
-            isEditingDisabled = false,
-            reduceAmountBy = BigDecimal.ZERO,
-            isIgnoreReduce = false,
-        )
-    }
-
-    private fun createTestFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createTestFeeSelectorUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Market(fee),
-            ),
-            selectedFeeItem = FeeItem.Market(fee),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooLowUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooLowUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = fee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.0001",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooHighUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighUMV2(): FeeSelectorUMV2.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = customFee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.01",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = true,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUMV2(): FeeSelectorUMV2.Content {
-        val priorityFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Custom(
-                    fee = customFee,
-                    customValues = persistentListOf(
-                        CustomFeeFieldUM(
-                            value = "0.008",
-                            onValueChange = {},
-                            keyboardOptions = mockk(relaxed = true),
-                            keyboardActions = mockk(relaxed = true),
-                            symbol = "TST",
-                            decimals = 8,
-                            title = mockk(relaxed = true),
-                            footer = mockk(relaxed = true),
-                        ),
-                    ),
-                ),
-            ),
-            selectedFeeItem = FeeItem.Custom(
-                fee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-            ),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    private fun createNormalFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "TST",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createNormalFeeSelectorUMV2(): FeeSelectorUMV2.Content {
-        val fee = Fee.Common(
-            amount = Amount(
-                currencySymbol = "TST",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeSelectorUMV2.Content(
-            isPrimaryButtonEnabled = true,
-            fees = transactionFee,
-            feeItems = persistentListOf(
-                FeeItem.Market(fee),
-            ),
-            selectedFeeItem = FeeItem.Market(fee),
-            feeExtraInfo = FeeExtraInfo(
-                isFeeApproximate = false,
-                isFeeConvertibleToFiat = false,
-                isTronToken = false,
-            ),
-            feeFiatRateUM = FeeFiatRateUM(
-                rate = BigDecimal("50000"),
-                appCurrency = appCurrency,
-            ),
-            feeNonce = FeeNonce.Nonce(
-                nonce = BigInteger.ZERO,
-                onNonceChange = {},
-            ),
-        )
-    }
-
-    companion object {
-        @JvmStatic
-        @BeforeAll
-        fun setUpLocale() {
-            Locale.setDefault(Locale.US)
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerTest.kt b/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerTest.kt
deleted file mode 100644
index a0c7096cb7..0000000000
--- a/features/send-v2/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerTest.kt
+++ /dev/null
@@ -1,441 +0,0 @@
-package com.tangem.features.send.v2.send.confirm.model.transformers
-
-import com.google.common.truth.Truth.assertThat
-import com.tangem.blockchain.common.transaction.Fee
-import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.common.ui.amountScreen.models.AmountFieldModel
-import com.tangem.common.ui.amountScreen.models.AmountState
-import com.tangem.common.ui.notifications.NotificationUM
-import com.tangem.core.analytics.api.AnalyticsEventHandler
-import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.currency.CryptoCurrency
-import com.tangem.features.send.v2.api.entity.CustomFeeFieldUM
-import com.tangem.features.send.v2.common.ui.state.ConfirmUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeSelectorUM
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeType
-import com.tangem.features.send.v2.subcomponents.fee.ui.state.FeeUM
-import io.mockk.mockk
-import io.mockk.verify
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.test.runTest
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Test
-import java.math.BigDecimal
-import java.math.BigInteger
-import java.util.Locale
-
-class SendConfirmationNotificationsTransformerTest {
-
-    private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
-    private val cryptoCurrency: CryptoCurrency = mockk(relaxed = true)
-    private val appCurrency = AppCurrency(name = "US Dollar", code = "USD", symbol = "$")
-    private val analyticsCategoryName = "test_category"
-
-    @Test
-    fun `GIVEN non content state WHEN transform THEN returns original state`() = runTest {
-        // GIVEN
-        val feeUM: FeeUM = mockk(relaxed = true)
-        val amountUM: AmountState = mockk(relaxed = true)
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState: ConfirmUM = ConfirmUM.Empty
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isEqualTo(initialState)
-    }
-
-    @Test
-    fun `GIVEN fee UM not content WHEN transform THEN returns original state`() = runTest {
-        // GIVEN
-        val feeUM: FeeUM = FeeUM.Empty()
-        val amountUM: AmountState = mockk(relaxed = true)
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState: ConfirmUM.Content = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isEqualTo(initialState)
-    }
-
-    @Test
-    fun `GIVEN normal fee WHEN transform THEN returns state with footer and no notifications`() = runTest {
-        // GIVEN
-        val feeUM = createNormalFeeUM()
-        val amountUM = createTestAmountUM()
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).isEmpty()
-        assertThat(content.sendingFooter).isNotEqualTo(initialState.sendingFooter)
-    }
-
-    @Test
-    fun `GIVEN fee too high WHEN transform THEN returns state with too high notification`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooHighUM()
-        val amountUM = createTestAmountUM()
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(1)
-        assertThat(content.notifications.first()).isInstanceOf(NotificationUM.Warning.TooHigh::class.java)
-    }
-
-    @Test
-    fun `GIVEN fee too low WHEN transform THEN returns state with too low notification`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooLowUM()
-        val amountUM = createTestAmountUM()
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(1)
-        assertThat(content.notifications.first()).isInstanceOf(NotificationUM.Warning.FeeTooLow::class.java)
-        verify { analyticsEventHandler.send(any()) }
-    }
-
-    @Test
-    fun `GIVEN both fee too high and too low WHEN transform THEN returns state with both notifications`() = runTest {
-        // GIVEN
-        val feeUM = createFeeTooHighAndTooLowUM()
-        val amountUM = createTestAmountUM()
-        val transformer = SendConfirmationNotificationsTransformer(
-            feeUM = feeUM,
-            amountUM = amountUM,
-            analyticsEventHandler = analyticsEventHandler,
-            cryptoCurrency = cryptoCurrency,
-            appCurrency = appCurrency,
-            analyticsCategoryName = analyticsCategoryName,
-        )
-        val initialState = createTestConfirmUM()
-
-        // WHEN
-        val result = transformer.transform(initialState)
-
-        // THEN
-        assertThat(result).isInstanceOf(ConfirmUM.Content::class.java)
-        val content = result as ConfirmUM.Content
-        assertThat(content.notifications).hasSize(2)
-        assertThat(content.notifications.any { it is NotificationUM.Warning.TooHigh }).isTrue()
-        assertThat(content.notifications.any { it is NotificationUM.Warning.FeeTooLow }).isTrue()
-    }
-
-    private fun createTestConfirmUM(): ConfirmUM.Content {
-        return ConfirmUM.Content(
-            isPrimaryButtonEnabled = true,
-            walletName = mockk(relaxed = true),
-            isSending = false,
-            showTapHelp = false,
-            sendingFooter = mockk(relaxed = true),
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createTestAmountUM(): AmountState.Data {
-        val cryptoAmount = com.tangem.domain.tokens.model.Amount(
-            currencySymbol = "SOL",
-            value = BigDecimal("1.5"),
-            decimals = 8,
-        )
-        val fiatAmount = com.tangem.domain.tokens.model.Amount(
-            currencySymbol = "USD",
-            value = BigDecimal("50.00"),
-            decimals = 2,
-        )
-
-        return AmountState.Data(
-            isPrimaryButtonEnabled = true,
-            isRedesignEnabled = false,
-            title = mockk(relaxed = true),
-            availableBalance = mockk(relaxed = true),
-            availableBalanceCrypto = mockk(relaxed = true),
-            availableBalanceFiat = mockk(relaxed = true),
-            tokenName = mockk(relaxed = true),
-            tokenIconState = mockk(relaxed = true),
-            segmentedButtonConfig = persistentListOf(),
-            selectedButton = 0,
-            isSegmentedButtonsEnabled = false,
-            amountTextField = AmountFieldModel(
-                value = "1.5",
-                onValueChange = {},
-                keyboardOptions = mockk(relaxed = true),
-                keyboardActions = mockk(relaxed = true),
-                cryptoAmount = cryptoAmount,
-                fiatAmount = fiatAmount,
-                isFiatValue = false,
-                fiatValue = "50.00",
-                isFiatUnavailable = false,
-                isValuePasted = false,
-                onValuePastedTriggerDismiss = {},
-                isError = false,
-                isWarning = false,
-                error = mockk(relaxed = true),
-            ),
-            appCurrency = appCurrency,
-            isEditingDisabled = false,
-            reduceAmountBy = BigDecimal.ZERO,
-            isIgnoreReduce = false,
-        )
-    }
-
-    private fun createNormalFeeUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Single(fee)
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Market,
-                selectedFee = fee,
-                customValues = persistentListOf(),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.01",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooLowUM(): FeeUM.Content {
-        val fee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.0001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = fee,
-            priority = fee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = fee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.0001",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    private fun createFeeTooHighAndTooLowUM(): FeeUM.Content {
-        val priorityFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.001"),
-                decimals = 8,
-            ),
-        )
-        val minimumFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.01"),
-                decimals = 8,
-            ),
-        )
-        val customFee = Fee.Common(
-            amount = com.tangem.blockchain.common.Amount(
-                currencySymbol = "SOL",
-                value = BigDecimal("0.008"),
-                decimals = 8,
-            ),
-        )
-        val transactionFee = TransactionFee.Choosable(
-            minimum = minimumFee,
-            normal = minimumFee,
-            priority = priorityFee,
-        )
-        return FeeUM.Content(
-            feeSelectorUM = FeeSelectorUM.Content(
-                fees = transactionFee,
-                selectedType = FeeType.Custom,
-                selectedFee = customFee,
-                customValues = persistentListOf(
-                    CustomFeeFieldUM(
-                        value = "0.008",
-                        onValueChange = {},
-                        keyboardOptions = mockk(relaxed = true),
-                        keyboardActions = mockk(relaxed = true),
-                        symbol = "SOL",
-                        decimals = 8,
-                        title = mockk(relaxed = true),
-                        footer = mockk(relaxed = true),
-                    ),
-                ),
-                nonce = BigInteger.ZERO,
-            ),
-            rate = BigDecimal("50000"),
-            isFeeConvertibleToFiat = true,
-            isFeeApproximate = false,
-            isTronToken = false,
-            isEditingDisabled = false,
-            isPrimaryButtonEnabled = true,
-            appCurrency = AppCurrency.Default,
-            isCustomSelected = false,
-            notifications = persistentListOf(),
-        )
-    }
-
-    companion object {
-        @JvmStatic
-        @BeforeAll
-        fun setUpLocale() {
-            Locale.setDefault(Locale.US)
-        }
-    }
-}
\ No newline at end of file
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingClickIntents.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingClickIntents.kt
index 23a8e8b53e..28507abd9f 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingClickIntents.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingClickIntents.kt
@@ -67,4 +67,6 @@ internal interface StakingClickIntents : AmountScreenClickIntents {
     fun openTokenDetails(cryptoCurrency: CryptoCurrency)
 
     fun showPrimaryClickAlert()
+
+    fun onOpenLearnMoreAboutApproveClick()
 }
\ No newline at end of file
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt
index 40cd10e5aa..b4c31ec116 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/model/StakingModel.kt
@@ -16,6 +16,7 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.navigation.share.ShareManager
+import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.haptic.TangemHapticEffect
@@ -73,6 +74,7 @@ import com.tangem.features.staking.impl.presentation.state.utils.checkAndCalcula
 import com.tangem.features.staking.impl.presentation.state.utils.isSingleAction
 import com.tangem.features.staking.impl.presentation.state.utils.withStubUnstakeAction
 import com.tangem.utils.Provider
+import com.tangem.utils.TangemBlogUrlBuilder.RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP
 import com.tangem.utils.coroutines.*
 import com.tangem.utils.extensions.isSingleItem
 import com.tangem.utils.extensions.orZero
@@ -123,6 +125,7 @@ internal class StakingModel @Inject constructor(
     private val getActionRequirementAmountUseCase: GetActionRequirementAmountUseCase,
     private val paramsInterceptorHolder: ParamsInterceptorHolder,
     private val shareManager: ShareManager,
+    private val urlOpener: UrlOpener,
     @DelayedWork private val coroutineScope: CoroutineScope,
     private val innerRouter: InnerStakingRouter,
     appRouter: AppRouter,
@@ -263,7 +266,7 @@ internal class StakingModel @Inject constructor(
                 isInitialInfoStep && noBalanceState && !isAccountInitialized -> {
                     analyticsEventHandler.send(StakingAnalyticsEvent.UnitializedAddress(
                         token = cryptoCurrencyStatus.currency.symbol,
-                    ),)
+                    ))
                     stakingEventFactory.createInitializeAccountAlert()
                     return@launch
                 }
@@ -543,7 +546,7 @@ internal class StakingModel @Inject constructor(
         val rewardBlockType = yieldBalance?.reward?.rewardBlockType
         val rewardPendingActionConstraints = yieldBalance?.reward?.rewardConstraints
 
-        if (rewardBlockType == RewardBlockType.RewardsRequirementsError) {
+        if (rewardBlockType is RewardBlockType.RewardsRequirementsError) {
             val minimumAmount = rewardPendingActionConstraints?.amountArg?.minimum
             // Temporary fix, until StakeKit adds minimum requirement amount to balance response
             val minimumAmountValue = if (minimumAmount == null && yieldBalance.integrationId != null) {
@@ -662,7 +665,7 @@ internal class StakingModel @Inject constructor(
                 contractAddress = tokenCryptoCurrency.contractAddress,
                 spenderAddress = approval.spenderAddress,
                 fee = fee,
-                cryptoCurrency = tokenCryptoCurrency,
+                cryptoCurrencyStatus = cryptoCurrencyStatus,
                 userWalletId = userWalletId,
             ).fold(
                 ifLeft = { error ->
@@ -927,6 +930,10 @@ internal class StakingModel @Inject constructor(
         )
     }
 
+    override fun onOpenLearnMoreAboutApproveClick() {
+        urlOpener.openUrl(RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP)
+    }
+
     private suspend fun setupApprovalNeeded() {
         val approval = StakingIntegrationID.create(currencyId = cryptoCurrencyStatus.currency.id)?.approval
             ?: StakingApproval.Empty
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/StakingUiState.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/StakingUiState.kt
index 2a9a204e5a..ae13e50f62 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/StakingUiState.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/StakingUiState.kt
@@ -68,7 +68,6 @@ internal sealed class StakingStates {
             override val isPrimaryButtonEnabled: Boolean,
             val showBanner: Boolean,
             val infoItems: ImmutableList<RoundedListWithDividersItemData>,
-            val aprRange: TextReference,
             val onInfoClick: (InfoType) -> Unit,
             val yieldBalance: InnerYieldBalanceState,
             val pullToRefreshConfig: PullToRefreshConfig,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/bottomsheet/InfoType.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/bottomsheet/InfoType.kt
index b923734491..b116a196f2 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/bottomsheet/InfoType.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/bottomsheet/InfoType.kt
@@ -2,6 +2,7 @@ package com.tangem.features.staking.impl.presentation.state.bottomsheet
 
 internal enum class InfoType {
     ANNUAL_PERCENTAGE_RATE,
+    ANNUAL_PERCENTAGE_YIELD,
     UNBONDING_PERIOD,
     REWARD_CLAIMING,
     WARMUP_PERIOD,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
index 4251a689ff..75c557eb38 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt
@@ -15,6 +15,7 @@ import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.staking.utils.getRewardStakingBalance
 import com.tangem.features.staking.impl.presentation.state.InnerYieldBalanceState
 import com.tangem.features.staking.impl.presentation.state.YieldReward
+import com.tangem.lib.crypto.BlockchainUtils
 import com.tangem.lib.crypto.BlockchainUtils.isStakingRewardUnavailable
 import com.tangem.utils.Provider
 import com.tangem.utils.converter.Converter
@@ -91,7 +92,13 @@ internal class YieldBalancesConverter(
         val isRewardsClaimable = rewards?.isNotEmpty() == true
 
         return when {
-            isStakingRewardUnavailable(blockchainId) -> RewardBlockType.RewardUnavailable
+            isStakingRewardUnavailable(blockchainId) -> {
+                if (BlockchainUtils.isSolana(blockchainId)) {
+                    RewardBlockType.RewardUnavailable.SolanaRewardUnavailable
+                } else {
+                    RewardBlockType.RewardUnavailable.DefaultRewardUnavailable
+                }
+            }
             isRewardsClaimable && isActionable -> RewardBlockType.Rewards
             isRewardsClaimable && !isActionable -> RewardBlockType.RewardsRequirementsError
             else -> RewardBlockType.NoRewards
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingFeeTransactionLoader.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingFeeTransactionLoader.kt
index d4f2c4da10..05373bb1f8 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingFeeTransactionLoader.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingFeeTransactionLoader.kt
@@ -189,7 +189,7 @@ internal class StakingFeeTransactionLoader @AssistedInject constructor(
         val tokenCurrency = cryptoCurrencyStatus.currency as? CryptoCurrency.Token
             ?: return onApprovalFeeError(GetFeeError.UnknownError)
         val approvalTransactionData = createApprovalTransactionUseCase(
-            cryptoCurrency = tokenCurrency,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
             userWalletId = userWallet.walletId,
             amount = amount,
             contractAddress = tokenCurrency.contractAddress,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingTransactionSender.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingTransactionSender.kt
index a3ed7f103f..ef5030f334 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingTransactionSender.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/helpers/StakingTransactionSender.kt
@@ -158,7 +158,7 @@ internal class StakingTransactionSender @AssistedInject constructor(
                     getConstructedStakingTransactionUseCase(
                         networkId = cryptoCurrencyStatus.currency.network.rawId,
                         fee = fee,
-                        amount = amount.convertToSdkAmount(cryptoCurrencyStatus.currency),
+                        amount = amount.convertToSdkAmount(cryptoCurrencyStatus),
                         transactionId = transaction.id,
                     ).fold(
                         ifRight = { (constructedTransaction, transactionData) ->
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt
index 4deacdff09..1b6868f841 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt
@@ -18,7 +18,6 @@ internal object InitialStakingStatePreview {
     val defaultState = StakingStates.InitialInfoState.Data(
         isPrimaryButtonEnabled = true,
         showBanner = true,
-        aprRange = stringReference("2.54-5.12%"),
         infoItems = persistentListOf(
             RoundedListWithDividersItemData(
                 id = R.string.staking_details_available,
@@ -68,7 +67,7 @@ internal object InitialStakingStatePreview {
             reward = YieldReward(
                 rewardsFiat = "100 $",
                 rewardsCrypto = "100 SOL",
-                rewardBlockType = RewardBlockType.RewardUnavailable,
+                rewardBlockType = RewardBlockType.RewardUnavailable.DefaultRewardUnavailable,
                 rewardConstraints = null,
             ),
             isActionable = true,
@@ -88,7 +87,6 @@ internal object InitialStakingStatePreview {
                         name = "Binance",
                         image = null,
                         website = null,
-                        apr = "5".toBigDecimal(),
                         commission = null,
                         stakedBalance = null,
                         votingPower = null,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ValidatorStatePreviewData.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ValidatorStatePreviewData.kt
index 225057c19c..b65729f59a 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ValidatorStatePreviewData.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ValidatorStatePreviewData.kt
@@ -13,7 +13,10 @@ internal object ValidatorStatePreviewData {
             status = ValidatorStatus.ACTIVE,
             name = "Luganodes",
             image = "https://assets.stakek.it/validators/luganodes.png",
-            apr = BigDecimal("0.054823398040640445"),
+            rewardInfo = Yield.RewardInfo(
+                rate = BigDecimal("0.054823398040640445"),
+                type = Yield.RewardType.APR,
+            ),
             commission = 0.1,
             stakedBalance = "355544384.45009977",
             website = "https://luganodes.com/",
@@ -26,7 +29,10 @@ internal object ValidatorStatePreviewData {
             status = ValidatorStatus.ACTIVE,
             name = "InfStones",
             image = "https://assets.stakek.it/validators/infstones.png",
-            apr = BigDecimal("0.057786472172836965"),
+            rewardInfo = Yield.RewardInfo(
+                rate = BigDecimal("0.057786472172836965"),
+                type = Yield.RewardType.APR,
+            ),
             commission = 0.05,
             stakedBalance = "12495684.05643019",
             website = "https://infstones.com/",
@@ -39,7 +45,10 @@ internal object ValidatorStatePreviewData {
             status = ValidatorStatus.ACTIVE,
             name = "Kiln",
             image = "https://assets.stakek.it/validators/kiln.png",
-            apr = BigDecimal("0.057786472172836965"),
+            rewardInfo = Yield.RewardInfo(
+                rate = BigDecimal("0.057786472172836965"),
+                type = Yield.RewardType.APR,
+            ),
             commission = 0.05,
             stakedBalance = "85400369.96393165",
             website = "https://infstones.com/",
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt
index 68eed82fb9..d1ed5d5c98 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt
@@ -76,4 +76,6 @@ internal object StakingClickIntentsStub : StakingClickIntents {
     override fun onActiveStakeAnalytic() {}
 
     override fun showPrimaryClickAlert() {}
+
+    override fun onOpenLearnMoreAboutApproveClick() {}
 }
\ No newline at end of file
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetButtonsStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetButtonsStateTransformer.kt
index acaeb8948e..a5d35a5215 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetButtonsStateTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetButtonsStateTransformer.kt
@@ -52,7 +52,7 @@ internal class SetButtonsStateTransformer(
             iconRes = R.drawable.ic_tangem_24.takeIf { prevState.showColdWalletInteractionIcon },
             isDimmed = isPrimaryButtonDisabled,
             isIconVisible = isIconVisible,
-            showProgress = isInProgress,
+            shouldShowProgress = isInProgress,
             isEnabled = prevState.isButtonEnabled(),
             onClick = {
                 if (isPrimaryButtonDisabled) {
@@ -70,7 +70,7 @@ internal class SetButtonsStateTransformer(
             iconRes = R.drawable.ic_back_24,
             isSecondary = true,
             isIconVisible = true,
-            showProgress = false,
+            shouldShowProgress = false,
             isEnabled = true,
             onClick = prevState.clickIntents::onPrevClick,
         ).takeIf { prevState.currentStep.isPrevButtonVisible() }
@@ -82,7 +82,7 @@ internal class SetButtonsStateTransformer(
             iconRes = R.drawable.ic_web_24,
             isSecondary = true,
             isIconVisible = true,
-            showProgress = false,
+            shouldShowProgress = false,
             isEnabled = true,
             onClick = prevState.clickIntents::onExploreClick,
         ) to NavigationButton(
@@ -90,7 +90,7 @@ internal class SetButtonsStateTransformer(
             iconRes = R.drawable.ic_share_24,
             isSecondary = true,
             isIconVisible = true,
-            showProgress = false,
+            shouldShowProgress = false,
             isEnabled = true,
             onClick = prevState.clickIntents::onShareClick,
         )
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt
index 47475d3b74..d26cfd7e24 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt
@@ -88,7 +88,6 @@ internal class SetInitialDataStateTransformer(
                 !amount.isNullOrZero() && sources.yieldBalanceSource.isActual() && sources.networkSource.isActual()
             },
             showBanner = !isAnyTokenStaked && yieldBalance == InnerYieldBalanceState.Empty,
-            aprRange = getAprRange(yield.preferredValidators),
             infoItems = getInfoItems(),
             onInfoClick = clickIntents::onInfoClick,
             yieldBalance = yieldBalance,
@@ -101,7 +100,7 @@ internal class SetInitialDataStateTransformer(
 
     private fun getInfoItems(): PersistentList<RoundedListWithDividersItemData> {
         return listOfNotNull(
-            createAnnualPercentageRateItem(),
+            createAnnualPercentageItem(),
             createAvailableItem(cryptoCurrencyStatus),
             createUnbondingPeriodItem(),
             createMinimumRequirementItem(cryptoCurrencyStatus),
@@ -111,17 +110,32 @@ internal class SetInitialDataStateTransformer(
         ).toPersistentList()
     }
 
-    private fun createAnnualPercentageRateItem(): RoundedListWithDividersItemData {
+    private fun createAnnualPercentageItem(): RoundedListWithDividersItemData {
         val validators = yield.preferredValidators
+        val rateRangeInfo = getPercentageRange(validators)
         return RoundedListWithDividersItemData(
             id = R.string.staking_details_annual_percentage_rate,
-            startText = TextReference.Res(R.string.staking_details_annual_percentage_rate),
-            endText = getAprRange(validators),
-            iconClick = { clickIntents.onInfoClick(InfoType.ANNUAL_PERCENTAGE_RATE) },
+            startText = getRateStartText(rateRangeInfo.first),
+            endText = rateRangeInfo.second,
+            iconClick = {
+                when (rateRangeInfo.first) {
+                    Yield.RewardType.APR -> clickIntents.onInfoClick(InfoType.ANNUAL_PERCENTAGE_RATE)
+                    Yield.RewardType.APY -> clickIntents.onInfoClick(InfoType.ANNUAL_PERCENTAGE_YIELD)
+                    Yield.RewardType.UNKNOWN -> {}
+                }
+            },
             isEndTextHighlighted = false,
         )
     }
 
+    private fun getRateStartText(rewardType: Yield.RewardType): TextReference {
+        return when (rewardType) {
+            Yield.RewardType.APR -> TextReference.Res(R.string.staking_details_annual_percentage_rate)
+            Yield.RewardType.APY -> TextReference.Res(R.string.staking_details_annual_percentage_yield)
+            else -> TextReference.EMPTY
+        }
+    }
+
     private fun createAvailableItem(cryptoCurrencyStatus: CryptoCurrencyStatus): RoundedListWithDividersItemData {
         return RoundedListWithDividersItemData(
             id = R.string.staking_details_available,
@@ -227,26 +241,30 @@ internal class SetInitialDataStateTransformer(
         )
     }
 
-    private fun getAprRange(validators: List<Yield.Validator>): TextReference {
+    private fun getPercentageRange(validators: List<Yield.Validator>): Pair<Yield.RewardType, TextReference> {
         if (validators.isEmpty()) {
-            return stringReference(DASH_SIGN)
+            return Yield.RewardType.APR to stringReference(DASH_SIGN)
         }
-        val aprValues = validators
+        val rewardInfos = validators
             .filter { it.preferred }
             .takeIf { it.isNotEmpty() }
-            ?.mapNotNull { it.apr }
-            ?: validators.mapNotNull { it.apr }
+            ?.mapNotNull { it.rewardInfo }
+            ?: validators.mapNotNull { it.rewardInfo }
 
-        val minApr = aprValues.min()
-        val maxApr = aprValues.max()
+        val infoWithMinRate = rewardInfos.minBy { it.rate }
+        val infoWithMaxRate = rewardInfos.maxBy { it.rate }
 
-        val formattedMinApr = minApr.format { percent() }.remove("%")
-        val formattedMaxApr = maxApr.format { percent() }
+        val formattedMinRate = infoWithMinRate.rate.format { percent() }.remove("%")
+        val formattedMaxRate = infoWithMaxRate.rate.format { percent() }
 
-        if (maxApr - minApr < EQUALITY_THRESHOLD) {
-            return stringReference("$formattedMinApr%")
+        if (infoWithMaxRate.rate - infoWithMinRate.rate < EQUALITY_THRESHOLD) {
+            return infoWithMaxRate.type to stringReference("$formattedMinRate%")
         }
-        return resourceReference(R.string.common_range, wrappedList(formattedMinApr, formattedMaxApr))
+        return infoWithMaxRate.type to
+            resourceReference(
+                id = R.string.common_range,
+                formatArgs = wrappedList(formattedMinRate, formattedMaxRate),
+            )
     }
 
     private fun showMinimumRequirementInfo(blockchainId: String): Boolean {
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt
index 9f1c669b3e..003e330e9b 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt
@@ -23,6 +23,10 @@ internal class ShowInfoBottomSheetStateTransformer(
                         title = resourceReference(R.string.staking_details_annual_percentage_rate),
                         text = resourceReference(R.string.staking_details_annual_percentage_rate_info),
                     )
+                    InfoType.ANNUAL_PERCENTAGE_YIELD -> StakingInfoBottomSheetConfig(
+                        title = resourceReference(R.string.staking_details_annual_percentage_yield),
+                        text = resourceReference(R.string.staking_details_annual_percentage_yield_info),
+                    )
                     InfoType.UNBONDING_PERIOD -> StakingInfoBottomSheetConfig(
                         title = resourceReference(R.string.staking_details_unbonding_period),
                         text = resourceReference(R.string.staking_details_unbonding_period_info),
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt
index 5ceb9ac4d3..5221aba998 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt
@@ -18,8 +18,8 @@ internal class SetApprovalBottomSheetInProgressTransformer(
                     config.copy(
                         data = config.data.copy(
                             approveButton = config.data.approveButton.copy(
-                                enabled = false,
-                                loading = true,
+                                isEnabled = false,
+                                isLoading = true,
                             ),
                             cancelButton = config.data.cancelButton.copy(
                                 enabled = false,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt
index 4e3bac09c8..f0b2ca6298 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt
@@ -63,8 +63,8 @@ internal class ShowApprovalBottomSheetTransformer(
                             wrappedList(feeCryptoValue, feeFiatValue),
                         ),
                         approveButton = ApprovePermissionButton(
-                            enabled = true,
-                            loading = false,
+                            isEnabled = true,
+                            isLoading = false,
                             onClick = prevState.clickIntents::onApprovalClick,
                         ),
                         cancelButton = CancelPermissionButton(
@@ -77,6 +77,7 @@ internal class ShowApprovalBottomSheetTransformer(
                         dialogText = resourceReference(R.string.give_permission_staking_footer),
                         footerText = resourceReference(R.string.staking_give_permission_fee_footer),
                         onChangeApproveType = prevState.clickIntents::onApproveTypeChange,
+                        onOpenLearnMoreAboutApproveClick = {},
                     ),
                     walletInteractionIcon = walletInterationIcon(userWallet),
                     onCancel = onDismiss,
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/utils/StakingRewardsUtils.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/utils/StakingRewardsUtils.kt
index 9ddc12135c..454a1aa5fb 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/utils/StakingRewardsUtils.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/utils/StakingRewardsUtils.kt
@@ -52,6 +52,22 @@ internal fun getRewardScheduleText(
     }
 }
 
+internal fun getRewardTypeShortText(rewardType: Yield.RewardType): TextReference {
+    return when (rewardType) {
+        Yield.RewardType.APR -> TextReference.Res(R.string.staking_details_apr)
+        Yield.RewardType.APY -> TextReference.Res(R.string.staking_details_apy)
+        else -> TextReference.EMPTY
+    }
+}
+
+internal fun getRewardTypeLongText(rewardType: Yield.RewardType): TextReference {
+    return when (rewardType) {
+        Yield.RewardType.APR -> TextReference.Res(R.string.staking_details_annual_percentage_rate)
+        Yield.RewardType.APY -> TextReference.Res(R.string.staking_details_annual_percentage_yield)
+        else -> TextReference.EMPTY
+    }
+}
+
 private fun getCustomRewardSchedule(networkId: String, decapitalize: Boolean = false): TextReference? {
     return when {
         isSolana(networkId) -> {
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingClaimRewardsValidatorContent.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingClaimRewardsValidatorContent.kt
index ca16207365..2fa13297d4 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingClaimRewardsValidatorContent.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingClaimRewardsValidatorContent.kt
@@ -15,10 +15,11 @@ import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.format.bigdecimal.percent
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.features.staking.impl.R
+import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.features.staking.impl.presentation.model.StakingClickIntents
 import com.tangem.features.staking.impl.presentation.state.BalanceState
 import com.tangem.features.staking.impl.presentation.state.StakingStates
+import com.tangem.features.staking.impl.presentation.state.utils.getRewardTypeShortText
 import com.tangem.utils.extensions.orZero
 
 @Composable
@@ -64,11 +65,11 @@ internal fun StakingClaimRewardsValidatorContent(
 @Suppress("UnusedPrivateMember")
 @Composable
 private fun BalanceState.getAprTextColored() = combinedReference(
-    resourceReference(R.string.staking_details_apr),
+    getRewardTypeShortText(validator?.rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
     annotatedReference {
         appendSpace()
         appendColored(
-            text = validator?.apr.orZero().format { percent() },
+            text = validator?.rewardInfo?.rate?.orZero().format { percent() },
             color = TangemTheme.colors.text.accent,
         )
     },
@@ -76,6 +77,6 @@ private fun BalanceState.getAprTextColored() = combinedReference(
 
 @Composable
 private fun BalanceState.getAprTextNeutral() = combinedReference(
-    resourceReference(R.string.staking_details_apr),
-    stringReference(" " + validator?.apr.orZero().format { percent() }),
+    getRewardTypeShortText(validator?.rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
+    stringReference(" " + validator?.rewardInfo?.rate?.orZero().format { percent() }),
 )
\ No newline at end of file
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingInitialInfoContent.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingInitialInfoContent.kt
index 27ba05eb91..4e9fa839b4 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingInitialInfoContent.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingInitialInfoContent.kt
@@ -46,6 +46,7 @@ import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.StakingDetailsScreenTestTags
 import com.tangem.domain.models.staking.BalanceType
 import com.tangem.domain.models.staking.RewardBlockType
+import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.features.staking.impl.R
 import com.tangem.features.staking.impl.presentation.model.StakingClickIntents
 import com.tangem.features.staking.impl.presentation.state.BalanceState
@@ -53,6 +54,7 @@ import com.tangem.features.staking.impl.presentation.state.InnerYieldBalanceStat
 import com.tangem.features.staking.impl.presentation.state.StakingStates
 import com.tangem.features.staking.impl.presentation.state.previewdata.InitialStakingStatePreview
 import com.tangem.features.staking.impl.presentation.state.stub.StakingClickIntentsStub
+import com.tangem.features.staking.impl.presentation.state.utils.getRewardTypeShortText
 import com.tangem.utils.StringsSigns.DOT
 import com.tangem.utils.extensions.orZero
 
@@ -233,10 +235,14 @@ private fun StakingRewardBlock(
                 append(reward.rewardsCrypto.orMaskWithStars(isBalanceHidden))
             } to TangemTheme.colors.text.primary1
         }
-        RewardBlockType.RewardUnavailable -> {
+        RewardBlockType.RewardUnavailable.DefaultRewardUnavailable -> {
             resourceReference(R.string.staking_details_auto_claiming_rewards_daily_text) to
                 TangemTheme.colors.text.tertiary
         }
+        RewardBlockType.RewardUnavailable.SolanaRewardUnavailable -> {
+            resourceReference(R.string.staking_soloana_details_auto_claiming_rewards_daily_text) to
+                TangemTheme.colors.text.tertiary
+        }
         RewardBlockType.NoRewards -> {
             resourceReference(R.string.staking_details_no_rewards_to_claim) to TangemTheme.colors.text.tertiary
         }
@@ -308,17 +314,14 @@ private fun StakeButtonBlock(buttonState: NavigationButtonsState) {
     }
 }
 
-/**
- * For FCA fixes remove coloring for now
- */
 @Suppress("UnusedPrivateMember")
 @Composable
 private fun BalanceState.getAprTextColored() = combinedReference(
-    resourceReference(R.string.staking_details_apr),
+    getRewardTypeShortText(validator?.rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
     annotatedReference {
         appendSpace()
         appendColored(
-            text = validator?.apr.orZero().format { percent() },
+            text = validator?.rewardInfo?.rate?.orZero().format { percent() },
             color = TangemTheme.colors.text.accent,
         )
     },
@@ -326,8 +329,8 @@ private fun BalanceState.getAprTextColored() = combinedReference(
 
 @Composable
 private fun BalanceState.getAprTextNeutral() = combinedReference(
-    resourceReference(R.string.staking_details_apr),
-    stringReference(" " + validator?.apr.orZero().format { percent() }),
+    getRewardTypeShortText(validator?.rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
+    stringReference(" " + validator?.rewardInfo?.rate?.orZero().format { percent() }),
 )
 
 @Composable
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingValidatorListContent.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingValidatorListContent.kt
index 3c842275b6..c98b98f368 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingValidatorListContent.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/StakingValidatorListContent.kt
@@ -33,6 +33,7 @@ import com.tangem.features.staking.impl.presentation.model.StakingClickIntents
 import com.tangem.features.staking.impl.presentation.state.StakingStates
 import com.tangem.features.staking.impl.presentation.state.previewdata.ValidatorStatePreviewData
 import com.tangem.features.staking.impl.presentation.state.stub.StakingClickIntentsStub
+import com.tangem.features.staking.impl.presentation.state.utils.getRewardTypeLongText
 import com.tangem.utils.extensions.orZero
 
 /**
@@ -106,11 +107,11 @@ internal fun StakingValidatorListContent(
 @Suppress("UnusedPrivateMember")
 @Composable
 private fun Yield.Validator.getAprTextColored() = combinedReference(
-    resourceReference(R.string.staking_details_annual_percentage_rate),
+    getRewardTypeLongText(rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
     annotatedReference {
         appendSpace()
         appendColored(
-            text = apr.orZero().format { percent() },
+            text = rewardInfo?.rate?.orZero().format { percent() },
             color = TangemTheme.colors.text.accent,
         )
     },
@@ -118,8 +119,8 @@ private fun Yield.Validator.getAprTextColored() = combinedReference(
 
 @Composable
 private fun Yield.Validator.getAprTextNeutral() = combinedReference(
-    resourceReference(R.string.staking_details_annual_percentage_rate),
-    stringReference(" " + apr.orZero().format { percent() }),
+    getRewardTypeLongText(rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
+    stringReference(" " + rewardInfo?.rate?.orZero().format { percent() }),
 )
 
 @Composable
diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/ValidatorBlock.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/ValidatorBlock.kt
index 7182fc7bf4..53f66ed8af 100644
--- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/ValidatorBlock.kt
+++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/block/ValidatorBlock.kt
@@ -17,8 +17,10 @@ import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.core.ui.format.bigdecimal.percent
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.test.StakingSendDetailsScreenTestTags
+import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.features.staking.impl.R
 import com.tangem.features.staking.impl.presentation.state.StakingStates
+import com.tangem.features.staking.impl.presentation.state.utils.getRewardTypeShortText
 import com.tangem.features.staking.impl.presentation.ui.ValidatorImagePlaceholder
 import com.tangem.utils.extensions.orZero
 
@@ -57,16 +59,16 @@ internal fun ValidatorBlock(validatorState: StakingStates.ValidatorState, isClic
 @Composable
 private fun StakingStates.ValidatorState.Data.getInfoTitleColored() = combinedReference(
     annotatedReference {
-        append(resourceReference(R.string.staking_details_apr).resolveReference())
+        append(getRewardTypeShortText(chosenValidator.rewardInfo?.type ?: Yield.RewardType.UNKNOWN).resolveReference())
         appendSpace()
         appendColored(
-            text = chosenValidator.apr.orZero().format { percent() },
+            text = chosenValidator.rewardInfo?.rate.orZero().format { percent() },
             color = TangemTheme.colors.text.accent,
         )
     },
 )
 
 private fun StakingStates.ValidatorState.Data.getInfoTitleNeutral() = combinedReference(
-    resourceReference(R.string.staking_details_apr),
-    stringReference(" " + chosenValidator.apr.orZero().format { percent() }),
+    getRewardTypeShortText(chosenValidator.rewardInfo?.type ?: Yield.RewardType.UNKNOWN),
+    stringReference(" " + chosenValidator.rewardInfo?.rate?.orZero().format { percent() }),
 )
\ No newline at end of file
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/DefaultSwapAmountUpdateTrigger.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/DefaultSwapAmountUpdateTrigger.kt
index 33f79518f4..29162606e3 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/DefaultSwapAmountUpdateTrigger.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/DefaultSwapAmountUpdateTrigger.kt
@@ -45,19 +45,19 @@ internal class DefaultSwapAmountUpdateTrigger @Inject constructor() :
     SwapAmountReduceListener {
 
     override val updateAmountTriggerFlow: SharedFlow<Pair<String, Boolean>>
-    field = MutableSharedFlow<Pair<String, Boolean>>()
+        field = MutableSharedFlow<Pair<String, Boolean>>()
 
     override val reduceToTriggerFlow: SharedFlow<BigDecimal>
-    field = MutableSharedFlow<BigDecimal>()
+        field = MutableSharedFlow<BigDecimal>()
 
     override val reduceByTriggerFlow: SharedFlow<ReduceByData>
-    field = MutableSharedFlow<ReduceByData>()
+        field = MutableSharedFlow<ReduceByData>()
 
     override val ignoreReduceTriggerFlow: SharedFlow<Unit>
-    field = MutableSharedFlow<Unit>()
+        field = MutableSharedFlow<Unit>()
 
     override val reloadQuotesTriggerFlow: Flow<Unit>
-    field = MutableSharedFlow<Unit>()
+        field = MutableSharedFlow<Unit>()
 
     override suspend fun triggerUpdateAmount(amountValue: String, isEnterInFiatSelected: Boolean) {
         updateAmountTriggerFlow.emit(amountValue to isEnterInFiatSelected)
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/SwapAmountComponentParams.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/SwapAmountComponentParams.kt
index 2eca8f1a8e..ee40d193e5 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/SwapAmountComponentParams.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/SwapAmountComponentParams.kt
@@ -6,6 +6,7 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.swap.models.SwapDirection
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM
 import com.tangem.features.swap.v2.impl.sendviaswap.SendWithSwapRoute
 import kotlinx.coroutines.flow.Flow
@@ -15,6 +16,7 @@ internal sealed class SwapAmountComponentParams {
 
     abstract val amountUM: SwapAmountUM
     abstract val analyticsCategoryName: String
+    abstract val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource
     abstract val userWallet: UserWallet
     abstract val swapDirection: SwapDirection
     abstract val isBalanceHidingFlow: StateFlow<Boolean>
@@ -31,6 +33,7 @@ internal sealed class SwapAmountComponentParams {
         override val primaryCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
         override val secondaryCryptoCurrency: CryptoCurrency?,
         override val filterProviderTypes: List<ExpressProviderType> = emptyList(),
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val title: TextReference,
         val callback: SwapAmountComponent.ModelCallback,
         val currentRoute: Flow<SendWithSwapRoute>,
@@ -45,6 +48,7 @@ internal sealed class SwapAmountComponentParams {
         override val primaryCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
         override val secondaryCryptoCurrency: CryptoCurrency?,
         override val filterProviderTypes: List<ExpressProviderType> = emptyList(),
+        override val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val blockClickEnableFlow: StateFlow<Boolean>,
     ) : SwapAmountComponentParams()
 }
\ No newline at end of file
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
index 53c158cd76..8f43cade49 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/SwapAmountModel.kt
@@ -114,7 +114,7 @@ internal class SwapAmountModel @Inject constructor(
     private var showBestRateAnimation: Boolean = false
 
     val uiState: StateFlow<SwapAmountUM>
-    field = MutableStateFlow(params.amountUM)
+        field = MutableStateFlow(params.amountUM)
 
     private val amountDebouncer = Debouncer()
     private val quoteTaskScheduler = SingleTaskScheduler<Unit>()
@@ -224,6 +224,7 @@ internal class SwapAmountModel @Inject constructor(
                 categoryName = params.analyticsCategoryName,
                 token = primaryCryptoCurrency.symbol,
                 blockchain = primaryCryptoCurrency.network.name,
+                source = params.analyticsSendSource,
             ),
         )
         uiState.transformerUpdate(
@@ -280,7 +281,7 @@ internal class SwapAmountModel @Inject constructor(
                     initialCurrency = primaryCryptoCurrency,
                     selectedCurrency = selectedCurrency.takeIf { isEditMode },
                     source = AppRoute.ChooseManagedTokens.Source.SendViaSwap,
-                    showSendViaSwapNotification = showSendViaSwapNotification,
+                    shouldShowSendViaSwapNotification = showSendViaSwapNotification,
                     analyticsCategoryName = params.analyticsCategoryName,
                 ),
             )
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapAmountFieldConverter.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapAmountFieldConverter.kt
index a2a62e6b95..c8eb091285 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapAmountFieldConverter.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/model/converter/SwapAmountFieldConverter.kt
@@ -50,7 +50,6 @@ internal class SwapAmountFieldConverter(
                 cryptoCurrencyStatus = cryptoCurrencyStatus,
                 maxEnterAmount = maxEnterAmountConverter.convert(cryptoCurrencyStatus),
                 iconStateConverter = iconStateConverter,
-                isRedesignEnabled = true,
                 isBalanceHidden = isBalanceHidden,
             ).convert(
                 AmountParameters(
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/ui/SwapAmountContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/ui/SwapAmountContent.kt
index 119255fe91..a53021a6a3 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/ui/SwapAmountContent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/amount/ui/SwapAmountContent.kt
@@ -7,7 +7,9 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -24,6 +26,7 @@ import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import com.tangem.common.ui.amountScreen.models.AmountState
 import com.tangem.common.ui.amountScreen.ui.AmountFieldV2
+import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.components.SpacerH2
 import com.tangem.core.ui.components.TextShimmer
 import com.tangem.core.ui.components.atoms.text.EllipsisText
@@ -44,6 +47,7 @@ import com.tangem.features.swap.v2.impl.amount.ui.preview.SwapAmountClickIntents
 import com.tangem.features.swap.v2.impl.amount.ui.preview.SwapAmountContentPreview
 import com.tangem.features.swap.v2.impl.common.entity.SwapQuoteUM
 
+@Suppress("DestructuringDeclarationWithTooManyEntries")
 @Composable
 internal fun SwapAmountContent(
     amountUM: SwapAmountUM,
@@ -53,9 +57,9 @@ internal fun SwapAmountContent(
     val swapAmountContent = amountUM as? SwapAmountUM.Content
     val isFixedRate = swapAmountContent?.swapRateType == ExpressRateType.Fixed
     ConstraintLayout(
-        modifier = modifier,
+        modifier = modifier.verticalScroll(rememberScrollState()),
     ) {
-        val (amountFromRef, amountToRef, middleButtonRef) = createRefs()
+        val (amountFromRef, amountToRef, middleButtonRef, spacerRef) = createRefs()
         SwapAmountBlock(
             amountFieldUM = amountUM.primaryAmount,
             selectedAmountType = amountUM.selectedAmountType,
@@ -90,6 +94,14 @@ internal fun SwapAmountContent(
                     end.linkTo(parent.end)
                 },
         )
+        SpacerH16(
+            modifier = Modifier.constrainAs(spacerRef) {
+                top.linkTo(amountToRef.bottom)
+                bottom.linkTo(parent.bottom)
+                start.linkTo(parent.start)
+                end.linkTo(parent.end)
+            },
+        )
     }
 }
 
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/chooseprovider/model/SwapChooseProviderModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/chooseprovider/model/SwapChooseProviderModel.kt
index 08511759a0..0ac41aea88 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/chooseprovider/model/SwapChooseProviderModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/chooseprovider/model/SwapChooseProviderModel.kt
@@ -37,7 +37,7 @@ internal class SwapChooseProviderModel @Inject constructor(
     }
 
     val uiState: StateFlow<SwapChooseProviderBottomSheetContent>
-    field: MutableStateFlow<SwapChooseProviderBottomSheetContent> = MutableStateFlow(getInitialState())
+        field: MutableStateFlow<SwapChooseProviderBottomSheetContent> = MutableStateFlow(getInitialState())
 
     fun onProviderClick(quoteUM: SwapQuoteUM) {
         params.callback.onProviderResult(quoteUM)
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/DefaultSwapChooseTokenNetworkTrigger.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/DefaultSwapChooseTokenNetworkTrigger.kt
index 7a0ffa5011..844e5aa49d 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/DefaultSwapChooseTokenNetworkTrigger.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/DefaultSwapChooseTokenNetworkTrigger.kt
@@ -16,7 +16,7 @@ internal class DefaultSwapChooseTokenNetworkTrigger @Inject constructor() :
     SwapChooseTokenNetworkListener {
 
     override val swapChooseTokenNetworkResultFlow: SharedFlow<SwapChooseTokenTriggerData>
-    field = MutableSharedFlow<SwapChooseTokenTriggerData>()
+        field = MutableSharedFlow<SwapChooseTokenTriggerData>()
 
     override suspend fun trigger(
         swapCurrencies: SwapCurrencies,
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenNetworkModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenNetworkModel.kt
index 0acbedc911..8d2c61caf1 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenNetworkModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/choosetoken/fromSupported/model/SwapChooseTokenNetworkModel.kt
@@ -46,20 +46,20 @@ internal class SwapChooseTokenNetworkModel @Inject constructor(
     private val params: SwapChooseTokenNetworkComponent.Params = paramsContainer.require()
 
     val uiState: StateFlow<SwapChooseTokenNetworkUM>
-    field: MutableStateFlow<SwapChooseTokenNetworkUM> = MutableStateFlow(
-        SwapChooseTokenNetworkUM(
-            TangemBottomSheetConfig(
-                isShown = true,
-                onDismissRequest = params.onDismiss,
-                content = SwapChooseTokenNetworkContentUM.Loading(
-                    messageContent = getErrorMessage(
-                        tokenName = params.token.name,
-                        onDismiss = params.onDismiss,
+        field: MutableStateFlow<SwapChooseTokenNetworkUM> = MutableStateFlow(
+            SwapChooseTokenNetworkUM(
+                TangemBottomSheetConfig(
+                    isShown = true,
+                    onDismissRequest = params.onDismiss,
+                    content = SwapChooseTokenNetworkContentUM.Loading(
+                        messageContent = getErrorMessage(
+                            tokenName = params.token.name,
+                            onDismiss = params.onDismiss,
+                        ),
                     ),
                 ),
             ),
-        ),
-    )
+        )
 
     init {
         initContent()
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/SwapNotificationsUpdateTrigger.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/SwapNotificationsUpdateTrigger.kt
index e595eb19a1..e1d036fad4 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/SwapNotificationsUpdateTrigger.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/SwapNotificationsUpdateTrigger.kt
@@ -30,10 +30,10 @@ internal class DefaultSwapNotificationsUpdateTrigger @Inject constructor() :
     SwapNotificationsUpdateTrigger {
 
     override val updateTriggerFlow: SharedFlow<SwapNotificationData>
-    field = MutableSharedFlow<SwapNotificationData>()
+        field = MutableSharedFlow<SwapNotificationData>()
 
     override val hasErrorFlow: SharedFlow<Boolean>
-    field = MutableSharedFlow<Boolean>()
+        field = MutableSharedFlow<Boolean>()
 
     override suspend fun callbackHasError(hasError: Boolean) {
         hasErrorFlow.emit(hasError)
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/model/SwapNotificationsModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/model/SwapNotificationsModel.kt
index 2f4e43e68a..e2be8113cd 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/model/SwapNotificationsModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/notifications/model/SwapNotificationsModel.kt
@@ -38,7 +38,7 @@ internal class SwapNotificationsModel @Inject constructor(
     private var notificationData = params.swapNotificationData
 
     val uiState: StateFlow<ImmutableList<NotificationUM>>
-    field = MutableStateFlow<ImmutableList<NotificationUM>>(persistentListOf())
+        field = MutableStateFlow<ImmutableList<NotificationUM>>(persistentListOf())
 
     init {
         subscribeToNotificationUpdateTrigger()
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
index df40299e1b..27c689d8a0 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
@@ -17,8 +17,8 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.decompose.navigation.inner.InnerRouter
+import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.core.ui.decompose.getEmptyComposableContentComponent
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.swap.models.R
 import com.tangem.domain.swap.models.SwapDirection
@@ -48,6 +48,7 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
     private val sendDestinationComponentFactory: SendDestinationComponent.Factory,
     private val confirmComponentFactory: SendWithSwapConfirmComponent.Factory,
     private val analyticsEventHandler: AnalyticsEventHandler,
+    private val urlOpener: UrlOpener,
 ) : SendWithSwapComponent, AppComponentContext by appComponentContext {
 
     private val stackNavigation = StackNavigation<SendWithSwapRoute>()
@@ -85,13 +86,19 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                 when (val activeComponent = stack.active.instance) {
                     is SwapAmountComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.AmountScreenOpened(categoryName = model.analyticCategoryName),
+                            CommonSendAnalyticEvents.AmountScreenOpened(
+                                categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
+                            ),
                         )
                         activeComponent.updateState(model.uiState.value.amountUM)
                     }
                     is SendDestinationComponent -> {
                         analyticsEventHandler.send(
-                            CommonSendAnalyticEvents.AddressScreenOpened(categoryName = model.analyticCategoryName),
+                            CommonSendAnalyticEvents.AddressScreenOpened(
+                                categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
+                            ),
                         )
                         activeComponent.updateState(model.uiState.value.destinationUM)
                     }
@@ -99,6 +106,7 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                         analyticsEventHandler.send(
                             CommonSendAnalyticEvents.ConfirmationScreenOpened(
                                 categoryName = model.analyticCategoryName,
+                                source = model.analyticsSendSource,
                             ),
                         )
                         if (model.currentRoute.value.isEditMode) {
@@ -121,7 +129,12 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                 (state.navigationUM as? NavigationUM.Content)?.backIconClick() ?: onChildBack()
             },
         )
-        SendWithSwapContent(navigationUM = state.navigationUM, stackState = stackState)
+        SendWithSwapContent(
+            navigationUM = state.navigationUM,
+            confirmUM = state.confirmUM,
+            stackState = stackState,
+            onLinkClick = urlOpener::openUrl,
+        )
     }
 
     private fun createChild(route: SendWithSwapRoute, childContext: AppComponentContext) = when (route) {
@@ -146,15 +159,16 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                 callback = model,
                 userWallet = model.userWallet,
                 filterProviderTypes = SEND_WITH_SWAP_PROVIDER_TYPES,
+                analyticsSendSource = model.analyticsSendSource,
             ),
         )
     }
 
     private fun getDestinationComponent(factoryContext: AppComponentContext): ComposableContentComponent {
         val amountContentUM = model.uiState.value.amountUM as? SwapAmountUM.Content
-            ?: return getEmptyComposableContentComponent()
+            ?: return ComposableContentComponent.EMPTY
         val secondaryCryptoCurrency = amountContentUM.secondaryCryptoCurrencyStatus?.currency
-            ?: return getEmptyComposableContentComponent()
+            ?: return ComposableContentComponent.EMPTY
 
         return sendDestinationComponentFactory.create(
             context = factoryContext,
@@ -163,6 +177,7 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                 currentRoute = model.currentRoute.filterIsInstance<DestinationRoute>(),
                 isBalanceHidingFlow = model.isBalanceHiddenFlow,
                 analyticsCategoryName = model.analyticCategoryName,
+                analyticsSendSource = model.analyticsSendSource,
                 title = resourceReference(R.string.common_address),
                 userWalletId = params.userWalletId,
                 cryptoCurrency = secondaryCryptoCurrency,
@@ -184,6 +199,7 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
                 analyticsCategoryName = model.analyticCategoryName,
                 primaryCryptoCurrencyStatusFlow = model.primaryCryptoCurrencyStatusFlow,
                 primaryFeePaidCurrencyStatusFlow = model.primaryFeePaidCurrencyStatusFlow,
+                analyticsSendSource = model.analyticsSendSource,
                 swapDirection = SwapDirection.Direct,
             ),
         )
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt
index b0cfea80d2..b731648cfe 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt
@@ -8,7 +8,6 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.child
 import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -17,6 +16,7 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.swap.models.SwapDirection
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.PredefinedValues
 import com.tangem.features.send.v2.api.params.FeeSelectorParams.*
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationBlockComponent
@@ -43,7 +43,6 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
     sendDestinationBlockComponent: SendDestinationBlockComponent.Factory,
     feeSelectorBlockComponentFactory: FeeSelectorBlockComponent.Factory,
     sendNotificationsComponentFactory: SendNotificationsComponent.Factory,
-    private val urlOpener: UrlOpener,
 ) : ComposableContentComponent, AppComponentContext by appComponentContext {
 
     private val model: SendWithSwapConfirmModel = getOrCreateModel(params = params)
@@ -62,6 +61,7 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
             isBalanceHidingFlow = params.isBalanceHidingFlow,
             swapDirection = params.swapDirection,
             filterProviderTypes = SEND_WITH_SWAP_PROVIDER_TYPES,
+            analyticsSendSource = params.analyticsSendSource,
         ),
         onResult = model::onAmountResult,
         onClick = model::showEditAmount,
@@ -72,6 +72,7 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
         params = SendDestinationComponentParams.DestinationBlockParams(
             state = model.uiState.value.destinationUM,
             analyticsCategoryName = params.analyticsCategoryName,
+            analyticsSendSource = params.analyticsSendSource,
             userWalletId = params.userWallet.walletId,
             blockClickEnableFlow = blockClickEnableFlow.asStateFlow(),
             cryptoCurrency = model.secondaryCurrency,
@@ -91,6 +92,7 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
             feeStateConfiguration = FeeStateConfiguration.ExcludeLow,
             feeDisplaySource = FeeDisplaySource.Screen,
             analyticsCategoryName = params.analyticsCategoryName,
+            analyticsSendSource = params.analyticsSendSource,
         ),
         onResult = model::onFeeResult,
     )
@@ -158,7 +160,6 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
             sendNotificationsUM = sendNotificationsUM,
             swapNotificationsComponent = swapNotificationsComponent,
             swapNotificationsUM = swapNotificationsUM,
-            onLinkClick = urlOpener::openUrl,
             modifier = modifier,
         )
     }
@@ -166,6 +167,7 @@ internal class SendWithSwapConfirmComponent @AssistedInject constructor(
     data class Params(
         val sendWithSwapUM: SendWithSwapUM,
         val analyticsCategoryName: String,
+        val analyticsSendSource: CommonSendAnalyticEvents.CommonSendSource,
         val userWallet: UserWallet,
         val appCurrency: AppCurrency,
         val currentRoute: Flow<SendWithSwapRoute>,
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
index 82ddd80851..c4961dabf6 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt
@@ -91,7 +91,7 @@ internal class SendWithSwapConfirmModel @Inject constructor(
     private val params: SendWithSwapConfirmComponent.Params = paramsContainer.require()
 
     val uiState: StateFlow<SendWithSwapUM>
-    field = MutableStateFlow(params.sendWithSwapUM)
+        field = MutableStateFlow(params.sendWithSwapUM)
 
     val primaryCurrencyStatus: CryptoCurrencyStatus = params.primaryCryptoCurrencyStatusFlow.value
     val secondaryCurrencyStatus: CryptoCurrencyStatus? = amountUM?.secondaryCryptoCurrencyStatus
@@ -227,7 +227,7 @@ internal class SendWithSwapConfirmModel @Inject constructor(
                 estimateFeeUseCase(
                     amount = amountValue,
                     userWallet = params.userWallet,
-                    cryptoCurrency = primaryCurrencyStatus.currency,
+                    cryptoCurrencyStatus = primaryCurrencyStatus,
                 ).map {
                     it.patchTransactionFeeForSwap(INCREASE_GAS_LIMIT_FOR_CEX)
                 }
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SwapTransactionSender.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SwapTransactionSender.kt
index 91239d4afe..58ed07d518 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SwapTransactionSender.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SwapTransactionSender.kt
@@ -131,7 +131,7 @@ internal class SwapTransactionSender @AssistedInject constructor(
         }
 
         val txData = createTransferTransactionUseCase(
-            amount = fromAmount.convertToSdkAmount(fromStatus.currency),
+            amount = fromAmount.convertToSdkAmount(fromStatus),
             fee = fee,
             memo = swapTransaction.txExtraId,
             destination = swapTransaction.txTo,
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt
index c39df3a68a..1688c9b88a 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt
@@ -8,23 +8,18 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.text.LinkAnnotation
-import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
-import com.tangem.common.ui.footers.SendingText
 import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.common.ui.notifications.notifications
+import com.tangem.core.ui.components.SpacerH16
 import com.tangem.core.ui.extensions.*
-import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
 import com.tangem.features.send.v2.api.SendNotificationsComponent
 import com.tangem.features.send.v2.api.subcomponents.destination.SendDestinationBlockComponent
-import com.tangem.features.swap.v2.impl.R
 import com.tangem.features.swap.v2.impl.amount.SwapAmountBlockComponent
 import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM
 import com.tangem.features.swap.v2.impl.notifications.SwapNotificationsComponent
 import com.tangem.features.swap.v2.impl.sendviaswap.entity.SendWithSwapUM
-import com.tangem.utils.StringsSigns
 import kotlinx.collections.immutable.ImmutableList
 
 @Suppress("LongParameterList")
@@ -38,120 +33,44 @@ internal fun SendWithSwapConfirmContent(
     sendNotificationsUM: ImmutableList<NotificationUM>,
     swapNotificationsComponent: SwapNotificationsComponent,
     swapNotificationsUM: ImmutableList<NotificationUM>,
-    onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val confirmUM = sendWithSwapUM.confirmUM as? ConfirmUM.Content
 
-    Column(modifier = modifier) {
-        LazyColumn(
-            modifier = Modifier
-                .weight(1f)
-                .padding(horizontal = 12.dp),
-        ) {
-            item(key = "SendWithSwapBlocks") {
-                Column(
-                    verticalArrangement = Arrangement.spacedBy(12.dp),
-                ) {
-                    amountBlockComponent.Content(Modifier)
-                    sendDestinationBlockComponent.Content(Modifier)
-                    feeSelectorBlockComponent.Content(Modifier.clip(RoundedCornerShape(16.dp)))
-                }
+    LazyColumn(
+        modifier = modifier
+            .padding(horizontal = 12.dp),
+    ) {
+        item(key = "SendWithSwapBlocks") {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
+                amountBlockComponent.Content(Modifier)
+                sendDestinationBlockComponent.Content(Modifier)
+                feeSelectorBlockComponent.Content(Modifier.clip(RoundedCornerShape(16.dp)))
             }
-            if (confirmUM != null) {
-                // tapHelp(isDisplay = confirmUM.showTapHelp) // todo
-                with(swapNotificationsComponent) {
-                    content(
-                        state = swapNotificationsUM,
-                        isClickDisabled = confirmUM.isTransactionInProcess,
-                    )
-                }
-                with(sendNotificationsComponent) {
-                    content(
-                        state = sendNotificationsUM,
-                        isClickDisabled = confirmUM.isTransactionInProcess,
-                    )
-                }
-                notifications(
-                    notifications = confirmUM.notifications,
+        }
+        if (confirmUM != null) {
+            // tapHelp(isDisplay = confirmUM.showTapHelp) // todo
+            with(swapNotificationsComponent) {
+                content(
+                    state = swapNotificationsUM,
                     isClickDisabled = confirmUM.isTransactionInProcess,
                 )
             }
-        }
-        val sendFooter = confirmUM?.sendingFooter ?: TextReference.EMPTY
-        val legalFooter = getAnnotatedStringForLegals(confirmUM?.tosUM, onClick = onLinkClick)
-        SendingText(
-            footerText = if (sendFooter != TextReference.EMPTY || legalFooter != TextReference.EMPTY) {
-                combinedReference(sendFooter, legalFooter)
-            } else {
-                TextReference.EMPTY
-            },
-        )
-    }
-}
-
-@Composable
-private fun getAnnotatedStringForLegals(tosUM: ConfirmUM.Content.TosUM?, onClick: (String) -> Unit): TextReference {
-    if (tosUM == null) return TextReference.EMPTY
-    val tos = tosUM.tosLink
-    val policy = tosUM.policyLink
-    return if (tos != null && policy != null) {
-        val tosTitle = tos.title.resolveReference()
-        val policyTitle = policy.title.resolveReference()
-        val fullString = stringResourceSafe(id = R.string.express_legal_two_placeholders, tosTitle, policyTitle)
-        val tosIndex = fullString.indexOf(tosTitle)
-        val policyIndex = fullString.indexOf(policyTitle)
-
-        annotatedReference {
-            append(StringsSigns.POINT_SIGN)
-            appendSpace()
-            append(fullString.substring(0, tosIndex))
-            withLink(
-                link = LinkAnnotation.Clickable(
-                    tag = "TOS_TAG",
-                    linkInteractionListener = { onClick(tos.link) },
-                ),
-                block = {
-                    appendColored(
-                        text = fullString.substring(tosIndex, tosIndex + tosTitle.length),
-                        color = TangemTheme.colors.text.accent,
-                    )
-                },
-            )
-            append(fullString.substring(tosIndex + tosTitle.length, policyIndex))
-            withLink(
-                link = LinkAnnotation.Clickable(
-                    tag = "POLICY_TAG",
-                    linkInteractionListener = { onClick(policy.link) },
-                ),
-                block = {
-                    appendColored(
-                        text = fullString.substring(policyIndex, policyIndex + policyTitle.length),
-                        color = TangemTheme.colors.text.accent,
-                    )
-                },
+            with(sendNotificationsComponent) {
+                content(
+                    state = sendNotificationsUM,
+                    isClickDisabled = confirmUM.isTransactionInProcess,
+                )
+            }
+            notifications(
+                notifications = confirmUM.notifications,
+                isClickDisabled = confirmUM.isTransactionInProcess,
             )
         }
-    } else {
-        val legal = requireNotNull(tos ?: policy) { "tos or policy must not be null" }
-        val legalTitle = legal.title.resolveReference()
-        val fullString = stringResourceSafe(id = R.string.express_legal_one_placeholder, legalTitle)
-        val legalIndex = fullString.indexOf(legalTitle)
-
-        annotatedReference {
-            append(fullString.substring(0, legalIndex))
-            withLink(
-                link = LinkAnnotation.Clickable(
-                    tag = "LEGAL_TAG",
-                    linkInteractionListener = { onClick(legal.link) },
-                ),
-                block = {
-                    appendColored(
-                        text = fullString.substring(legalIndex, legalIndex + legalTitle.length),
-                        color = TangemTheme.colors.text.accent,
-                    )
-                },
-            )
+        item("SPACER_KEY") {
+            SpacerH16()
         }
     }
 }
\ No newline at end of file
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt
index a92ea2bbff..811d403eac 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt
@@ -60,6 +60,7 @@ internal class SendWithSwapModel @Inject constructor(
     private val params: SendWithSwapComponent.Params = paramsContainer.require()
 
     val analyticCategoryName = CommonSendAnalyticEvents.SEND_CATEGORY
+    val analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.SendWithSwap
     val initialRoute = SendWithSwapRoute.Amount(false)
     val currentRoute = MutableStateFlow<SendWithSwapRoute>(initialRoute)
 
@@ -67,26 +68,26 @@ internal class SendWithSwapModel @Inject constructor(
     var appCurrency: AppCurrency = AppCurrency.Default
 
     val uiState: StateFlow<SendWithSwapUM>
-    field = MutableStateFlow(initialState())
+        field = MutableStateFlow(initialState())
 
     val isBalanceHiddenFlow: StateFlow<Boolean>
-    field = MutableStateFlow(false)
+        field = MutableStateFlow(false)
 
     val primaryCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
-    field = MutableStateFlow(
-        CryptoCurrencyStatus(
-            currency = params.currency,
-            value = CryptoCurrencyStatus.Loading,
-        ),
-    )
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = params.currency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
 
     val primaryFeePaidCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
-    field = MutableStateFlow(
-        CryptoCurrencyStatus(
-            currency = params.currency,
-            value = CryptoCurrencyStatus.Loading,
-        ),
-    )
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = params.currency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
 
     init {
         initUserWallet()
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/model/SendWithSwapSuccessModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/model/SendWithSwapSuccessModel.kt
index ba7331c157..33909f7563 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/model/SendWithSwapSuccessModel.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/model/SendWithSwapSuccessModel.kt
@@ -57,10 +57,10 @@ internal class SendWithSwapSuccessModel @Inject constructor(
                     iconRes = R.drawable.ic_web_24,
                     onClick = ::onExploreClick,
                 ) to NavigationButton(
-                        textReference = resourceReference(R.string.common_share),
-                        iconRes = R.drawable.ic_share_24,
-                        onClick = ::onShareClick,
-                    )).takeUnless { confirmUM?.txUrl.isNullOrBlank() },
+                    textReference = resourceReference(R.string.common_share),
+                    iconRes = R.drawable.ic_share_24,
+                    onClick = ::onShareClick,
+                )).takeUnless { confirmUM?.txUrl.isNullOrBlank() },
             ),
         )
     }
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
index a3dc753213..4e50ff50f7 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt
@@ -21,7 +21,7 @@ import com.tangem.common.ui.amountScreen.utils.getFiatReference
 import com.tangem.common.ui.navigationButtons.NavigationButton
 import com.tangem.common.ui.navigationButtons.NavigationButtonsBlockV2
 import com.tangem.common.ui.navigationButtons.NavigationUM
-import com.tangem.core.ui.components.BottomFade
+import com.tangem.core.ui.components.Fade
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.icons.identicon.IdentIcon
 import com.tangem.core.ui.components.inputrow.InputRowBestRate
@@ -61,59 +61,70 @@ import java.math.BigDecimal
 internal fun SendWithSwapSuccessContent(sendWithSwapUM: SendWithSwapUM) {
     if (sendWithSwapUM.navigationUM !is NavigationUM.Content) return
 
+    Column {
+        Box(
+            modifier = Modifier
+                .weight(1f)
+                .background(TangemTheme.colors.background.tertiary),
+        ) {
+            SuccessContent(
+                sendWithSwapUM = sendWithSwapUM,
+                modifier = Modifier.fillMaxHeight(),
+            )
+            Fade(
+                modifier = Modifier.align(Alignment.BottomCenter),
+                backgroundColor = TangemTheme.colors.background.tertiary,
+            )
+        }
+        NavigationButtonsBlockV2(
+            navigationUM = sendWithSwapUM.navigationUM,
+            modifier = Modifier.padding(
+                start = 16.dp,
+                end = 16.dp,
+                bottom = 16.dp,
+            ),
+        )
+    }
+}
+
+@Composable
+private fun SuccessContent(sendWithSwapUM: SendWithSwapUM, modifier: Modifier = Modifier) {
     val confirmUM = sendWithSwapUM.confirmUM as? ConfirmUM.Success ?: return
     val amountUM = sendWithSwapUM.amountUM as? SwapAmountUM.Content ?: return
     val quoteUM = amountUM.selectedQuote as? SwapQuoteUM.Content ?: return
     val destinationUM = sendWithSwapUM.destinationUM as? DestinationUM.Content ?: return
     val feeSelectorUM = sendWithSwapUM.feeSelectorUM as? FeeSelectorUM.Content ?: return
 
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(TangemTheme.colors.background.tertiary),
+    Column(
+        modifier = modifier
+            .padding(horizontal = 16.dp)
+            .verticalScroll(rememberScrollState()),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
     ) {
-        Column(
-            modifier = Modifier
-                .padding(horizontal = 16.dp)
-                .verticalScroll(rememberScrollState()),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            TransactionDoneTitle(
-                title = resourceReference(R.string.sent_transaction_sent_title),
-                subtitle = resourceReference(
-                    id = R.string.send_date_format,
-                    formatArgs = wrappedList(
-                        confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
-                        confirmUM.transactionDate.toTimeFormat(),
-                    ),
-                ),
-                modifier = Modifier.padding(vertical = 12.dp),
-            )
-            SwapAmountBlock(amountUM = amountUM)
-            InputRowBestRate(
-                imageUrl = confirmUM.provider.imageLarge,
-                title = stringReference(confirmUM.provider.name),
-                titleExtra = stringReference(confirmUM.provider.type.typeName),
-                subtitle = quoteUM.rate,
-                modifier = Modifier
-                    .clip(TangemTheme.shapes.roundedCornersXMedium)
-                    .background(TangemTheme.colors.background.action),
-            )
-            DestinationBlock(destinationUM.addressTextField)
-            FeeBlock(feeSelectorUM = feeSelectorUM)
-            Spacer(Modifier.height(128.dp))
-        }
-        BottomFade(Modifier.align(Alignment.BottomCenter), TangemTheme.colors.background.tertiary)
-        NavigationButtonsBlockV2(
-            navigationUM = sendWithSwapUM.navigationUM,
-            modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .padding(
-                    start = 16.dp,
-                    end = 16.dp,
-                    bottom = 16.dp,
+        TransactionDoneTitle(
+            title = resourceReference(R.string.sent_transaction_sent_title),
+            subtitle = resourceReference(
+                id = R.string.send_date_format,
+                formatArgs = wrappedList(
+                    confirmUM.transactionDate.toTimeFormat(DateTimeFormatters.dateFormatter),
+                    confirmUM.transactionDate.toTimeFormat(),
                 ),
+            ),
+            modifier = Modifier.padding(vertical = 12.dp),
         )
+        SwapAmountBlock(amountUM = amountUM)
+        InputRowBestRate(
+            imageUrl = confirmUM.provider.imageLarge,
+            title = stringReference(confirmUM.provider.name),
+            titleExtra = stringReference(confirmUM.provider.type.typeName),
+            subtitle = quoteUM.rate,
+            modifier = Modifier
+                .clip(TangemTheme.shapes.roundedCornersXMedium)
+                .background(TangemTheme.colors.background.action),
+        )
+        DestinationBlock(destinationUM.addressTextField)
+        FeeBlock(feeSelectorUM = feeSelectorUM)
+        Spacer(Modifier.height(16.dp))
     }
 }
 
@@ -300,14 +311,13 @@ private fun SendWithSwapSuccessContent_Preview() {
                     networkName = "Polygon",
                     isValidating = false,
                     isInitialized = false,
-                    isRedesignEnabled = false,
                     isRecentHidden = false,
                 ),
                 feeSelectorUM = FeeSelectorUM.Content(
                     fees = TransactionFee.Single(
                         normal = Fee.Common(
                             BigDecimal.ONE.convertToSdkAmount(
-                                SwapAmountContentPreview.cryptoCurrencyStatus.currency,
+                                SwapAmountContentPreview.cryptoCurrencyStatus,
                             ),
                         ),
                     ),
@@ -315,7 +325,7 @@ private fun SendWithSwapSuccessContent_Preview() {
                     selectedFeeItem = FeeItem.Market(
                         Fee.Common(
                             BigDecimal.ONE.convertToSdkAmount(
-                                SwapAmountContentPreview.cryptoCurrencyStatus.currency,
+                                SwapAmountContentPreview.cryptoCurrencyStatus,
                             ),
                         ),
                     ),
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/ui/SendWithSwapContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/ui/SendWithSwapContent.kt
index 3075a24638..fe0e00831b 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/ui/SendWithSwapContent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/ui/SendWithSwapContent.kt
@@ -1,11 +1,14 @@
 package com.tangem.features.swap.v2.impl.sendviaswap.ui
 
+import androidx.compose.animation.*
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import com.arkivanov.decompose.extensions.compose.stack.Children
 import com.arkivanov.decompose.extensions.compose.stack.animation.fade
@@ -13,18 +16,25 @@ import com.arkivanov.decompose.extensions.compose.stack.animation.plus
 import com.arkivanov.decompose.extensions.compose.stack.animation.slide
 import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation
 import com.arkivanov.decompose.router.stack.ChildStack
+import com.tangem.common.ui.footers.SendingText
 import com.tangem.common.ui.navigationButtons.NavigationPrimaryButton
 import com.tangem.common.ui.navigationButtons.NavigationUM
+import com.tangem.core.ui.components.Fade
 import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
+import com.tangem.features.swap.v2.impl.R
+import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM
 import com.tangem.features.swap.v2.impl.sendviaswap.SendWithSwapRoute
+import com.tangem.utils.StringsSigns
 
 @Composable
 internal fun SendWithSwapContent(
     navigationUM: NavigationUM,
+    confirmUM: ConfirmUM,
     stackState: ChildStack<SendWithSwapRoute, ComposableContentComponent>,
+    onLinkClick: (String) -> Unit,
 ) {
     val navigationUM = navigationUM as? NavigationUM.Content ?: return
 
@@ -53,16 +63,109 @@ internal fun SendWithSwapContent(
             },
             modifier = Modifier.weight(1f),
         ) {
-            it.instance.Content(Modifier.weight(1f))
+            Box(modifier = Modifier.fillMaxHeight()) {
+                it.instance.Content(Modifier.fillMaxSize(1f))
+
+                if (stackState.active.configuration != SendWithSwapRoute.Success) {
+                    Fade(
+                        backgroundColor = TangemTheme.colors.background.tertiary,
+                        modifier = Modifier.align(Alignment.BottomCenter),
+                    )
+                }
+            }
         }
         if (stackState.active.configuration != SendWithSwapRoute.Success) {
-            NavigationPrimaryButton(
-                navigationUM.primaryButton,
-                modifier = Modifier.padding(
-                    start = 16.dp,
-                    end = 16.dp,
-                    bottom = 16.dp,
+            Column {
+                AnimatedVisibility(
+                    visible = stackState.active.configuration == SendWithSwapRoute.Confirm,
+                    enter = slideInVertically(initialOffsetY = { it / 2 }) + fadeIn(),
+                    exit = slideOutVertically(targetOffsetY = { it / 2 }) + fadeOut(),
+                ) {
+                    val confirmContentUM = confirmUM as? ConfirmUM.Content
+                    val sendFooter = confirmContentUM?.sendingFooter ?: TextReference.EMPTY
+                    val legalFooter = getAnnotatedStringForLegals(confirmContentUM?.tosUM, onClick = onLinkClick)
+                    SendingText(
+                        footerText = if (sendFooter != TextReference.EMPTY || legalFooter != TextReference.EMPTY) {
+                            combinedReference(sendFooter, legalFooter)
+                        } else {
+                            TextReference.EMPTY
+                        },
+                    )
+                }
+                NavigationPrimaryButton(
+                    navigationUM.primaryButton,
+                    modifier = Modifier.padding(
+                        start = 16.dp,
+                        end = 16.dp,
+                        bottom = 16.dp,
+                    ),
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun getAnnotatedStringForLegals(tosUM: ConfirmUM.Content.TosUM?, onClick: (String) -> Unit): TextReference {
+    if (tosUM == null) return TextReference.EMPTY
+    val tos = tosUM.tosLink
+    val policy = tosUM.policyLink
+    return if (tos != null && policy != null) {
+        val tosTitle = tos.title.resolveReference()
+        val policyTitle = policy.title.resolveReference()
+        val fullString = stringResourceSafe(id = R.string.express_legal_two_placeholders, tosTitle, policyTitle)
+        val tosIndex = fullString.indexOf(tosTitle)
+        val policyIndex = fullString.indexOf(policyTitle)
+
+        annotatedReference {
+            append(StringsSigns.POINT_SIGN)
+            appendSpace()
+            append(fullString.substring(0, tosIndex))
+            withLink(
+                link = LinkAnnotation.Clickable(
+                    tag = "TOS_TAG",
+                    linkInteractionListener = { onClick(tos.link) },
                 ),
+                block = {
+                    appendColored(
+                        text = fullString.substring(tosIndex, tosIndex + tosTitle.length),
+                        color = TangemTheme.colors.text.accent,
+                    )
+                },
+            )
+            append(fullString.substring(tosIndex + tosTitle.length, policyIndex))
+            withLink(
+                link = LinkAnnotation.Clickable(
+                    tag = "POLICY_TAG",
+                    linkInteractionListener = { onClick(policy.link) },
+                ),
+                block = {
+                    appendColored(
+                        text = fullString.substring(policyIndex, policyIndex + policyTitle.length),
+                        color = TangemTheme.colors.text.accent,
+                    )
+                },
+            )
+        }
+    } else {
+        val legal = requireNotNull(tos ?: policy) { "tos or policy must not be null" }
+        val legalTitle = legal.title.resolveReference()
+        val fullString = stringResourceSafe(id = R.string.express_legal_one_placeholder, legalTitle)
+        val legalIndex = fullString.indexOf(legalTitle)
+
+        annotatedReference {
+            append(fullString.substring(0, legalIndex))
+            withLink(
+                link = LinkAnnotation.Clickable(
+                    tag = "LEGAL_TAG",
+                    linkInteractionListener = { onClick(legal.link) },
+                ),
+                block = {
+                    appendColored(
+                        text = fullString.substring(legalIndex, legalIndex + legalTitle.length),
+                        color = TangemTheme.colors.text.accent,
+                    )
+                },
             )
         }
     }
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
index a05a0f0b26..2f34e89a84 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/DefaultSwapRepository.kt
@@ -203,8 +203,7 @@ internal class DefaultSwapRepository(
     override suspend fun getExchangeStatus(
         userWallet: UserWallet,
         txId: String,
-    ): Either<UnknownError,
-        ExchangeStatusModel,> {
+    ): Either<UnknownError, ExchangeStatusModel> {
         return withContext(coroutineDispatcher.io) {
             either {
                 catch(
diff --git a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ExpressDataError.kt b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ExpressDataError.kt
index 1446dd81b2..568214f788 100644
--- a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ExpressDataError.kt
+++ b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ExpressDataError.kt
@@ -6,6 +6,8 @@ sealed class ExpressDataError {
 
     abstract val code: Int
 
+    open val message: String? = null
+
     data class BadRequest(override val code: Int) : ExpressDataError()
 
     data class SwapsAreUnavailableNowError(override val code: Int) : ExpressDataError()
@@ -57,4 +59,9 @@ sealed class ExpressDataError {
     data object UnknownError : ExpressDataError() {
         override val code: Int = -1
     }
+
+    data object TooLargeSolanaTransactionError : ExpressDataError() {
+        override val code: Int = -2
+        override val message: String = "tooLargeSolanaTransaction"
+    }
 }
\ No newline at end of file
diff --git a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/ExchangeStatus.kt b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/ExchangeStatus.kt
index 15d4228d1b..69300406c2 100644
--- a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/ExchangeStatus.kt
+++ b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/ExchangeStatus.kt
@@ -32,11 +32,11 @@ data class ExchangeStatusModel(
     val averageDuration: Int? = null,
 ) {
     val hasLongTime: Boolean
-        get() = if (createdAt != null && averageDuration != null) {
-            DateTime.now().minusSeconds(averageDuration * 5) > createdAt
-        } else {
-            false
-        }
+        get() = createdAt?.isBefore(DateTime.now().minusMinutes(FIFTEEN_MINUTES)) ?: false
+
+    private companion object {
+        const val FIFTEEN_MINUTES = 15
+    }
 }
 
 @JsonClass(generateAdapter = false)
diff --git a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/PermissionOptions.kt b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/PermissionOptions.kt
index 7a246d7566..e07d257628 100644
--- a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/PermissionOptions.kt
+++ b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/domain/PermissionOptions.kt
@@ -1,6 +1,6 @@
 package com.tangem.feature.swap.domain.models.domain
 
-import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.feature.swap.domain.models.ui.RequestApproveStateData
 import com.tangem.feature.swap.domain.models.ui.TxFee
 
@@ -9,14 +9,14 @@ import com.tangem.feature.swap.domain.models.ui.TxFee
  *
  * @param approveData tx data to give approve, it loaded from 1inch in findBestQuote if needed
  * @param forTokenContractAddress token contract address for which needs permission
- * @param fromToken which token will be swapping
+ * @param fromTokenStatus which token will be swapping
  * @param approveType unlimited or tx amount approve
  * @param txFee fee for tx
  */
 data class PermissionOptions(
     val approveData: RequestApproveStateData,
     val forTokenContractAddress: String,
-    val fromToken: CryptoCurrency,
+    val fromTokenStatus: CryptoCurrencyStatus,
     val spenderAddress: String,
     val approveType: SwapApproveType,
     val txFee: TxFee,
diff --git a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataStateExpress.kt b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataStateExpress.kt
index 93e4308f49..6e4041dee5 100644
--- a/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataStateExpress.kt
+++ b/features/swap/domain/models/src/main/java/com/tangem/feature/swap/domain/models/ui/TokensDataStateExpress.kt
@@ -29,5 +29,5 @@ fun TokensDataStateExpress.getGroupWithReverse(isReverseFromTo: Boolean): Curren
 data class CurrenciesGroup(
     val available: List<CryptoCurrencySwapInfo>,
     val unavailable: List<CryptoCurrencySwapInfo>,
-    val afterSearch: Boolean,
+    val isAfterSearch: Boolean,
 )
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
index d01b686595..7e47fff730 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractorImpl.kt
@@ -1,7 +1,9 @@
 package com.tangem.feature.swap.domain
 
+import android.util.Base64
 import arrow.core.Either
 import arrow.core.getOrElse
+import com.tangem.blockchain.blockchains.solana.SolanaTransactionHelper
 import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.TransactionData
@@ -11,6 +13,7 @@ import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
 import com.tangem.blockchainsdk.utils.fromNetworkId
 import com.tangem.blockchainsdk.utils.toBlockchain
+import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
@@ -42,6 +45,7 @@ import com.tangem.feature.swap.domain.models.SwapAmount
 import com.tangem.feature.swap.domain.models.domain.*
 import com.tangem.feature.swap.domain.models.toStringWithRightOffset
 import com.tangem.feature.swap.domain.models.ui.*
+import com.tangem.lib.crypto.BlockchainUtils.SOLANA_TRANSACTION_SIZE_THRESHOLD_BYTES
 import com.tangem.lib.crypto.UserWalletManager
 import com.tangem.lib.crypto.models.ProxyAmount
 import dagger.assisted.Assisted
@@ -52,8 +56,6 @@ import timber.log.Timber
 import java.math.BigDecimal
 import java.math.BigInteger
 import java.math.RoundingMode
-import android.util.Base64
-import com.tangem.blockchainsdk.utils.toNetworkId
 
 @Suppress("LargeClass", "LongParameterList")
 internal class SwapInteractorImpl @AssistedInject constructor(
@@ -172,7 +174,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         return CurrenciesGroup(
             available = availableCryptoCurrencies,
             unavailable = unavailableCryptoCurrencies.map { CryptoCurrencySwapInfo(it, emptyList()) },
-            afterSearch = false,
+            isAfterSearch = false,
         )
     }
 
@@ -227,7 +229,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         val approveTransaction = createApprovalTransactionUseCase(
             fee = permissionOptions.txFee.fee,
             userWalletId = userWalletId,
-            cryptoCurrency = permissionOptions.fromToken as CryptoCurrency.Token,
+            cryptoCurrencyStatus = permissionOptions.fromTokenStatus,
             amount = amount?.value,
             contractAddress = permissionOptions.forTokenContractAddress,
             spenderAddress = permissionOptions.spenderAddress,
@@ -239,7 +241,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         val result = sendTransactionUseCase(
             txData = approveTransaction,
             userWallet = userWallet,
-            network = permissionOptions.fromToken.network,
+            network = permissionOptions.fromTokenStatus.currency.network,
         )
         return result.fold(
             ifRight = { hash ->
@@ -546,7 +548,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         )
 
         val result = validateTransactionUseCase(
-            amount = amount.value.convertToSdkAmount(currency),
+            amount = amount.value.convertToSdkAmount(fromToken),
             fee = fee,
             memo = null,
             destination = getTokenAddress(fromToken.currency),
@@ -842,7 +844,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         }
 
         val txData = createTransferTransactionUseCase(
-            amount = amount.value.convertToSdkAmount(currencyToSend.currency),
+            amount = amount.value.convertToSdkAmount(currencyToSend),
             fee = txFee.fee,
             memo = exchangeDataCex.txExtraId,
             destination = exchangeDataCex.txTo,
@@ -1022,7 +1024,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
             val txFeeResult = getUnhandledFee(
                 amount = amount.value,
                 userWallet = userWallet,
-                cryptoCurrency = fromToken,
+                cryptoCurrencyStatus = fromTokenStatus,
             )
 
             val txFee = if (provider.type == ExchangeProviderType.CEX) {
@@ -1325,10 +1327,23 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                 val otherNativeFee = transaction.otherNativeFeeWei
                     ?.movePointLeft(nativeCoinDecimals)
                     ?: BigDecimal.ZERO
+
                 val txFeeState = if (isSolana(networkId)) {
+                    val transactionBytes = Base64.decode(transaction.txData, Base64.NO_WRAP)
+
+                    val formattedHash = getFormattedHash(transactionBytes)
+
+                    if (formattedHash.size > SOLANA_TRANSACTION_SIZE_THRESHOLD_BYTES && userWallet is UserWallet.Cold) {
+                        return produceDexSwapDataError(
+                            error = ExpressDataError.TooLargeSolanaTransactionError,
+                            fromToken = fromToken,
+                            amount = amount,
+                        )
+                    }
+
                     getFeeDataForSolanaDexSwap(
                         network = fromToken.currency.network,
-                        transaction = transaction,
+                        transactionBytes = transactionBytes,
                     )
                         .toTxFeeState(fromToken.currency, otherNativeFee)
                 } else {
@@ -1387,22 +1402,34 @@ internal class SwapInteractorImpl @AssistedInject constructor(
                 )
             },
             ifLeft = { error ->
-                val rates = getQuotes(fromToken.currency.id)
-                val fromTokenSwapInfo = TokenSwapInfo(
-                    tokenAmount = amount,
-                    amountFiat = rates[fromToken.currency.id]?.multiply(amount.value)
-                        ?: BigDecimal.ZERO,
-                    cryptoCurrencyStatus = fromToken,
-                )
-                SwapState.SwapError(
-                    fromTokenSwapInfo,
-                    error,
-                    IncludeFeeInAmount.Excluded,
+                produceDexSwapDataError(
+                    error = error,
+                    fromToken = fromToken,
+                    amount = amount,
                 )
             },
         )
     }
 
+    private suspend fun produceDexSwapDataError(
+        error: ExpressDataError,
+        fromToken: CryptoCurrencyStatus,
+        amount: SwapAmount,
+    ): SwapState.SwapError {
+        val rates = getQuotes(fromToken.currency.id)
+        val fromTokenSwapInfo = TokenSwapInfo(
+            tokenAmount = amount,
+            amountFiat = rates[fromToken.currency.id]?.multiply(amount.value)
+                ?: BigDecimal.ZERO,
+            cryptoCurrencyStatus = fromToken,
+        )
+        return SwapState.SwapError(
+            fromTokenSwapInfo,
+            error,
+            IncludeFeeInAmount.Excluded,
+        )
+    }
+
     private suspend fun getFeeDataForDexSwap(
         network: Network,
         transaction: ExpressTransactionModel.DEX,
@@ -1446,13 +1473,9 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         }
     }
 
-    private suspend fun getFeeDataForSolanaDexSwap(
-        network: Network,
-        transaction: ExpressTransactionModel.DEX,
-    ): TransactionFee {
-        val txData = transaction.txData
+    private suspend fun getFeeDataForSolanaDexSwap(network: Network, transactionBytes: ByteArray): TransactionFee {
         val transactionData = TransactionData.Compiled(
-            value = TransactionData.Compiled.Data.Bytes(Base64.decode(txData, Base64.NO_WRAP)),
+            value = TransactionData.Compiled.Data.Bytes(transactionBytes),
         )
 
         return getFeeUseCase(
@@ -1520,12 +1543,12 @@ internal class SwapInteractorImpl @AssistedInject constructor(
     private suspend fun getUnhandledFee(
         amount: BigDecimal,
         userWallet: UserWallet,
-        cryptoCurrency: CryptoCurrency,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
     ): Either<GetFeeError, TransactionFee> {
         return estimateFeeUseCase(
             amount = amount,
             userWallet = userWallet,
-            cryptoCurrency = cryptoCurrency,
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
         )
     }
 
@@ -1560,7 +1583,7 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         // setting up amount for approve with given amount for swap [SwapApproveType.Limited]
         val callData = SmartContractCallDataProviderFactory.getApprovalCallData(
             spenderAddress = requireNotNull(spenderAddress) { "Spender address is null" },
-            amount = swapAmount.value.convertToSdkAmount(fromToken),
+            amount = swapAmount.value.convertToSdkAmount(fromTokenStatus),
             blockchain = fromToken.network.toBlockchain(),
         )
         val feeData = try {
@@ -2018,6 +2041,16 @@ internal class SwapInteractorImpl @AssistedInject constructor(
         return networkId == Blockchain.Solana.toNetworkId()
     }
 
+    // TODO create usecase [REDACTED_TASK_KEY]
+    private fun getFormattedHash(hash: ByteArray): ByteArray {
+        return try {
+            SolanaTransactionHelper.removeSignaturesPlaceholders(hash)
+        } catch (e: Exception) {
+            Timber.e("Failed to format the hash: ${e.message}")
+            hash
+        }
+    }
+
     companion object {
         private const val INCREASE_GAS_LIMIT_FOR_DEX = 112 // 12%
         private const val INCREASE_GAS_LIMIT_FOR_SEND = 105 // 5%
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
index 0f2e700cd8..8d8ed4d072 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/analytics/SwapEvents.kt
@@ -2,6 +2,11 @@ package com.tangem.feature.swap.analytics
 
 import com.tangem.common.ui.bottomsheet.permission.state.ApproveType
 import com.tangem.core.analytics.models.AnalyticsEvent
+import com.tangem.core.analytics.models.AnalyticsParam.Key.ERROR_CODE
+import com.tangem.core.analytics.models.AnalyticsParam.Key.ERROR_MESSAGE
+import com.tangem.core.analytics.models.AnalyticsParam.Key.PROVIDER
+import com.tangem.core.analytics.models.AnalyticsParam.Key.RECEIVE_TOKEN
+import com.tangem.core.analytics.models.AnalyticsParam.Key.SEND_TOKEN
 import com.tangem.feature.swap.domain.models.domain.SwapProvider
 import com.tangem.feature.swap.domain.models.ui.FeeType
 
@@ -108,14 +113,16 @@ sealed class SwapEvents(
         val receiveToken: String,
         val provider: SwapProvider,
         val errorCode: Int,
+        val errorMessage: String?,
     ) : SwapEvents(
         event = "Notice - Express Error",
-        params = mapOf(
-            "Send Token" to sendToken,
-            "Receive Token" to receiveToken,
-            "Provider" to provider.name,
-            "Error Code" to errorCode.toString(),
-        ),
+        params = buildMap {
+            put(SEND_TOKEN, sendToken)
+            put(RECEIVE_TOKEN, receiveToken)
+            put(PROVIDER, provider.name)
+            put(ERROR_CODE, errorCode.toString())
+            errorMessage?.let { put(ERROR_MESSAGE, it) }
+        },
     )
     // TODO parameters
 
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
index 86245f0585..9d3b8ab6ac 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/converters/TokensDataConverter.kt
@@ -55,7 +55,7 @@ class TokensDataConverter(
                 .toImmutableList(),
             onSearchEntered = onSearchEntered,
             onTokenSelected = onTokenSelected,
-            afterSearch = group.afterSearch,
+            afterSearch = group.isAfterSearch,
         )
     }
 
@@ -85,7 +85,7 @@ class TokensDataConverter(
                     url = currency.iconUrl,
                     fallbackResId = currency.networkIconResId,
                     isGrayscale = !isAvailable,
-                    showCustomBadge = currency.isCustom,
+                    shouldShowCustomBadge = currency.isCustom,
                 )
             }
             is CryptoCurrency.Token -> {
@@ -95,7 +95,7 @@ class TokensDataConverter(
                 CurrencyIconState.TokenIcon(
                     url = currency.iconUrl,
                     isGrayscale = !isAvailable,
-                    showCustomBadge = currency.isCustom,
+                    shouldShowCustomBadge = currency.isCustom,
                     topBadgeIconResId = currency.networkIconResId,
                     fallbackTint = tint,
                     fallbackBackground = background,
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
index 6a7f2b979e..cf53aeb958 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt
@@ -63,6 +63,7 @@ import com.tangem.feature.swap.ui.StateBuilder
 import com.tangem.feature.swap.utils.formatToUIRepresentation
 import com.tangem.features.swap.SwapComponent
 import com.tangem.utils.Provider
+import com.tangem.utils.TangemBlogUrlBuilder.RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP
 import com.tangem.utils.coroutines.*
 import com.tangem.utils.isNullOrZero
 import kotlinx.coroutines.NonCancellable
@@ -503,6 +504,7 @@ internal class SwapModel @Inject constructor(
                 receiveToken = receiveToken ?: "",
                 provider = provider,
                 errorCode = error.code,
+                errorMessage = error.message,
             ),
         )
     }
@@ -700,9 +702,11 @@ internal class SwapModel @Inject constructor(
     private fun givePermissionsToSwap() {
         modelScope.launch(dispatchers.main) {
             runCatching {
-                val fromToken = requireNotNull(dataState.fromCryptoCurrency?.currency) {
-                    "dataState.fromCurrency might not be null"
+                val fromCryptoCurrency = requireNotNull(dataState.fromCryptoCurrency) {
+                    "dataState.fromCryptoCurrency might not be null"
                 }
+                val fromToken = fromCryptoCurrency.currency
+
                 val approveDataModel = requireNotNull(dataState.approveDataModel) {
                     "dataState.approveDataModel.spenderAddress shouldn't be null"
                 }
@@ -725,7 +729,7 @@ internal class SwapModel @Inject constructor(
                         permissionOptions = PermissionOptions(
                             approveData = approveDataModel,
                             forTokenContractAddress = (fromToken as? CryptoCurrency.Token)?.contractAddress.orEmpty(),
-                            fromToken = fromToken,
+                            fromTokenStatus = fromCryptoCurrency,
                             approveType = approveType,
                             txFee = feeForPermission,
                             spenderAddress = approveDataModel.spenderAddress,
@@ -783,7 +787,7 @@ internal class SwapModel @Inject constructor(
                     fromGroup = tokenDataState.fromGroup.copy(
                         available = available,
                         unavailable = unavailable,
-                        afterSearch = true,
+                        isAfterSearch = true,
                     ),
                 )
             } else {
@@ -791,7 +795,7 @@ internal class SwapModel @Inject constructor(
                     toGroup = tokenDataState.toGroup.copy(
                         available = available,
                         unavailable = unavailable,
-                        afterSearch = true,
+                        isAfterSearch = true,
                     ),
                 )
             }
@@ -1162,6 +1166,9 @@ internal class SwapModel @Inject constructor(
                 modelScope.launch { shouldShowStoriesUseCase.neverToShow(StoryContentIds.STORY_FIRST_TIME_SWAP.id) }
                 swapRouter.openScreen(SwapNavScreen.Main)
             },
+            onOpenLearnMoreAboutApproveClick = {
+                urlOpener.openUrl(RESOURCE_TO_LEARN_ABOUT_APPROVING_IN_SWAP)
+            },
         )
     }
 
@@ -1261,7 +1268,15 @@ internal class SwapModel @Inject constructor(
         }
 
         return groupToFind.available.find { idToFind == it.currencyStatus.currency.id.value }?.providers
-            ?: emptyList()
+            ?.filter { provider ->
+                // !!!WARNING!!! Filter out dex provider if yield supply is active
+                val yieldSupplyStatus = fromToken.value.yieldSupplyStatus
+                if (yieldSupplyStatus != null && yieldSupplyStatus.isActive) {
+                    provider.type == ExchangeProviderType.CEX
+                } else {
+                    true
+                }
+            }.orEmpty()
     }
 
     private fun Map<SwapProvider, SwapState>.getLastLoadedSuccessStates(): SuccessLoadedSwapData {
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
index 36018d5189..cb90d135f8 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapNotificationsFactory.kt
@@ -243,6 +243,7 @@ internal class SwapNotificationsFactory(
                 SwapNotificationUM.Info.PermissionNeeded(
                     providerName = fromToken.symbol,
                     fromTokenSymbol = providerName,
+                    onApproveClick = actions.openPermissionBottomSheet,
                 ),
             )
         }
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/models/UiActions.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/models/UiActions.kt
index 0969d9b54b..25c2225451 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/models/UiActions.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/models/UiActions.kt
@@ -32,4 +32,5 @@ data class UiActions(
     val onSuccess: () -> Unit,
     val onLinkClick: (String) -> Unit,
     val onReceiveCardWarningClick: () -> Unit,
+    val onOpenLearnMoreAboutApproveClick: () -> Unit,
 )
\ No newline at end of file
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/models/states/SwapNotificationUM.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/models/states/SwapNotificationUM.kt
index a5f0f1a251..317e905564 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/models/states/SwapNotificationUM.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/models/states/SwapNotificationUM.kt
@@ -199,6 +199,7 @@ internal object SwapNotificationUM {
         data class PermissionNeeded(
             val providerName: String,
             val fromTokenSymbol: String,
+            val onApproveClick: () -> Unit,
         ) : Info(
             title = resourceReference(R.string.express_provider_permission_needed),
             subtitle = resourceReference(
@@ -206,6 +207,10 @@ internal object SwapNotificationUM {
                 formatArgs = wrappedList(providerName, fromTokenSymbol),
             ),
             iconResId = R.drawable.ic_locked_24,
+            buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+                text = TextReference.Res(R.string.common_approve),
+                onClick = onApproveClick,
+            ),
         )
     }
 }
\ No newline at end of file
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index ec50b17698..a21003f5f4 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -347,6 +347,7 @@ internal class StateBuilder(
                 providerName = swapProvider.name,
                 onGivePermissionClick = actions.onGivePermissionClick,
                 onChangeApproveType = actions.onChangeApproveType,
+                onOpenLearnMoreAboutApproveClick = actions.onOpenLearnMoreAboutApproveClick,
             ),
             fee = feeState,
             swapButton = SwapButton(
@@ -411,7 +412,8 @@ internal class StateBuilder(
             it is SwapNotificationUM.Error || it is NotificationUM.Error ||
                 it is SwapNotificationUM.Warning.ExpressError || it is SwapNotificationUM.Warning.ExpressGeneralError ||
                 it is SwapNotificationUM.Warning.NoAvailableTokensToSwap ||
-                it is SwapNotificationUM.Warning.NeedReserveToCreateAccount
+                it is SwapNotificationUM.Warning.NeedReserveToCreateAccount ||
+                it is SwapNotificationUM.Info.PermissionNeeded
         }
     }
 
@@ -934,12 +936,14 @@ internal class StateBuilder(
         )
     }
 
+    @Suppress("LongParameterList")
     private fun convertPermissionState(
         lastPermissionState: GiveTxPermissionState,
         permissionDataState: PermissionDataState,
         providerName: String,
         onGivePermissionClick: () -> Unit,
         onChangeApproveType: (ApproveType) -> Unit,
+        onOpenLearnMoreAboutApproveClick: () -> Unit,
     ): GiveTxPermissionState {
         val approveType = if (lastPermissionState is GiveTxPermissionState.ReadyForRequest) {
             lastPermissionState.approveType
@@ -964,7 +968,7 @@ internal class StateBuilder(
                     spenderAddress = getShortAddressValue(permissionDataState.spenderAddress),
                     fee = TextReference.Str("${permissionFee.feeCryptoFormatted} (${permissionFee.feeFiatFormatted})"),
                     approveButton = ApprovePermissionButton(
-                        enabled = true,
+                        isEnabled = true,
                         onClick = onGivePermissionClick,
                     ),
                     cancelButton = CancelPermissionButton(
@@ -977,6 +981,7 @@ internal class StateBuilder(
                     ),
                     dialogText = resourceReference(R.string.swapping_approve_information_text),
                     footerText = resourceReference(R.string.swap_give_permission_fee_footer),
+                    onOpenLearnMoreAboutApproveClick = onOpenLearnMoreAboutApproveClick,
                 )
             }
         }
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
index 8fe8424317..2fe84bb466 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapScreenContent.kt
@@ -78,7 +78,7 @@ internal fun SwapScreenContent(state: SwapStateHolder, modifier: Modifier = Modi
 
             if (state.notifications.isNotEmpty()) SwapNotifications(notifications = state.notifications)
 
-            MainButton(state = state, onPermissionWarningClick = state.onShowPermissionBottomSheet)
+            SpacerHMax()
 
             if (state.tosState != null && state.providerState !is ProviderState.Empty) {
                 ProviderTos(
@@ -87,6 +87,8 @@ internal fun SwapScreenContent(state: SwapStateHolder, modifier: Modifier = Modi
                         .padding(top = TangemTheme.dimens.spacing16),
                 )
             }
+
+            MainButton(state = state)
         }
 
         if (state.shouldShowMaxAmount && keyboard is Keyboard.Opened) {
@@ -359,34 +361,22 @@ private fun SwapNotifications(notifications: List<NotificationUM>) {
 }
 
 @Composable
-private fun MainButton(state: SwapStateHolder, onPermissionWarningClick: () -> Unit) {
-    // order is important
-    when {
-        state.isInsufficientFunds -> {
-            PrimaryButton(
-                modifier = Modifier.fillMaxWidth(),
-                text = stringResourceSafe(id = R.string.swapping_insufficient_funds),
-                enabled = false,
-                onClick = state.swapButton.onClick,
-            )
-        }
-        state.notifications.any { it is SwapNotificationUM.Info.PermissionNeeded } -> {
-            PrimaryButton(
-                modifier = Modifier.fillMaxWidth(),
-                text = stringResourceSafe(id = R.string.give_permission_title),
-                enabled = true,
-                onClick = onPermissionWarningClick,
-            )
-        }
-        else -> {
-            PrimaryButtonIconEnd(
-                modifier = Modifier.fillMaxWidth(),
-                text = stringResourceSafe(id = R.string.swapping_swap_action),
-                iconResId = state.swapButton.walletInteractionIcon,
-                enabled = state.swapButton.enabled,
-                onClick = state.swapButton.onClick,
-            )
-        }
+private fun MainButton(state: SwapStateHolder) {
+    if (state.isInsufficientFunds) {
+        PrimaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = stringResourceSafe(id = R.string.swapping_insufficient_funds),
+            enabled = false,
+            onClick = state.swapButton.onClick,
+        )
+    } else {
+        PrimaryButtonIconEnd(
+            modifier = Modifier.fillMaxWidth(),
+            text = stringResourceSafe(id = R.string.swapping_swap_action),
+            iconResId = state.swapButton.walletInteractionIcon,
+            enabled = state.swapButton.enabled,
+            onClick = state.swapButton.onClick,
+        )
     }
 }
 
@@ -438,6 +428,7 @@ private val state = SwapStateHolder(
         SwapNotificationUM.Info.PermissionNeeded(
             providerName = "Provider",
             fromTokenSymbol = "POL",
+            onApproveClick = {},
         ),
         SwapNotificationUM.Warning.NoAvailableTokensToSwap("POLYGON"),
     ),
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
index f2821d83a4..b03970cc63 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSelectTokenScreen.kt
@@ -287,7 +287,7 @@ private val token = TokenToSelectState.TokenToSelect(
         url = "",
         fallbackResId = 0,
         isGrayscale = false,
-        showCustomBadge = false,
+        shouldShowCustomBadge = false,
     ),
     id = "",
     name = "Optimistic Ethereum (ETH)",
diff --git a/features/tangempay/details/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayDetailsComponent.kt b/features/tangempay/details/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayDetailsComponent.kt
index bd9326f7e9..ab118672a6 100644
--- a/features/tangempay/details/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayDetailsComponent.kt
+++ b/features/tangempay/details/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayDetailsComponent.kt
@@ -2,9 +2,8 @@ package com.tangem.features.tangempay.components
 
 import com.tangem.core.decompose.factory.ComponentFactory
 import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.domain.models.wallet.UserWalletId
 
 interface TangemPayDetailsComponent : ComposableContentComponent {
-    data class Params(val userWalletId: UserWalletId)
+    data class Params(val customerWalletAddress: String, val cardNumberEnd: String)
     interface Factory : ComponentFactory<Params, TangemPayDetailsComponent>
 }
\ No newline at end of file
diff --git a/features/tangempay/details/impl/build.gradle.kts b/features/tangempay/details/impl/build.gradle.kts
index 84f577edf1..689a03be9f 100644
--- a/features/tangempay/details/impl/build.gradle.kts
+++ b/features/tangempay/details/impl/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
     implementation(projects.core.configToggles)
     implementation(projects.core.decompose)
     implementation(projects.core.ui)
+    implementation(projects.core.error)
 
     /** Features api */
     implementation(projects.features.tangempay.details.api)
@@ -25,8 +26,12 @@ dependencies {
     implementation(projects.domain.balanceHiding)
     implementation(projects.domain.balanceHiding.models)
     implementation(projects.domain.models)
+    implementation(projects.domain.visa)
+    implementation(projects.domain.visa.models)
 
     /** Compose */
+    implementation(deps.compose.coil)
+    implementation(deps.compose.constraintLayout)
     implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
     implementation(deps.compose.ui)
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayDetailsComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayDetailsComponent.kt
index cd5e1f5b79..0aa60f2cf3 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayDetailsComponent.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayDetailsComponent.kt
@@ -23,14 +23,19 @@ internal class DefaultTangemPayDetailsComponent @AssistedInject constructor(
     private val model: TangemPayDetailsModel = getOrCreateModel(params = params)
     private val txHistoryComponent = DefaultTangemPayTxHistoryComponent(
         appComponentContext = child("txHistoryComponent"),
-        params = DefaultTangemPayTxHistoryComponent.Params(userWalletId = params.userWalletId),
+        params = DefaultTangemPayTxHistoryComponent.Params(customerWalletAddress = params.customerWalletAddress),
     )
 
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+
         NavigationBar3ButtonsScrim()
-        TangemPayDetailsScreen(state = state, txHistoryComponent = txHistoryComponent, modifier = modifier)
+        TangemPayDetailsScreen(
+            state = state,
+            txHistoryComponent = txHistoryComponent,
+            modifier = modifier,
+        )
     }
 
     @AssistedFactory
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/DefaultTangemPayTxHistoryComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/DefaultTangemPayTxHistoryComponent.kt
index c0ccc0a291..4338d0ecbc 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/DefaultTangemPayTxHistoryComponent.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/DefaultTangemPayTxHistoryComponent.kt
@@ -4,10 +4,9 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
-import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
 import com.tangem.features.tangempay.model.TangemPayTxHistoryModel
-import com.tangem.features.txhistory.entity.TxHistoryUM
-import com.tangem.features.txhistory.ui.txHistoryItems
+import com.tangem.features.tangempay.ui.tangemPayTxHistoryItems
 import kotlinx.coroutines.flow.StateFlow
 
 internal class DefaultTangemPayTxHistoryComponent(
@@ -16,11 +15,11 @@ internal class DefaultTangemPayTxHistoryComponent(
 ) : AppComponentContext by appComponentContext, TangemPayTxHistoryComponent {
 
     private val model: TangemPayTxHistoryModel = getOrCreateModel(params = params)
-    override val state: StateFlow<TxHistoryUM> = model.uiState
+    override val state: StateFlow<TangemPayTxHistoryUM> = model.uiState
 
-    override fun LazyListScope.txHistoryContent(listState: LazyListState, state: TxHistoryUM) {
-        txHistoryItems(listState, state)
+    override fun LazyListScope.txHistoryContent(listState: LazyListState, state: TangemPayTxHistoryUM) {
+        tangemPayTxHistoryItems(listState, state)
     }
 
-    data class Params(val userWalletId: UserWalletId)
+    data class Params(val customerWalletAddress: String)
 }
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
index 61d078d853..b430960c14 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
@@ -2,170 +2,150 @@ package com.tangem.features.tangempay.components.txHistory
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
-import com.tangem.core.ui.components.transactions.state.TransactionState
 import com.tangem.core.ui.extensions.stringReference
-import com.tangem.features.tangempay.details.impl.R
-import com.tangem.features.txhistory.entity.TxHistoryUM
-import com.tangem.features.txhistory.ui.txHistoryItems
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.features.tangempay.entity.TangemPayTransactionState
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+import com.tangem.features.tangempay.ui.tangemPayTxHistoryItems
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-internal class PreviewTangemPayTxHistoryComponent(txHistoryUM: TxHistoryUM) : TangemPayTxHistoryComponent {
-    override val state: StateFlow<TxHistoryUM> = MutableStateFlow(txHistoryUM)
+internal class PreviewTangemPayTxHistoryComponent(txHistoryUM: TangemPayTxHistoryUM) : TangemPayTxHistoryComponent {
+    override val state: StateFlow<TangemPayTxHistoryUM> = MutableStateFlow(txHistoryUM)
 
-    override fun LazyListScope.txHistoryContent(listState: LazyListState, state: TxHistoryUM) {
-        txHistoryItems(listState, state)
+    override fun LazyListScope.txHistoryContent(listState: LazyListState, state: TangemPayTxHistoryUM) {
+        tangemPayTxHistoryItems(listState = listState, state = state)
     }
 
     companion object {
-        val loadingUM = TxHistoryUM.Loading(isBalanceHidden = true, onExploreClick = {})
-        val emptyUM = TxHistoryUM.Empty(isBalanceHidden = true, onExploreClick = {})
-        val contentUM = TxHistoryUM.Content(
+        val loadingUM = TangemPayTxHistoryUM.Loading(isBalanceHidden = true)
+        val emptyUM = TangemPayTxHistoryUM.Empty(isBalanceHidden = true)
+        val contentUM = TangemPayTxHistoryUM.Content(
             isBalanceHidden = false,
             loadMore = { false },
             items = persistentListOf(
-                TxHistoryUM.TxHistoryItemUM.Title(onExploreClick = {}),
-                TxHistoryUM.TxHistoryItemUM.GroupTitle(title = "Today", itemKey = "Today"),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Title,
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(title = "Today", itemKey = "Today"),
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
+                        onClick = {},
                         amount = "-4.99 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "16:41",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
-                        onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Starbucks"),
                         subtitle = stringReference("Food&Drinks"),
-                        timestamp = 3464,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-126.20 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "12:04",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Wallmart"),
                         subtitle = stringReference("Supermarket"),
-                        timestamp = 3465,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.GroupTitle(title = "Yesterday", itemKey = "Yesterday"),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(title = "Yesterday", itemKey = "Yesterday"),
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-4.99 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "21:41",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Starbucks"),
                         subtitle = stringReference("Food&Drinks"),
-                        timestamp = 3464,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-126.20 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "10:04",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Wallmart"),
                         subtitle = stringReference("Supermarket"),
-                        timestamp = 3465,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-4.99 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "19:41",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Starbucks"),
                         subtitle = stringReference("Food&Drinks"),
-                        timestamp = 3464,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-126.20 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "18:04",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Wallmart"),
                         subtitle = stringReference("Supermarket"),
-                        timestamp = 3465,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-4.99 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "17:41",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Starbucks"),
                         subtitle = stringReference("Food&Drinks"),
-                        timestamp = 3464,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-126.20 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "16:04",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Wallmart"),
                         subtitle = stringReference("Supermarket"),
-                        timestamp = 3465,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-4.99 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "15:41",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Starbucks"),
                         subtitle = stringReference("Food&Drinks"),
-                        timestamp = 3464,
+                        iconUrl = null,
                     ),
                 ),
-                TxHistoryUM.TxHistoryItemUM.Transaction(
-                    state = TransactionState.Content(
-                        txHash = "signiferumque",
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(
+                    transaction = TangemPayTransactionState.Content.Spend(
+                        id = "signiferumque",
                         amount = "-126.20 USD",
+                        amountColor = { TangemTheme.colors.text.primary1 },
                         time = "14:04",
-                        status = TransactionState.Content.Status.Confirmed,
-                        direction = TransactionState.Content.Direction.OUTGOING,
                         onClick = {},
-                        iconRes = R.drawable.ic_arrow_up_24,
                         title = stringReference("Wallmart"),
                         subtitle = stringReference("Supermarket"),
-                        timestamp = 3465,
+                        iconUrl = null,
                     ),
                 ),
             ),
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/TangemPayTxHistoryComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/TangemPayTxHistoryComponent.kt
index 3b538ef7fd..8bc58a08f9 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/TangemPayTxHistoryComponent.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/TangemPayTxHistoryComponent.kt
@@ -2,10 +2,10 @@ package com.tangem.features.tangempay.components.txHistory
 
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
-import com.tangem.features.txhistory.entity.TxHistoryUM
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
 import kotlinx.coroutines.flow.StateFlow
 
 internal interface TangemPayTxHistoryComponent {
-    val state: StateFlow<TxHistoryUM>
-    fun LazyListScope.txHistoryContent(listState: LazyListState, state: TxHistoryUM)
+    val state: StateFlow<TangemPayTxHistoryUM>
+    fun LazyListScope.txHistoryContent(listState: LazyListState, state: TangemPayTxHistoryUM)
 }
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsUM.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsUM.kt
index dbb7977543..cad1301dc5 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsUM.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsUM.kt
@@ -2,6 +2,7 @@ package com.tangem.features.tangempay.entity
 
 import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
+import com.tangem.core.ui.extensions.TextReference
 import kotlinx.collections.immutable.ImmutableList
 
 internal data class TangemPayDetailsUM(
@@ -12,7 +13,16 @@ internal data class TangemPayDetailsUM(
     val isBalanceHidden: Boolean,
 )
 
-data class TangemPayCardDetailsUM(val number: String, val expiry: String, val cvv: String, val onReveal: () -> Unit)
+data class TangemPayCardDetailsUM(
+    val number: String = "",
+    val expiry: String = "",
+    val cvv: String = "",
+    val buttonText: TextReference = TextReference.EMPTY,
+    val onClick: () -> Unit = {},
+    val onCopy: (String) -> Unit = {},
+    val isHidden: Boolean = true,
+    val isLoading: Boolean = false,
+)
 
 internal sealed class TangemPayDetailsBalanceBlockState {
 
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTransactionState.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTransactionState.kt
new file mode 100644
index 0000000000..675103d42e
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTransactionState.kt
@@ -0,0 +1,54 @@
+package com.tangem.features.tangempay.entity
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.extensions.TextReference
+
+internal sealed interface TangemPayTransactionState {
+
+    val id: String
+
+    data class Loading(override val id: String) : TangemPayTransactionState
+
+    sealed interface Content : TangemPayTransactionState {
+
+        val onClick: () -> Unit
+        val amount: String
+        val amountColor: @Composable (() -> Color)
+        val title: TextReference
+        val subtitle: TextReference
+        val time: String
+
+        data class Spend(
+            override val id: String,
+            override val onClick: () -> Unit,
+            override val amount: String,
+            override val amountColor: @Composable (() -> Color),
+            override val title: TextReference,
+            override val subtitle: TextReference,
+            override val time: String,
+            val iconUrl: String?,
+        ) : Content
+
+        data class Payment(
+            override val id: String,
+            override val onClick: () -> Unit,
+            override val amount: String,
+            override val amountColor: @Composable (() -> Color),
+            override val title: TextReference,
+            override val subtitle: TextReference,
+            override val time: String,
+            val isIncome: Boolean,
+        ) : Content
+
+        data class Fee(
+            override val id: String,
+            override val onClick: () -> Unit,
+            override val amount: String,
+            override val amountColor: @Composable (() -> Color),
+            override val title: TextReference,
+            override val subtitle: TextReference,
+            override val time: String,
+        ) : Content
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTxHistoryUM.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTxHistoryUM.kt
new file mode 100644
index 0000000000..4bc4f8207b
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayTxHistoryUM.kt
@@ -0,0 +1,45 @@
+package com.tangem.features.tangempay.entity
+
+import com.tangem.core.ui.components.transactions.state.TxHistoryState
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+
+internal sealed interface TangemPayTxHistoryUM {
+
+    val isBalanceHidden: Boolean
+
+    data class Loading(override val isBalanceHidden: Boolean) : TangemPayTxHistoryUM {
+        val items = persistentListOf(
+            TangemPayTxHistoryItemUM.Title,
+            TangemPayTxHistoryItemUM.Transaction(TangemPayTransactionState.Loading("LOADING_TX_HASH_1")),
+            TangemPayTxHistoryItemUM.Transaction(TangemPayTransactionState.Loading("LOADING_TX_HASH_2")),
+            TangemPayTxHistoryItemUM.Transaction(TangemPayTransactionState.Loading("LOADING_TX_HASH_3")),
+        )
+    }
+
+    data class Empty(override val isBalanceHidden: Boolean) : TangemPayTxHistoryUM
+    data class Error(override val isBalanceHidden: Boolean, val onReload: () -> Unit) : TangemPayTxHistoryUM
+
+    data class Content(
+        override val isBalanceHidden: Boolean,
+        val items: ImmutableList<TangemPayTxHistoryItemUM>,
+        val loadMore: () -> Boolean,
+    ) : TangemPayTxHistoryUM
+
+    fun copySealed(isBalanceHidden: Boolean): TangemPayTxHistoryUM {
+        return when (this) {
+            is Content -> copy(isBalanceHidden = isBalanceHidden)
+            is Empty -> copy(isBalanceHidden = isBalanceHidden)
+            is Error -> copy(isBalanceHidden = isBalanceHidden)
+            is Loading -> copy(isBalanceHidden = isBalanceHidden)
+        }
+    }
+
+    sealed interface TangemPayTxHistoryItemUM {
+        data object Title : TangemPayTxHistoryItemUM
+        data class GroupTitle(val title: String, val itemKey: String) : TangemPayTxHistoryItemUM {
+            val legacyGroupTitle = TxHistoryState.TxHistoryItemState.GroupTitle(title = title, itemKey = itemKey)
+        }
+        data class Transaction(val transaction: TangemPayTransactionState) : TangemPayTxHistoryItemUM
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayDetailsModel.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayDetailsModel.kt
index a39519d4a9..0760c76fda 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayDetailsModel.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayDetailsModel.kt
@@ -3,20 +3,28 @@ package com.tangem.features.tangempay.model
 import androidx.compose.runtime.Stable
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
+import com.tangem.core.decompose.ui.UiMessageSender
+import com.tangem.core.ui.clipboard.ClipboardManager
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig.ShowRefreshState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.message.SnackbarMessage
+import com.tangem.domain.pay.repository.CardDetailsRepository
+import com.tangem.features.tangempay.components.TangemPayDetailsComponent
+import com.tangem.features.tangempay.details.impl.R
 import com.tangem.features.tangempay.entity.TangemPayCardDetailsUM
 import com.tangem.features.tangempay.entity.TangemPayDetailsBalanceBlockState
 import com.tangem.features.tangempay.entity.TangemPayDetailsTopBarConfig
 import com.tangem.features.tangempay.entity.TangemPayDetailsUM
-import com.tangem.features.tangempay.model.transformers.TangemPayDetailsRefreshTransformer
+import com.tangem.features.tangempay.model.transformers.*
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
 import com.tangem.utils.transformer.update
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
@@ -25,37 +33,100 @@ import javax.inject.Inject
 @Stable
 @ModelScoped
 internal class TangemPayDetailsModel @Inject constructor(
+    paramsContainer: ParamsContainer,
     override val dispatchers: CoroutineDispatcherProvider,
     private val router: Router,
+    private val cardDetailsRepository: CardDetailsRepository,
+    private val clipboardManager: ClipboardManager,
+    private val uiMessageSender: UiMessageSender,
 ) : Model() {
 
+    private val params: TangemPayDetailsComponent.Params = paramsContainer.require()
+
     val uiState: StateFlow<TangemPayDetailsUM>
-    field = MutableStateFlow(getInitialState())
+        field = MutableStateFlow(getInitialState())
 
     private val refreshStateJobHolder = JobHolder()
+    private val fetchBalanceJobHolder = JobHolder()
+    private val revealCardDetailsJobHolder = JobHolder()
+
+    init {
+        fetchBalance()
+    }
+
+    private fun fetchBalance(): Job {
+        return modelScope.launch {
+            val result = cardDetailsRepository.getCardBalance()
+            uiState.update(DetailsBalanceTransformer(result))
+        }.saveIn(fetchBalanceJobHolder)
+    }
 
-    @Suppress("MagicNumber", "UnusedPrivateMember")
     private fun onRefreshSwipe(refreshState: ShowRefreshState) {
-        uiState.update(TangemPayDetailsRefreshTransformer(isRefreshing = true))
         modelScope.launch {
-            // simulate update logic
-            delay(2000)
+            uiState.update(TangemPayDetailsRefreshTransformer(isRefreshing = refreshState.value))
+            fetchBalance().join()
             uiState.update(TangemPayDetailsRefreshTransformer(isRefreshing = false))
         }.saveIn(refreshStateJobHolder)
     }
 
-    private fun getInitialState(): TangemPayDetailsUM {
-        return TangemPayDetailsUM(
-            topBarConfig = TangemPayDetailsTopBarConfig(onBackClick = router::pop, items = null),
-            pullToRefreshConfig = PullToRefreshConfig(isRefreshing = false, onRefresh = ::onRefreshSwipe),
-            balanceBlockState = TangemPayDetailsBalanceBlockState.Loading(actionButtons = persistentListOf()),
-            cardDetailsUM = TangemPayCardDetailsUM(
-                number = "•••• •••• •••• 1245",
-                expiry = "••/••",
-                cvv = "•••",
-                onReveal = {},
-            ),
-            isBalanceHidden = false,
+    private fun getInitialState() = TangemPayDetailsUM(
+        topBarConfig = TangemPayDetailsTopBarConfig(onBackClick = router::pop, items = null),
+        pullToRefreshConfig = PullToRefreshConfig(isRefreshing = false, onRefresh = ::onRefreshSwipe),
+        balanceBlockState = TangemPayDetailsBalanceBlockState.Loading(actionButtons = persistentListOf()),
+        cardDetailsUM = TangemPayCardDetailsUM(),
+        isBalanceHidden = false,
+    ).let {
+        DetailsHiddenStateTransformer(
+            onClickReveal = ::revealCardDetails,
+            cardNumberEnd = params.cardNumberEnd,
+        ).transform(it)
+    }
+
+    private fun revealCardDetails() {
+        modelScope.launch {
+            uiState.update(
+                transformer = DetailsRevealProgressStateTransformer(onClickHide = ::hideCardDetails),
+            )
+            cardDetailsRepository.revealCardDetails()
+                .onRight {
+                    uiState.update(
+                        transformer = DetailsRevealedStateTransformer(
+                            details = it,
+                            onClickHide = ::hideCardDetails,
+                            onClickCopy = ::copyData,
+                        ),
+                    )
+                }
+                .onLeft {
+                    uiState.update(
+                        transformer = DetailsHiddenStateTransformer(
+                            onClickReveal = ::revealCardDetails,
+                            cardNumberEnd = params.cardNumberEnd,
+                        ),
+                    )
+                    showError()
+                }
+        }.saveIn(revealCardDetailsJobHolder)
+    }
+
+    private fun hideCardDetails() {
+        modelScope.launch {
+            revealCardDetailsJobHolder.cancel()
+            uiState.update(
+                transformer = DetailsHiddenStateTransformer(
+                    onClickReveal = ::revealCardDetails,
+                    cardNumberEnd = params.cardNumberEnd,
+                ),
+            )
+        }
+    }
+
+    private fun copyData(text: String) {
+        clipboardManager.setText(text = text.filterNot { it.isWhitespace() }, isSensitive = true)
+    }
+    private fun showError() {
+        uiMessageSender.send(
+            SnackbarMessage(TextReference.Res(R.string.tangempay_card_details_error_text)),
         )
     }
 }
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayTxHistoryModel.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayTxHistoryModel.kt
index e8532b5dbe..1b3778feb0 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayTxHistoryModel.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayTxHistoryModel.kt
@@ -5,16 +5,16 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
+import com.tangem.domain.tangempay.repository.TangemPayTxHistoryRepository
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
 import com.tangem.features.tangempay.components.txHistory.DefaultTangemPayTxHistoryComponent
-import com.tangem.features.tangempay.components.txHistory.PreviewTangemPayTxHistoryComponent
-import com.tangem.features.txhistory.entity.TxHistoryUM
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+import com.tangem.features.tangempay.utils.TangemPayTxHistoryListManager
+import com.tangem.features.tangempay.utils.TangemPayTxHistoryUiActions
+import com.tangem.pagination.PaginationStatus
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.update
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -24,39 +24,95 @@ import javax.inject.Inject
 internal class TangemPayTxHistoryModel @Inject constructor(
     private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
     override val dispatchers: CoroutineDispatcherProvider,
+    tangemPayTxHistoryRepository: TangemPayTxHistoryRepository,
     paramsContainer: ParamsContainer,
-) : Model() {
+) : Model(), TangemPayTxHistoryUiActions {
 
     private val params: DefaultTangemPayTxHistoryComponent.Params = paramsContainer.require()
+    private val listManager = TangemPayTxHistoryListManager(
+        repository = tangemPayTxHistoryRepository,
+        dispatchers = dispatchers,
+        customerWalletAddress = params.customerWalletAddress,
+        txHistoryUiActions = this,
+    )
 
-    val uiState: StateFlow<TxHistoryUM>
-    field = MutableStateFlow(getInitialState())
+    val uiState: StateFlow<TangemPayTxHistoryUM>
+        field = MutableStateFlow<TangemPayTxHistoryUM>(getLoadingState(isBalanceHidden = true))
 
     init {
         handleBalanceHiding()
+        launchPagination()
         subscribeToUiItemChanges()
     }
 
-    @Suppress("MagicNumber")
+    private fun launchPagination() {
+        modelScope.launch { listManager.launchPagination() }
+    }
+
     private fun subscribeToUiItemChanges() {
-        modelScope.launch {
-            Timber.d("subscribeToUiItemChanges: ${params.userWalletId}")
-            delay(2000)
-            uiState.update { PreviewTangemPayTxHistoryComponent.contentUM }
+        listManager.uiItems
+            .onEach(::updateState)
+            .launchIn(modelScope)
+        listManager.paginationStatus
+            .onEach { paginationStatus -> handlePaginationStatus(paginationStatus) }
+            .launchIn(modelScope)
+    }
+
+    private fun updateState(items: ImmutableList<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>) {
+        uiState.update { state ->
+            if (state is TangemPayTxHistoryUM.Content) {
+                state.copy(items = items)
+            } else {
+                TangemPayTxHistoryUM.Content(
+                    items = items,
+                    isBalanceHidden = state.isBalanceHidden,
+                    loadMore = ::loadMoreItems,
+                )
+            }
         }
     }
 
+    private fun handlePaginationStatus(status: PaginationStatus<*>) {
+        uiState.update { state ->
+            when (status) {
+                is PaginationStatus.InitialLoadingError -> getErrorState(state.isBalanceHidden)
+                PaginationStatus.EndOfPagination,
+                PaginationStatus.InitialLoading,
+                PaginationStatus.NextBatchLoading,
+                PaginationStatus.None,
+                is PaginationStatus.Paginating<*>,
+                -> state
+            }
+        }
+    }
+
+    private fun loadMoreItems(): Boolean {
+        modelScope.launch { listManager.loadMore(params.customerWalletAddress) }
+        return true
+    }
+
+    fun reload() {
+        uiState.update { state ->
+            state as? TangemPayTxHistoryUM.Content ?: getLoadingState(state.isBalanceHidden)
+        }
+        modelScope.launch { listManager.reload() }
+    }
+
     private fun handleBalanceHiding() {
         getBalanceHidingSettingsUseCase()
             .onEach { uiState.update { state -> state.copySealed(isBalanceHidden = it.isBalanceHidden) } }
             .launchIn(modelScope)
     }
 
-    private fun onExploreClick() {
-        Timber.d("onExploreClick: open explorer")
+    override fun onTransactionClick(item: TangemPayTxHistoryItem) {
+        Timber.d("onTransactionClick: $item")
     }
 
-    private fun getInitialState(): TxHistoryUM {
-        return TxHistoryUM.Loading(isBalanceHidden = true, onExploreClick = ::onExploreClick)
+    private fun getErrorState(isBalanceHidden: Boolean): TangemPayTxHistoryUM.Error {
+        return TangemPayTxHistoryUM.Error(isBalanceHidden = isBalanceHidden, onReload = ::reload)
+    }
+
+    private fun getLoadingState(isBalanceHidden: Boolean): TangemPayTxHistoryUM.Loading {
+        return TangemPayTxHistoryUM.Loading(isBalanceHidden = isBalanceHidden)
     }
 }
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsBalanceTransformer.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsBalanceTransformer.kt
new file mode 100644
index 0000000000..14627ed23d
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsBalanceTransformer.kt
@@ -0,0 +1,42 @@
+package com.tangem.features.tangempay.model.transformers
+
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.pay.model.TangemPayCardBalance
+import com.tangem.features.tangempay.entity.TangemPayDetailsBalanceBlockState
+import com.tangem.features.tangempay.entity.TangemPayDetailsUM
+import com.tangem.utils.transformer.Transformer
+import kotlinx.collections.immutable.persistentListOf
+import java.util.Currency
+
+internal class DetailsBalanceTransformer(
+    private val balance: Either<UniversalError, TangemPayCardBalance>,
+) : Transformer<TangemPayDetailsUM> {
+
+    override fun transform(prevState: TangemPayDetailsUM): TangemPayDetailsUM {
+        val balance = when (balance) {
+            is Either.Left<UniversalError> -> {
+                TangemPayDetailsBalanceBlockState.Error(persistentListOf())
+            }
+            is Either.Right<TangemPayCardBalance> -> {
+                TangemPayDetailsBalanceBlockState.Content(
+                    isBalanceFlickering = false,
+                    fiatBalance = getBalanceText(balance.value),
+                    // TODO [REDACTED_TASK_KEY]: Add crypto balance when the BFF is ready
+                    cryptoBalance = "",
+                    actionButtons = persistentListOf(),
+                )
+            }
+        }
+        return prevState.copy(balanceBlockState = balance)
+    }
+
+    private fun getBalanceText(balance: TangemPayCardBalance): String {
+        val currency = Currency.getInstance(balance.currencyCode)
+        return balance.balance.format {
+            fiat(fiatCurrencyCode = currency.currencyCode, fiatCurrencySymbol = currency.symbol)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsHiddenStateTransformer.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsHiddenStateTransformer.kt
new file mode 100644
index 0000000000..35025ce2a3
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsHiddenStateTransformer.kt
@@ -0,0 +1,38 @@
+package com.tangem.features.tangempay.model.transformers
+
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.features.tangempay.details.impl.R
+import com.tangem.features.tangempay.entity.TangemPayCardDetailsUM
+import com.tangem.features.tangempay.entity.TangemPayDetailsUM
+import com.tangem.features.tangempay.utils.CardDetailsFormatUtil
+import com.tangem.utils.StringsSigns
+import com.tangem.utils.transformer.Transformer
+
+private const val CARD_NUMBER_SART_DIGITS_COUNT = 12
+private const val DATE_PART_LENGTH = 2
+private const val CVV_LENGTH = 3
+
+internal class DetailsHiddenStateTransformer(
+    private val onClickReveal: () -> Unit,
+    private val cardNumberEnd: String,
+) : Transformer<TangemPayDetailsUM> {
+
+    private val cardStartMasked = maskedBlock(CARD_NUMBER_SART_DIGITS_COUNT)
+    private val dateMasked = maskedBlock(DATE_PART_LENGTH)
+    private val cvvMasked = maskedBlock(CVV_LENGTH)
+
+    override fun transform(prevState: TangemPayDetailsUM): TangemPayDetailsUM {
+        val cardDetailsUM = TangemPayCardDetailsUM(
+            number = CardDetailsFormatUtil.formatCardNumber(cardNumber = "$cardStartMasked$cardNumberEnd"),
+            expiry = CardDetailsFormatUtil.formatDate(month = dateMasked, year = dateMasked),
+            cvv = cvvMasked,
+            buttonText = TextReference.Res(R.string.tangempay_card_details_reveal_text),
+            onClick = onClickReveal,
+            onCopy = {},
+            isHidden = true,
+        )
+        return prevState.copy(cardDetailsUM = cardDetailsUM)
+    }
+
+    private fun maskedBlock(count: Int) = StringsSigns.DOT.repeat(count)
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealProgressStateTransformer.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealProgressStateTransformer.kt
new file mode 100644
index 0000000000..b4c1968160
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealProgressStateTransformer.kt
@@ -0,0 +1,22 @@
+package com.tangem.features.tangempay.model.transformers
+
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.features.tangempay.details.impl.R
+import com.tangem.features.tangempay.entity.TangemPayDetailsUM
+import com.tangem.utils.transformer.Transformer
+
+internal class DetailsRevealProgressStateTransformer(
+    private val onClickHide: (() -> Unit),
+) : Transformer<TangemPayDetailsUM> {
+
+    override fun transform(prevState: TangemPayDetailsUM): TangemPayDetailsUM {
+        return prevState.copy(
+            cardDetailsUM = prevState.cardDetailsUM.copy(
+                buttonText = TextReference.Res(R.string.tangempay_card_details_hide_text),
+                onClick = onClickHide,
+                isLoading = true,
+                isHidden = true,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealedStateTransformer.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealedStateTransformer.kt
new file mode 100644
index 0000000000..45ba18f069
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/DetailsRevealedStateTransformer.kt
@@ -0,0 +1,29 @@
+package com.tangem.features.tangempay.model.transformers
+
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.domain.pay.model.TangemPayCardDetails
+import com.tangem.features.tangempay.details.impl.R
+import com.tangem.features.tangempay.entity.TangemPayCardDetailsUM
+import com.tangem.features.tangempay.entity.TangemPayDetailsUM
+import com.tangem.features.tangempay.utils.CardDetailsFormatUtil
+import com.tangem.utils.transformer.Transformer
+
+internal class DetailsRevealedStateTransformer(
+    private val details: TangemPayCardDetails,
+    private val onClickHide: (() -> Unit),
+    private val onClickCopy: ((String) -> Unit),
+) : Transformer<TangemPayDetailsUM> {
+
+    override fun transform(prevState: TangemPayDetailsUM): TangemPayDetailsUM {
+        val cardDetailsUM = TangemPayCardDetailsUM(
+            number = CardDetailsFormatUtil.formatCardNumber(cardNumber = details.pan),
+            expiry = CardDetailsFormatUtil.formatDate(month = details.expirationMonth, year = details.expirationYear),
+            cvv = details.cvv,
+            onClick = onClickHide,
+            buttonText = TextReference.Res(R.string.tangempay_card_details_hide_text),
+            onCopy = onClickCopy,
+            isHidden = false,
+        )
+        return prevState.copy(cardDetailsUM = cardDetailsUM)
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt
new file mode 100644
index 0000000000..9184fac026
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt
@@ -0,0 +1,80 @@
+package com.tangem.features.tangempay.model.transformers
+
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.utils.DateTimeFormatters
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.features.tangempay.entity.TangemPayTransactionState
+import com.tangem.features.tangempay.utils.TangemPayTxHistoryUiActions
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.extensions.isPositive
+import org.joda.time.DateTimeZone
+
+internal class TangemPayTxHistoryItemsConverter(
+    private val txHistoryUiActions: TangemPayTxHistoryUiActions,
+) : Converter<TangemPayTxHistoryItem, TangemPayTransactionState.Content> {
+    override fun convert(value: TangemPayTxHistoryItem): TangemPayTransactionState.Content {
+        return when (value) {
+            is TangemPayTxHistoryItem.Spend -> convertSpend(spend = value)
+            is TangemPayTxHistoryItem.Payment -> convertPayment(payment = value)
+            is TangemPayTxHistoryItem.Fee -> convertFee(fee = value)
+        }
+    }
+
+    private fun convertSpend(spend: TangemPayTxHistoryItem.Spend): TangemPayTransactionState.Content.Spend {
+        val localDate = spend.date.withZone(DateTimeZone.getDefault())
+        val amount = spend.amount.format {
+            fiat(fiatCurrencyCode = spend.currency.currencyCode, fiatCurrencySymbol = spend.currency.symbol)
+        }
+        return TangemPayTransactionState.Content.Spend(
+            id = spend.id,
+            onClick = { txHistoryUiActions.onTransactionClick(spend) },
+            amount = amount,
+            amountColor = { TangemTheme.colors.text.primary1 },
+            title = stringReference(spend.enrichedMerchantName ?: spend.merchantName),
+            subtitle = stringReference(spend.enrichedMerchantCategory ?: spend.merchantCategory),
+            time = DateTimeFormatters.formatDate(localDate, DateTimeFormatters.timeFormatter),
+            iconUrl = spend.enrichedMerchantIconUrl,
+        )
+    }
+
+    private fun convertPayment(payment: TangemPayTxHistoryItem.Payment): TangemPayTransactionState.Content.Payment {
+        val amount = payment.amount.format {
+            fiat(fiatCurrencyCode = payment.currency.currencyCode, fiatCurrencySymbol = payment.currency.symbol)
+        }
+        val title = if (payment.amount.isPositive()) "Deposit" else "Withdrawal"
+        return TangemPayTransactionState.Content.Payment(
+            id = payment.id,
+            onClick = { txHistoryUiActions.onTransactionClick(payment) },
+            amount = amount,
+            amountColor = {
+                if (payment.amount.isPositive()) {
+                    TangemTheme.colors.text.accent
+                } else {
+                    TangemTheme.colors.text.primary1
+                }
+            },
+            title = stringReference(title),
+            subtitle = stringReference("Transfers"),
+            time = DateTimeFormatters.formatDate(payment.date, DateTimeFormatters.timeFormatter),
+            isIncome = payment.amount.isPositive(),
+        )
+    }
+
+    private fun convertFee(fee: TangemPayTxHistoryItem.Fee): TangemPayTransactionState.Content.Fee {
+        val amount = fee.amount.format {
+            fiat(fiatCurrencyCode = fee.currency.currencyCode, fiatCurrencySymbol = fee.currency.symbol)
+        }
+        return TangemPayTransactionState.Content.Fee(
+            id = fee.id,
+            onClick = { txHistoryUiActions.onTransactionClick(fee) },
+            amount = amount,
+            amountColor = { TangemTheme.colors.text.primary1 },
+            title = stringReference("Fee"),
+            subtitle = stringReference("Service fees"),
+            time = DateTimeFormatters.formatDate(fee.date, DateTimeFormatters.timeFormatter),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDetailsScreen.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDetailsScreen.kt
index f68617ebd5..c2e6cc25f7 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDetailsScreen.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDetailsScreen.kt
@@ -2,6 +2,12 @@ package com.tangem.features.tangempay.ui
 
 import android.content.res.Configuration
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -12,10 +18,13 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
@@ -33,9 +42,13 @@ import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfi
 import com.tangem.core.ui.components.containers.pullToRefresh.TangemPullToRefreshContainer
 import com.tangem.core.ui.components.dropdownmenu.TangemDropdownItem
 import com.tangem.core.ui.components.dropdownmenu.TangemDropdownMenu
+import com.tangem.core.ui.components.snackbar.TangemSnackbarHost
 import com.tangem.core.ui.components.text.applyBladeBrush
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.orMaskWithStars
+import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.core.ui.test.TokenDetailsTopBarTestTags
@@ -49,17 +62,26 @@ import com.tangem.features.tangempay.entity.TangemPayDetailsUM
 import com.tangem.utils.StringsSigns.DASH_SIGN
 import kotlinx.collections.immutable.persistentListOf
 
+private const val REVEAL_ANIMATION_MILLIS = 500
+
 @Composable
 internal fun TangemPayDetailsScreen(
     state: TangemPayDetailsUM,
     txHistoryComponent: TangemPayTxHistoryComponent,
     modifier: Modifier = Modifier,
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
 ) {
     Scaffold(
         modifier = modifier,
         topBar = { TangemPayDetailsTopAppBar(config = state.topBarConfig) },
         contentWindowInsets = ScaffoldDefaults.contentWindowInsets.exclude(WindowInsets.navigationBars),
         containerColor = TangemTheme.colors.background.secondary,
+        snackbarHost = {
+            TangemSnackbarHost(
+                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
+                hostState = snackbarHostState,
+            )
+        },
     ) { scaffoldPaddings ->
         val listState = rememberLazyListState()
         val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
@@ -124,7 +146,7 @@ internal fun TangemPayDetailsBalanceBlock(
     ) {
         Text(
             modifier = Modifier.padding(start = 12.dp),
-            text = "Tangem Pay",
+            text = stringResourceSafe(R.string.tangempay_title),
             color = TangemTheme.colors.text.tertiary,
             style = TangemTheme.typography.subtitle2,
         )
@@ -133,11 +155,12 @@ internal fun TangemPayDetailsBalanceBlock(
             state = state,
             isBalanceHidden = isBalanceHidden,
         )
-        CryptoBalance(
-            modifier = Modifier.padding(start = 12.dp, top = 4.dp),
-            state = state,
-            isBalanceHidden = isBalanceHidden,
-        )
+        // TODO [REDACTED_TASK_KEY]: Uncomment after adding crypto balance when the BFF is ready
+        // CryptoBalance(
+        //     modifier = Modifier.padding(start = 12.dp, top = 4.dp),
+        //     state = state,
+        //     isBalanceHidden = isBalanceHidden,
+        // )
         if (state.actionButtons.isNotEmpty()) {
             HorizontalActionChips(
                 modifier = Modifier.padding(top = 12.dp),
@@ -179,6 +202,7 @@ private fun FiatBalance(
     }
 }
 
+@Suppress("UnusedPrivateMember")
 @Composable
 private fun CryptoBalance(
     state: TangemPayDetailsBalanceBlockState,
@@ -213,52 +237,97 @@ private fun CryptoBalance(
 // region Card details block
 @Composable
 private fun TangemPayCardDetailsBlock(state: TangemPayCardDetailsUM, modifier: Modifier = Modifier) {
+    val alpha = if (state.isLoading) {
+        val infiniteTransition = rememberInfiniteTransition()
+        val animation by infiniteTransition.animateFloat(
+            initialValue = 1f,
+            targetValue = 0.3f,
+            animationSpec = infiniteRepeatable(
+                animation = tween(REVEAL_ANIMATION_MILLIS, easing = LinearEasing),
+                repeatMode = RepeatMode.Reverse,
+            ),
+        )
+        animation
+    } else {
+        1f
+    }
     Column(
         modifier = modifier
             .background(
                 color = TangemTheme.colors.background.primary,
                 shape = TangemTheme.shapes.roundedCornersMedium,
-            )
-            .padding(all = 12.dp),
+            ),
     ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(bottom = 8.dp),
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            Text(
-                text = "Card details",
-                color = TangemTheme.colors.text.tertiary,
-                style = TangemTheme.typography.subtitle2,
-            )
-            Text(
-                modifier = Modifier.clickable(onClick = state.onReveal),
-                text = "Reveal",
-                color = TangemTheme.colors.text.accent,
-                style = TangemTheme.typography.body2,
-            )
-        }
+        CardDetailsBlockHeader(state)
         CardDetailsTextContainer(
             modifier = Modifier
+                .graphicsLayer { this.alpha = alpha }
                 .fillMaxWidth()
-                .padding(top = 4.dp),
+                .padding(start = 12.dp, end = 12.dp, top = 4.dp),
             text = state.number,
+            onCopy = { state.onCopy(state.number) },
+            isHidden = state.isHidden,
         )
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(top = 8.dp),
+                .padding(start = 12.dp, end = 12.dp, bottom = 12.dp, top = 8.dp),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
         ) {
-            CardDetailsTextContainer(modifier = Modifier.weight(1f), text = state.expiry)
-            CardDetailsTextContainer(modifier = Modifier.weight(1f), text = state.cvv)
+            CardDetailsTextContainer(
+                modifier = Modifier
+                    .graphicsLayer { this.alpha = alpha }
+                    .weight(1f),
+                text = state.expiry,
+                onCopy = { state.onCopy(state.expiry) },
+                isHidden = state.isHidden,
+            )
+            CardDetailsTextContainer(
+                modifier = Modifier
+                    .graphicsLayer { this.alpha = alpha }
+                    .weight(1f),
+                text = state.cvv,
+                onCopy = { state.onCopy(state.cvv) },
+                isHidden = state.isHidden,
+            )
         }
     }
 }
 
 @Composable
-private fun CardDetailsTextContainer(text: String, modifier: Modifier = Modifier) {
+private fun CardDetailsBlockHeader(state: TangemPayCardDetailsUM, modifier: Modifier = Modifier) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Text(
+            modifier = Modifier
+                .padding(start = 12.dp, top = 12.dp),
+            text = stringResourceSafe(R.string.tangempay_card_details_title),
+            color = TangemTheme.colors.text.tertiary,
+            style = TangemTheme.typography.subtitle2,
+        )
+        Text(
+            modifier = Modifier
+                .padding(top = 8.dp, end = 4.dp)
+                .clip(TangemTheme.shapes.roundedCornersMedium)
+                .clickable(onClick = state.onClick)
+                .padding(horizontal = 8.dp, vertical = 4.dp),
+            text = state.buttonText.resolveReference(),
+            color = TangemTheme.colors.text.accent,
+            style = TangemTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun CardDetailsTextContainer(
+    text: String,
+    isHidden: Boolean,
+    onCopy: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     Row(
         modifier = modifier
             .heightIn(min = 48.dp)
@@ -269,9 +338,27 @@ private fun CardDetailsTextContainer(text: String, modifier: Modifier = Modifier
             modifier = Modifier.padding(vertical = 4.dp, horizontal = 12.dp),
             text = text,
             maxLines = 1,
-            color = TangemTheme.colors.text.disabled,
+            color = if (isHidden) TangemTheme.colors.text.disabled else TangemTheme.colors.text.primary1,
             style = TangemTheme.typography.body2,
         )
+
+        if (!isHidden) {
+            Spacer(modifier = Modifier.weight(1f))
+
+            IconButton(
+                modifier = Modifier
+                    .padding(end = TangemTheme.dimens.spacing8)
+                    .size(TangemTheme.dimens.size32),
+                onClick = onCopy,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = R.drawable.ic_copy_new_24),
+                    tint = TangemTheme.colors.icon.informative,
+                    contentDescription = null,
+                )
+            }
+        }
     }
 }
 
@@ -365,7 +452,9 @@ private class TangemPayDetailsUMProvider : CollectionPreviewParameterProvider<Ta
                 number = "•••• •••• •••• 1245",
                 expiry = "••/••",
                 cvv = "•••",
-                onReveal = {},
+                onCopy = {},
+                onClick = {},
+                buttonText = TextReference.Res(R.string.tangempay_card_details_reveal_text),
             ),
             isBalanceHidden = false,
         ),
@@ -377,7 +466,9 @@ private class TangemPayDetailsUMProvider : CollectionPreviewParameterProvider<Ta
                 number = "•••• •••• •••• 1245",
                 expiry = "••/••",
                 cvv = "•••",
-                onReveal = {},
+                onCopy = {},
+                onClick = {},
+                buttonText = TextReference.Res(R.string.tangempay_card_details_hide_text),
             ),
             isBalanceHidden = false,
         ),
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt
new file mode 100644
index 0000000000..b7c07cbc03
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt
@@ -0,0 +1,373 @@
+package com.tangem.features.tangempay.ui
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.constraintlayout.compose.ChainStyle
+import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.constraintlayout.compose.Dimension
+import coil.compose.rememberAsyncImagePainter
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.CircleShimmer
+import com.tangem.core.ui.components.RectangleShimmer
+import com.tangem.core.ui.components.list.InfiniteListHandler
+import com.tangem.core.ui.components.transactions.TxHistoryGroupTitle
+import com.tangem.core.ui.decorations.roundedShapeItemDecoration
+import com.tangem.core.ui.extensions.orMaskWithStars
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.test.TransactionHistoryBlockTestTags
+import com.tangem.features.tangempay.entity.TangemPayTransactionState
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+
+private const val LOAD_ITEMS_BUFFER = 20
+
+internal fun LazyListScope.tangemPayTxHistoryItems(listState: LazyListState, state: TangemPayTxHistoryUM) {
+    when (state) {
+        is TangemPayTxHistoryUM.Content -> contentItems(listState = listState, state = state)
+        is TangemPayTxHistoryUM.Empty -> TODO("[REDACTED_JIRA]")
+        is TangemPayTxHistoryUM.Error -> TODO("[REDACTED_JIRA]")
+        is TangemPayTxHistoryUM.Loading -> loadingItems(state = state)
+    }
+}
+
+private fun LazyListScope.contentItems(listState: LazyListState, state: TangemPayTxHistoryUM.Content) {
+    itemsIndexed(
+        items = state.items,
+        key = { index, item ->
+            when (item) {
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle -> item.itemKey
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Title -> index + item.hashCode()
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction ->
+                    item.transaction.id + (item.transaction as? TangemPayTransactionState.Content)?.hashCode()
+            }
+        },
+        contentType = { _, item -> item::class.java },
+        itemContent = { index, item ->
+            TangemPayTxHistoryListItem(
+                state = item,
+                isBalanceHidden = state.isBalanceHidden,
+                modifier = Modifier.roundedShapeItemDecoration(
+                    currentIndex = index,
+                    lastIndex = state.items.lastIndex,
+                ),
+            )
+        },
+    )
+    item {
+        InfiniteListHandler(
+            listState = listState,
+            buffer = LOAD_ITEMS_BUFFER,
+            onLoadMore = state.loadMore,
+        )
+    }
+}
+
+private fun LazyListScope.loadingItems(state: TangemPayTxHistoryUM.Loading) {
+    itemsIndexed(
+        items = state.items,
+        key = { _, item ->
+            when (item) {
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle -> item.itemKey
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Title -> item.hashCode()
+                is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction ->
+                    item.transaction.id + (item.transaction as? TangemPayTransactionState.Content)?.hashCode()
+            }
+        },
+        contentType = { _, item -> item::class.java },
+        itemContent = { index, item ->
+            TangemPayTxHistoryListItem(
+                state = item,
+                isBalanceHidden = true,
+                modifier = Modifier.roundedShapeItemDecoration(
+                    currentIndex = index,
+                    lastIndex = state.items.lastIndex,
+                ),
+            )
+        },
+    )
+}
+
+@Composable
+private fun TangemPayTxHistoryListItem(
+    state: TangemPayTxHistoryUM.TangemPayTxHistoryItemUM,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    when (state) {
+        is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle -> {
+            TxHistoryGroupTitle(config = state.legacyGroupTitle, modifier = modifier)
+        }
+        is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Title -> {
+            TangemPayTxHistoryTitle(modifier = modifier)
+        }
+        is TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction -> {
+            TangemPayTransaction(
+                transactionState = state.transaction,
+                isBalanceHidden = isBalanceHidden,
+                modifier = modifier,
+            )
+        }
+    }
+}
+
+@Composable
+private fun TangemPayTxHistoryTitle(modifier: Modifier = Modifier) {
+    Text(
+        text = stringResourceSafe(id = R.string.common_transactions),
+        color = TangemTheme.colors.text.tertiary,
+        style = TangemTheme.typography.subtitle2,
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary)
+            .padding(top = TangemTheme.dimens.spacing12)
+            .padding(horizontal = TangemTheme.dimens.spacing12)
+            .fillMaxWidth()
+            .heightIn(min = TangemTheme.dimens.size24)
+            .testTag(TransactionHistoryBlockTestTags.TITLE_TEXT),
+    )
+}
+
+@Suppress("LongMethod")
+@Composable
+private fun TangemPayTransaction(
+    transactionState: TangemPayTransactionState,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Surface(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary)
+            .clickable(
+                enabled = transactionState is TangemPayTransactionState.Content,
+                onClick = (transactionState as? TangemPayTransactionState.Content)?.onClick ?: {},
+            )
+            .fillMaxWidth()
+            .heightIn(min = TangemTheme.dimens.size56)
+            .padding(
+                vertical = TangemTheme.dimens.spacing8,
+                horizontal = TangemTheme.dimens.spacing12,
+            ),
+        color = TangemTheme.colors.background.primary,
+    ) {
+        @Suppress("DestructuringDeclarationWithTooManyEntries")
+        ConstraintLayout(modifier = Modifier.fillMaxWidth()) {
+            val (iconItem, titleItem, subtitleItem, amountItem, timestampItem) = createRefs()
+
+            createVerticalChain(titleItem, subtitleItem, chainStyle = ChainStyle.Spread)
+            createVerticalChain(amountItem, timestampItem, chainStyle = ChainStyle.Spread)
+
+            Icon(
+                state = transactionState,
+                modifier = Modifier
+                    .size(TangemTheme.dimens.size40)
+                    .constrainAs(iconItem) {
+                        start.linkTo(parent.start)
+                        centerVerticallyTo(parent)
+                    },
+            )
+
+            Title(
+                state = transactionState,
+                modifier = Modifier
+                    .padding(
+                        start = TangemTheme.dimens.spacing12,
+                        end = TangemTheme.dimens.spacing4,
+                    )
+                    .constrainAs(titleItem) {
+                        top.linkTo(parent.top)
+                        bottom.linkTo(subtitleItem.top)
+                        start.linkTo(iconItem.end)
+                        end.linkTo(amountItem.start)
+                        width = Dimension.fillToConstraints
+                    },
+            )
+
+            Subtitle(
+                state = transactionState,
+                modifier = Modifier
+                    .padding(
+                        start = TangemTheme.dimens.spacing12,
+                        end = TangemTheme.dimens.spacing4,
+                    )
+                    .constrainAs(subtitleItem) {
+                        top.linkTo(titleItem.bottom)
+                        bottom.linkTo(parent.bottom)
+                        start.linkTo(iconItem.end)
+                        end.linkTo(timestampItem.start)
+                        width = Dimension.fillToConstraints
+                    },
+            )
+
+            Amount(
+                state = transactionState,
+                isBalanceHidden = isBalanceHidden,
+                modifier = Modifier.constrainAs(amountItem) {
+                    top.linkTo(parent.top)
+                    bottom.linkTo(timestampItem.top)
+                    start.linkTo(titleItem.end)
+                    end.linkTo(parent.end)
+                    width = Dimension.fillToConstraints
+                },
+            )
+
+            Timestamp(
+                state = transactionState,
+                modifier = Modifier.constrainAs(timestampItem) {
+                    top.linkTo(amountItem.bottom)
+                    bottom.linkTo(parent.bottom)
+                    end.linkTo(parent.end)
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun Icon(state: TangemPayTransactionState, modifier: Modifier = Modifier) {
+    when (state) {
+        is TangemPayTransactionState.Content.Spend -> {
+            if (state.iconUrl != null) {
+                RemoteIcon(modifier = modifier, url = state.iconUrl)
+            } else {
+                LocalStaticIcon(modifier = modifier, id = R.drawable.ic_category_24)
+            }
+        }
+        is TangemPayTransactionState.Content.Fee -> LocalStaticIcon(modifier = modifier, id = R.drawable.ic_percent_24)
+        is TangemPayTransactionState.Content.Payment -> LocalStaticIcon(
+            modifier = modifier,
+            id = if (state.isIncome) R.drawable.ic_arrow_down_24 else R.drawable.ic_arrow_up_24,
+        )
+        is TangemPayTransactionState.Loading -> {
+            CircleShimmer(modifier = modifier.size(TangemTheme.dimens.size40))
+        }
+    }
+}
+
+@Composable
+private fun RemoteIcon(url: String, modifier: Modifier = Modifier) {
+    Icon(
+        modifier = modifier
+            .size(TangemTheme.dimens.size40)
+            .clip(CircleShape),
+        painter = rememberAsyncImagePainter(url),
+        contentDescription = null,
+        tint = Color.Unspecified,
+    )
+}
+
+@Composable
+private fun LocalStaticIcon(@DrawableRes id: Int, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .size(TangemTheme.dimens.size40)
+            .background(color = TangemTheme.colors.icon.secondary.copy(alpha = 0.1F), shape = CircleShape),
+    ) {
+        Icon(
+            painter = painterResource(id),
+            contentDescription = null,
+            modifier = Modifier
+                .size(TangemTheme.dimens.size20)
+                .align(Alignment.Center),
+            tint = TangemTheme.colors.icon.informative,
+        )
+    }
+}
+
+@Composable
+private fun Title(state: TangemPayTransactionState, modifier: Modifier = Modifier) {
+    when (state) {
+        is TangemPayTransactionState.Content -> {
+            Text(
+                modifier = modifier,
+                text = state.title.resolveReference(),
+                color = TangemTheme.colors.text.primary1,
+                style = TangemTheme.typography.subtitle2,
+                overflow = TextOverflow.Ellipsis,
+                maxLines = 1,
+            )
+        }
+        is TangemPayTransactionState.Loading -> {
+            RectangleShimmer(
+                modifier = modifier.size(width = TangemTheme.dimens.size70, height = TangemTheme.dimens.size12),
+            )
+        }
+    }
+}
+
+@Composable
+private fun Subtitle(state: TangemPayTransactionState, modifier: Modifier = Modifier) {
+    when (state) {
+        is TangemPayTransactionState.Content -> {
+            Text(
+                text = state.subtitle.resolveReference(),
+                modifier = modifier,
+                textAlign = TextAlign.Start,
+                color = TangemTheme.colors.text.tertiary,
+                style = TangemTheme.typography.caption2,
+            )
+        }
+        is TangemPayTransactionState.Loading -> {
+            RectangleShimmer(
+                modifier = modifier.size(width = TangemTheme.dimens.size52, height = TangemTheme.dimens.size12),
+            )
+        }
+    }
+}
+
+@Composable
+private fun Amount(state: TangemPayTransactionState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
+    when (state) {
+        is TangemPayTransactionState.Content -> {
+            Text(
+                text = state.amount.orMaskWithStars(isBalanceHidden),
+                modifier = modifier,
+                textAlign = TextAlign.End,
+                color = state.amountColor(),
+                style = TangemTheme.typography.body2,
+            )
+        }
+        is TangemPayTransactionState.Loading -> {
+            RectangleShimmer(
+                modifier = modifier.size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12),
+            )
+        }
+    }
+}
+
+@Composable
+private fun Timestamp(state: TangemPayTransactionState, modifier: Modifier = Modifier) {
+    when (state) {
+        is TangemPayTransactionState.Content -> {
+            Text(
+                text = state.time,
+                modifier = modifier,
+                textAlign = TextAlign.End,
+                color = TangemTheme.colors.text.tertiary,
+                style = TangemTheme.typography.caption2,
+            )
+        }
+        is TangemPayTransactionState.Loading -> {
+            RectangleShimmer(
+                modifier = modifier.size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/CardDetailsFormatUtil.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/CardDetailsFormatUtil.kt
new file mode 100644
index 0000000000..248ae838a0
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/CardDetailsFormatUtil.kt
@@ -0,0 +1,19 @@
+package com.tangem.features.tangempay.utils
+
+internal object CardDetailsFormatUtil {
+
+    private const val CARD_NUMBER_CHUNK_LENGTH = 4
+    private const val DATE_LENGTH = 2
+
+    fun formatCardNumber(cardNumber: String): String {
+        return cardNumber
+            .filterNot { it.isWhitespace() }
+            .chunked(CARD_NUMBER_CHUNK_LENGTH).joinToString(" ")
+    }
+
+    fun formatDate(month: String, year: String): String {
+        val monthFormatted = month.padStart(DATE_LENGTH, '0')
+        val yearFormatted = year.takeLast(DATE_LENGTH)
+        return "$monthFormatted/$yearFormatted"
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryListManager.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryListManager.kt
new file mode 100644
index 0000000000..3ccf9cf202
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryListManager.kt
@@ -0,0 +1,86 @@
+package com.tangem.features.tangempay.utils
+
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListBatchingContext
+import com.tangem.domain.tangempay.model.TangemPayTxHistoryListConfig
+import com.tangem.domain.tangempay.repository.TangemPayTxHistoryRepository
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+import com.tangem.pagination.BatchAction
+import com.tangem.pagination.BatchListState
+import com.tangem.pagination.PaginationStatus
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.JobHolder
+import com.tangem.utils.coroutines.saveIn
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.*
+
+private typealias TangemPayTxHistoryBatchAction = BatchAction<Int, TangemPayTxHistoryListConfig, Nothing>
+
+internal class TangemPayTxHistoryListManager(
+    private val repository: TangemPayTxHistoryRepository,
+    private val dispatchers: CoroutineDispatcherProvider,
+    private val customerWalletAddress: String,
+    private val txHistoryUiActions: TangemPayTxHistoryUiActions,
+) {
+    private val jobHolder = JobHolder()
+    private val actionsFlow: MutableSharedFlow<TangemPayTxHistoryBatchAction> = MutableSharedFlow(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
+    )
+    private val state: MutableStateFlow<TangemPayTxHistoryState> = MutableStateFlow(TangemPayTxHistoryState())
+    private val uiManager = TangemPayTxHistoryUiManager(state = state, txHistoryUiActions = txHistoryUiActions)
+
+    val uiItems: Flow<ImmutableList<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>> = uiManager.items
+    val paginationStatus: Flow<PaginationStatus<*>> = state.map { it.status }.distinctUntilChanged()
+
+    suspend fun launchPagination() = coroutineScope {
+        val batchFlow = repository.getTxHistoryBatchFlow(
+            context = TangemPayTxHistoryListBatchingContext(actionsFlow = actionsFlow, coroutineScope = this),
+            batchSize = 50,
+        )
+
+        batchFlow.state
+            .onEach { state -> updateState(state) }
+            .flowOn(dispatchers.default)
+            .launchIn(scope = this)
+            .saveIn(jobHolder)
+
+        // Initial load
+        reload()
+    }
+
+    suspend fun reload() {
+        actionsFlow.emit(
+            BatchAction.Reload(
+                requestParams = TangemPayTxHistoryListConfig(
+                    customerWalletAddress = customerWalletAddress,
+                    shouldRefresh = true,
+                ),
+            ),
+        )
+    }
+
+    suspend fun loadMore(customerWalletAddress: String) {
+        actionsFlow.emit(
+            BatchAction.LoadMore(
+                requestParams = TangemPayTxHistoryListConfig(customerWalletAddress, shouldRefresh = false),
+            ),
+        )
+    }
+
+    private fun updateState(batchListState: BatchListState<Int, List<TangemPayTxHistoryItem>>) {
+        state.update { state ->
+            val clearUiBatches =
+                state.status is PaginationStatus.InitialLoading && batchListState.status is PaginationStatus.Paginating
+            state.copy(
+                status = batchListState.status,
+                uiBatches = uiManager.createOrUpdateUiBatches(
+                    newCurrencyBatches = batchListState.data,
+                    clearUiBatches = clearUiBatches,
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryState.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryState.kt
new file mode 100644
index 0000000000..5717238dda
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryState.kt
@@ -0,0 +1,10 @@
+package com.tangem.features.tangempay.utils
+
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+import com.tangem.pagination.Batch
+import com.tangem.pagination.PaginationStatus
+
+internal data class TangemPayTxHistoryState(
+    val status: PaginationStatus<*> = PaginationStatus.None,
+    val uiBatches: List<Batch<Int, List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>>> = listOf(),
+)
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiActions.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiActions.kt
new file mode 100644
index 0000000000..08b2f82527
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiActions.kt
@@ -0,0 +1,7 @@
+package com.tangem.features.tangempay.utils
+
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+
+internal interface TangemPayTxHistoryUiActions {
+    fun onTransactionClick(item: TangemPayTxHistoryItem)
+}
\ No newline at end of file
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt
new file mode 100644
index 0000000000..0c4fb3698e
--- /dev/null
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt
@@ -0,0 +1,124 @@
+package com.tangem.features.tangempay.utils
+
+import com.tangem.core.ui.utils.toDateFormatWithTodayYesterday
+import com.tangem.domain.visa.model.TangemPayTxHistoryItem
+import com.tangem.features.tangempay.entity.TangemPayTxHistoryUM
+import com.tangem.features.tangempay.model.transformers.TangemPayTxHistoryItemsConverter
+import com.tangem.pagination.Batch
+import com.tangem.pagination.PaginationStatus
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+import java.util.UUID
+
+internal class TangemPayTxHistoryUiManager(
+    private val state: MutableStateFlow<TangemPayTxHistoryState>,
+    private val txHistoryUiActions: TangemPayTxHistoryUiActions,
+) {
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    val items: Flow<ImmutableList<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>> = state
+        // filter initial states, since we dont emit loading items as UI items
+        .filter {
+            it.status !is PaginationStatus.None &&
+                it.status !is PaginationStatus.InitialLoading &&
+                it.status !is PaginationStatus.InitialLoadingError
+        }
+        .mapLatest { state ->
+            state.uiBatches.asSequence()
+                .flatMap { it.data }
+                .toImmutableList()
+        }
+        .distinctUntilChanged()
+
+    private val txHistoryItemConverter = TangemPayTxHistoryItemsConverter(txHistoryUiActions = txHistoryUiActions)
+
+    fun createOrUpdateUiBatches(
+        newCurrencyBatches: List<Batch<Int, List<TangemPayTxHistoryItem>>>,
+        clearUiBatches: Boolean,
+    ): List<Batch<Int, List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>>> {
+        val currentUiBatches = state.value.uiBatches
+        val batches = if (clearUiBatches) mutableListOf() else currentUiBatches.toMutableList()
+
+        for ((key, data) in newCurrencyBatches) {
+            // Find if batch with same key exists
+            val existingBatchIndex = batches.indexOfFirst { it.key == key }
+            val shouldUpdateExisting = existingBatchIndex != -1 &&
+                currentUiBatches[existingBatchIndex].data.transactionItemsSizeNotEqual(data)
+
+            // Case 1: Update existing batch if sizes differ
+            if (shouldUpdateExisting) {
+                val items = generateUiItems(key, data)
+                batches[existingBatchIndex] = Batch(key = key, data = items)
+                continue
+            }
+
+            // Case 2: Skip if batch exists and has same size
+            if (existingBatchIndex != -1) {
+                continue
+            }
+
+            // Case 3: Create new batch
+            val items = generateUiItems(key, data)
+            batches.add(Batch(key = key, data = items))
+        }
+
+        return batches
+    }
+
+    private fun generateUiItems(
+        key: Int,
+        data: List<TangemPayTxHistoryItem>,
+    ): List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM> {
+        val items = mutableListOf<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>()
+
+        // Add title for the first batch
+        if (key == 0) {
+            items.add(TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Title)
+        }
+
+        // Process batch items only if there are any
+        if (data.isNotEmpty()) {
+            // Add first item with its group title
+            val firstItem = data.first()
+            val firstDate = firstItem.date.millis.toDateFormatWithTodayYesterday()
+
+            items.add(
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(
+                    title = firstDate,
+                    itemKey = UUID.randomUUID().toString(),
+                ),
+            )
+            items.add(
+                TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(txHistoryItemConverter.convert(firstItem)),
+            )
+
+            // Process remaining items with date separators when needed
+            data.zipWithNext { current, next ->
+                val currentDate = current.date.millis.toDateFormatWithTodayYesterday()
+                val nextDate = next.date.millis.toDateFormatWithTodayYesterday()
+
+                if (currentDate != nextDate) {
+                    items.add(
+                        TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(
+                            title = nextDate,
+                            itemKey = UUID.randomUUID().toString(),
+                        ),
+                    )
+                }
+                items.add(
+                    TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction(txHistoryItemConverter.convert(next)),
+                )
+            }
+        }
+
+        return items
+    }
+
+    private fun List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>.transactionItemsSizeNotEqual(
+        txInfos: List<TangemPayTxHistoryItem>,
+    ): Boolean {
+        return this.filterIsInstance<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction>().size != txInfos.size
+    }
+}
\ No newline at end of file
diff --git a/features/tangempay/onboarding/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayOnboardingComponent.kt b/features/tangempay/onboarding/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayOnboardingComponent.kt
index d2257362fb..0ad307aa79 100644
--- a/features/tangempay/onboarding/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayOnboardingComponent.kt
+++ b/features/tangempay/onboarding/api/src/main/kotlin/com/tangem/features/tangempay/components/TangemPayOnboardingComponent.kt
@@ -5,9 +5,13 @@ import com.tangem.core.ui.decompose.ComposableContentComponent
 
 interface TangemPayOnboardingComponent : ComposableContentComponent {
 
-    data class Params(
-        val deeplink: String,
-    )
+    sealed class Params {
+        data class Deeplink(
+            val deeplink: String,
+        ) : Params()
+
+        object ContinueOnboarding : Params()
+    }
 
     interface Factory : ComponentFactory<Params, TangemPayOnboardingComponent>
 }
\ No newline at end of file
diff --git a/features/tangempay/onboarding/impl/build.gradle.kts b/features/tangempay/onboarding/impl/build.gradle.kts
index 1d205ff513..0b2af70dd3 100644
--- a/features/tangempay/onboarding/impl/build.gradle.kts
+++ b/features/tangempay/onboarding/impl/build.gradle.kts
@@ -15,6 +15,8 @@ dependencies {
     /** Core */
     implementation(projects.core.decompose)
     implementation(projects.core.ui)
+    implementation(projects.core.error)
+    implementation(deps.arrow.core)
 
     /** Common */
     implementation(projects.common.routing)
@@ -25,6 +27,9 @@ dependencies {
     implementation(projects.features.tangempay.details.api)
     implementation(projects.features.kyc.api)
 
+    /** Domain */
+    implementation(projects.domain.visa)
+
     /** Compose */
     implementation(deps.compose.foundation)
     implementation(deps.compose.material3)
diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayOnboardingComponent.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayOnboardingComponent.kt
index c770c768d1..01effd1f8b 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayOnboardingComponent.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/components/DefaultTangemPayOnboardingComponent.kt
@@ -7,10 +7,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.features.tangempay.model.TangemPayOnboardingModel
+import com.tangem.features.tangempay.ui.TandemPayOnboardingScreen
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import com.tangem.features.tangempay.ui.TandemPayOnboardingScreen
 
 internal class DefaultTangemPayOnboardingComponent @AssistedInject constructor(
     @Assisted appComponentContext: AppComponentContext,
@@ -22,7 +22,12 @@ internal class DefaultTangemPayOnboardingComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.screenState.collectAsStateWithLifecycle()
-        TandemPayOnboardingScreen(modifier = modifier, state = state)
+        TandemPayOnboardingScreen(
+            modifier = modifier,
+            state = state,
+            onBackClick = model::back,
+            onOpenKycClick = model::openKyc,
+        )
     }
 
     @AssistedFactory
diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/deeplink/DefaultOnboardVisaDeepLinkHandler.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/deeplink/DefaultOnboardVisaDeepLinkHandler.kt
index 3b10b702a9..15313ee912 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/deeplink/DefaultOnboardVisaDeepLinkHandler.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/deeplink/DefaultOnboardVisaDeepLinkHandler.kt
@@ -16,7 +16,8 @@ internal class DefaultOnboardVisaDeepLinkHandler @AssistedInject constructor(
 
     init {
         if (tangemPayFeatureToggles.isTangemPayEnabled) {
-            appRouter.push(AppRoute.TangemPayOnboarding(uri.toString()))
+            val mode = AppRoute.TangemPayOnboarding.Mode.Deeplink(uri.toString())
+            appRouter.push(AppRoute.TangemPayOnboarding(mode))
         } else {
             appRouter.push(AppRoute.Home())
         }
diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayOnboardingModel.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayOnboardingModel.kt
index 482864d146..65caca46f0 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayOnboardingModel.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/model/TangemPayOnboardingModel.kt
@@ -1,26 +1,71 @@
 package com.tangem.features.tangempay.model
 
 import androidx.compose.runtime.Stable
+import com.tangem.common.routing.AppRoute
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.decompose.navigation.Router
+import com.tangem.domain.pay.repository.OnboardingRepository
 import com.tangem.features.tangempay.components.TangemPayOnboardingComponent
 import com.tangem.features.tangempay.ui.TangemPayOnboardingScreenState
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @Stable
 @ModelScoped
 internal class TangemPayOnboardingModel @Inject constructor(
     paramsContainer: ParamsContainer,
+    private val router: Router,
     override val dispatchers: CoroutineDispatcherProvider,
+    private val repository: OnboardingRepository,
 ) : Model() {
 
-    @Suppress("UnusedPrivateMember")
     private val params = paramsContainer.require<TangemPayOnboardingComponent.Params>()
 
     val screenState: StateFlow<TangemPayOnboardingScreenState>
-    field = MutableStateFlow(TangemPayOnboardingScreenState())
+        field = MutableStateFlow(TangemPayOnboardingScreenState())
+
+    init {
+        modelScope.launch {
+            when (params) {
+                is TangemPayOnboardingComponent.Params.ContinueOnboarding -> {
+                    checkCustomerInfo()
+                }
+                is TangemPayOnboardingComponent.Params.Deeplink -> {
+                    repository.validateDeeplink(params.deeplink)
+                        .onRight { isValid -> if (isValid) checkCustomerInfo() }
+                        .onLeft { back() }
+                }
+            }
+        }
+    }
+
+    fun openKyc() {
+        router.replaceAll(AppRoute.Wallet, AppRoute.Kyc)
+    }
+
+    fun back() {
+        router.pop()
+    }
+
+    private suspend fun checkCustomerInfo() {
+        repository.getCustomerInfo()
+            .onRight { customerInfo ->
+                when {
+                    !customerInfo.isKycApproved() -> {
+                        when (params) {
+                            is TangemPayOnboardingComponent.Params.Deeplink ->
+                                screenState.value = screenState.value.copy(fullScreenLoading = false)
+                            else -> openKyc()
+                        }
+                    }
+                    else -> back()
+                }
+            }
+            .onLeft { back() }
+    }
 }
\ No newline at end of file
diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TandemPayOnboardingScreen.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TandemPayOnboardingScreen.kt
index 42882bafb0..7240b154e5 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TandemPayOnboardingScreen.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TandemPayOnboardingScreen.kt
@@ -13,13 +13,18 @@ import com.tangem.core.ui.components.appbar.AppBarWithBackButton
 import com.tangem.core.ui.res.TangemThemePreview
 
 @Composable
-internal fun TandemPayOnboardingScreen(state: TangemPayOnboardingScreenState, modifier: Modifier = Modifier) {
+internal fun TandemPayOnboardingScreen(
+    state: TangemPayOnboardingScreenState,
+    onOpenKycClick: () -> Unit,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     Scaffold(
         modifier = modifier,
         topBar = {
             AppBarWithBackButton(
                 modifier = Modifier.statusBarsPadding(),
-                onBackClick = {},
+                onBackClick = onBackClick,
                 iconRes = R.drawable.ic_back_24,
             )
         },
@@ -29,6 +34,7 @@ internal fun TandemPayOnboardingScreen(state: TangemPayOnboardingScreenState, mo
                     .padding(paddingValues)
                     .fillMaxSize(),
                 state = state,
+                onButtonClick = onOpenKycClick,
             )
         },
     )
@@ -39,6 +45,6 @@ internal fun TandemPayOnboardingScreen(state: TangemPayOnboardingScreenState, mo
 @Composable
 private fun PreviewDarkTheme() {
     TangemThemePreview {
-        TandemPayOnboardingScreen(state = TangemPayOnboardingScreenState())
+        TandemPayOnboardingScreen(state = TangemPayOnboardingScreenState(), {}, {})
     }
 }
\ No newline at end of file
diff --git a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayOnboardingContent.kt b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayOnboardingContent.kt
index ee247407a6..25b03d0e92 100644
--- a/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayOnboardingContent.kt
+++ b/features/tangempay/onboarding/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayOnboardingContent.kt
@@ -19,7 +19,11 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.tangempay.onboarding.impl.R
 
 @Composable
-internal fun TangemPayOnboardingContent(state: TangemPayOnboardingScreenState, modifier: Modifier = Modifier) {
+internal fun TangemPayOnboardingContent(
+    state: TangemPayOnboardingScreenState,
+    onButtonClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
     if (state.fullScreenLoading) {
         Box(
             modifier = modifier.fillMaxSize(),
@@ -71,8 +75,8 @@ internal fun TangemPayOnboardingContent(state: TangemPayOnboardingScreenState, m
                     textReference = resourceReference(R.string.tangempay_onboarding_get_card_button_text),
                     iconRes = R.drawable.ic_tangem_24,
                     isIconVisible = true,
-                    showProgress = state.buttonLoading,
-                    onClick = {},
+                    shouldShowProgress = state.buttonLoading,
+                    onClick = onButtonClick,
                 ),
             )
         }
diff --git a/features/tester/impl/build.gradle.kts b/features/tester/impl/build.gradle.kts
index 6be7aca95c..57fe70672c 100644
--- a/features/tester/impl/build.gradle.kts
+++ b/features/tester/impl/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     kapt(deps.hilt.kapt)
 
     /** Domain modules */
+    implementation(projects.domain.account)
     implementation(projects.domain.appTheme)
     implementation(projects.domain.appTheme.models)
     implementation(projects.domain.card)
@@ -40,6 +41,8 @@ dependencies {
     implementation(projects.domain.wallets.models)
     implementation(projects.domain.wallets)
 
+    implementation(projects.data.common)
+
     /** Other libraries */
     implementation(deps.arrow.core)
     implementation(deps.kotlin.immutable.collections)
@@ -62,6 +65,7 @@ dependencies {
 
     /** Other modules */
     implementation(projects.common.routing)
+    implementation(projects.common.ui)
     implementation(projects.libs.blockchainSdk)
     implementation(projects.libs.crypto)
 }
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/TesterActivity.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/TesterActivity.kt
index 8cd7fd94f1..1428366edc 100644
--- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/TesterActivity.kt
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/TesterActivity.kt
@@ -16,6 +16,8 @@ import com.tangem.core.navigation.finisher.AppFinisher
 import com.tangem.core.ui.UiDependencies
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.screen.ComposeActivity
+import com.tangem.feature.tester.presentation.accounts.ui.AccountsScreen
+import com.tangem.feature.tester.presentation.accounts.viewmodel.AccountsViewModel
 import com.tangem.feature.tester.presentation.actions.TesterActionsScreen
 import com.tangem.feature.tester.presentation.actions.TesterActionsViewModel
 import com.tangem.feature.tester.presentation.environments.ui.EnvironmentTogglesScreen
@@ -62,7 +64,7 @@ internal class TesterActivity : ComposeActivity() {
         TesterNavHost()
     }
 
-    @Suppress("TopLevelComposableFunctions", "LongMethod")
+    @Suppress("TopLevelComposableFunctions", "LongMethod", "CyclomaticComplexMethod")
     @Composable
     private fun TesterNavHost() {
         val navController = rememberNavController().also { innerTesterRouter.setNavController(it) }
@@ -79,6 +81,7 @@ internal class TesterActivity : ComposeActivity() {
                             ButtonUM.BLOCKCHAIN_PROVIDERS,
                             ButtonUM.TESTER_ACTIONS,
                             ButtonUM.TEST_PUSHES,
+                            ButtonUM.ACCOUNTS,
                         ),
                         onButtonClick = {
                             val route = when (it) {
@@ -88,6 +91,7 @@ internal class TesterActivity : ComposeActivity() {
                                 ButtonUM.BLOCKCHAIN_PROVIDERS -> TesterScreen.BLOCKCHAIN_PROVIDERS
                                 ButtonUM.TESTER_ACTIONS -> TesterScreen.TESTER_ACTIONS
                                 ButtonUM.TEST_PUSHES -> TesterScreen.TEST_PUSHES
+                                ButtonUM.ACCOUNTS -> TesterScreen.ACCOUNTS
                             }
 
                             innerTesterRouter.open(route)
@@ -149,6 +153,15 @@ internal class TesterActivity : ComposeActivity() {
 
                 TestPushScreen(state, viewModel)
             }
+
+            composable(route = TesterScreen.ACCOUNTS.name) {
+                val viewModel = hiltViewModel<AccountsViewModel>().apply {
+                    setupNavigation(innerTesterRouter)
+                }
+                val state by viewModel.uiState.collectAsStateWithLifecycle()
+
+                AccountsScreen(state)
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/entity/AccountsUM.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/entity/AccountsUM.kt
new file mode 100644
index 0000000000..168afd1186
--- /dev/null
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/entity/AccountsUM.kt
@@ -0,0 +1,27 @@
+package com.tangem.feature.tester.presentation.accounts.entity
+
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.wallet.UserWallet
+import kotlinx.collections.immutable.ImmutableList
+
+internal data class AccountsUM(
+    val onBackClick: () -> Unit,
+    val walletSelector: WalletSelector,
+    val accountListBottomSheetConfig: AccountListBottomSheetConfig,
+    val onAccountsClick: () -> Unit,
+    val onFetchAccountsClick: () -> Unit,
+    val onCreateMainAccountClick: () -> Unit,
+    val onClearETagClick: () -> Unit,
+) {
+
+    data class WalletSelector(
+        val selected: UserWallet?,
+        val wallets: ImmutableList<UserWallet>,
+        val onWalletSelect: (UserWallet) -> Unit,
+    ) : TangemBottomSheetConfigContent
+
+    data class AccountListBottomSheetConfig(
+        val accounts: ImmutableList<Account.CryptoPortfolio>,
+    ) : TangemBottomSheetConfigContent
+}
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/ui/AccountsScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/ui/AccountsScreen.kt
new file mode 100644
index 0000000000..66202d3842
--- /dev/null
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/ui/AccountsScreen.kt
@@ -0,0 +1,257 @@
+package com.tangem.feature.tester.presentation.accounts.ui
+
+import android.content.Context
+import android.widget.Toast
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.util.fastForEachIndexed
+import com.tangem.common.ui.account.toUM
+import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
+import com.tangem.core.ui.components.divider.DividerWithPadding
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.tester.impl.R
+import com.tangem.feature.tester.presentation.accounts.entity.AccountsUM
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun AccountsScreen(state: AccountsUM, modifier: Modifier = Modifier) {
+    BackHandler(onBack = state.onBackClick)
+
+    var isWalletSelectorShown by remember { mutableStateOf(false) }
+    var isAccountListShown by remember { mutableStateOf(false) }
+
+    LazyColumn(
+        modifier = modifier
+            .fillMaxSize()
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        stickyHeader { AppBar(onBackClick = state.onBackClick) }
+
+        item {
+            WalletInfoBlock(
+                walletName = state.walletSelector.selected?.name,
+                onClick = {
+                    if (state.walletSelector.wallets.isNotEmpty()) {
+                        isWalletSelectorShown = true
+                    }
+                },
+            )
+        }
+
+        if (state.walletSelector.selected != null) {
+            ManageAccountsButtons(
+                state = state,
+                onAccountsClick = { context ->
+                    if (state.accountListBottomSheetConfig.accounts.isNotEmpty()) {
+                        state.onAccountsClick()
+                        isAccountListShown = true
+                    } else {
+                        Toast.makeText(context, "No accounts found", Toast.LENGTH_SHORT).show()
+                    }
+                },
+            )
+        }
+    }
+
+    WalletSelector(
+        isShown = isWalletSelectorShown,
+        onDismissRequest = { isWalletSelectorShown = false },
+        content = state.walletSelector,
+    )
+
+    AccountList(
+        isShown = isAccountListShown,
+        onDismissRequest = { isAccountListShown = false },
+        content = state.accountListBottomSheetConfig,
+    )
+}
+
+@Composable
+private fun AppBar(onBackClick: () -> Unit) {
+    AppBarWithBackButton(
+        onBackClick = onBackClick,
+        text = stringResourceSafe(id = R.string.accounts),
+        containerColor = TangemTheme.colors.background.primary,
+    )
+}
+
+@Composable
+private fun WalletInfoBlock(walletName: String?, onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .fillMaxWidth()
+            .heightIn(min = 48.dp)
+            .background(color = TangemTheme.colors.background.secondary, shape = RoundedCornerShape(16.dp))
+            .clickable(onClick = onClick)
+            .padding(vertical = 12.dp, horizontal = 16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_wallet_24),
+            contentDescription = null,
+            tint = TangemTheme.colors.icon.accent,
+        )
+
+        val text by remember(walletName) { mutableStateOf(walletName ?: "Choose wallet") }
+        Text(
+            text = text,
+            style = TangemTheme.typography.body2,
+            color = TangemTheme.colors.text.primary1,
+        )
+
+        Icon(
+            painter = painterResource(R.drawable.ic_chevron_right_24),
+            contentDescription = null,
+            tint = TangemTheme.colors.icon.secondary,
+        )
+    }
+}
+
+@Composable
+private fun WalletSelector(isShown: Boolean, onDismissRequest: () -> Unit, content: AccountsUM.WalletSelector) {
+    TangemBottomSheet(
+        config = TangemBottomSheetConfig(
+            isShown = isShown,
+            onDismissRequest = onDismissRequest,
+            content = content,
+        ),
+        titleText = stringReference("Choose wallet"),
+    ) { content: AccountsUM.WalletSelector ->
+        content.wallets.fastForEachIndexed { index, wallet ->
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable {
+                        content.onWalletSelect(wallet)
+                        onDismissRequest()
+                    }
+                    .padding(horizontal = 24.dp, vertical = 12.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                Text(
+                    text = wallet.name,
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.primary1,
+                )
+
+                if (wallet.walletId == content.selected?.walletId) {
+                    Icon(
+                        painter = painterResource(R.drawable.ic_check_24),
+                        contentDescription = null,
+                        tint = TangemTheme.colors.icon.accent,
+                    )
+                }
+            }
+
+            if (index == content.wallets.lastIndex) {
+                Spacer(modifier = Modifier.height(16.dp))
+            } else {
+                DividerWithPadding(start = 16.dp, end = 16.dp)
+            }
+        }
+    }
+}
+
+@Composable
+private fun AccountList(
+    isShown: Boolean,
+    onDismissRequest: () -> Unit,
+    content: AccountsUM.AccountListBottomSheetConfig,
+) {
+    TangemBottomSheet(
+        config = TangemBottomSheetConfig(
+            isShown = isShown,
+            onDismissRequest = onDismissRequest,
+            content = content,
+        ),
+        titleText = stringReference("Accounts"),
+    ) { content: AccountsUM.AccountListBottomSheetConfig ->
+        content.accounts.fastForEachIndexed { index, account ->
+            val accountName = account.accountName.toUM().value.resolveReference()
+            Text(
+                text = "#${account.derivationIndex.value} – $accountName",
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp, vertical = 12.dp),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.primary1,
+            )
+
+            if (index == content.accounts.lastIndex) {
+                Spacer(modifier = Modifier.height(16.dp))
+            } else {
+                DividerWithPadding(start = 16.dp, end = 16.dp)
+            }
+        }
+    }
+}
+
+@Suppress("FunctionNaming")
+private fun LazyListScope.ManageAccountsButtons(state: AccountsUM, onAccountsClick: (Context) -> Unit) {
+    item {
+        val context = LocalContext.current
+
+        PrimaryButton(
+            text = stringResourceSafe(R.string.accounts),
+            onClick = { onAccountsClick(context) },
+            modifier = Modifier
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .fillMaxWidth(),
+        )
+    }
+
+    item {
+        PrimaryButton(
+            text = "Fetch accounts",
+            onClick = state.onFetchAccountsClick,
+            modifier = Modifier
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .fillMaxWidth(),
+        )
+    }
+
+    item {
+        PrimaryButton(
+            text = "Clear ETag",
+            onClick = state.onClearETagClick,
+            modifier = Modifier
+                .padding(horizontal = 16.dp, vertical = 8.dp)
+                .fillMaxWidth(),
+        )
+    }
+
+    if (state.accountListBottomSheetConfig.accounts.none { it.isMainAccount }) {
+        item {
+            PrimaryButton(
+                text = "Create Main account",
+                onClick = state.onCreateMainAccountClick,
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp)
+                    .fillMaxWidth(),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/viewmodel/AccountsViewModel.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/viewmodel/AccountsViewModel.kt
new file mode 100644
index 0000000000..31be606a60
--- /dev/null
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/accounts/viewmodel/AccountsViewModel.kt
@@ -0,0 +1,165 @@
+package com.tangem.feature.tester.presentation.accounts.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.data.common.cache.etag.ETagsStore
+import com.tangem.domain.account.fetcher.SingleAccountListFetcher
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.repository.AccountsCRUDRepository
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.models.TokensGroupType
+import com.tangem.domain.models.TokensSortType
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.account.AccountName
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.feature.tester.presentation.accounts.entity.AccountsUM
+import com.tangem.feature.tester.presentation.navigation.InnerTesterRouter
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@HiltViewModel
+internal class AccountsViewModel @Inject constructor(
+    private val userWalletsListRepository: UserWalletsListRepository,
+    private val singleAccountListFetcher: SingleAccountListFetcher,
+    private val singleAccountListSupplier: SingleAccountListSupplier,
+    private val accountsCRUDRepository: AccountsCRUDRepository,
+    private val eTagsStore: ETagsStore,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : ViewModel() {
+
+    val uiState: StateFlow<AccountsUM>
+        field = MutableStateFlow(getInitialState())
+
+    private val walletAccounts: StateFlow<Map<UserWalletId, AccountList>>
+        field = MutableStateFlow(emptyMap())
+
+    private var router: InnerTesterRouter? = null
+
+    init {
+        viewModelScope.launch {
+            val userWallets = userWalletsListRepository.userWalletsSync()
+
+            uiState.update { state ->
+                state.copy(
+                    walletSelector = state.walletSelector.copy(wallets = userWallets.toImmutableList()),
+                )
+            }
+
+            userWallets.mapIndexed { index, userWallet ->
+                singleAccountListSupplier(params = SingleAccountListProducer.Params(userWalletId = userWallet.walletId))
+                    .distinctUntilChanged()
+                    .onEach { accountList ->
+                        walletAccounts.update { currentMap ->
+                            currentMap.toMutableMap().apply {
+                                this[userWallet.walletId] = accountList
+                            }
+                        }
+                    }
+                    .flowOn(dispatchers.default)
+                    .launchIn(viewModelScope)
+            }
+        }
+    }
+
+    fun setupNavigation(router: InnerTesterRouter) {
+        this.router = router
+    }
+
+    private fun getInitialState(): AccountsUM {
+        return AccountsUM(
+            onBackClick = { router?.back() },
+            walletSelector = AccountsUM.WalletSelector(
+                selected = null,
+                wallets = persistentListOf(),
+                onWalletSelect = ::onWalletSelect,
+            ),
+            accountListBottomSheetConfig = AccountsUM.AccountListBottomSheetConfig(
+                accounts = persistentListOf(),
+            ),
+            onAccountsClick = ::updateAccountsList,
+            onFetchAccountsClick = ::fetchAccounts,
+            onCreateMainAccountClick = ::createMainAccount,
+            onClearETagClick = ::clearETag,
+        )
+    }
+
+    private fun onWalletSelect(userWallet: UserWallet) {
+        uiState.update {
+            it.copy(
+                walletSelector = it.walletSelector.copy(selected = userWallet),
+                accountListBottomSheetConfig = it.accountListBottomSheetConfig.copy(
+                    accounts = walletAccounts.value[userWallet.walletId]?.accounts
+                        ?.filterIsInstance<Account.CryptoPortfolio>()
+                        ?.toImmutableList()
+                        ?: persistentListOf(),
+                ),
+            )
+        }
+    }
+
+    private fun updateAccountsList() {
+        val userWalletId = uiState.value.walletSelector.selected?.walletId ?: return
+
+        val accounts = walletAccounts.value[userWalletId]?.accounts
+            ?.filterIsInstance<Account.CryptoPortfolio>()
+            ?.toImmutableList()
+            ?: persistentListOf()
+
+        uiState.update { state ->
+            state.copy(
+                accountListBottomSheetConfig = state.accountListBottomSheetConfig.copy(
+                    accounts = accounts,
+                ),
+            )
+        }
+    }
+
+    private fun fetchAccounts() {
+        viewModelScope.launch {
+            val userWalletId = uiState.value.walletSelector.selected?.walletId ?: return@launch
+
+            singleAccountListFetcher(
+                params = SingleAccountListFetcher.Params(userWalletId = userWalletId),
+            )
+        }
+    }
+
+    private fun createMainAccount() {
+        viewModelScope.launch {
+            val userWallet = uiState.value.walletSelector.selected ?: return@launch
+
+            // It's temporary solution to create main account for testing purposes
+            val accountList = AccountList(
+                userWallet = userWallet,
+                accounts = setOf(
+                    Account.CryptoPortfolio.createMainAccount(userWallet.walletId).copy(
+                        accountName = AccountName.invoke(value = "Main Account").getOrNull()!!,
+                    ),
+                ),
+                totalAccounts = 1,
+                sortType = TokensSortType.NONE,
+                groupType = TokensGroupType.NONE,
+            )
+                .getOrNull()!!
+
+            accountsCRUDRepository.saveAccounts(accountList)
+        }
+    }
+
+    private fun clearETag() {
+        viewModelScope.launch {
+            val userWallet = uiState.value.walletSelector.selected ?: return@launch
+            eTagsStore.clear(userWalletId = userWallet.walletId, key = ETagsStore.Key.WalletAccounts)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/common/components/notification/InitialSetupNotification.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/common/components/notification/InitialSetupNotification.kt
new file mode 100644
index 0000000000..95ccc51c8e
--- /dev/null
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/common/components/notification/InitialSetupNotification.kt
@@ -0,0 +1,21 @@
+package com.tangem.feature.tester.presentation.common.components.notification
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.components.notifications.NotificationConfig
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.feature.tester.impl.R
+
+@Composable
+internal fun InitialSetupNotification(subtitle: TextReference, modifier: Modifier = Modifier) {
+    Notification(
+        config = NotificationConfig(
+            subtitle = subtitle,
+            iconResId = R.drawable.ic_accepted_20,
+            title = resourceReference(id = R.string.initial_setup_warning_title),
+        ),
+        modifier = modifier,
+    )
+}
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/ui/FeatureTogglesScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/ui/FeatureTogglesScreen.kt
index 6db389959c..6d6a2b8536 100644
--- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/ui/FeatureTogglesScreen.kt
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/ui/FeatureTogglesScreen.kt
@@ -24,6 +24,7 @@ import com.tangem.feature.tester.impl.R
 import com.tangem.feature.tester.presentation.common.components.appbar.TopBarWithRefresh
 import com.tangem.feature.tester.presentation.common.components.appbar.TopBarWithRefreshUM
 import com.tangem.feature.tester.presentation.common.components.notification.CustomSetupNotification
+import com.tangem.feature.tester.presentation.common.components.notification.InitialSetupNotification
 import com.tangem.feature.tester.presentation.featuretoggles.models.TesterFeatureToggle
 import com.tangem.feature.tester.presentation.featuretoggles.state.FeatureTogglesContentState
 import kotlinx.collections.immutable.persistentListOf
@@ -52,8 +53,19 @@ internal fun FeatureTogglesScreen(state: FeatureTogglesContentState) {
                     ),
                     modifier = Modifier
                         .animateItem()
-                        .padding(horizontal = 16.dp)
-                        .padding(bottom = 8.dp),
+                        .padding(horizontal = 16.dp, vertical = 8.dp),
+                )
+            }
+        } else {
+            item(key = "warning_notification", contentType = "warning_notification") {
+                InitialSetupNotification(
+                    subtitle = resourceReference(
+                        id = R.string.feature_toggles_initial_setup_warning_description,
+                        wrappedList(state.appVersion),
+                    ),
+                    modifier = Modifier
+                        .animateItem()
+                        .padding(horizontal = 16.dp, vertical = 8.dp),
                 )
             }
         }
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/menu/state/TesterMenuUM.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/menu/state/TesterMenuUM.kt
index 5815a07d58..fa30058309 100644
--- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/menu/state/TesterMenuUM.kt
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/menu/state/TesterMenuUM.kt
@@ -24,6 +24,6 @@ data class TesterMenuUM(
         BLOCKCHAIN_PROVIDERS(R.string.blockchain_providers),
         TESTER_ACTIONS(R.string.tester_actions),
         TEST_PUSHES(R.string.test_push),
-        ;
+        ACCOUNTS(R.string.accounts),
     }
 }
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/navigation/TesterScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/navigation/TesterScreen.kt
index 8b45b44ea4..e87d942c19 100644
--- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/navigation/TesterScreen.kt
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/navigation/TesterScreen.kt
@@ -13,4 +13,5 @@ internal enum class TesterScreen {
     EXCLUDED_BLOCKCHAINS,
     BLOCKCHAIN_PROVIDERS,
     TEST_PUSHES,
+    ACCOUNTS,
 }
\ No newline at end of file
diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/providers/ui/BlockchainProvidersScreen.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/providers/ui/BlockchainProvidersScreen.kt
index 908033f11b..dfe5e893f2 100644
--- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/providers/ui/BlockchainProvidersScreen.kt
+++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/providers/ui/BlockchainProvidersScreen.kt
@@ -325,7 +325,7 @@ private fun AddPublicProviderDialog(state: BlockchainProvidersUM.AddPublicProvid
         fieldValue = value,
         confirmButton = DialogButtonUM(
             title = stringResourceSafe(R.string.common_save),
-            enabled = value.text.isNotBlank() && !state.hasError,
+            isEnabled = value.text.isNotBlank() && !state.hasError,
             onClick = {
                 state.onSaveClick(
                     buildString {
diff --git a/features/tester/impl/src/main/res/values/strings.xml b/features/tester/impl/src/main/res/values/strings.xml
index 98bd0a1df4..c47c184c25 100644
--- a/features/tester/impl/src/main/res/values/strings.xml
+++ b/features/tester/impl/src/main/res/values/strings.xml
@@ -3,7 +3,9 @@
     <string name="tester_menu" translatable="false">Tester menu</string>
     <string name="feature_toggles" translatable="false">Feature toggles</string>
     <string name="custom_setup_warning_title" translatable="false">Custom setup</string>
+    <string name="initial_setup_warning_title" translatable="false">Initial setup</string>
     <string name="feature_toggles_custom_setup_warning_description" translatable="false">Toggles differs from v%s config</string>
+    <string name="feature_toggles_initial_setup_warning_description" translatable="false">Toggles matches v%s config</string>
     <string name="blockchain_providers_custom_setup_warning_description" translatable="false">Providers differs from release config</string>
     <string name="restart_app" translatable="false">Restart app</string>
     <string name="environment_toggles" translatable="false">Environment toggles</string>
@@ -15,4 +17,5 @@
     <string name="blockchain_providers" translatable="false">Blockchain providers</string>
     <string name="share_logs" translatable="false">Share logs</string>
     <string name="test_push" translatable="false">Test push</string>
+    <string name="accounts" translatable="false">Accounts</string>
 </resources>
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/DefaultTokenReceiveComponent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/DefaultTokenReceiveComponent.kt
index 20f139ff39..24d68dcfea 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/DefaultTokenReceiveComponent.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/DefaultTokenReceiveComponent.kt
@@ -95,6 +95,7 @@ internal class DefaultTokenReceiveComponent @AssistedInject constructor(
                     showMemoDisclaimer = model.params.config.showMemoDisclaimer,
                     fullName = model.params.config.cryptoCurrency.network.name,
                     tokenName = model.getTokenName(),
+                    currencyIconState = model.state.value.iconState,
                 ),
             )
             TokenReceiveRoutes.Warning -> TokenReceiveWarningComponent(
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/TokenReceiveAssetsComponent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/TokenReceiveAssetsComponent.kt
index a292fe45db..f435631cb2 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/TokenReceiveAssetsComponent.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/component/TokenReceiveAssetsComponent.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.domain.tokens.model.analytics.TokenReceiveCopyActionSource
 import com.tangem.features.tokenreceive.entity.ReceiveAddress
@@ -30,6 +31,7 @@ internal class TokenReceiveAssetsComponent(
     internal interface TokenReceiveAssetsModelCallback {
         fun onQrCodeClick(address: String)
         fun onCopyClick(address: ReceiveAddress, source: TokenReceiveCopyActionSource)
+        fun onShareClick(address: String)
     }
 
     data class TokenReceiveAssetsParams(
@@ -38,6 +40,7 @@ internal class TokenReceiveAssetsComponent(
         val callback: TokenReceiveAssetsModelCallback,
         val onDismiss: () -> Unit,
         val showMemoDisclaimer: Boolean,
+        val currencyIconState: CurrencyIconState,
         val fullName: String,
         val tokenName: String,
     )
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/TokenReceiveStateFactory.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/TokenReceiveStateFactory.kt
index 5747409661..02595a5ca4 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/TokenReceiveStateFactory.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/TokenReceiveStateFactory.kt
@@ -15,6 +15,7 @@ import com.tangem.features.tokenreceive.entity.ReceiveAddress.Type.Ens
 import com.tangem.features.tokenreceive.entity.ReceiveAddress.Type.Primary
 import com.tangem.features.tokenreceive.ui.state.TokenReceiveUM
 import com.tangem.utils.Provider
+import com.tangem.utils.extensions.addIf
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toPersistentList
@@ -129,7 +130,12 @@ internal class TokenReceiveStateFactory(
         tokenName: String,
         tokenReceiveNotification: List<TokenReceiveNotification>,
     ): List<NotificationUM> {
+        val yieldSupplyNotification: TokenReceiveNotification? =
+            tokenReceiveNotification.firstOrNull { it.isYieldSupplyNotification }
         return buildList {
+            addIf(yieldSupplyNotification != null) {
+                NotificationUM.Warning.YieldSupplyIsActive(tokenName)
+            }
             add(
                 NotificationUM.Info(
                     title = resourceReference(
@@ -143,7 +149,7 @@ internal class TokenReceiveStateFactory(
                     iconTint = NotificationConfig.IconTint.Accent,
                 ),
             )
-            tokenReceiveNotification.map { notification ->
+            tokenReceiveNotification.filter { !it.isYieldSupplyNotification }.map { notification ->
                 add(
                     NotificationUM.Warning(
                         title = resourceReference(notification.title),
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveAssetsModel.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveAssetsModel.kt
index e3f6ccdf6e..decfd54c50 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveAssetsModel.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveAssetsModel.kt
@@ -37,21 +37,24 @@ internal class TokenReceiveAssetsModel @Inject constructor(
     }
 
     internal val state: StateFlow<ReceiveAssetsUM>
-    field = MutableStateFlow<ReceiveAssetsUM>(
-        ReceiveAssetsUM(
-            onCopyClick = {
-                params.callback.onCopyClick(
-                    address = it,
-                    source = TokenReceiveCopyActionSource.Receive,
-                )
-            },
-            onOpenQrCodeClick = params.callback::onQrCodeClick,
-            addresses = params.addresses,
-            showMemoDisclaimer = params.showMemoDisclaimer,
-            isEnsResultLoading = false,
-            notificationConfigs = params.notificationConfigs,
-        ),
-    )
+        field = MutableStateFlow<ReceiveAssetsUM>(
+            ReceiveAssetsUM(
+                onCopyClick = {
+                    params.callback.onCopyClick(
+                        address = it,
+                        source = TokenReceiveCopyActionSource.Receive,
+                    )
+                },
+                onOpenQrCodeClick = params.callback::onQrCodeClick,
+                addresses = params.addresses,
+                showMemoDisclaimer = params.showMemoDisclaimer,
+                isEnsResultLoading = false,
+                notificationConfigs = params.notificationConfigs,
+                currencyIconState = params.currencyIconState,
+                network = params.tokenName,
+                onShareClick = params.callback::onShareClick,
+            ),
+        )
 
     private fun configureEnsStatus(): AnalyticsParam.EnsStatus {
         val hasEnsAddress = params.addresses.any { it.type == ReceiveAddress.Type.Ens }
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt
index a2729de835..4229545563 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt
@@ -56,7 +56,7 @@ internal class TokenReceiveModel @Inject constructor(
     val stackNavigation = StackNavigation<TokenReceiveRoutes>()
 
     internal val state: StateFlow<TokenReceiveUM>
-    field = MutableStateFlow<TokenReceiveUM>(tokenReceiveStateFactory.getInitialState(getTokenName()))
+        field = MutableStateFlow<TokenReceiveUM>(tokenReceiveStateFactory.getInitialState(getTokenName()))
 
     init {
         modelScope.launch {
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveQrCodeModel.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveQrCodeModel.kt
index 71f202d02b..6f10eea53a 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveQrCodeModel.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveQrCodeModel.kt
@@ -23,18 +23,18 @@ internal class TokenReceiveQrCodeModel @Inject constructor(
     private val params = paramsContainer.require<TokenReceiveQrCodeComponent.TokenReceiveQrCodeParams>()
 
     internal val state: StateFlow<QrCodeUM>
-    field = MutableStateFlow<QrCodeUM>(
-        QrCodeUM(
-            network = params.cryptoCurrency.network.name,
-            addressValue = params.address.value,
-            addressName = TextReference.Str("${params.cryptoCurrency.name} (${params.cryptoCurrency.symbol})"),
-            onCopyClick = {
-                params.callback.onCopyClick(
-                    address = params.address,
-                    source = TokenReceiveCopyActionSource.QR,
-                )
-            },
-            onShareClick = params.callback::onShareClick,
-        ),
-    )
+        field = MutableStateFlow<QrCodeUM>(
+            QrCodeUM(
+                network = params.cryptoCurrency.network.name,
+                addressValue = params.address.value,
+                addressName = TextReference.Str("${params.cryptoCurrency.name} (${params.cryptoCurrency.symbol})"),
+                onCopyClick = {
+                    params.callback.onCopyClick(
+                        address = params.address,
+                        source = TokenReceiveCopyActionSource.QR,
+                    )
+                },
+                onShareClick = params.callback::onShareClick,
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveWarningModel.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveWarningModel.kt
index 7d57f2d60d..8a22d33f92 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveWarningModel.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveWarningModel.kt
@@ -21,11 +21,11 @@ internal class TokenReceiveWarningModel @Inject constructor(
     private val params = paramsContainer.require<TokenReceiveWarningComponent.TokenReceiveWarningParams>()
 
     internal val state: StateFlow<WarningUM>
-    field = MutableStateFlow<WarningUM>(
-        WarningUM(
-            iconState = params.iconState,
-            onWarningAcknowledged = params.callback::onWarningAcknowledged,
-            network = params.network.name,
-        ),
-    )
+        field = MutableStateFlow<WarningUM>(
+            WarningUM(
+                iconState = params.iconState,
+                onWarningAcknowledged = params.callback::onWarningAcknowledged,
+                network = params.network.name,
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt
index 22a746d2f2..4e0ac4a548 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt
@@ -1,15 +1,19 @@
 package com.tangem.features.tokenreceive.ui
 
 import android.content.res.Configuration
+import androidx.compose.animation.animateColorAsState
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.key
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -19,33 +23,35 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.util.fastFilter
 import androidx.compose.ui.util.fastForEach
 import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.core.res.getStringSafe
 import com.tangem.core.ui.R
-import com.tangem.core.ui.components.SpacerH12
-import com.tangem.core.ui.components.SpacerH8
-import com.tangem.core.ui.components.SpacerW
-import com.tangem.core.ui.components.SpacerW12
+import com.tangem.core.ui.components.*
 import com.tangem.core.ui.components.atoms.text.EllipsisText
 import com.tangem.core.ui.components.atoms.text.TextEllipsis
+import com.tangem.core.ui.components.buttons.actions.ActionBaseButton
+import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
+import com.tangem.core.ui.components.buttons.actions.ActionButtonContent
 import com.tangem.core.ui.components.buttons.small.TangemIconButton
-import com.tangem.core.ui.components.icons.identicon.IdentIcon
+import com.tangem.core.ui.components.currency.icon.CurrencyIcon
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.notifications.Notification
-import com.tangem.core.ui.extensions.resolveReference
-import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
-import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.features.tokenreceive.entity.ReceiveAddress
 import com.tangem.features.tokenreceive.ui.state.ReceiveAssetsUM
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.launch
 
 @Composable
@@ -57,43 +63,39 @@ internal fun TokenReceiveAssetsContent(assetsUM: ReceiveAssetsUM) {
             modifier = Modifier
                 .fillMaxWidth()
                 .background(color = TangemTheme.colors.background.tertiary)
-                .padding(
-                    start = 16.dp,
-                    end = 16.dp,
-                    bottom = 8.dp,
-                ),
+                .padding(bottom = 16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            SpacerH8()
-
-            Info(
-                showMemoDisclaimer = assetsUM.showMemoDisclaimer,
-                notificationConfigs = assetsUM.notificationConfigs,
-            )
-
-            SpacerH12()
-
             AddressBlock(
-                onCopyClick = assetsUM.onCopyClick,
-                onOpenQrCodeClick = assetsUM.onOpenQrCodeClick,
-                addresses = assetsUM.addresses,
+                assetsUM = assetsUM,
                 snackbarHostState = snackbarHostState,
             )
 
             if (assetsUM.isEnsResultLoading) {
-                LoadingBlock()
+                SpacerH8()
+                LoadingBlock(modifier = Modifier.padding(horizontal = 16.dp))
             }
+
+            SpacerH12()
+
+            Info(
+                showMemoDisclaimer = assetsUM.showMemoDisclaimer,
+                notificationConfigs = assetsUM.notificationConfigs,
+                currencyIconState = assetsUM.currencyIconState,
+            )
         }
     }
 }
 
 @Composable
 private fun Info(
+    currencyIconState: CurrencyIconState,
     notificationConfigs: ImmutableList<NotificationUM>,
     showMemoDisclaimer: Boolean,
     modifier: Modifier = Modifier,
 ) {
     Column(
-        modifier = modifier,
+        modifier = modifier.padding(horizontal = 16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.spacedBy(space = 16.dp),
     ) {
@@ -109,81 +111,226 @@ private fun Info(
             )
         }
 
-        notificationConfigs.fastForEach {
-            key(it.hashCode()) {
-                Notification(config = it.config)
+        notificationConfigs.fastForEach { notificationConfig ->
+            key(notificationConfig.hashCode()) {
+                // TODO remove after new design system
+                if (notificationConfig is NotificationUM.Warning.YieldSupplyIsActive) {
+                    YieldSupplyDepositedWarning(
+                        currencyIconState = currencyIconState,
+                        title = stringResourceSafe(
+                            R.string.yield_module_balance_info_sheet_title,
+                            notificationConfig.tokenName,
+                        ),
+                        subtitle = stringResourceSafe(R.string.yield_module_balance_info_sheet_subtitle),
+                    )
+                } else {
+                    Notification(config = notificationConfig.config)
+                }
             }
         }
     }
 }
 
 @Composable
-private fun AddressBlock(
-    onOpenQrCodeClick: (address: String) -> Unit,
-    onCopyClick: (address: ReceiveAddress) -> Unit,
-    addresses: ImmutableList<ReceiveAddress>,
-    snackbarHostState: SnackbarHostState,
+private fun YieldSupplyDepositedWarning(
+    currencyIconState: CurrencyIconState,
+    title: String,
+    subtitle: String,
+    modifier: Modifier = Modifier,
 ) {
+    Surface(
+        modifier = modifier
+            .defaultMinSize(minHeight = TangemTheme.dimens.size44)
+            .fillMaxWidth(),
+        shape = TangemTheme.shapes.roundedCornersXMedium,
+        color = TangemTheme.colors.button.disabled,
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(all = TangemTheme.dimens.spacing12),
+        ) {
+            Box(
+                modifier = Modifier
+                    .height(22.dp)
+                    .width(22.dp),
+                contentAlignment = Alignment.TopStart,
+            ) {
+                CurrencyIcon(
+                    modifier = Modifier
+                        .align(Alignment.TopStart)
+                        .size(13.dp),
+                    state = currencyIconState,
+                    shouldDisplayNetwork = false,
+                    iconSize = 13.dp,
+                )
+
+                Image(
+                    modifier = Modifier
+                        .background(TangemTheme.colors.background.tertiary, RoundedCornerShape(15.dp))
+                        .padding(1.dp)
+                        .size(15.dp)
+                        .align(Alignment.BottomEnd),
+                    imageVector = ImageVector.vectorResource(R.drawable.img_aave_22),
+                    contentDescription = null,
+                )
+            }
+
+            SpacerW(width = TangemTheme.dimens.spacing8)
+
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = title,
+                    color = TangemTheme.colors.text.primary1,
+                    style = TangemTheme.typography.button,
+                )
+
+                SpacerH(height = TangemTheme.dimens.spacing2)
+
+                Text(
+                    text = subtitle,
+                    color = TangemTheme.colors.text.tertiary,
+                    style = TangemTheme.typography.caption2,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun AddressBlock(assetsUM: ReceiveAssetsUM, snackbarHostState: SnackbarHostState) {
     val hapticFeedback = LocalHapticFeedback.current
     val coroutineScope = rememberCoroutineScope()
     val context = LocalContext.current
     val resources = context.resources
 
-    addresses.fastForEach { address ->
-        when (val type = address.type) {
-            is ReceiveAddress.Type.Primary -> {
-                key(address.value) {
-                    AddressItem(
-                        onCopyClick = {
-                            onCopyClick(address)
-                            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                            coroutineScope.launch {
-                                snackbarHostState.showSnackbar(
-                                    message = resources.getStringSafe(
-                                        R.string.wallet_notification_address_copied,
-                                    ),
-                                )
-                            }
-                        },
-                        onOpenQrCodeClick = {
-                            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                            onOpenQrCodeClick(address.value)
-                        },
-                        address = address.value,
-                        primaryType = type,
-                    )
-                    SpacerH8()
-                }
+    assetsUM.addresses
+        .fastFilter { it.type is ReceiveAddress.Type.Ens }
+        .fastForEach { address ->
+            key(address.value) {
+                EnsItem(
+                    modifier = Modifier.padding(horizontal = 16.dp),
+                    onCopyClick = {
+                        assetsUM.onCopyClick(address)
+                        hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                        coroutineScope.launch {
+                            snackbarHostState.showSnackbar(
+                                message = resources.getStringSafe(
+                                    R.string.wallet_notification_address_copied,
+                                ),
+                            )
+                        }
+                    },
+                    address = address.value,
+                )
+                SpacerH8()
             }
-            ReceiveAddress.Type.Ens -> {
-                key(address.value) {
-                    EnsItem(
-                        onCopyClick = {
-                            onCopyClick(address)
-                            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                            coroutineScope.launch {
-                                snackbarHostState.showSnackbar(
-                                    message = resources.getStringSafe(
-                                        R.string.wallet_notification_address_copied,
-                                    ),
-                                )
-                            }
-                        },
-                        address = address.value,
+        }
+
+    PrimaryAddressesItems(
+        addresses = assetsUM.addresses.fastFilter { it.type is ReceiveAddress.Type.Primary }.toImmutableList(),
+        currencyIconState = assetsUM.currencyIconState,
+        snackbarHostState = snackbarHostState,
+        onShareClick = {
+            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+            assetsUM.onShareClick(it)
+        },
+        onCopyClick = {
+            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+            coroutineScope.launch {
+                snackbarHostState.showSnackbar(
+                    message = resources.getStringSafe(
+                        R.string.wallet_notification_address_copied,
+                    ),
+                )
+            }
+            assetsUM.onCopyClick(it)
+        },
+        onOpenQrCodeClick = {
+            hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+            assetsUM.onOpenQrCodeClick(it)
+        },
+    )
+}
+
+@Suppress("LongParameterList")
+@Composable
+private fun PrimaryAddressesItems(
+    addresses: ImmutableList<ReceiveAddress>,
+    currencyIconState: CurrencyIconState,
+    snackbarHostState: SnackbarHostState,
+    onShareClick: (String) -> Unit,
+    onCopyClick: (ReceiveAddress) -> Unit,
+    onOpenQrCodeClick: (String) -> Unit,
+) {
+    if (addresses.isEmpty()) return
+    var selectedAddress by remember { mutableStateOf(addresses.first()) }
+    val pagerState = rememberPagerState(
+        initialPage = 0,
+        initialPageOffsetFraction = 0f,
+        pageCount = addresses::count,
+    )
+    LaunchedEffect(key1 = pagerState.currentPage) {
+        selectedAddress = addresses[pagerState.currentPage]
+    }
+
+    HorizontalPager(
+        state = pagerState,
+        contentPadding = PaddingValues(horizontal = 16.dp),
+        pageSpacing = 16.dp,
+    ) {
+        AddressItem(
+            currencyIconState = currencyIconState,
+            onOpenQrCodeClick = { onOpenQrCodeClick(selectedAddress.value) },
+            onCopyClick = { onCopyClick(selectedAddress) },
+            onShareClick = { onShareClick(selectedAddress.value) },
+            primaryType = selectedAddress.type as ReceiveAddress.Type.Primary,
+            address = selectedAddress.value,
+            snackbarHostState = snackbarHostState,
+        )
+    }
+
+    SpacerH(4.dp)
+
+    if (pagerState.pageCount > 1) {
+        val indicatorState = rememberLazyListState()
+        val selectedColor = TangemTheme.colors.icon.primary1
+        val unselectedColor = TangemTheme.colors.icon.informative
+
+        LazyRow(
+            modifier = Modifier.height(20.dp),
+            state = indicatorState,
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            repeat(pagerState.pageCount) { iteration ->
+                item(key = iteration) {
+                    val color by animateColorAsState(
+                        targetValue = if (pagerState.currentPage == iteration) selectedColor else unselectedColor,
+                        label = "",
+                    )
+
+                    Box(
+                        modifier = Modifier
+                            .padding(horizontal = 4.dp, vertical = 6.dp)
+                            .background(color = color, shape = CircleShape)
+                            .size(7.dp),
                     )
-                    SpacerH8()
                 }
             }
         }
     }
 }
 
+@Suppress("LongParameterList")
 @Composable
 private fun AddressItem(
+    currencyIconState: CurrencyIconState,
     onOpenQrCodeClick: () -> Unit,
     onCopyClick: () -> Unit,
-    address: String,
+    onShareClick: () -> Unit,
     primaryType: ReceiveAddress.Type.Primary,
+    address: String,
+    snackbarHostState: SnackbarHostState,
     modifier: Modifier = Modifier,
 ) {
     Card(
@@ -193,59 +340,112 @@ private fun AddressItem(
         onClick = onOpenQrCodeClick,
     ) {
         Column(
-            modifier = Modifier.padding(vertical = 14.dp, horizontal = 12.dp),
+            modifier = Modifier.padding(horizontal = 12.dp, vertical = 32.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
         ) {
+            CurrencyIcon(
+                modifier = Modifier.size(56.dp),
+                state = currencyIconState,
+                shouldDisplayNetwork = true,
+                iconSize = 56.dp,
+            )
+
+            SpacerH(12.dp)
+
+            Text(
+                text = primaryType.displayName.resolveReference(),
+                color = TangemTheme.colors.text.primary1,
+                style = TangemTheme.typography.subtitle1,
+                textAlign = TextAlign.Center,
+            )
+
+            Text(
+                modifier = Modifier
+                    .heightIn(min = 40.dp)
+                    .padding(horizontal = 16.dp),
+                text = address,
+                color = TangemTheme.colors.text.tertiary,
+                style = TangemTheme.typography.body2,
+                textAlign = TextAlign.Center,
+            )
+
+            SpacerH8()
+
             Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .clip(RoundedCornerShape(16.dp))
+                    .clickable(onClick = onOpenQrCodeClick)
+                    .padding(vertical = 6.dp, horizontal = 12.dp),
+                horizontalArrangement = Arrangement.Center,
             ) {
-                IdentIcon(
-                    address = address,
-                    modifier = Modifier
-                        .size(size = 36.dp)
-                        .clip(shape = RoundedCornerShape(18.dp)),
+                Icon(
+                    modifier = Modifier.size(16.dp),
+                    imageVector = ImageVector.vectorResource(R.drawable.ic_qrcode_new_24),
+                    contentDescription = null,
                 )
 
-                SpacerW12()
+                SpacerW(4.dp)
 
-                Column(modifier = Modifier.weight(1f)) {
-                    EllipsisText(
-                        text = primaryType.displayName.resolveReference(),
-                        ellipsis = TextEllipsis.End,
-                        color = TangemTheme.colors.text.primary1,
-                        style = TangemTheme.typography.subtitle2,
-                    )
-
-                    EllipsisText(
-                        text = address,
-                        ellipsis = TextEllipsis.Middle,
-                        color = TangemTheme.colors.text.tertiary,
-                        style = TangemTheme.typography.caption2,
-                    )
-                }
-
-                SpacerW12()
-
-                TangemIconButton(
-                    modifier = Modifier.size(TangemTheme.dimens.size32),
-                    innerPadding = 6.dp,
-                    iconRes = R.drawable.ic_qrcode_new_24,
-                    onClick = onOpenQrCodeClick,
-                )
-
-                SpacerW(12.dp)
-
-                TangemIconButton(
-                    modifier = Modifier.size(TangemTheme.dimens.size32),
-                    iconRes = R.drawable.ic_copy_new_24,
-                    innerPadding = 6.dp,
-                    onClick = onCopyClick,
+                Text(
+                    text = stringResourceSafe(R.string.token_receive_show_qr_code_title),
+                    style = TangemTheme.typography.caption1,
+                    color = TangemTheme.colors.text.secondary,
                 )
             }
+
+            SpacerH(20.dp)
+
+            ButtonsBlock(
+                snackbarHostState = snackbarHostState,
+                onCopyClick = onCopyClick,
+                onShareClick = onShareClick,
+            )
         }
     }
 }
 
+@Composable
+private fun ButtonsBlock(snackbarHostState: SnackbarHostState, onCopyClick: () -> Unit, onShareClick: () -> Unit) {
+    val hapticFeedback = LocalHapticFeedback.current
+    val coroutineScope = rememberCoroutineScope()
+    val context = LocalContext.current
+    val resources = context.resources
+
+    Row(
+        modifier = Modifier.width(IntrinsicSize.Min),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        ActionButtonWithResizableText(
+            modifier = Modifier.weight(1f),
+            config = ActionButtonConfig(
+                text = TextReference.Res(id = R.string.common_copy),
+                iconResId = R.drawable.ic_copy_new_24,
+                onClick = {
+                    onCopyClick()
+                    hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    coroutineScope.launch {
+                        snackbarHostState.showSnackbar(
+                            message = resources.getStringSafe(R.string.wallet_notification_address_copied),
+                        )
+                    }
+                },
+            ),
+        )
+
+        ActionButtonWithResizableText(
+            modifier = Modifier.weight(1f),
+            config = ActionButtonConfig(
+                text = TextReference.Res(id = R.string.common_share),
+                iconResId = R.drawable.ic_share_24,
+                onClick = {
+                    hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                    onShareClick()
+                },
+            ),
+        )
+    }
+}
+
 @Composable
 private fun EnsItem(onCopyClick: () -> Unit, address: String, modifier: Modifier = Modifier) {
     Card(
@@ -277,7 +477,7 @@ private fun EnsItem(onCopyClick: () -> Unit, address: String, modifier: Modifier
 
             TangemIconButton(
                 modifier = Modifier.size(TangemTheme.dimens.size28),
-                iconRes = R.drawable.ic_copy_new_24,
+                iconRes = R.drawable.ic_share_24,
                 innerPadding = 6.dp,
                 onClick = onCopyClick,
             )
@@ -306,6 +506,38 @@ private fun LoadingBlock(modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+private fun ActionButtonWithResizableText(config: ActionButtonConfig, modifier: Modifier = Modifier) {
+    val fontSizeRange = FontSizeRange(min = 10.sp, max = 14.sp)
+    var fontSizeValue by remember { mutableFloatStateOf(fontSizeRange.max.value) }
+
+    ActionBaseButton(
+        config = config,
+        shape = RoundedCornerShape(size = TangemTheme.dimens.radius24),
+        content = { contentModifier ->
+            ActionButtonContent(
+                config = config,
+                text = { color ->
+                    ResizableText(
+                        text = config.text.resolveReference(),
+                        fontSizeValue = fontSizeValue.sp,
+                        fontSizeRange = fontSizeRange,
+                        onFontSizeChange = { fontSizeValue = it },
+                        color = color,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1,
+                        style = TangemTheme.typography.button,
+                    )
+                },
+                modifier = contentModifier.padding(horizontal = 16.dp),
+                paddingBetweenIconAndText = 4.dp,
+            )
+        },
+        modifier = modifier,
+        color = TangemTheme.colors.button.secondary,
+    )
+}
+
 @Composable
 @Preview(showBackground = true, widthDp = 360)
 @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
@@ -333,6 +565,7 @@ private class TokenReceiveAssetsContentProvider : PreviewParameterProvider<Recei
             ),
         ),
         addresses = persistentListOf(
+            address,
             address,
             address.copy(type = ReceiveAddress.Type.Ens, value = "papasha.eth"),
         ),
@@ -340,6 +573,9 @@ private class TokenReceiveAssetsContentProvider : PreviewParameterProvider<Recei
         onCopyClick = {},
         onOpenQrCodeClick = {},
         isEnsResultLoading = true,
+        network = "USDT",
+        currencyIconState = CurrencyIconState.Locked,
+        onShareClick = {},
     )
 
     override val values: Sequence<ReceiveAssetsUM>
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveWarningContent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveWarningContent.kt
index 25c47e9b3c..ed2a67a9be 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveWarningContent.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveWarningContent.kt
@@ -120,7 +120,7 @@ private class TokenReceiveWarningContentProvider : PreviewParameterProvider<Warn
         fallbackTint = TangemColorPalette.Black,
         fallbackBackground = TangemColorPalette.Meadow,
         isGrayscale = false,
-        showCustomBadge = false,
+        shouldShowCustomBadge = false,
     )
 
     override val values: Sequence<WarningUM>
diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/state/ReceiveAssetsUM.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/state/ReceiveAssetsUM.kt
index 9c8b118f36..1f50bf43d3 100644
--- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/state/ReceiveAssetsUM.kt
+++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/state/ReceiveAssetsUM.kt
@@ -1,6 +1,7 @@
 package com.tangem.features.tokenreceive.ui.state
 
 import com.tangem.common.ui.notifications.NotificationUM
+import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.features.tokenreceive.entity.ReceiveAddress
 import kotlinx.collections.immutable.ImmutableList
 
@@ -9,6 +10,9 @@ internal data class ReceiveAssetsUM(
     val addresses: ImmutableList<ReceiveAddress>,
     val onOpenQrCodeClick: (address: String) -> Unit,
     val onCopyClick: (address: ReceiveAddress) -> Unit,
+    val onShareClick: (address: String) -> Unit,
     val isEnsResultLoading: Boolean,
+    val currencyIconState: CurrencyIconState,
+    val network: String,
     val notificationConfigs: ImmutableList<NotificationUM>,
 )
\ No newline at end of file
diff --git a/features/tokendetails/impl/build.gradle.kts b/features/tokendetails/impl/build.gradle.kts
index 5da95d55a3..4945e2727a 100644
--- a/features/tokendetails/impl/build.gradle.kts
+++ b/features/tokendetails/impl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(deps.plugins.android.library)
+    alias(deps.plugins.kotlin.serialization)
     alias(deps.plugins.kotlin.android)
     alias(deps.plugins.kotlin.kapt)
     alias(deps.plugins.hilt.android)
@@ -102,6 +103,7 @@ dependencies {
     implementation(projects.features.txhistory.api)
     implementation(projects.features.sendV2.api)
     implementation(projects.features.tokenRecieve.api)
+    implementation(projects.features.yieldSupply.api)
 
     implementation(deps.decompose.ext.compose)
 
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/DefaultTokenDetailsComponent.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/DefaultTokenDetailsComponent.kt
index 2291d82965..5de293633a 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/DefaultTokenDetailsComponent.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/DefaultTokenDetailsComponent.kt
@@ -5,8 +5,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.arkivanov.decompose.ComponentContext
-import com.arkivanov.decompose.router.slot.childSlot
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
+import com.arkivanov.decompose.router.slot.childSlot
 import com.arkivanov.decompose.router.slot.dismiss
 import com.arkivanov.essenty.lifecycle.subscribe
 import com.tangem.core.decompose.context.AppComponentContext
@@ -15,14 +15,16 @@ import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
-import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.feature.tokendetails.presentation.tokendetails.model.TokenDetailsModel
+import com.tangem.feature.tokendetails.presentation.tokendetails.route.TokenDetailsBottomSheetConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.ui.TokenDetailsScreen
 import com.tangem.features.markets.token.block.TokenMarketBlockComponent
 import com.tangem.features.tokendetails.TokenDetailsComponent
 import com.tangem.features.tokenreceive.TokenReceiveComponent
 import com.tangem.features.txhistory.component.TxHistoryComponent
+import com.tangem.features.yield.supply.api.YieldSupplyComponent
+import com.tangem.features.yield.supply.api.YieldSupplyDepositedWarningComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -34,6 +36,8 @@ internal class DefaultTokenDetailsComponent @AssistedInject constructor(
     tokenMarketBlockComponentFactory: TokenMarketBlockComponent.Factory,
     txHistoryComponentFactory: TxHistoryComponent.Factory,
     private val tokenReceiveComponentFactory: TokenReceiveComponent.Factory,
+    private val yieldSupplyWarningComponentFactory: YieldSupplyDepositedWarningComponent.Factory,
+    yieldSupplyComponentFactory: YieldSupplyComponent.Factory,
 ) : TokenDetailsComponent, AppComponentContext by appComponentContext {
 
     private val model: TokenDetailsModel = getOrCreateModel(params)
@@ -48,7 +52,7 @@ internal class DefaultTokenDetailsComponent @AssistedInject constructor(
 
     private val bottomSheetSlot = childSlot(
         source = model.bottomSheetNavigation,
-        serializer = TokenReceiveConfig.serializer(),
+        serializer = TokenDetailsBottomSheetConfig.serializer(),
         handleBackButton = false,
         childFactory = ::bottomSheetChild,
     )
@@ -67,6 +71,14 @@ internal class DefaultTokenDetailsComponent @AssistedInject constructor(
         )
     }
 
+    private val yieldSupplyComponent = yieldSupplyComponentFactory.create(
+        context = child("tokenYieldSupplyComponent"),
+        params = YieldSupplyComponent.Params(
+            userWalletId = params.userWalletId,
+            cryptoCurrency = params.currency,
+        ),
+    )
+
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
@@ -76,6 +88,7 @@ internal class DefaultTokenDetailsComponent @AssistedInject constructor(
             state = state,
             tokenMarketBlockComponent = tokenMarketBlockComponent,
             txHistoryComponent = txHistoryComponent,
+            yieldSupplyComponent = yieldSupplyComponent,
         )
         bottomSheet.child?.instance?.BottomSheet()
     }
@@ -87,15 +100,26 @@ internal class DefaultTokenDetailsComponent @AssistedInject constructor(
     }
 
     private fun bottomSheetChild(
-        config: TokenReceiveConfig,
+        route: TokenDetailsBottomSheetConfig,
         componentContext: ComponentContext,
-    ): ComposableBottomSheetComponent = tokenReceiveComponentFactory.create(
-        context = childByContext(componentContext),
-        params = TokenReceiveComponent.Params(
-            config = config,
-            onDismiss = model.bottomSheetNavigation::dismiss,
-        ),
-    )
+    ): ComposableBottomSheetComponent = when (route) {
+        is TokenDetailsBottomSheetConfig.Receive -> tokenReceiveComponentFactory.create(
+            context = childByContext(componentContext),
+            params = TokenReceiveComponent.Params(
+                config = route.tokenReceiveConfig,
+                onDismiss = model.bottomSheetNavigation::dismiss,
+            ),
+        )
+        is TokenDetailsBottomSheetConfig.YieldSupplyWarning -> yieldSupplyWarningComponentFactory.create(
+            context = childByContext(componentContext),
+            params = YieldSupplyDepositedWarningComponent.Params(
+                cryptoCurrency = route.cryptoCurrency,
+                onDismiss = model.bottomSheetNavigation::dismiss,
+                modelCallback = model,
+                tokenAction = route.tokenAction,
+            ),
+        )
+    }
 
     @AssistedFactory
     interface Factory : TokenDetailsComponent.Factory {
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/deeplink/TokenDetailsDeepLinkActionTrigger.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/deeplink/TokenDetailsDeepLinkActionTrigger.kt
index 05bddf4542..9cc8ba1051 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/deeplink/TokenDetailsDeepLinkActionTrigger.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/deeplink/TokenDetailsDeepLinkActionTrigger.kt
@@ -19,7 +19,7 @@ internal class DefaultTokenDetailsDeepLinkActionTrigger @Inject constructor() :
     TokenDetailsDeepLinkActionListener {
 
     override val tokenDetailsActionFlow: SharedFlow<String>
-    field = MutableSharedFlow<String>()
+        field = MutableSharedFlow<String>()
 
     override suspend fun trigger(txId: String) {
         tokenDetailsActionFlow.emit(txId)
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
index 01040f4abc..66afedfdbf 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/TokenDetailsPreviewData.kt
@@ -178,6 +178,7 @@ internal object TokenDetailsPreviewData {
         bottomSheetConfig = null,
         isBalanceHidden = false,
         isMarketPriceAvailable = false,
+        isYieldSupplyFeatureEnabled = false,
     )
 
     val tokenDetailsState_2 = TokenDetailsState(
@@ -203,6 +204,7 @@ internal object TokenDetailsPreviewData {
         bottomSheetConfig = null,
         isBalanceHidden = false,
         isMarketPriceAvailable = true,
+        isYieldSupplyFeatureEnabled = true,
     )
 
     val tokenDetailsState_3 = tokenDetailsState_2.copy(stakingBlocksState = stakingBalanceBlock)
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsClickIntents.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsClickIntents.kt
index e0e6cd1566..66d495e481 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsClickIntents.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsClickIntents.kt
@@ -79,4 +79,6 @@ interface TokenDetailsClickIntents {
     fun onConfirmDisposeExpressStatus()
 
     fun onDisposeExpressStatus()
+
+    fun onYieldInfoClick()
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt
index 3e626329c4..8397d73477 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt
@@ -5,6 +5,7 @@ import arrow.core.getOrElse
 import arrow.core.merge
 import com.arkivanov.decompose.router.slot.SlotNavigation
 import com.arkivanov.decompose.router.slot.activate
+import com.arkivanov.decompose.router.slot.dismiss
 import com.tangem.blockchain.common.address.AddressType
 import com.tangem.common.routing.AppRoute
 import com.tangem.common.routing.AppRouter
@@ -37,6 +38,7 @@ import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.models.ReceiveAddressModel
 import com.tangem.domain.models.TokenReceiveConfig
+import com.tangem.domain.models.TokenReceiveNotification
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.network.Network
@@ -58,6 +60,7 @@ import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.tokens.model.analytics.*
 import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent.Companion.toReasonAnalyticsText
 import com.tangem.domain.tokens.model.analytics.TokenScreenAnalyticsEvent.DetailsScreenOpened.TokenBalance
+import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.domain.transaction.error.AssociateAssetError
 import com.tangem.domain.transaction.error.IncompleteTransactionError
 import com.tangem.domain.transaction.error.OpenTrustlineError
@@ -72,15 +75,17 @@ import com.tangem.feature.tokendetails.deeplink.TokenDetailsDeepLinkActionListen
 import com.tangem.feature.tokendetails.presentation.router.InnerTokenDetailsRouter
 import com.tangem.feature.tokendetails.presentation.tokendetails.analytics.TokenDetailsCurrencyStatusAnalyticsSender
 import com.tangem.feature.tokendetails.presentation.tokendetails.analytics.TokenDetailsNotificationsAnalyticsSender
+import com.tangem.feature.tokendetails.presentation.tokendetails.route.TokenDetailsBottomSheetConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenBalanceSegmentedButtonConfig
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.TokenDetailsStateFactory
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.factory.express.ExpressStatusFactory
-import com.tangem.features.send.v2.api.SendFeatureToggles
 import com.tangem.features.tokendetails.TokenDetailsComponent
 import com.tangem.features.tokendetails.impl.R
 import com.tangem.features.tokenreceive.TokenReceiveFeatureToggle
 import com.tangem.features.txhistory.entity.TxHistoryContentUpdateEmitter
+import com.tangem.features.yield.supply.api.YieldSupplyDepositedWarningComponent
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.*
 import com.tangem.utils.extensions.isZero
@@ -133,11 +138,14 @@ internal class TokenDetailsModel @Inject constructor(
     private val router: InnerTokenDetailsRouter,
     private val tokenDetailsDeepLinkActionListener: TokenDetailsDeepLinkActionListener,
     private val analyticsExceptionHandler: AnalyticsExceptionHandler,
-    private val sendFeatureToggles: SendFeatureToggles,
     private val tokenReceiveFeatureToggle: TokenReceiveFeatureToggle,
     private val getViewedTokenReceiveWarningUseCase: GetViewedTokenReceiveWarningUseCase,
     private val getEnsNameUseCase: GetEnsNameUseCase,
-) : Model(), TokenDetailsClickIntents {
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
+    private val saveViewedYieldSupplyWarningUseCase: SaveViewedYieldSupplyWarningUseCase,
+    private val saveViewedTokenReceiveWarningUseCase: SaveViewedTokenReceiveWarningUseCase,
+    private val needShowYieldSupplyDepositedWarningUseCase: NeedShowYieldSupplyDepositedWarningUseCase,
+) : Model(), TokenDetailsClickIntents, YieldSupplyDepositedWarningComponent.ModelCallback {
 
     private val params = paramsContainer.require<TokenDetailsComponent.Params>()
     private val userWalletId: UserWalletId = params.userWalletId
@@ -160,7 +168,7 @@ internal class TokenDetailsModel @Inject constructor(
     /** Transaction id to check for status */
     private val waitForFirstExpressStatusEmmit = MutableStateFlow(false)
 
-    val bottomSheetNavigation: SlotNavigation<TokenReceiveConfig> = SlotNavigation()
+    val bottomSheetNavigation: SlotNavigation<TokenDetailsBottomSheetConfig> = SlotNavigation()
 
     private val stateFactory = TokenDetailsStateFactory(
         currentStateProvider = Provider { uiState.value },
@@ -170,6 +178,7 @@ internal class TokenDetailsModel @Inject constructor(
         networkHasDerivationUseCase = networkHasDerivationUseCase,
         getUserWalletUseCase = getUserWalletUseCase,
         userWalletId = userWalletId,
+        yieldSupplyFeatureToggles = yieldSupplyFeatureToggles,
     )
 
     private val expressStatusFactory by lazy(mode = LazyThreadSafetyMode.NONE) {
@@ -524,22 +533,25 @@ internal class TokenDetailsModel @Inject constructor(
         if (handleUnavailabilityReason(unavailabilityReason = unavailabilityReason)) {
             return
         }
-
-        sendCurrency()
+        modelScope.launch {
+            if (needShowYieldSupplyDepositedWarningUseCase(cryptoCurrencyStatus)) {
+                bottomSheetNavigation.activate(
+                    configuration = TokenDetailsBottomSheetConfig.YieldSupplyWarning(
+                        cryptoCurrency = cryptoCurrency,
+                        tokenAction = TokenAction.Send,
+                    ),
+                )
+            } else {
+                sendCurrency()
+            }
+        }
     }
 
     private fun sendCurrency() {
-        val route = if (sendFeatureToggles.isSendWithSwapEnabled) {
-            AppRoute.SendEntryPoint(
-                currency = cryptoCurrency,
-                userWalletId = userWallet.walletId,
-            )
-        } else {
-            AppRoute.Send(
-                currency = cryptoCurrency,
-                userWalletId = userWallet.walletId,
-            )
-        }
+        val route = AppRoute.SendEntryPoint(
+            currency = cryptoCurrency,
+            userWalletId = userWallet.walletId,
+        )
 
         appRouter.push(route)
     }
@@ -560,26 +572,15 @@ internal class TokenDetailsModel @Inject constructor(
         }
 
         modelScope.launch {
-            if (tokenReceiveFeatureToggle.isNewTokenReceiveEnabled) {
+            if (needShowYieldSupplyWarning()) {
                 bottomSheetNavigation.activate(
-                    configuration = configureReceiveAddresses(addresses = networkAddress),
+                    configuration = TokenDetailsBottomSheetConfig.YieldSupplyWarning(
+                        cryptoCurrency = cryptoCurrency,
+                        tokenAction = TokenAction.Receive,
+                    ),
                 )
             } else {
-                analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ReceiveScreenOpened(cryptoCurrency.symbol))
-                internalUiState.value = stateFactory.getStateWithReceiveBottomSheet(
-                    currency = cryptoCurrency,
-                    networkAddress = networkAddress,
-                    onCopyClick = {
-                        analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonCopyAddress(cryptoCurrency.symbol))
-                        clipboardManager.setText(text = it, isSensitive = true)
-                    },
-                    onShareClick = {
-                        analyticsEventsHandler.send(
-                            TokenReceiveAnalyticsEvent.ButtonShareAddress(cryptoCurrency.symbol),
-                        )
-                        shareManager.shareText(text = it)
-                    },
-                )
+                navigateToReceive()
             }
         }
     }
@@ -653,13 +654,24 @@ internal class TokenDetailsModel @Inject constructor(
             return
         }
 
-        appRouter.push(
-            AppRoute.Swap(
-                currencyFrom = cryptoCurrency,
-                userWalletId = userWalletId,
-                screenSource = AnalyticsParam.ScreensSources.Token.value,
-            ),
-        )
+        modelScope.launch {
+            if (needShowYieldSupplyDepositedWarningUseCase(cryptoCurrencyStatus)) {
+                bottomSheetNavigation.activate(
+                    configuration = TokenDetailsBottomSheetConfig.YieldSupplyWarning(
+                        cryptoCurrency = cryptoCurrency,
+                        tokenAction = TokenAction.Swap,
+                    ),
+                )
+            } else {
+                appRouter.push(
+                    AppRoute.Swap(
+                        currencyFrom = cryptoCurrency,
+                        userWalletId = userWalletId,
+                        screenSource = AnalyticsParam.ScreensSources.Token.value,
+                    ),
+                )
+            }
+        }
     }
 
     override fun onDismissDialog() {
@@ -1007,6 +1019,15 @@ internal class TokenDetailsModel @Inject constructor(
         internalUiState.value = stateFactory.getStateWithClosedBottomSheet()
     }
 
+    override fun onYieldInfoClick() {
+        bottomSheetNavigation.activate(
+            configuration = TokenDetailsBottomSheetConfig.YieldSupplyWarning(
+                cryptoCurrency = cryptoCurrency,
+                tokenAction = TokenAction.Info,
+            ),
+        )
+    }
+
     private fun handleUnavailabilityReason(unavailabilityReason: ScenarioUnavailabilityReason): Boolean {
         if (unavailabilityReason == ScenarioUnavailabilityReason.None) return false
 
@@ -1037,7 +1058,7 @@ internal class TokenDetailsModel @Inject constructor(
             .launchIn(modelScope)
     }
 
-    private suspend fun configureReceiveAddresses(addresses: NetworkAddress): TokenReceiveConfig {
+    private suspend fun configureReceiveAddresses(addresses: NetworkAddress): TokenDetailsBottomSheetConfig {
         val ensName = getEnsNameUseCase.invoke(
             userWalletId = userWalletId,
             network = cryptoCurrency.network,
@@ -1066,12 +1087,27 @@ internal class TokenDetailsModel @Inject constructor(
             }
         }
 
-        return TokenReceiveConfig(
-            shouldShowWarning = cryptoCurrency.name !in getViewedTokenReceiveWarningUseCase(),
-            cryptoCurrency = cryptoCurrency,
-            userWalletId = userWalletId,
-            showMemoDisclaimer = cryptoCurrency.network.transactionExtrasType != Network.TransactionExtrasType.NONE,
-            receiveAddress = receiveAddresses,
+        val notifications = buildList {
+            if (isActiveYieldSupply()) {
+                add(
+                    TokenReceiveNotification(
+                        title = R.string.yield_module_balance_info_sheet_title,
+                        subtitle = R.string.yield_module_balance_info_sheet_subtitle,
+                        isYieldSupplyNotification = true,
+                    ),
+                )
+            }
+        }
+
+        return TokenDetailsBottomSheetConfig.Receive(
+            TokenReceiveConfig(
+                shouldShowWarning = cryptoCurrency.name !in getViewedTokenReceiveWarningUseCase(),
+                cryptoCurrency = cryptoCurrency,
+                userWalletId = userWalletId,
+                showMemoDisclaimer = cryptoCurrency.network.transactionExtrasType != Network.TransactionExtrasType.NONE,
+                tokenReceiveNotification = notifications,
+                receiveAddress = receiveAddresses,
+            ),
         )
     }
 
@@ -1112,6 +1148,67 @@ internal class TokenDetailsModel @Inject constructor(
         isBalanceLoadedEventSent = true
     }
 
+    private suspend fun needShowYieldSupplyWarning(): Boolean {
+        return yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled &&
+            needShowYieldSupplyDepositedWarningUseCase(cryptoCurrencyStatus)
+    }
+
+    private fun isActiveYieldSupply(): Boolean {
+        return yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled &&
+            cryptoCurrencyStatus?.value?.yieldSupplyStatus?.isActive == true
+    }
+
+    override fun onYieldSupplyWarningAcknowledged(tokenAction: TokenAction) {
+        bottomSheetNavigation.dismiss()
+        modelScope.launch {
+            if (tokenAction != TokenAction.Info) {
+                saveViewedYieldSupplyWarningUseCase(cryptoCurrency.name)
+            }
+            if (tokenAction == TokenAction.Receive) {
+                saveViewedTokenReceiveWarningUseCase(cryptoCurrency.name)
+            }
+            when (tokenAction) {
+                TokenAction.Receive -> navigateToReceive()
+                TokenAction.Send -> sendCurrency()
+                TokenAction.Swap -> appRouter.push(
+                    AppRoute.Swap(
+                        currencyFrom = cryptoCurrency,
+                        userWalletId = userWalletId,
+                        screenSource = AnalyticsParam.ScreensSources.Token.value,
+                    ),
+                )
+                TokenAction.Info -> Unit
+            }
+        }
+    }
+
+    private fun navigateToReceive() {
+        val networkAddress = cryptoCurrencyStatus?.value?.networkAddress ?: return
+        if (tokenReceiveFeatureToggle.isNewTokenReceiveEnabled) {
+            modelScope.launch {
+                bottomSheetNavigation.activate(
+                    configuration = configureReceiveAddresses(addresses = networkAddress),
+                )
+            }
+        } else {
+            analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ReceiveScreenOpened(cryptoCurrency.symbol))
+            internalUiState.value = stateFactory.getStateWithReceiveBottomSheet(
+                currency = cryptoCurrency,
+                networkAddress = networkAddress,
+                onCopyClick = {
+                    analyticsEventsHandler.send(TokenReceiveAnalyticsEvent.ButtonCopyAddress(cryptoCurrency.symbol))
+                    clipboardManager.setText(text = it, isSensitive = true)
+                },
+                onShareClick = {
+                    analyticsEventsHandler.send(
+                        TokenReceiveAnalyticsEvent.ButtonShareAddress(cryptoCurrency.symbol),
+                    )
+                    shareManager.shareText(text = it)
+                },
+            )
+        }
+    }
+
     private companion object {
         const val EXPRESS_STATUS_UPDATE_DELAY = 10_000L
     }
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/route/TokenDetailsBottomSheetConfig.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/route/TokenDetailsBottomSheetConfig.kt
new file mode 100644
index 0000000000..dfba415f3b
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/route/TokenDetailsBottomSheetConfig.kt
@@ -0,0 +1,20 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.route
+
+import com.tangem.core.decompose.navigation.Route
+import com.tangem.domain.models.TokenReceiveConfig
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.tokens.model.details.TokenAction
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed class TokenDetailsBottomSheetConfig : Route {
+
+    @Serializable
+    data class Receive(val tokenReceiveConfig: TokenReceiveConfig) : TokenDetailsBottomSheetConfig()
+
+    @Serializable
+    data class YieldSupplyWarning(
+        val cryptoCurrency: CryptoCurrency,
+        val tokenAction: TokenAction,
+    ) : TokenDetailsBottomSheetConfig()
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsBalanceBlockState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsBalanceBlockState.kt
index a0fbbf99e4..b650254ea3 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsBalanceBlockState.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsBalanceBlockState.kt
@@ -27,6 +27,7 @@ internal sealed class TokenDetailsBalanceBlockState {
         val displayFiatBalance: String,
         val isBalanceSelectorEnabled: Boolean,
         val isBalanceFlickering: Boolean,
+        val yieldSupplyState: TokenDetailsYieldSupplyState = TokenDetailsYieldSupplyState.Empty,
     ) : TokenDetailsBalanceBlockState()
 
     data class Error(
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
index d3a16f09cd..40805e48b9 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsState.kt
@@ -23,4 +23,5 @@ internal data class TokenDetailsState(
     val bottomSheetConfig: TangemBottomSheetConfig?,
     val isBalanceHidden: Boolean,
     val isMarketPriceAvailable: Boolean,
+    val isYieldSupplyFeatureEnabled: Boolean,
 )
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsYieldSupplyState.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsYieldSupplyState.kt
new file mode 100644
index 0000000000..edc2dfdfeb
--- /dev/null
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/TokenDetailsYieldSupplyState.kt
@@ -0,0 +1,8 @@
+package com.tangem.feature.tokendetails.presentation.tokendetails.state
+
+sealed class TokenDetailsYieldSupplyState {
+
+    data object Empty : TokenDetailsYieldSupplyState()
+
+    data class Active(val yieldInfoClick: (() -> Unit)) : TokenDetailsYieldSupplyState()
+}
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/ExchangeStatusNotification.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/ExchangeStatusNotification.kt
index 8817f3a7f7..c36b62c6e9 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/ExchangeStatusNotification.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/ExchangeStatusNotification.kt
@@ -45,13 +45,16 @@ internal sealed interface ExchangeStatusNotification {
         ),
     )
 
-    data class LongTimeExchange(val onGoToProviderClick: () -> Unit) : CommonNotification(
+    data class LongTimeExchange(
+        private val onGoToProviderClick: () -> Unit,
+        private val providerName: String,
+    ) : CommonNotification(
         config = NotificationConfig(
             title = resourceReference(R.string.express_exchange_notification_long_transaction_time_title),
             subtitle = resourceReference(R.string.express_exchange_notification_long_transaction_time_text),
             iconResId = R.drawable.ic_alert_triangle_20,
             buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
-                text = resourceReference(R.string.common_go_to_provider),
+                text = resourceReference(R.string.provider_name_support, wrappedList(providerName)),
                 onClick = onGoToProviderClick,
             ),
         ),
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
index b3c3f03e68..a43ef77c42 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/components/TokenDetailsActionButton.kt
@@ -25,7 +25,7 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_buy),
             iconResId = R.drawable.ic_plus_24,
             onClick = onClick,
-            dimContent = dimContent,
+            shouldDimContent = dimContent,
         ),
     )
 
@@ -40,7 +40,7 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_send),
             iconResId = R.drawable.ic_arrow_up_24,
             onClick = onClick,
-            dimContent = dimContent,
+            shouldDimContent = dimContent,
         ),
     )
 
@@ -58,7 +58,7 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
             iconResId = R.drawable.ic_arrow_down_24,
             onClick = onClick,
             onLongClick = onLongClick,
-            enabled = true,
+            isEnabled = true,
         ),
     )
 
@@ -73,7 +73,7 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_sell),
             iconResId = R.drawable.ic_currency_24,
             onClick = onClick,
-            dimContent = dimContent,
+            shouldDimContent = dimContent,
         ),
     )
 
@@ -92,8 +92,8 @@ internal sealed class TokenDetailsActionButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.swapping_swap_action),
             iconResId = R.drawable.ic_exchange_vertical_24,
             onClick = onClick,
-            dimContent = dimContent,
-            showBadge = showBadge,
+            shouldDimContent = dimContent,
+            shouldShowBadge = showBadge,
         ),
     )
 }
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
index 86527f1f30..22b55017a2 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt
@@ -16,8 +16,10 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.model.TokenDeta
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.BalanceType
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsYieldSupplyState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsNotification
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.utils.getBalance
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.Provider
 import com.tangem.utils.StringsSigns.DASH_SIGN
 import com.tangem.utils.converter.Converter
@@ -29,6 +31,7 @@ internal class TokenDetailsLoadedBalanceConverter(
     private val currentStateProvider: Provider<TokenDetailsState>,
     private val appCurrencyProvider: Provider<AppCurrency>,
     private val clickIntents: TokenDetailsClickIntents,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
 ) : Converter<Either<CurrencyStatusError, CryptoCurrencyStatus>, TokenDetailsState> {
 
     override fun convert(value: Either<CurrencyStatusError, CryptoCurrencyStatus>): TokenDetailsState {
@@ -100,6 +103,14 @@ internal class TokenDetailsLoadedBalanceConverter(
                 selectedBalanceType = currentState.selectedBalanceType,
                 isBalanceSelectorEnabled = isBalanceSelectorEnabled,
                 isBalanceFlickering = status.value.isFlickering(),
+                yieldSupplyState =
+                if (yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled &&
+                    status.value.yieldSupplyStatus?.isActive == true
+                ) {
+                    TokenDetailsYieldSupplyState.Active(clickIntents::onYieldInfoClick)
+                } else {
+                    TokenDetailsYieldSupplyState.Empty
+                },
             )
             is CryptoCurrencyStatus.Loading -> TokenDetailsBalanceBlockState.Loading(
                 actionButtons = currentState.actionButtons,
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
index ee0b33124a..faca9bd311 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSkeletonStateConverter.kt
@@ -18,6 +18,7 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.model.TokenDeta
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.*
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
 import com.tangem.features.tokendetails.impl.R
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.lib.crypto.BlockchainUtils.isBitcoin
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.ImmutableList
@@ -29,6 +30,7 @@ internal class TokenDetailsSkeletonStateConverter(
     private val networkHasDerivationUseCase: NetworkHasDerivationUseCase,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val userWalletId: UserWalletId,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
 ) : Converter<CryptoCurrency, TokenDetailsState> {
 
     private val iconStateConverter by lazy { TokenDetailsIconStateConverter() }
@@ -69,6 +71,7 @@ internal class TokenDetailsSkeletonStateConverter(
             bottomSheetConfig = null,
             isBalanceHidden = true,
             isMarketPriceAvailable = value.id.rawCurrencyId != null,
+            isYieldSupplyFeatureEnabled = yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled,
         )
     }
 
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStakingInfoConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStakingInfoConverter.kt
index f6fb474788..b16d554602 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStakingInfoConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStakingInfoConverter.kt
@@ -156,14 +156,16 @@ internal class TokenDetailsStakingInfoConverter(
     private fun getRewardText(status: CryptoCurrencyStatus, stakingRewardAmount: BigDecimal?): TextReference {
         val blockchainId = status.currency.network.rawId
         val rewardBlockType = when {
-            isStakingRewardUnavailable(blockchainId) -> RewardBlockType.RewardUnavailable
+            isStakingRewardUnavailable(blockchainId) -> RewardBlockType.RewardUnavailable.DefaultRewardUnavailable
             stakingRewardAmount.isNullOrZero() -> RewardBlockType.NoRewards
             else -> RewardBlockType.Rewards
         }
 
         return when (rewardBlockType) {
             RewardBlockType.NoRewards -> resourceReference(R.string.staking_details_no_rewards_to_claim)
-            RewardBlockType.RewardUnavailable -> TextReference.EMPTY
+            RewardBlockType.RewardUnavailable.DefaultRewardUnavailable,
+            RewardBlockType.RewardUnavailable.SolanaRewardUnavailable,
+            -> TextReference.EMPTY
             RewardBlockType.RewardsRequirementsError,
             RewardBlockType.Rewards,
             -> resourceReference(
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
index 77eb685821..af30b75a43 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt
@@ -31,6 +31,7 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDeta
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsDialogConfig
 import com.tangem.features.tokendetails.impl.R
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.Provider
 import kotlinx.collections.immutable.toImmutableList
 
@@ -43,6 +44,7 @@ internal class TokenDetailsStateFactory(
     private val networkHasDerivationUseCase: NetworkHasDerivationUseCase,
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val userWalletId: UserWalletId,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
 ) {
 
     private val skeletonStateConverter by lazy {
@@ -51,6 +53,7 @@ internal class TokenDetailsStateFactory(
             networkHasDerivationUseCase = networkHasDerivationUseCase,
             getUserWalletUseCase = getUserWalletUseCase,
             userWalletId = userWalletId,
+            yieldSupplyFeatureToggles = yieldSupplyFeatureToggles,
         )
     }
 
@@ -67,6 +70,7 @@ internal class TokenDetailsStateFactory(
             currentStateProvider = currentStateProvider,
             appCurrencyProvider = appCurrencyProvider,
             clickIntents = clickIntents,
+            yieldSupplyFeatureToggles = yieldSupplyFeatureToggles,
         )
     }
 
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
index 01835b8f16..42e28102ef 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsSwapTransactionsStateConverter.kt
@@ -93,6 +93,7 @@ internal class TokenDetailsSwapTransactionsStateConverter(
                         txUrl = statusModel?.txExternalUrl,
                         refundToken = statusModel?.refundCurrency,
                         hasLongTime = statusModel?.hasLongTime,
+                        providerName = transaction.provider.name,
                     )
                     val showProviderLink = getShowProviderLink(notification, transaction.status)
                     result.add(
@@ -130,6 +131,7 @@ internal class TokenDetailsSwapTransactionsStateConverter(
             txUrl = statusModel.txExternalUrl,
             refundToken = statusModel.refundCurrency,
             hasLongTime = statusModel.hasLongTime,
+            providerName = tx.provider.name,
         )
         val showProviderLink = getShowProviderLink(notification, statusModel)
         return tx.copy(
@@ -201,6 +203,7 @@ internal class TokenDetailsSwapTransactionsStateConverter(
         txUrl: String?,
         refundToken: CryptoCurrency?,
         hasLongTime: Boolean?,
+        providerName: String,
     ): ExchangeStatusNotification? {
         return when {
             status == ExchangeStatus.Failed || status == ExchangeStatus.TxFailed -> {
@@ -233,12 +236,15 @@ internal class TokenDetailsSwapTransactionsStateConverter(
                 }
             }
             status?.isTerminal == false && txUrl != null && hasLongTime == true -> {
-                ExchangeStatusNotification.LongTimeExchange {
-                    analyticsEventsHandler.send(
-                        event = TokenExchangeAnalyticsEvent.GoToProviderLongTime(cryptoCurrency.symbol),
-                    )
-                    clickIntents.onGoToProviderClick(txUrl)
-                }
+                ExchangeStatusNotification.LongTimeExchange(
+                    onGoToProviderClick = {
+                        analyticsEventsHandler.send(
+                            event = TokenExchangeAnalyticsEvent.GoToProviderLongTime(cryptoCurrency.symbol),
+                        )
+                        clickIntents.onGoToProviderClick(txUrl)
+                    },
+                    providerName = providerName,
+                )
             }
             else -> null
         }
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
index 14a17ee2e1..f3466d9025 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt
@@ -40,6 +40,7 @@ import com.tangem.feature.tokendetails.presentation.tokendetails.ui.components.s
 import com.tangem.features.markets.token.block.TokenMarketBlockComponent
 import com.tangem.features.txhistory.component.TxHistoryComponent
 import com.tangem.features.txhistory.entity.TxHistoryUM
+import com.tangem.features.yield.supply.api.YieldSupplyComponent
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
@@ -50,6 +51,7 @@ internal fun TokenDetailsScreen(
     state: TokenDetailsState,
     tokenMarketBlockComponent: TokenMarketBlockComponent?,
     txHistoryComponent: TxHistoryComponent,
+    yieldSupplyComponent: YieldSupplyComponent,
 ) {
     val bottomBarHeight = with(LocalDensity.current) { WindowInsets.systemBars.getBottom(this).toDp() }
 
@@ -145,6 +147,12 @@ internal fun TokenDetailsScreen(
                     )
                 }
 
+                if (state.isYieldSupplyFeatureEnabled) {
+                    item {
+                        yieldSupplyComponent.Content(modifier = itemModifier)
+                    }
+                }
+
                 expressTransactionsItems(
                     expressTxs = state.expressTxsToDisplay,
                     modifier = itemModifier,
@@ -190,6 +198,11 @@ private fun TokenDetailsScreenPreview(
 
                 override fun LazyListScope.txHistoryContent(listState: LazyListState, state: TxHistoryUM) = Unit
             },
+            yieldSupplyComponent = object : YieldSupplyComponent {
+                @Composable
+                override fun Content(modifier: Modifier) {
+                }
+            },
         )
     }
 }
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
index d1110e97fa..d38b7d4e5c 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsBalanceBlock.kt
@@ -1,16 +1,24 @@
 package com.tangem.feature.tokendetails.presentation.tokendetails.ui.components
 
 import android.content.res.Configuration
+import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.buttons.HorizontalActionChips
 import com.tangem.core.ui.components.buttons.segmentedbutton.SegmentedButtons
@@ -22,6 +30,7 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.feature.tokendetails.presentation.tokendetails.TokenDetailsPreviewData
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsBalanceBlockState
+import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsYieldSupplyState
 import com.tangem.feature.tokendetails.presentation.tokendetails.state.components.TokenDetailsActionButton
 import com.tangem.features.tokendetails.impl.R
 import com.tangem.utils.StringsSigns.DASH_SIGN
@@ -44,8 +53,7 @@ internal fun TokenDetailsBalanceBlock(
         val spacing12 = TangemTheme.dimens.spacing12
 
         ConstraintLayout(
-            modifier = Modifier
-                .fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(),
         ) {
             val (balanceTitle, toggleButtons, fiatBalance, cryptoBalance, actionChips) = createRefs()
 
@@ -87,13 +95,12 @@ internal fun TokenDetailsBalanceBlock(
 
             HorizontalActionChips(
                 buttons = state.actionButtons.map(TokenDetailsActionButton::config).toImmutableList(),
-                modifier = Modifier
-                    .constrainAs(actionChips) {
-                        top.linkTo(anchor = cryptoBalance.bottom, margin = spacing12)
-                        start.linkTo(anchor = parent.start)
-                        end.linkTo(anchor = parent.end)
-                        bottom.linkTo(anchor = parent.bottom, margin = spacing12)
-                    },
+                modifier = Modifier.constrainAs(actionChips) {
+                    top.linkTo(anchor = cryptoBalance.bottom, margin = spacing12)
+                    start.linkTo(anchor = parent.start)
+                    end.linkTo(anchor = parent.end)
+                    bottom.linkTo(anchor = parent.bottom, margin = spacing12)
+                },
                 containerColor = TangemTheme.colors.background.primary,
                 contentPadding = PaddingValues(horizontal = TangemTheme.dimens.spacing12),
             )
@@ -144,14 +151,54 @@ private fun CryptoBalance(
                 height = TangemTheme.dimens.size16,
             ),
         )
-        is TokenDetailsBalanceBlockState.Content -> Text(
-            modifier = modifier,
-            text = state.displayCryptoBalance.orMaskWithStars(isBalanceHidden),
-            style = TangemTheme.typography.caption2.applyBladeBrush(
-                isEnabled = state.isBalanceFlickering,
-                textColor = TangemTheme.colors.text.tertiary,
-            ),
-        )
+        is TokenDetailsBalanceBlockState.Content -> {
+            Crossfade(
+                modifier = modifier,
+                targetState = state.yieldSupplyState,
+            ) { yieldSupplyState ->
+                when (yieldSupplyState) {
+                    is TokenDetailsYieldSupplyState.Active -> {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
+                        ) {
+                            Icon(
+                                modifier = Modifier.size(TangemTheme.dimens.size16),
+                                painter = painterResource(id = R.drawable.ic_exchange_horizontal_24),
+                                tint = TangemTheme.colors.icon.inactive,
+                                contentDescription = null,
+                            )
+                            Text(
+                                text = state.displayCryptoBalance.orMaskWithStars(isBalanceHidden),
+                                style = TangemTheme.typography.caption2.applyBladeBrush(
+                                    isEnabled = state.isBalanceFlickering,
+                                    textColor = TangemTheme.colors.text.tertiary,
+                                ),
+                            )
+                            Icon(
+                                modifier = Modifier
+                                    .size(TangemTheme.dimens.size16)
+                                    .clickable(
+                                        interactionSource = remember { MutableInteractionSource() },
+                                        indication = ripple(bounded = false),
+                                        onClick = { yieldSupplyState.yieldInfoClick() },
+                                    ),
+                                painter = painterResource(id = R.drawable.ic_information_24),
+                                tint = TangemTheme.colors.icon.inactive,
+                                contentDescription = null,
+                            )
+                        }
+                    }
+                    is TokenDetailsYieldSupplyState.Empty -> Text(
+                        text = state.displayCryptoBalance.orMaskWithStars(isBalanceHidden),
+                        style = TangemTheme.typography.caption2.applyBladeBrush(
+                            isEnabled = state.isBalanceFlickering,
+                            textColor = TangemTheme.colors.text.tertiary,
+                        ),
+                    )
+                }
+            }
+        }
         is TokenDetailsBalanceBlockState.Error -> Text(
             modifier = modifier,
             text = DASH_SIGN.orMaskWithStars(isBalanceHidden),
@@ -209,6 +256,9 @@ private class TokenDetailsBalanceBlockStateProvider : CollectionPreviewParameter
         TokenDetailsPreviewData.balanceLoading,
         TokenDetailsPreviewData.balanceContent,
         TokenDetailsPreviewData.balanceContent.copy(isBalanceFlickering = true),
+        TokenDetailsPreviewData.balanceContent.copy(
+            yieldSupplyState = TokenDetailsYieldSupplyState.Active({}),
+        ),
         TokenDetailsPreviewData.balanceError,
     ),
 )
\ No newline at end of file
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt
index 5a4f590fe7..3e57199b5a 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenDetailsDialogs.kt
@@ -21,7 +21,7 @@ private fun TokenDetailsDialog(config: TokenDetailsDialogConfig) {
         message = config.content.message.resolveReference(),
         confirmButton = DialogButtonUM(
             title = config.content.confirmButtonConfig.text.resolveReference(),
-            warning = config.content.confirmButtonConfig.warning,
+            isWarning = config.content.confirmButtonConfig.warning,
             onClick = config.content.confirmButtonConfig.onClick,
         ),
         onDismissDialog = config.onDismissRequest,
@@ -29,7 +29,7 @@ private fun TokenDetailsDialog(config: TokenDetailsDialogConfig) {
         dismissButton = config.content.cancelButtonConfig?.let { cancelButtonConfig ->
             DialogButtonUM(
                 title = cancelButtonConfig.text.resolveReference(),
-                warning = cancelButtonConfig.warning,
+                isWarning = cancelButtonConfig.warning,
                 onClick = cancelButtonConfig.onClick,
             )
         },
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt
index c0b325c9e4..f52e15610f 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/TokenIcon.kt
@@ -86,11 +86,11 @@ private fun CoinIcon(
 
 @Composable
 private fun TokenIcon(
-    url: String?,
     alpha: Float,
+    url: String?,
     colorFilter: ColorFilter?,
-    errorIcon: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    errorIcon: @Composable () -> Unit,
 ) {
     if (url == null) {
         errorIcon()
@@ -129,8 +129,8 @@ private inline fun DefaultCurrencyIcon(
     iconData: Any,
     alpha: Float,
     colorFilter: ColorFilter?,
-    crossinline errorIcon: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    crossinline errorIcon: @Composable () -> Unit,
 ) {
     var iconBackgroundColor by remember { mutableStateOf(Color.Transparent) }
     var isBackgroundColorDefined by remember { mutableStateOf(false) }
diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/express/ExpressStatusBottomSheetStateProvider.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/express/ExpressStatusBottomSheetStateProvider.kt
index fc4a214ee0..427406a32b 100644
--- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/express/ExpressStatusBottomSheetStateProvider.kt
+++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/components/express/ExpressStatusBottomSheetStateProvider.kt
@@ -72,7 +72,10 @@ class ExpressStatusBottomSheetStateProvider : PreviewParameterProvider<ExpressSt
                             isDone = false,
                         ),
                     ),
-                    notification = ExchangeStatusNotification.LongTimeExchange {},
+                    notification = ExchangeStatusNotification.LongTimeExchange(
+                        onGoToProviderClick = {},
+                        providerName = "Unlimit",
+                    ),
                     showProviderLink = false,
                     fromCryptoCurrency = token,
                     toCryptoCurrency = token,
diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
index 4b0fb801b0..f18879a60a 100644
--- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
+++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/converter/TxHistoryItemToTransactionStateConverter.kt
@@ -53,6 +53,7 @@ internal class TxHistoryItemToTransactionStateConverter(
             is TxInfo.TransactionType.Operation,
             is TxInfo.TransactionType.Swap,
             is TxInfo.TransactionType.Transfer,
+            is TxInfo.TransactionType.YieldSupply,
             is TxInfo.TransactionType.UnknownOperation,
             -> if (isOutgoing) R.drawable.ic_arrow_up_24 else R.drawable.ic_arrow_down_24
         }
@@ -62,7 +63,9 @@ internal class TxHistoryItemToTransactionStateConverter(
         is TxInfo.TransactionType.Approve -> resourceReference(R.string.common_approval)
         is TxInfo.TransactionType.Operation -> stringReference(type.name)
         is TxInfo.TransactionType.Swap -> resourceReference(R.string.common_swap)
-        is TxInfo.TransactionType.Transfer -> resourceReference(R.string.common_transfer)
+        is TxInfo.TransactionType.YieldSupply,
+        is TxInfo.TransactionType.Transfer,
+        -> resourceReference(R.string.common_transfer)
         is TxInfo.TransactionType.Staking.Stake -> resourceReference(R.string.common_stake)
         is TxInfo.TransactionType.Staking.Unstake -> resourceReference(R.string.common_unstake)
         is TxInfo.TransactionType.Staking.Vote -> resourceReference(R.string.staking_vote)
diff --git a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt
index 21ea7b7b33..1c8153f1cb 100644
--- a/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt
+++ b/features/txhistory/impl/src/main/kotlin/com/tangem/features/txhistory/utils/TxHistoryListManager.kt
@@ -65,7 +65,7 @@ internal class TxHistoryListManager(
     suspend fun startLoading() {
         actionsFlow.emit(
             BatchAction.Reload(
-                requestParams = TxHistoryListConfig(userWalletId, currency, refresh = false),
+                requestParams = TxHistoryListConfig(userWalletId, currency, shouldRefresh = false),
             ),
         )
     }
@@ -73,7 +73,7 @@ internal class TxHistoryListManager(
     suspend fun reload() {
         actionsFlow.emit(
             BatchAction.Reload(
-                requestParams = TxHistoryListConfig(userWalletId, currency, refresh = true),
+                requestParams = TxHistoryListConfig(userWalletId, currency, shouldRefresh = true),
             ),
         )
     }
@@ -81,7 +81,7 @@ internal class TxHistoryListManager(
     suspend fun loadMore(userWalletId: UserWalletId, currency: CryptoCurrency) {
         actionsFlow.emit(
             BatchAction.LoadMore(
-                requestParams = TxHistoryListConfig(userWalletId, currency, refresh = false),
+                requestParams = TxHistoryListConfig(userWalletId, currency, shouldRefresh = false),
             ),
         )
     }
diff --git a/features/wallet-settings/impl/build.gradle.kts b/features/wallet-settings/impl/build.gradle.kts
index 3bb8904189..e34be56eb8 100644
--- a/features/wallet-settings/impl/build.gradle.kts
+++ b/features/wallet-settings/impl/build.gradle.kts
@@ -33,6 +33,11 @@ dependencies {
     implementation(projects.common.ui)
 
     /* Project - Domain */
+    implementation(projects.domain.account.status)
+    implementation(projects.domain.appCurrency)
+    implementation(projects.domain.appCurrency.models)
+    implementation(projects.domain.balanceHiding)
+    implementation(projects.domain.balanceHiding.models)
     implementation(projects.domain.legacy)
     implementation(projects.domain.card)
     implementation(projects.domain.models)
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
index e716a35761..d359b824c4 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewWalletSettingsComponent.kt
@@ -3,6 +3,7 @@ package com.tangem.feature.walletsettings.component.preview
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.tangem.common.ui.account.AccountIconPreviewData
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
 import com.tangem.common.ui.userwallet.state.UserWalletItemUM.ImageState
 import com.tangem.core.analytics.DummyAnalyticsEventHandler
 import com.tangem.core.decompose.navigation.DummyRouter
@@ -20,9 +21,27 @@ import com.tangem.feature.walletsettings.impl.R
 import com.tangem.feature.walletsettings.ui.WalletSettingsScreen
 import com.tangem.feature.walletsettings.utils.ItemsBuilder
 import com.tangem.hot.sdk.model.HotWalletId
+import java.util.UUID
 
 internal class PreviewWalletSettingsComponent : WalletSettingsComponent {
 
+    private val accountName get() = stringReference(value = "Main account")
+
+    private val accountItem: UserWalletItemUM
+        get() = UserWalletItemUM(
+            id = UserWalletId(UUID.randomUUID().toString().encodeToByteArray()),
+            name = accountName,
+            information = UserWalletItemUM.Information.Loaded(stringReference("12 tokens")),
+            balance = UserWalletItemUM.Balance.Loaded("$726.04", false),
+            isEnabled = true,
+            onClick = { },
+            imageState = ImageState.Account(
+                name = accountName,
+                icon = AccountIconPreviewData.randomAccountIcon(),
+            ),
+            label = null,
+        )
+
     private val previewState = WalletSettingsUM(
         popBack = {},
         items = ItemsBuilder(
@@ -66,14 +85,7 @@ internal class PreviewWalletSettingsComponent : WalletSettingsComponent {
             id = "accounts_header",
             text = resourceReference(R.string.common_accounts),
         ).let(::add)
-        WalletSettingsAccountsUM.Account(
-            id = "accountId",
-            accountName = stringReference("Main account"),
-            accountIconUM = AccountIconPreviewData.randomAccountIcon(),
-            tokensInfo = stringReference("10 tokens"),
-            networksInfo = stringReference("2 networks"),
-            onClick = {},
-        ).let(::add)
+        add(WalletSettingsAccountsUM.Account(accountItem))
         WalletSettingsAccountsUM.Footer(
             id = "accounts_footer",
             addAccount = AddAccountUM(
@@ -86,6 +98,7 @@ internal class PreviewWalletSettingsComponent : WalletSettingsComponent {
                 iconRes = R.drawable.ic_archive_24,
                 onClick = {},
             ),
+            showDescription = true,
             description = resourceReference(R.string.account_reorder_description),
         ).let(::add)
     }
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
index d2cb70fe36..fe8eafb722 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/WalletSettingsItemUM.kt
@@ -1,7 +1,7 @@
 package com.tangem.feature.walletsettings.entity
 
 import androidx.compose.runtime.Immutable
-import com.tangem.common.ui.account.CryptoPortfolioIconUM
+import com.tangem.common.ui.userwallet.state.UserWalletItemUM
 import com.tangem.common.ui.userwallet.state.UserWalletItemUM.ImageState
 import com.tangem.core.ui.components.block.model.BlockUM
 import com.tangem.core.ui.extensions.TextReference
@@ -65,18 +65,16 @@ internal sealed class WalletSettingsAccountsUM : WalletSettingsItemUM() {
     ) : WalletSettingsAccountsUM()
 
     data class Account(
-        override val id: String,
-        val accountName: TextReference,
-        val accountIconUM: CryptoPortfolioIconUM,
-        val tokensInfo: TextReference,
-        val networksInfo: TextReference,
-        val onClick: () -> Unit,
-    ) : WalletSettingsAccountsUM()
+        val state: UserWalletItemUM,
+    ) : WalletSettingsAccountsUM() {
+        override val id: String get() = state.id.stringValue
+    }
 
     data class Footer(
         override val id: String,
         val addAccount: AddAccountUM,
         val archivedAccounts: BlockUM,
+        val showDescription: Boolean,
         val description: TextReference,
     ) : WalletSettingsAccountsUM() {
 
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
index 0a86e4509c..e7864d0edc 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/model/WalletSettingsModel.kt
@@ -38,6 +38,7 @@ import com.tangem.feature.walletsettings.analytics.WalletSettingsAnalyticEvents
 import com.tangem.feature.walletsettings.component.WalletSettingsComponent
 import com.tangem.feature.walletsettings.entity.DialogConfig
 import com.tangem.feature.walletsettings.entity.NetworksAvailableForNotificationBSConfig
+import com.tangem.feature.walletsettings.entity.WalletSettingsAccountsUM
 import com.tangem.feature.walletsettings.entity.WalletSettingsItemUM
 import com.tangem.feature.walletsettings.entity.WalletSettingsUM
 import com.tangem.feature.walletsettings.impl.R
@@ -123,7 +124,8 @@ internal class WalletSettingsModel @Inject constructor(
             getWalletNotificationsEnabledUseCase(params.userWalletId),
             isUpgradeWalletNotificationEnabledUseCase(params.userWalletId),
             walletCardItemDelegate.cardItemFlow(wallet),
-        ) { nftEnabled, notificationsEnabled, isUpgradeNotificationEnabled, cardItem ->
+            accountItemsDelegate.loadAccount(),
+        ) { nftEnabled, notificationsEnabled, isUpgradeNotificationEnabled, cardItem, accountList ->
             val isWalletBackedUp = when (wallet) {
                 is UserWallet.Hot -> wallet.backedUp
                 is UserWallet.Cold -> true
@@ -138,6 +140,7 @@ internal class WalletSettingsModel @Inject constructor(
                         isNotificationsFeatureEnabled = true,
                         isNotificationsPermissionGranted = isNotificationsPermissionGranted(),
                         isUpgradeNotificationEnabled = isUpgradeNotificationEnabled,
+                        accountList = accountList,
                     ),
                     isWalletBackedUp = isWalletBackedUp,
                 )
@@ -168,6 +171,7 @@ internal class WalletSettingsModel @Inject constructor(
         isNotificationsEnabled: Boolean,
         isNotificationsPermissionGranted: Boolean,
         isUpgradeNotificationEnabled: Boolean,
+        accountList: List<WalletSettingsAccountsUM>,
     ): PersistentList<WalletSettingsItemUM> {
         val isMultiCurrency = when (userWallet) {
             is UserWallet.Cold -> userWallet.isMultiCurrency
@@ -194,7 +198,7 @@ internal class WalletSettingsModel @Inject constructor(
                     firstActionBuilder = {
                         EventMessageAction(
                             title = resourceReference(R.string.common_delete),
-                            warning = true,
+                            isWarning = true,
                             onClick = ::forgetWallet,
                         )
                     },
@@ -219,7 +223,7 @@ internal class WalletSettingsModel @Inject constructor(
             walletUpgradeDismissed = isUpgradeNotificationEnabled,
             onUpgradeWalletClick = ::onUpgradeWalletClick,
             onDismissUpgradeWalletClick = ::onDismissUpgradeWalletClick,
-            accountsUM = with(accountItemsDelegate) { listOf() }, // todo account
+            accountsUM = accountList,
         )
     }
 
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
index 11d76500bd..5cd35e1719 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
@@ -24,7 +24,7 @@ internal fun RenameWalletDialog(model: RenameWalletUM, onDismiss: () -> Unit) {
         fieldValue = value,
         confirmButton = DialogButtonUM(
             title = stringResourceSafe(id = R.string.common_ok),
-            enabled = model.isConfirmEnabled,
+            isEnabled = model.isConfirmEnabled,
             onClick = model.onConfirmClick,
         ),
         dismissButton = DialogButtonUM(
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
index c0d5e0cd86..7a01f6760f 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@@ -22,9 +23,8 @@ 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.dp
-import com.tangem.common.ui.account.AccountRow
 import com.tangem.common.ui.userwallet.CardImage
-import com.tangem.core.ui.components.SpacerH
+import com.tangem.common.ui.userwallet.UserWalletItem
 import com.tangem.core.ui.components.SpacerH8
 import com.tangem.core.ui.components.TangemSwitch
 import com.tangem.core.ui.components.appbar.TangemTopAppBar
@@ -52,8 +52,8 @@ import com.tangem.feature.walletsettings.impl.R
 @Composable
 internal fun WalletSettingsScreen(
     state: WalletSettingsUM,
-    dialog: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    dialog: @Composable () -> Unit,
 ) {
     val backgroundColor = TangemTheme.colors.background.secondary
 
@@ -214,7 +214,7 @@ private fun CardBlock(model: WalletSettingsItemUM.CardBlock, modifier: Modifier
             }
             SecondarySmallButton(
                 config = SmallButtonConfig(
-                    enabled = model.isEnabled,
+                    isEnabled = model.isEnabled,
                     text = resourceReference(R.string.common_rename),
                     onClick = model.onClick,
                 ),
@@ -292,7 +292,7 @@ private fun AccountsHeader(model: WalletSettingsAccountsUM.Header, modifier: Mod
             .padding(
                 start = TangemTheme.dimens.spacing12,
                 end = TangemTheme.dimens.spacing12,
-                top = TangemTheme.dimens.spacing8,
+                top = TangemTheme.dimens.spacing12,
                 bottom = TangemTheme.dimens.spacing4,
             ),
         text = model.text.resolveReference(),
@@ -305,21 +305,10 @@ private fun AccountsHeader(model: WalletSettingsAccountsUM.Header, modifier: Mod
 
 @Composable
 private fun AccountItem(model: WalletSettingsAccountsUM.Account, modifier: Modifier = Modifier) {
-    val subtitle = stringResourceSafe(
-        id = R.string.account_label_tokens_info,
-        formatArgs = arrayOf(
-            model.tokensInfo.resolveReference(),
-            model.networksInfo.resolveReference(),
-        ),
-    )
-    AccountRow(
+    UserWalletItem(
+        state = model.state,
         modifier = modifier
-            .background(color = TangemTheme.colors.background.primary)
-            .clickable(onClick = model.onClick)
-            .padding(12.dp),
-        title = model.accountName,
-        subtitle = stringReference(subtitle),
-        icon = model.accountIconUM,
+            .background(color = TangemTheme.colors.background.primary),
     )
 }
 
@@ -336,18 +325,19 @@ private fun AccountsFooter(model: WalletSettingsAccountsUM.Footer, modifier: Mod
             ),
         ) {
             AddAccountRow(model.addAccount)
-            SpacerH(
-                height = TangemTheme.dimens.size0_5,
+            HorizontalDivider(
+                thickness = TangemTheme.dimens.size0_5,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(horizontal = TangemTheme.dimens.spacing12)
-                    .background(TangemTheme.colors.stroke.primary),
+                    .padding(horizontal = TangemTheme.dimens.spacing12),
+                color = TangemTheme.colors.stroke.primary,
             )
             BlockItem(
                 modifier = Modifier.fillMaxWidth(),
                 model = model.archivedAccounts,
             )
         }
+        if (!model.showDescription) return
         SpacerH8()
         Text(
             modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing12),
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/utils/AccountItemsDelegate.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/utils/AccountItemsDelegate.kt
index 0857416626..ed1a0254c5 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/utils/AccountItemsDelegate.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/utils/AccountItemsDelegate.kt
@@ -1,30 +1,81 @@
 package com.tangem.feature.walletsettings.utils
 
 import com.tangem.common.routing.AppRoute
-import com.tangem.common.ui.account.toUM
+import com.tangem.common.ui.account.AccountPortfolioItemUMConverter
 import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.components.block.model.BlockUM
-import com.tangem.core.ui.extensions.pluralReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
+import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
 import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.feature.walletsettings.component.WalletSettingsComponent
 import com.tangem.feature.walletsettings.entity.WalletSettingsAccountsUM
 import com.tangem.feature.walletsettings.entity.WalletSettingsAccountsUM.Footer.AddAccountUM
 import com.tangem.feature.walletsettings.impl.R
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
 
+@Suppress("LongParameterList")
 @ModelScoped
 internal class AccountItemsDelegate @Inject constructor(
+    paramsContainer: ParamsContainer,
     private val router: Router,
     private val messageSender: UiMessageSender,
+    private val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
+    private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
+    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val accountsFeatureToggles: AccountsFeatureToggles,
 ) {
+    val userWalletId = paramsContainer.require<WalletSettingsComponent.Params>().userWalletId
 
-    fun buildUiList(userWalletId: UserWalletId, accounts: List<Account>): List<WalletSettingsAccountsUM> = buildList {
+    fun loadAccount(): Flow<List<WalletSettingsAccountsUM>> {
+        if (!accountsFeatureToggles.isFeatureEnabled) return flowOf(emptyList())
+        val params = SingleAccountStatusListProducer.Params(userWalletId)
+        return combine(
+            flow = singleAccountStatusListSupplier(params),
+            flow2 = getSelectedAppCurrencyUseCase.invokeOrDefault(),
+            flow3 = getBalanceHidingSettingsUseCase.isBalanceHidden(),
+        ) { accountStatusList, appCurrency, isBalanceHidden ->
+            buildUiList(accountStatusList, appCurrency, isBalanceHidden)
+        }
+    }
+
+    private fun buildUiList(
+        accountStatusList: AccountStatusList,
+        appCurrency: AppCurrency,
+        isBalanceHidden: Boolean,
+    ): List<WalletSettingsAccountsUM> = buildList {
+        fun AccountStatus.CryptoPortfolio.mapCryptoPortfolio(): WalletSettingsAccountsUM {
+            val accountItemUM = AccountPortfolioItemUMConverter(
+                onClick = { openAccountDetails(this.account) },
+                appCurrency = appCurrency,
+                accountBalance = this.tokenList.totalFiatBalance,
+                isBalanceHidden = isBalanceHidden,
+            ).convert(account)
+            return WalletSettingsAccountsUM.Account(state = accountItemUM)
+        }
+
+        fun mapAccount(account: AccountStatus): WalletSettingsAccountsUM = when (account) {
+            is AccountStatus.CryptoPortfolio -> account.mapCryptoPortfolio()
+        }
+
+        val accounts = accountStatusList.accountStatuses
         WalletSettingsAccountsUM.Header(
             id = "accounts_header",
             text = resourceReference(R.string.common_accounts),
@@ -32,7 +83,8 @@ internal class AccountItemsDelegate @Inject constructor(
 
         addAll(accounts.map(::mapAccount))
 
-        val addAccountEnabled = true // todo account
+        val addAccountEnabled = accounts.size < AccountList.MAX_ACCOUNTS_COUNT
+        val showDescription = accounts.size > 1
         WalletSettingsAccountsUM.Footer(
             id = "accounts_footer",
             addAccount = AddAccountUM(
@@ -47,33 +99,11 @@ internal class AccountItemsDelegate @Inject constructor(
                 iconRes = R.drawable.ic_archive_24,
                 onClick = { openArchivedAccounts(userWalletId) },
             ),
+            showDescription = showDescription,
             description = resourceReference(R.string.account_reorder_description),
         ).let(::add)
     }
 
-    private fun mapAccount(account: Account): WalletSettingsAccountsUM = when (account) {
-        is Account.CryptoPortfolio -> account.mapCryptoPortfolio()
-    }
-
-    private fun Account.CryptoPortfolio.mapCryptoPortfolio(): WalletSettingsAccountsUM {
-        return WalletSettingsAccountsUM.Account(
-            id = accountId.value,
-            accountName = accountName.toUM().value,
-            accountIconUM = icon.toUM(),
-            tokensInfo = pluralReference(
-                R.plurals.common_tokens_count,
-                count = tokensCount,
-                formatArgs = wrappedList(tokensCount),
-            ),
-            networksInfo = pluralReference(
-                R.plurals.common_networks_count,
-                count = networksCount,
-                formatArgs = wrappedList(networksCount),
-            ),
-            onClick = { openAccountDetails(this) },
-        )
-    }
-
     private fun openAccountDetails(account: Account) {
         router.push(AppRoute.AccountDetails(account))
     }
@@ -96,15 +126,10 @@ internal class AccountItemsDelegate @Inject constructor(
                 title = resourceReference(R.string.account_add_limit_dialog_title),
                 message = resourceReference(
                     id = R.string.account_add_limit_dialog_description,
-                    formatArgs = wrappedList(MAX_ACCOUNT_COUNT.toString()),
+                    formatArgs = wrappedList(AccountList.MAX_ACCOUNTS_COUNT.toString()),
                 ),
                 firstActionBuilder = { firstAction },
             ),
         )
     }
-
-    companion object {
-        // todo account use domain const?
-        private const val MAX_ACCOUNT_COUNT = 20
-    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/build.gradle.kts b/features/wallet/impl/build.gradle.kts
index daafa8122d..4b2119adcb 100644
--- a/features/wallet/impl/build.gradle.kts
+++ b/features/wallet/impl/build.gradle.kts
@@ -58,11 +58,14 @@ dependencies {
     implementation(projects.core.decompose)
     implementation(projects.core.datasource)
     implementation(projects.core.res)
+    implementation(projects.core.error)
 
     implementation(projects.libs.crypto)
     implementation(projects.libs.blockchainSdk)
 
     /** Domain modules */
+    implementation(projects.domain.account)
+    implementation(projects.domain.account.status)
     implementation(projects.domain.analytics)
     implementation(projects.domain.appCurrency)
     implementation(projects.domain.appCurrency.models)
@@ -96,6 +99,8 @@ dependencies {
     implementation(projects.domain.wallets.models)
     implementation(projects.domain.notifications)
     implementation(projects.domain.transaction)
+    implementation(projects.domain.yieldSupply)
+    implementation(projects.domain.yieldSupply.models)
 
     /** Feature Apis */
     implementation(projects.features.details.api)
@@ -115,6 +120,8 @@ dependencies {
     implementation(projects.features.sendV2.api)
     implementation(projects.features.kyc.api)
     implementation(projects.features.tokenRecieve.api)
+    implementation(projects.features.yieldSupply.api)
+    implementation(projects.features.tangempay.details.api)
 
     /** Common modules */
     implementation(projects.common)
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
index 8b75c0188c..acd97c7552 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/WalletComponent.kt
@@ -15,6 +15,7 @@ import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.core.ui.decompose.ComposableDialogComponent
+import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.child.wallet.model.WalletModel
 import com.tangem.feature.wallet.navigation.WalletRoute
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
@@ -25,6 +26,7 @@ import com.tangem.features.markets.entry.MarketsEntryComponent
 import com.tangem.features.pushnotifications.api.PushNotificationsBottomSheetComponent
 import com.tangem.features.pushnotifications.api.PushNotificationsParams
 import com.tangem.features.tokenreceive.TokenReceiveComponent
+import com.tangem.features.yield.supply.api.YieldSupplyDepositedWarningComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -39,6 +41,7 @@ internal class WalletComponent @AssistedInject constructor(
     private val askBiometryComponentFactory: AskBiometryComponent.Factory,
     private val pushNotificationsBottomSheetComponent: PushNotificationsBottomSheetComponent.Factory,
     private val tokenReceiveComponentFactory: TokenReceiveComponent.Factory,
+    private val yieldSupplyDepositedWarningComponent: YieldSupplyDepositedWarningComponent.Factory,
 ) : ComposableContentComponent, AppComponentContext by appComponentContext {
 
     private val model: WalletModel = getOrCreateModel()
@@ -68,7 +71,7 @@ internal class WalletComponent @AssistedInject constructor(
                     askBiometryComponentFactory.create(
                         context = childByContext(componentContext),
                         params = AskBiometryComponent.Params(
-                            bottomSheetVariant = true,
+                            isBottomSheetVariant = true,
                             modelCallbacks = model.askBiometryModelCallbacks,
                         ),
                     )
@@ -90,6 +93,21 @@ internal class WalletComponent @AssistedInject constructor(
                         ),
                     )
                 }
+                is WalletDialogConfig.YieldSupplyWarning -> {
+                    yieldSupplyDepositedWarningComponent.create(
+                        context = childByContext(componentContext),
+                        params = YieldSupplyDepositedWarningComponent.Params(
+                            cryptoCurrency = dialogConfig.cryptoCurrency,
+                            onDismiss = model.innerWalletRouter.dialogNavigation::dismiss,
+                            tokenAction = dialogConfig.tokenAction,
+                            modelCallback = object : YieldSupplyDepositedWarningComponent.ModelCallback {
+                                override fun onYieldSupplyWarningAcknowledged(tokenAction: TokenAction) {
+                                    dialogConfig.onWarningAcknowledged(tokenAction)
+                                }
+                            },
+                        ),
+                    )
+                }
             }
         },
     )
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletActivationBannerType.java b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletActivationBannerType.java
new file mode 100644
index 0000000000..53c4e6152a
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletActivationBannerType.java
@@ -0,0 +1,6 @@
+package com.tangem.feature.wallet.child.wallet.model;
+
+public enum WalletActivationBannerType {
+    Attention,
+    Warning,
+}
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
index 4921d64c1e..c843cb1153 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletModel.kt
@@ -10,7 +10,7 @@ import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
@@ -18,9 +18,12 @@ import com.tangem.domain.models.wallet.isMultiCurrency
 import com.tangem.domain.nft.ObserveAndClearNFTCacheIfNeedUseCase
 import com.tangem.domain.notifications.GetIsHuaweiDeviceWithoutGoogleServicesUseCase
 import com.tangem.domain.notifications.repository.NotificationsRepository
+import com.tangem.domain.pay.usecase.TangemPayIssueOrderUseCase
+import com.tangem.domain.pay.usecase.TangemPayMainScreenCustomerInfoUseCase
 import com.tangem.domain.settings.*
 import com.tangem.domain.tokens.RefreshMultiCurrencyWalletQuotesUseCase
 import com.tangem.domain.wallets.usecase.*
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyUpdateUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.router.InnerWalletRouter
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
@@ -39,7 +42,9 @@ import com.tangem.features.biometry.AskBiometryComponent
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
 import com.tangem.features.pushnotifications.api.PushNotificationsModelCallbacks
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
+import com.tangem.features.tangempay.TangemPayFeatureToggles
 import com.tangem.features.wallet.deeplink.WalletDeepLinkActionListener
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.Provider
 import com.tangem.utils.coroutines.*
 import kotlinx.coroutines.*
@@ -48,6 +53,8 @@ import kotlinx.coroutines.flow.*
 import timber.log.Timber
 import javax.inject.Inject
 
+private const val TANGEM_PAY_UPDATE_INTERVAL = 60_000L
+
 @Suppress("LongParameterList", "LargeClass")
 @Stable
 @ModelScoped
@@ -84,6 +91,11 @@ internal class WalletModel @Inject constructor(
     private val getIsHuaweiDeviceWithoutGoogleServicesUseCase: GetIsHuaweiDeviceWithoutGoogleServicesUseCase,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
     private val userWalletsListRepository: UserWalletsListRepository,
+    private val tangemPayMainScreenCustomerInfoUseCase: TangemPayMainScreenCustomerInfoUseCase,
+    private val tangemPayIssueOrderUseCase: TangemPayIssueOrderUseCase,
+    private val tangemPayFeatureToggles: TangemPayFeatureToggles,
+    private val yieldSupplyApyUpdateUseCase: YieldSupplyApyUpdateUseCase,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
     val screenLifecycleProvider: ScreenLifecycleProvider,
     val innerWalletRouter: InnerWalletRouter,
 ) : Model() {
@@ -96,6 +108,7 @@ internal class WalletModel @Inject constructor(
     private val refreshWalletJobHolder = JobHolder()
     private var needToRefreshWallet = false
     private val clearNFTCacheJobHolder = JobHolder()
+    private val updateTangemPayJobHolder = JobHolder()
 
     private var expressTxStatusTaskScheduler = SingleTaskScheduler<Unit>()
 
@@ -107,16 +120,26 @@ internal class WalletModel @Inject constructor(
 
         maybeMigrateNames()
         maybeSetWalletFirstTimeUsage()
+        updateYieldSupplyApy()
         subscribeToUserWalletsUpdates()
         subscribeOnBalanceHiding()
         subscribeOnSelectedWalletFlow()
         subscribeToScreenBackgroundState()
         subscribeOnPushNotificationsPermission()
+        subscribeToTangemPayInfo()
         enableNotificationsIfNeeded()
 
         clickIntents.initialize(innerWalletRouter, modelScope)
     }
 
+    private fun updateYieldSupplyApy() {
+        if (yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled) {
+            modelScope.launch(dispatchers.default) {
+                yieldSupplyApyUpdateUseCase()
+            }
+        }
+    }
+
     private fun maybeMigrateNames() {
         modelScope.launch {
             walletNameMigrationUseCase()
@@ -313,6 +336,48 @@ internal class WalletModel @Inject constructor(
             .saveIn(clearNFTCacheJobHolder)
     }
 
+    private fun subscribeToTangemPayInfo() {
+        /**
+         * Update state each time a user opens/returns to wallet screen
+         * and every minute while user stays on the main screen
+         */
+        screenLifecycleProvider.isBackgroundState.onEach { inBackground ->
+            updateTangemPayJobHolder.cancel()
+            if (!inBackground && tangemPayFeatureToggles.isTangemPayEnabled) {
+                modelScope.launch {
+                    refreshTangemPayInfo()
+                    while (isActive) {
+                        delay(TANGEM_PAY_UPDATE_INTERVAL)
+                        refreshTangemPayInfo()
+                    }
+                }.saveIn(updateTangemPayJobHolder)
+            }
+        }.launchIn(modelScope)
+    }
+
+    private suspend fun refreshTangemPayInfo() {
+        val info = tangemPayMainScreenCustomerInfoUseCase()
+        if (info != null) {
+            stateHolder.update(
+                transformer = TangemPayStateTransformer(
+                    value = info,
+                    onIssueOrderClick = ::issueOrder,
+                    onContinueKycClick = innerWalletRouter::openTangemPayOnboarding,
+                    openDetails = innerWalletRouter::openTangemPayDetails,
+                ),
+            )
+        }
+    }
+
+    private fun issueOrder() {
+        modelScope.launch {
+            stateHolder.update(TangemPayStateTransformer(issueProgressState = true))
+            tangemPayIssueOrderUseCase().onLeft {
+                stateHolder.update(TangemPayStateTransformer(issueState = true, onIssueOrderClick = ::issueOrder))
+            }
+        }
+    }
+
     private fun needToRefreshTimer() {
         modelScope.launch {
             delay(REFRESH_WALLET_BACKGROUND_TIMER_MILLIS)
@@ -366,7 +431,7 @@ internal class WalletModel @Inject constructor(
             is WalletsUpdateActionResolver.Action.RenameWallets -> {
                 stateHolder.update(transformer = RenameWalletsTransformer(renamedWallets = action.renamedWallets))
             }
-            is WalletsUpdateActionResolver.Action.ReloadWarningsForWallets -> {
+            is WalletsUpdateActionResolver.Action.ReloadWallets -> {
                 reloadWarnings(action)
             }
             WalletsUpdateActionResolver.Action.EmptyWallets -> {
@@ -378,7 +443,7 @@ internal class WalletModel @Inject constructor(
         }
     }
 
-    private fun reloadWarnings(action: WalletsUpdateActionResolver.Action.ReloadWarningsForWallets) {
+    private fun reloadWarnings(action: WalletsUpdateActionResolver.Action.ReloadWallets) {
         action.wallets.forEach {
             walletScreenContentLoader.load(
                 userWallet = it,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
index 562c8a99a8..6cce8840ea 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/WalletsUpdateActionResolver.kt
@@ -64,6 +64,9 @@ internal class WalletsUpdateActionResolver @Inject constructor(
         selectedWallet: UserWallet,
     ): Action {
         return when {
+            isHotWalletUpgraded(state, wallets) -> {
+                getHotWalletsUpgradedAction(state, wallets)
+            }
             isWalletsCountChanged(state, wallets) -> {
                 getChangeWalletsListAction(state, wallets, selectedWallet)
             }
@@ -91,6 +94,19 @@ internal class WalletsUpdateActionResolver @Inject constructor(
         return walletsToUpdate.isNotEmpty()
     }
 
+    private fun isHotWalletUpgraded(state: WalletScreenState, wallets: List<UserWallet>): Boolean {
+        val previousWallet = state
+            .wallets
+            .getOrNull(state.selectedWalletIndex)
+        return when (previousWallet) {
+            is WalletState.MultiCurrency -> {
+                val wallet = wallets.firstOrNull { it.walletId == previousWallet.walletCardState.id }
+                previousWallet.type == WalletState.MultiCurrency.WalletType.Hot && wallet is UserWallet.Cold
+            }
+            else -> false
+        }
+    }
+
     private fun isWalletsCountChanged(state: WalletScreenState, wallets: List<UserWallet>): Boolean {
         val prevWalletsSize = state.wallets.size
         val walletsSize = wallets.size
@@ -160,14 +176,22 @@ internal class WalletsUpdateActionResolver @Inject constructor(
     private fun getHotWalletsBackedUpAction(
         state: WalletScreenState,
         wallets: List<UserWallet>,
-    ): Action.ReloadWarningsForWallets {
+    ): Action.ReloadWallets {
         val incompleteActivationWalletIds = state.incompleteActivationWalletIds()
 
         val walletsToUpdate = wallets.filter {
             it is UserWallet.Hot && it.backedUp == incompleteActivationWalletIds.contains(it.walletId)
         }
 
-        return Action.ReloadWarningsForWallets(walletsToUpdate)
+        return Action.ReloadWallets(walletsToUpdate)
+    }
+
+    private fun getHotWalletsUpgradedAction(
+        state: WalletScreenState,
+        wallets: List<UserWallet>,
+    ): Action.ReloadWallets {
+        val walletsToUpdate = wallets.filter { it.walletId == state.getPrevSelectedWallet().id }
+        return Action.ReloadWallets(walletsToUpdate)
     }
 
     private fun getRenameWalletsAction(state: WalletScreenState, wallets: List<UserWallet>): Action.RenameWallets {
@@ -358,7 +382,7 @@ internal class WalletsUpdateActionResolver @Inject constructor(
             }
         }
 
-        data class ReloadWarningsForWallets(
+        data class ReloadWallets(
             val wallets: List<UserWallet>,
         ) : Action()
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt
index da6c773a77..eb07bc02f7 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt
@@ -4,6 +4,8 @@ import arrow.core.getOrElse
 import com.tangem.common.ui.expressStatus.ExpressStatusBottomSheetConfig
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.account.Account
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.isLocked
@@ -16,6 +18,7 @@ import com.tangem.domain.tokens.TokensAction
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.domain.OnrampStatusFactory
 import com.tangem.feature.wallet.presentation.wallet.domain.unwrap
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
@@ -42,9 +45,13 @@ internal interface WalletContentClickIntents {
 
     fun onDismissMarketsOnboarding()
 
-    fun onTokenItemClick(currencyStatus: CryptoCurrencyStatus)
+    fun onTokenItemClick(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus)
 
-    fun onTokenItemLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onTokenItemLongClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
+
+    fun onAccountExpandClick(account: Account)
+
+    fun onAccountCollapseClick(account: Account)
 
     fun onTransactionClick(txHash: String)
 
@@ -78,6 +85,7 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
     private val walletEventSender: WalletEventSender,
     private val analyticsEventHandler: AnalyticsEventHandler,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
+    private val accountDependencies: AccountDependencies,
 ) : BaseWalletClickIntents(), WalletContentClickIntents {
 
     override fun onDetailsClick() {
@@ -130,13 +138,13 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun onTokenItemClick(currencyStatus: CryptoCurrencyStatus) {
-        router.openTokenDetails(stateHolder.getSelectedWalletId(), currencyStatus)
+    override fun onTokenItemClick(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus) {
+        router.openTokenDetails(portfolioId, currencyStatus)
     }
 
-    override fun onTokenItemLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onTokenItemLongClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
         modelScope.launch(dispatchers.main) {
-            val userWalletId = stateHolder.getSelectedWalletId()
+            val userWalletId = portfolioId.userWalletId
             val userWallet = getUserWalletUseCase(userWalletId).getOrElse {
                 Timber.e(
                     """
@@ -152,17 +160,32 @@ internal class WalletContentClickIntentsImplementor @Inject constructor(
             getCryptoCurrencyActionsUseCase(userWallet = userWallet, cryptoCurrencyStatus = cryptoCurrencyStatus)
                 .take(count = 1)
                 .collectLatest {
-                    showActionsBottomSheet(it, userWallet)
+                    showActionsBottomSheet(it, userWallet, portfolioId)
                 }
         }
     }
 
-    private fun showActionsBottomSheet(tokenActionsState: TokenActionsState, userWallet: UserWallet) {
+    override fun onAccountExpandClick(account: Account) {
+        val userWalletId = stateHolder.getSelectedWalletId()
+        accountDependencies.expandedAccountsHolder.expandAccount(userWalletId, account.accountId)
+    }
+
+    override fun onAccountCollapseClick(account: Account) {
+        val userWalletId = stateHolder.getSelectedWalletId()
+        accountDependencies.expandedAccountsHolder.collapseAccount(userWalletId, account.accountId)
+    }
+
+    private fun showActionsBottomSheet(
+        tokenActionsState: TokenActionsState,
+        userWallet: UserWallet,
+        portfolioId: PortfolioId,
+    ) {
         stateHolder.showBottomSheet(
             ActionsBottomSheetConfig(
                 actions = MultiWalletCurrencyActionsConverter(
                     userWallet = userWallet,
                     clickIntents = currencyActionsClickIntents,
+                    portfolioId = portfolioId,
                 ).convert(tokenActionsState),
             ),
             userWallet.walletId,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt
index e7876af2a1..f57694c824 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletCurrencyActionsClickIntents.kt
@@ -29,6 +29,7 @@ import com.tangem.domain.core.utils.lceError
 import com.tangem.domain.demo.IsDemoCardUseCase
 import com.tangem.domain.exchange.RampStateManager
 import com.tangem.domain.markets.TokenMarketParams
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.ReceiveAddressModel
 import com.tangem.domain.models.TokenReceiveConfig
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -44,8 +45,10 @@ import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.staking.model.stakekit.Yield
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.GetViewedTokenReceiveWarningUseCase
-import com.tangem.domain.tokens.IsCryptoCurrencyCoinCouldHideUseCase
-import com.tangem.domain.tokens.RemoveCurrencyUseCase
+import com.tangem.domain.tokens.NeedShowYieldSupplyDepositedWarningUseCase
+import com.tangem.domain.tokens.SaveViewedTokenReceiveWarningUseCase
+import com.tangem.domain.tokens.SaveViewedYieldSupplyWarningUseCase
+import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.model.analytics.TokenReceiveAnalyticsEvent
@@ -67,7 +70,9 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
+import com.tangem.feature.wallet.presentation.wallet.utils.WalletFeatureUseCasesFacade
 import com.tangem.features.tokenreceive.TokenReceiveFeatureToggle
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
@@ -78,29 +83,41 @@ import javax.inject.Inject
 
 interface WalletCurrencyActionsClickIntents {
 
-    fun onSendClick(cryptoCurrencyStatus: CryptoCurrencyStatus, unavailabilityReason: ScenarioUnavailabilityReason)
-
-    fun onSellClick(cryptoCurrencyStatus: CryptoCurrencyStatus, unavailabilityReason: ScenarioUnavailabilityReason)
-
-    fun onBuyClick(cryptoCurrencyStatus: CryptoCurrencyStatus, unavailabilityReason: ScenarioUnavailabilityReason)
-
-    fun onSwapClick(
+    fun onSendClick(
+        portfolioId: PortfolioId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
-        userWalletId: UserWalletId,
         unavailabilityReason: ScenarioUnavailabilityReason,
     )
 
-    fun onReceiveClick(cryptoCurrencyStatus: CryptoCurrencyStatus, event: AnalyticsEvent? = null)
+    fun onSellClick(cryptoCurrencyStatus: CryptoCurrencyStatus, unavailabilityReason: ScenarioUnavailabilityReason)
 
-    fun onStakeClick(cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?)
+    fun onBuyClick(
+        portfolioId: PortfolioId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+        unavailabilityReason: ScenarioUnavailabilityReason,
+    )
+
+    fun onSwapClick(
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+        portfolioId: PortfolioId,
+        unavailabilityReason: ScenarioUnavailabilityReason,
+    )
+
+    fun onReceiveClick(
+        portfolioId: PortfolioId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+        event: AnalyticsEvent? = null,
+    )
+
+    fun onStakeClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?)
 
     fun onCopyAddressLongClick(cryptoCurrencyStatus: CryptoCurrencyStatus): TextReference?
 
-    fun onCopyAddressClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onCopyAddressClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
 
-    fun onHideTokensClick(cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onHideTokensClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
 
-    fun onPerformHideToken(cryptoCurrencyStatus: CryptoCurrencyStatus)
+    fun onPerformHideToken(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus)
 
     fun onExploreClick()
 
@@ -122,8 +139,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
     private val walletManagersFacade: WalletManagersFacade,
     private val isDemoCardUseCase: IsDemoCardUseCase,
     private val getSingleCryptoCurrencyStatusUseCase: GetSingleCryptoCurrencyStatusUseCase,
-    private val isCryptoCurrencyCoinCouldHide: IsCryptoCurrencyCoinCouldHideUseCase,
-    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
+    private val useCasesFacade: WalletFeatureUseCasesFacade,
     private val getExploreUrlUseCase: GetExploreUrlUseCase,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
@@ -137,15 +153,18 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
     private val rampStateManager: RampStateManager,
     private val tokenReceiveFeatureToggle: TokenReceiveFeatureToggle,
     private val getViewedTokenReceiveWarningUseCase: GetViewedTokenReceiveWarningUseCase,
+    private val saveViewedTokenReceiveWarningUseCase: SaveViewedTokenReceiveWarningUseCase,
     private val getEnsNameUseCase: GetEnsNameUseCase,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
+    private val needShowYieldSupplyDepositedWarningUseCase: NeedShowYieldSupplyDepositedWarningUseCase,
+    private val saveViewedYieldSupplyWarningUseCase: SaveViewedYieldSupplyWarningUseCase,
 ) : BaseWalletClickIntents(), WalletCurrencyActionsClickIntents {
 
     override fun onSendClick(
+        portfolioId: PortfolioId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
         unavailabilityReason: ScenarioUnavailabilityReason,
     ) {
-        val userWallet = getSelectedWalletSyncUseCase.unwrap() ?: return
-
         analyticsEventHandler.send(
             event = TokenScreenAnalyticsEvent.ButtonWithParams.ButtonSend(
                 token = cryptoCurrencyStatus.currency.symbol,
@@ -156,17 +175,36 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         if (handleUnavailabilityReason(unavailabilityReason)) return
 
-        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWallet.walletId))
-        val route = AppRoute.Send(
-            currency = cryptoCurrencyStatus.currency,
-            userWalletId = userWallet.walletId,
-        )
-
-        appRouter.push(route)
+        modelScope.launch(dispatchers.main) {
+            if (needShowYieldSupplyWarning(cryptoCurrencyStatus)) {
+                stateHolder.hideBottomSheet()
+                router.openYieldSupplyBottomSheet(
+                    cryptoCurrency = cryptoCurrencyStatus.currency,
+                    tokenAction = TokenAction.Send,
+                    onWarningAcknowledged = { tokenAction ->
+                        modelScope.launch {
+                            saveViewedYieldSupplyWarningUseCase(cryptoCurrencyStatus.currency.name)
+                            stateHolder.hideBottomSheet()
+                            navigateToSend(cryptoCurrencyStatus, portfolioId)
+                        }
+                    },
+                )
+            } else {
+                navigateToSend(cryptoCurrencyStatus, portfolioId)
+            }
+        }
     }
 
-    override fun onReceiveClick(cryptoCurrencyStatus: CryptoCurrencyStatus, event: AnalyticsEvent?) {
-        val userWalletId = stateHolder.getSelectedWalletId()
+    override fun onReceiveClick(
+        portfolioId: PortfolioId,
+        cryptoCurrencyStatus: CryptoCurrencyStatus,
+        event: AnalyticsEvent?,
+    ) {
+        val userWalletId = portfolioId.userWalletId
+        if (portfolioId is PortfolioId.Account) {
+            // todo account find address
+            TODO("account")
+        }
 
         analyticsEventHandler.send(
             event = TokenScreenAnalyticsEvent.ButtonWithParams.ButtonReceive(
@@ -178,24 +216,24 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         event?.let { analyticsEventHandler.send(it) }
 
-        if (tokenReceiveFeatureToggle.isNewTokenReceiveEnabled) {
-            stateHolder.hideBottomSheet()
-            modelScope.launch {
-                configureReceiveAddresses(cryptoCurrencyStatus = cryptoCurrencyStatus)?.let {
-                    router.openTokenReceiveBottomSheet(it)
-                }
+        modelScope.launch(dispatchers.main) {
+            if (needShowYieldSupplyWarning(cryptoCurrencyStatus)) {
+                stateHolder.hideBottomSheet()
+                router.openYieldSupplyBottomSheet(
+                    cryptoCurrency = cryptoCurrencyStatus.currency,
+                    tokenAction = TokenAction.Receive,
+                    onWarningAcknowledged = { tokenAction ->
+                        modelScope.launch {
+                            saveViewedTokenReceiveWarningUseCase(cryptoCurrencyStatus.currency.name)
+                            saveViewedYieldSupplyWarningUseCase(cryptoCurrencyStatus.currency.name)
+                            stateHolder.hideBottomSheet()
+                            navigateToReceive(cryptoCurrencyStatus)
+                        }
+                    },
+                )
+            } else {
+                navigateToReceive(cryptoCurrencyStatus)
             }
-        } else {
-            analyticsEventHandler.send(
-                event = TokenReceiveAnalyticsEvent.ReceiveScreenOpened(cryptoCurrencyStatus.currency.symbol),
-            )
-            stateHolder.showBottomSheet(
-                createReceiveBottomSheetContent(
-                    currency = cryptoCurrencyStatus.currency,
-                    addresses = cryptoCurrencyStatus.value.networkAddress ?: return,
-                ),
-                userWalletId,
-            )
         }
     }
 
@@ -240,7 +278,12 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
         )
     }
 
-    override fun onCopyAddressClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onCopyAddressClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val userWalletId = portfolioId.userWalletId
+        if (portfolioId is PortfolioId.Account) {
+            // todo account find address
+            TODO("account")
+        }
         analyticsEventHandler.send(
             event = TokenReceiveNewAnalyticsEvent.ButtonCopyAddress(
                 token = cryptoCurrencyStatus.currency.symbol,
@@ -251,10 +294,10 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         modelScope.launch(dispatchers.main) {
             walletManagersFacade.getDefaultAddress(
-                userWalletId = stateHolder.getSelectedWalletId(),
+                userWalletId = userWalletId,
                 network = cryptoCurrencyStatus.currency.network,
             )?.let { address ->
-                stateHolder.update(CloseBottomSheetTransformer(userWalletId = stateHolder.getSelectedWalletId()))
+                stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWalletId))
 
                 clipboardManager.setText(text = address, isSensitive = true)
                 walletEventSender.send(event = WalletEvent.CopyAddress)
@@ -262,7 +305,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun onHideTokensClick(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+    override fun onHideTokensClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
         analyticsEventHandler.send(
             event = TokenScreenAnalyticsEvent.ButtonRemoveToken(cryptoCurrencyStatus.currency.symbol),
         )
@@ -270,18 +313,20 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
         modelScope.launch(dispatchers.main) {
             walletEventSender.send(
                 event = WalletEvent.ShowAlert(
-                    state = getHideTokeAlertConfig(stateHolder.getSelectedWalletId(), cryptoCurrencyStatus),
+                    state = getHideTokeAlertConfig(portfolioId, cryptoCurrencyStatus),
                 ),
             )
         }
     }
 
     private suspend fun getHideTokeAlertConfig(
-        userWalletId: UserWalletId,
+        portfolioId: PortfolioId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
     ): WalletAlertState.DefaultAlert {
         val currency = cryptoCurrencyStatus.currency
-        return if (currency is CryptoCurrency.Coin && !isCryptoCurrencyCoinCouldHide(userWalletId, currency)) {
+        val isCryptoCurrencyCoinCouldHide = currency is CryptoCurrency.Coin &&
+            !useCasesFacade.isCryptoCurrencyCoinCouldHide(portfolioId = portfolioId, cryptoCurrencyCoin = currency)
+        return if (isCryptoCurrencyCoinCouldHide) {
             WalletAlertState.DefaultAlert(
                 title = resourceReference(
                     id = R.string.token_details_unable_hide_alert_title,
@@ -306,16 +351,14 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                     formatArgs = WrappedList(listOf(cryptoCurrencyStatus.currency.name)),
                 ),
                 message = resourceReference(R.string.token_details_hide_alert_message),
-                onConfirmClick = { onPerformHideToken(cryptoCurrencyStatus) },
+                onConfirmClick = { onPerformHideToken(portfolioId, cryptoCurrencyStatus) },
             )
         }
     }
 
-    override fun onPerformHideToken(cryptoCurrencyStatus: CryptoCurrencyStatus) {
-        val userWalletId = stateHolder.getSelectedWalletId()
-
+    override fun onPerformHideToken(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus) {
         modelScope.launch(dispatchers.io) {
-            removeCurrencyUseCase(userWalletId, cryptoCurrencyStatus.currency)
+            useCasesFacade.removeCurrencyUseCase(portfolioId, cryptoCurrencyStatus.currency)
                 .fold(
                     ifLeft = {
                         walletEventSender.send(
@@ -323,7 +366,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                         )
                     },
                     ifRight = {
-                        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWalletId))
+                        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
                     },
                 )
         }
@@ -356,11 +399,10 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
     }
 
     override fun onBuyClick(
+        portfolioId: PortfolioId,
         cryptoCurrencyStatus: CryptoCurrencyStatus,
         unavailabilityReason: ScenarioUnavailabilityReason,
     ) {
-        val userWallet = getSelectedWalletSyncUseCase.unwrap() ?: return
-
         analyticsEventHandler.send(
             event = TokenScreenAnalyticsEvent.ButtonWithParams.ButtonBuy(
                 token = cryptoCurrencyStatus.currency.symbol,
@@ -373,7 +415,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         appRouter.push(
             AppRoute.Onramp(
-                userWalletId = userWallet.walletId,
+                portfolioId = portfolioId,
                 currency = cryptoCurrencyStatus.currency,
                 source = OnrampSource.TOKEN_LONG_TAP,
             ),
@@ -382,7 +424,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
     override fun onSwapClick(
         cryptoCurrencyStatus: CryptoCurrencyStatus,
-        userWalletId: UserWalletId,
+        portfolioId: PortfolioId,
         unavailabilityReason: ScenarioUnavailabilityReason,
     ) {
         analyticsEventHandler.send(
@@ -395,13 +437,24 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
 
         if (handleUnavailabilityReason(unavailabilityReason)) return
 
-        appRouter.push(
-            AppRoute.Swap(
-                currencyFrom = cryptoCurrencyStatus.currency,
-                userWalletId = userWalletId,
-                screenSource = AnalyticsParam.ScreensSources.LongTap.value,
-            ),
-        )
+        modelScope.launch(dispatchers.main) {
+            if (needShowYieldSupplyWarning(cryptoCurrencyStatus)) {
+                stateHolder.hideBottomSheet()
+                router.openYieldSupplyBottomSheet(
+                    cryptoCurrency = cryptoCurrencyStatus.currency,
+                    tokenAction = TokenAction.Swap,
+                    onWarningAcknowledged = { tokenAction ->
+                        modelScope.launch {
+                            saveViewedYieldSupplyWarningUseCase(cryptoCurrencyStatus.currency.name)
+                            stateHolder.hideBottomSheet()
+                            navigateToSwap(cryptoCurrencyStatus, portfolioId)
+                        }
+                    },
+                )
+            } else {
+                navigateToSwap(cryptoCurrencyStatus, portfolioId)
+            }
+        }
     }
 
     override fun onExploreClick() {
@@ -428,7 +481,7 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
                 AppRoute.MarketsTokenDetails(
                     token = tokenMarketParams,
                     appCurrency = getSelectedAppCurrencyUseCase.unwrap(),
-                    showPortfolio = false,
+                    shouldShowPortfolio = false,
                     analyticsParams = AppRoute.MarketsTokenDetails.AnalyticsParams(
                         blockchain = cryptoCurrencyStatus.currency.network.name,
                         source = "Main",
@@ -440,17 +493,15 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun onStakeClick(cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?) {
-        val userWallet = getSelectedWalletSyncUseCase.unwrap() ?: return
-        stateHolder.update(CloseBottomSheetTransformer(userWalletId = userWallet.walletId))
+    override fun onStakeClick(portfolioId: PortfolioId, cryptoCurrencyStatus: CryptoCurrencyStatus, yield: Yield?) {
+        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
 
         modelScope.launch {
-            val userWalletId = stateHolder.getSelectedWalletId()
             val cryptoCurrency = cryptoCurrencyStatus.currency
 
             appRouter.push(
                 AppRoute.Staking(
-                    userWalletId = userWalletId,
+                    portfolioId = portfolioId,
                     cryptoCurrencyId = cryptoCurrency.id,
                     yieldId = yield?.id ?: return@launch,
                 ),
@@ -709,4 +760,52 @@ internal class WalletCurrencyActionsClickIntentsImplementor @Inject constructor(
             receiveAddress = receiveAddresses,
         )
     }
+
+    private suspend fun needShowYieldSupplyWarning(cryptoCurrencyStatus: CryptoCurrencyStatus): Boolean {
+        return yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled &&
+            needShowYieldSupplyDepositedWarningUseCase(cryptoCurrencyStatus)
+    }
+
+    private fun navigateToSend(cryptoCurrencyStatus: CryptoCurrencyStatus, portfolioId: PortfolioId) {
+        stateHolder.update(CloseBottomSheetTransformer(userWalletId = portfolioId.userWalletId))
+        val route = AppRoute.Send(
+            currency = cryptoCurrencyStatus.currency,
+            portfolioId = portfolioId,
+        )
+
+        appRouter.push(route)
+    }
+
+    private fun navigateToSwap(cryptoCurrencyStatus: CryptoCurrencyStatus, portfolioId: PortfolioId) {
+        appRouter.push(
+            AppRoute.Swap(
+                currencyFrom = cryptoCurrencyStatus.currency,
+                portfolioId = portfolioId,
+                screenSource = AnalyticsParam.ScreensSources.LongTap.value,
+            ),
+        )
+    }
+
+    private fun navigateToReceive(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val userWalletId = stateHolder.getSelectedWalletId()
+        if (tokenReceiveFeatureToggle.isNewTokenReceiveEnabled) {
+            stateHolder.hideBottomSheet()
+            modelScope.launch {
+                configureReceiveAddresses(cryptoCurrencyStatus = cryptoCurrencyStatus)?.let {
+                    router.openTokenReceiveBottomSheet(it)
+                }
+            }
+        } else {
+            analyticsEventHandler.send(
+                event = TokenReceiveAnalyticsEvent.ReceiveScreenOpened(cryptoCurrencyStatus.currency.symbol),
+            )
+            stateHolder.showBottomSheet(
+                createReceiveBottomSheetContent(
+                    currency = cryptoCurrencyStatus.currency,
+                    addresses = cryptoCurrencyStatus.value.networkAddress ?: return,
+                ),
+                userWalletId,
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt
index 55390d5b9e..d1e7c8cba5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt
@@ -1,18 +1,22 @@
 package com.tangem.feature.wallet.child.wallet.model.intents
 
+import android.os.Build
 import arrow.core.getOrElse
 import com.tangem.common.TangemBlogUrlBuilder
-import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.AppRoute.*
 import com.tangem.common.routing.AppRouter
+import com.tangem.common.ui.notifications.NotificationId
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.navigation.url.UrlOpener
+import com.tangem.core.ui.components.bottomsheets.message.*
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.domain.wallets.usecase.DerivePublicKeysUseCase
+import com.tangem.core.ui.message.bottomSheetMessage
 import com.tangem.domain.card.SetCardWasScannedUseCase
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
-import com.tangem.domain.core.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
 import com.tangem.domain.feedback.models.FeedbackEmailType
 import com.tangem.domain.models.currency.CryptoCurrency
@@ -20,21 +24,27 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.requireColdWallet
 import com.tangem.domain.networks.multi.MultiNetworkStatusFetcher
+import com.tangem.domain.notifications.SetShouldShowNotificationUseCase
+import com.tangem.domain.notifications.repository.NotificationsRepository
 import com.tangem.domain.onramp.model.OnrampSource
 import com.tangem.domain.promo.ShouldShowPromoWalletUseCase
 import com.tangem.domain.promo.models.PromoId
 import com.tangem.domain.quotes.multi.MultiQuoteStatusFetcher
 import com.tangem.domain.settings.NeverToSuggestRateAppUseCase
 import com.tangem.domain.settings.RemindToRateAppLaterUseCase
+import com.tangem.domain.settings.repositories.PermissionRepository
 import com.tangem.domain.staking.StakingIdFactory
 import com.tangem.domain.staking.multi.MultiYieldBalanceFetcher
 import com.tangem.domain.tokens.model.analytics.TokenSwapPromoAnalyticsEvent
 import com.tangem.domain.wallets.legacy.UserWalletsListManager.Lockable.UnlockType
 import com.tangem.domain.wallets.models.UnlockWalletsError
+import com.tangem.domain.wallets.usecase.DerivePublicKeysUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
 import com.tangem.domain.wallets.usecase.UnlockWalletsUseCase
+import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
 import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.Basic
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.MainScreen
 import com.tangem.feature.wallet.presentation.wallet.domain.ScanCardToUnlockWalletClickHandler
@@ -46,6 +56,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.WalletEvent
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.CloseBottomSheetTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletEventSender
 import com.tangem.features.hotwallet.HotWalletFeatureToggles
+import com.tangem.features.pushnotifications.api.analytics.PushNotificationAnalyticEvents
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -54,6 +65,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
+@Suppress("TooManyFunctions")
 internal interface WalletWarningsClickIntents {
 
     fun onAddBackupCardClick()
@@ -92,10 +104,14 @@ internal interface WalletWarningsClickIntents {
 
     fun onSeedPhraseSecondNotificationReject()
 
-    fun onFinishWalletActivationClick()
+    fun onAllowPermissions()
+
+    fun onDenyPermissions()
+
+    fun onFinishWalletActivationClick(type: WalletActivationBannerType)
 }
 
-@Suppress("LargeClass", "LongParameterList")
+@Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
 @ModelScoped
 internal class WalletWarningsClickIntentsImplementor @Inject constructor(
     private val stateHolder: WalletStateController,
@@ -121,8 +137,38 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
     private val appRouter: AppRouter,
     private val hotWalletFeatureToggles: HotWalletFeatureToggles,
     private val userWalletsListRepository: UserWalletsListRepository,
+    private val setShouldShowNotificationUseCase: SetShouldShowNotificationUseCase,
+    private val notificationsRepository: NotificationsRepository,
+    private val permissionRepository: PermissionRepository,
+    private val messageSender: UiMessageSender,
 ) : BaseWalletClickIntents(), WalletWarningsClickIntents {
 
+    private val finalizeWalletSetupAlertBS
+        get() = bottomSheetMessage {
+            infoBlock {
+                icon(R.drawable.img_knight_shield_32) {
+                    type = MessageBottomSheetUMV2.Icon.Type.Warning
+                    backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint
+                }
+                title = resourceReference(R.string.hw_activation_need_title)
+                body = resourceReference(R.string.hw_activation_need_description)
+            }
+            secondaryButton {
+                text = resourceReference(R.string.common_later)
+                onClick {
+                    closeBs()
+                }
+            }
+            primaryButton {
+                text = resourceReference(R.string.hw_activation_need_backup)
+                onClick {
+                    val userWallet = getSelectedUserWallet() ?: return@onClick
+                    appRouter.push(WalletActivation(userWallet.walletId))
+                    closeBs()
+                }
+            }
+        }
+
     override fun onAddBackupCardClick() {
         analyticsEventHandler.send(MainScreen.NoticeBackupYourWalletTapped)
 
@@ -303,7 +349,7 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
         when (promoId) {
             PromoId.Referral -> {
                 analyticsEventHandler.send(MainScreen.ReferralPromoButtonParticipate)
-                appRouter.push(AppRoute.ReferralProgram(userWalletId = userWallet.walletId))
+                appRouter.push(ReferralProgram(userWalletId = userWallet.walletId))
             }
             PromoId.Sepa -> {
                 analyticsEventHandler.send(
@@ -315,7 +361,7 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
                 )
                 cryptoCurrency ?: return
                 appRouter.push(
-                    AppRoute.Onramp(
+                    Onramp(
                         userWalletId = userWallet.walletId,
                         currency = cryptoCurrency,
                         source = OnrampSource.SEPA_BANNER,
@@ -417,9 +463,63 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun onFinishWalletActivationClick() {
-        val userWallet = getSelectedUserWallet() ?: return
-        appRouter.push(AppRoute.WalletActivation(userWallet.walletId))
+    override fun onFinishWalletActivationClick(type: WalletActivationBannerType) {
+        when (type) {
+            WalletActivationBannerType.Attention -> {
+                val userWallet = getSelectedUserWallet() ?: return
+                appRouter.push(WalletActivation(userWallet.walletId))
+            }
+            WalletActivationBannerType.Warning -> {
+                messageSender.send(finalizeWalletSetupAlertBS)
+            }
+        }
+    }
+
+    override fun onAllowPermissions() {
+        analyticsEventHandler.send(WalletScreenAnalyticsEvent.PushBannerPromo.ButtonAllowPush)
+        if (isNotificationsPermissionGranted()) {
+            updateSubscribeOnPushPermissions(true)
+        } else {
+            walletEventSender.send(
+                event = WalletEvent.RequestPushPermissions(
+                    onAllow = {
+                        updateSubscribeOnPushPermissions(true)
+                        analyticsEventHandler.send(
+                            PushNotificationAnalyticEvents.PermissionStatus(isAllowed = true),
+                        )
+                    },
+                    onDeny = {
+                        updateSubscribeOnPushPermissions(false)
+                        analyticsEventHandler.send(
+                            PushNotificationAnalyticEvents.PermissionStatus(isAllowed = false),
+                        )
+                    },
+                ),
+            )
+        }
+    }
+
+    override fun onDenyPermissions() {
+        analyticsEventHandler.send(WalletScreenAnalyticsEvent.PushBannerPromo.ButtonLaterPush)
+        updateSubscribeOnPushPermissions(false)
+    }
+
+    private fun updateSubscribeOnPushPermissions(shouldAllow: Boolean) {
+        modelScope.launch {
+            notificationsRepository.setUserAllowToSubscribeOnPushNotifications(shouldAllow)
+            setShouldShowNotificationUseCase(
+                key = NotificationId.EnablePushesReminderNotification.key,
+                value = false,
+            )
+        }
+    }
+
+    private fun isNotificationsPermissionGranted(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionRepository.hasRuntimePermission(android.Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            true
+        }
     }
 
     private suspend fun fetchCryptoCurrencies(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/AccountDependencies.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/AccountDependencies.kt
new file mode 100644
index 0000000000..5a811786ab
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/AccountDependencies.kt
@@ -0,0 +1,15 @@
+package com.tangem.feature.wallet.presentation.account
+
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
+import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
+import com.tangem.domain.account.usecase.IsAccountsModeEnabledUseCase
+import javax.inject.Inject
+
+@ModelScoped
+internal class AccountDependencies @Inject constructor(
+    val accountsFeatureToggles: AccountsFeatureToggles,
+    val isAccountsModeEnabledUseCase: IsAccountsModeEnabledUseCase,
+    val expandedAccountsHolder: ExpandedAccountsHolder,
+    val singleAccountStatusListSupplier: SingleAccountStatusListSupplier,
+)
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/ExpandedAccountsHolder.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/ExpandedAccountsHolder.kt
new file mode 100644
index 0000000000..9f47e3e882
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/account/ExpandedAccountsHolder.kt
@@ -0,0 +1,54 @@
+package com.tangem.feature.wallet.presentation.account
+
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.domain.account.models.AccountList
+import com.tangem.domain.account.producer.SingleAccountListProducer
+import com.tangem.domain.account.supplier.SingleAccountListSupplier
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.models.wallet.UserWalletId
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+@ModelScoped
+internal class ExpandedAccountsHolder @Inject constructor(
+    private val singleAccountListSupplier: SingleAccountListSupplier,
+) {
+
+    private val expandedAccounts = MutableStateFlow<Map<UserWalletId, Set<AccountId>>>(mapOf())
+
+    fun expandedAccounts(userWallet: UserWallet): Flow<Set<AccountId>> = channelFlow {
+        walletAccounts(userWallet)
+            .onEach { accountList ->
+                val isSingleAccount = accountList.totalAccounts == 1
+                val defaultExpanded = when {
+                    isSingleAccount -> setOf(accountList.mainAccount.accountId)
+                    else -> setOf()
+                }
+                expandedAccounts.update { map ->
+                    var expandedSet = map[userWallet.walletId] ?: defaultExpanded
+                    // force expand for single account
+                    if (isSingleAccount) expandedSet = defaultExpanded
+                    map.plus(userWallet.walletId to expandedSet)
+                }
+            }.launchIn(this)
+
+        expandedAccounts
+            .mapNotNull { map -> map[userWallet.walletId] }
+            .onEach { expanded -> channel.send(expanded) }
+            .collect()
+    }
+
+    fun expandAccount(userWalletId: UserWalletId, accountId: AccountId) = expandedAccounts.update { map ->
+        val expandedSet = map[userWalletId]?.plus(accountId) ?: return@update map
+        map.plus(userWalletId to expandedSet)
+    }
+
+    fun collapseAccount(userWalletId: UserWalletId, accountId: AccountId) = expandedAccounts.update { map ->
+        val expandedSet = map[userWalletId]?.minus(accountId) ?: return@update map
+        map.plus(userWalletId to expandedSet)
+    }
+
+    private fun walletAccounts(userWallet: UserWallet): Flow<AccountList> =
+        singleAccountListSupplier(SingleAccountListProducer.Params(userWallet.walletId))
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
index 59cae0a222..7e70100e8b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt
@@ -79,7 +79,7 @@ internal object WalletPreviewData {
                 fallbackTint = TangemColorPalette.Black,
                 fallbackBackground = TangemColorPalette.Meadow,
                 isGrayscale = false,
-                showCustomBadge = false,
+                shouldShowCustomBadge = false,
             ),
             titleState = TokenItemState.TitleState.Content(text = stringReference(value = "Polygon")),
             subtitle2State = TokenItemState.Subtitle2State.TextContent(text = "3 172,14 $"),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
index 8dee141518..cd5f108efd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt
@@ -159,6 +159,7 @@ internal object WalletScreenPreviewData {
                 isFlickering = false,
                 onItemClick = { },
             ),
+            type = WalletState.MultiCurrency.WalletType.Cold,
         )
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
index 0dab60619c..fab2288352 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
@@ -260,9 +260,9 @@ private fun TopBar(
                 config = ActionButtonConfig(
                     text = TextReference.Res(id = R.string.organize_tokens_sort_by_balance),
                     iconResId = R.drawable.ic_sort_24,
-                    enabled = config.isEnabled,
+                    isEnabled = config.isEnabled,
                     onClick = config.onSortClick,
-                    dimContent = config.isSortedByBalance,
+                    shouldDimContent = config.isSortedByBalance,
                 ),
                 color = TangemTheme.colors.background.primary,
             )
@@ -279,7 +279,7 @@ private fun TopBar(
                         },
                     ),
                     iconResId = R.drawable.ic_group_24,
-                    enabled = config.isEnabled,
+                    isEnabled = config.isEnabled,
                     onClick = config.onGroupClick,
                 ),
                 color = TangemTheme.colors.background.primary,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
index 602de14421..95c0458d24 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
@@ -7,13 +7,16 @@ import com.tangem.common.routing.AppRoute.ManageTokens.Source
 import com.tangem.common.routing.AppRouter
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.navigation.url.UrlOpener
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.TokenReceiveConfig
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.redux.StateDialog
+import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.navigation.WalletRoute
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
 import kotlinx.coroutines.channels.BufferOverflow
@@ -64,12 +67,12 @@ internal class DefaultWalletRouter @Inject constructor(
         urlOpener.openUrl(url)
     }
 
-    override fun openTokenDetails(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus) {
+    override fun openTokenDetails(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus) {
         val networkAddress = currencyStatus.value.networkAddress
         if (networkAddress != null && networkAddress.defaultAddress.value.isNotEmpty()) {
             router.push(
                 AppRoute.CurrencyDetails(
-                    userWalletId = userWalletId,
+                    portfolioId = portfolioId,
                     currency = currencyStatus.currency,
                 ),
             )
@@ -106,4 +109,26 @@ internal class DefaultWalletRouter @Inject constructor(
             configuration = WalletDialogConfig.TokenReceive(tokenReceiveConfig),
         )
     }
+
+    override fun openTangemPayOnboarding() {
+        router.push(AppRoute.TangemPayOnboarding(AppRoute.TangemPayOnboarding.Mode.ContinueOnboarding))
+    }
+
+    override fun openTangemPayDetails(customerWalletAddress: String, cardNumberEnd: String) {
+        router.push(AppRoute.TangemPayDetails(customerWalletAddress, cardNumberEnd))
+    }
+
+    override fun openYieldSupplyBottomSheet(
+        cryptoCurrency: CryptoCurrency,
+        tokenAction: TokenAction,
+        onWarningAcknowledged: (TokenAction) -> Unit,
+    ) {
+        dialogNavigation.activate(
+            configuration = WalletDialogConfig.YieldSupplyWarning(
+                cryptoCurrency = cryptoCurrency,
+                tokenAction = tokenAction,
+                onWarningAcknowledged = onWarningAcknowledged,
+            ),
+        )
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
index 946a3e7692..2ff741c7b5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt
@@ -2,11 +2,14 @@ package com.tangem.feature.wallet.presentation.router
 
 import androidx.compose.runtime.Stable
 import com.arkivanov.decompose.router.slot.SlotNavigation
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.TokenReceiveConfig
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.tokens.model.details.TokenAction
 import com.tangem.feature.wallet.navigation.WalletRoute
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletDialogConfig
 import kotlinx.coroutines.flow.SharedFlow
@@ -39,7 +42,7 @@ internal interface InnerWalletRouter {
     fun openUrl(url: String)
 
     /** Open token details screen */
-    fun openTokenDetails(userWalletId: UserWalletId, currencyStatus: CryptoCurrencyStatus)
+    fun openTokenDetails(portfolioId: PortfolioId, currencyStatus: CryptoCurrencyStatus)
 
     /** Open stories screen */
     fun openStoriesScreen()
@@ -57,4 +60,15 @@ internal interface InnerWalletRouter {
     fun openNFT(userWallet: UserWallet)
 
     fun openTokenReceiveBottomSheet(tokenReceiveConfig: TokenReceiveConfig)
+
+    fun openTangemPayOnboarding()
+
+    fun openTangemPayDetails(customerWalletAddress: String, cardNumberEnd: String)
+
+    /** Open BS abput yield supply active and all money deposited in AAVE */
+    fun openYieldSupplyBottomSheet(
+        cryptoCurrency: CryptoCurrency,
+        tokenAction: TokenAction,
+        onWarningAcknowledged: (TokenAction) -> Unit,
+    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt
index 386d7faea0..6e08203c24 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/WalletScreenAnalyticsEvent.kt
@@ -144,4 +144,14 @@ sealed class WalletScreenAnalyticsEvent {
         data object ReferralPromoButtonDismiss : MainScreen(event = "Button - Referral Dismiss")
         //endregion
     }
+
+    sealed class PushBannerPromo(
+        event: String,
+        params: Map<String, String> = mapOf(),
+    ) : AnalyticsEvent(category = "Promo", event = event, params = params) {
+
+        data object PushBanner : PushBannerPromo(event = "Push Banner")
+        data object ButtonAllowPush : PushBannerPromo(event = "Button - Allow Push")
+        data object ButtonLaterPush : PushBannerPromo(event = "Button - Later Push")
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsAnalyticsSender.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsAnalyticsSender.kt
index bd539e7397..9eaaa739ba 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsAnalyticsSender.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsAnalyticsSender.kt
@@ -4,8 +4,9 @@ import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsEvent
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.decompose.di.ModelScoped
-import com.tangem.domain.tokens.model.analytics.TokenSwapPromoAnalyticsEvent
+import com.tangem.domain.tokens.model.analytics.TokenSwapPromoAnalyticsEvent.*
 import com.tangem.domain.tokens.model.analytics.TokenSwapPromoAnalyticsEvent.Program
+import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.MainScreen
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
@@ -49,11 +50,11 @@ internal class WalletWarningsAnalyticsSender @Inject constructor(
             is WalletNotification.RateApp -> MainScreen.HowDoYouLikeTangem
             is WalletNotification.Critical.BackupError -> MainScreen.BackupError
             is WalletNotification.NoteMigration -> MainScreen.NotePromo
-            is WalletNotification.SwapPromo -> TokenSwapPromoAnalyticsEvent.NoticePromotionBanner(
+            is WalletNotification.SwapPromo -> NoticePromotionBanner(
                 source = AnalyticsParam.ScreensSources.Main,
                 program = Program.Empty, // Use it on new promo action
             )
-            is WalletNotification.Sepa -> TokenSwapPromoAnalyticsEvent.NoticePromotionBanner(
+            is WalletNotification.Sepa -> NoticePromotionBanner(
                 source = AnalyticsParam.ScreensSources.Main,
                 program = Program.Sepa,
             )
@@ -66,9 +67,11 @@ internal class WalletWarningsAnalyticsSender @Inject constructor(
             is WalletNotification.UsedOutdatedData,
             is WalletNotification.UnlockVisaAccess,
             is WalletNotification.FinishWalletActivation,
+            is WalletNotification.Warning.YeildSupplyApprove, // TODO apply correct event
             -> null
             is WalletNotification.Critical.SeedPhraseNotification -> MainScreen.NoticeSeedPhraseSupport
             is WalletNotification.Critical.SeedPhraseSecondNotification -> MainScreen.NoticeSeedPhraseSupportSecond
+            is WalletNotification.PushNotifications -> WalletScreenAnalyticsEvent.PushBannerPromo.PushBanner
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
index 7de4aeda99..2d5684a5c0 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
@@ -3,11 +3,14 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
 import arrow.core.getOrElse
+import com.tangem.common.ui.notifications.NotificationId
 import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.ui.components.notifications.NotificationConfig.ButtonsState
 import com.tangem.core.ui.components.notifications.NotificationConfig.IconTint
 import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.card.CardTypesResolver
 import com.tangem.domain.card.common.util.cardTypesResolver
 import com.tangem.domain.core.lce.Lce
@@ -18,6 +21,7 @@ import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.notifications.repository.NotificationsRepository
 import com.tangem.domain.onramp.GetOnrampCountryUseCase
 import com.tangem.domain.onramp.OnrampSepaAvailableUseCase
 import com.tangem.domain.promo.ShouldShowPromoWalletUseCase
@@ -28,19 +32,23 @@ import com.tangem.domain.tokens.error.TokenListError
 import com.tangem.domain.wallets.models.SeedPhraseNotificationsStatus
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
+import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
+import com.tangem.features.yield.supply.api.YieldSupplyFeatureToggles
 import com.tangem.lib.crypto.BlockchainUtils.isBitcoin
-import com.tangem.utils.coroutines.combine6
+import com.tangem.utils.extensions.addIf
 import com.tangem.utils.extensions.isPositive
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import timber.log.Timber
 import javax.inject.Inject
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "LargeClass")
 @ModelScoped
 internal class GetMultiWalletWarningsFactory @Inject constructor(
     private val tokenListStore: MultiWalletTokenListStore,
@@ -53,33 +61,71 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
     private val getCryptoCurrenciesUseCase: GetCryptoCurrenciesUseCase,
     private val onrampSepaAvailableUseCase: OnrampSepaAvailableUseCase,
     private val getOnrampCountryUseCase: GetOnrampCountryUseCase,
+    private val notificationsRepository: NotificationsRepository,
+    private val yieldSupplyFeatureToggles: YieldSupplyFeatureToggles,
+    private val accountDependencies: AccountDependencies,
 ) {
 
+    @Suppress("UNCHECKED_CAST", "MagicNumber")
     fun create(userWallet: UserWallet, clickIntents: WalletClickIntents): Flow<ImmutableList<WalletNotification>> {
         val cardTypesResolver = (userWallet as? UserWallet.Cold)?.scanResponse?.cardTypesResolver
 
-        return combine6(
-            flow1 = tokenListStore.getOrThrow(userWallet.walletId),
-            flow2 = isReadyToShowRateAppUseCase(),
-            flow3 = isNeedToBackupUseCase(userWallet.walletId),
-            flow4 = seedPhraseNotificationUseCase(userWalletId = userWallet.walletId),
-            flow5 = shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Referral),
-            flow6 = shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Sepa),
-        ) { maybeTokenList, isReadyToShowRating, isNeedToBackup, seedPhraseIssueStatus, shouldShowReferralPromo, shouldShowSepaBanner ->
+        val tokenListFlow = if (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
+            val params = SingleAccountStatusListProducer.Params(userWallet.walletId)
+            accountDependencies.singleAccountStatusListSupplier(params)
+        } else {
+            tokenListStore.getOrThrow(userWallet.walletId)
+        }
+        return combine(
+            tokenListFlow,
+            isReadyToShowRateAppUseCase(),
+            isNeedToBackupUseCase(userWallet.walletId),
+            seedPhraseNotificationUseCase(userWalletId = userWallet.walletId),
+            shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Referral),
+            shouldShowPromoWalletUseCase(userWalletId = userWallet.walletId, promoId = PromoId.Sepa),
+            notificationsRepository.getShouldShowNotification(NotificationId.EnablePushesReminderNotification.key),
+        ) { array ->
+            val totalFiatBalance: Lce<TokenListError, TotalFiatBalance>
+            val flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>
+            if (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
+                val accountStatusList = array[0] as AccountStatusList
+                totalFiatBalance = Lce.Content(accountStatusList.totalFiatBalance)
+                flattenCurrencies = Lce.Content(accountStatusList.flattenCurrencies())
+            } else {
+                val maybeTokenList = array[0] as Lce<TokenListError, TokenList>
+                totalFiatBalance = maybeTokenList.map { it.totalFiatBalance }
+                flattenCurrencies = maybeTokenList.map { it.flattenCurrencies() }
+            }
+
+            val isReadyToShowRating = array[1] as Boolean
+            val isNeedToBackup = array[2] as Boolean
+            val seedPhraseIssueStatus = array[3] as SeedPhraseNotificationsStatus
+            val shouldShowReferralPromo = array[4] as Boolean
+            val shouldShowSepaBanner = array[5] as Boolean
+            val shouldShowEnablePushesReminderNotification = array[6] as Boolean
+
             buildList {
-                addUsedOutdatedDataNotification(maybeTokenList)
+                addUsedOutdatedDataNotification(totalFiatBalance)
 
                 addCriticalNotifications(userWallet, seedPhraseIssueStatus, clickIntents)
 
-                addFinishWalletActivationNotification(userWallet, maybeTokenList, clickIntents)
+                addFinishWalletActivationNotification(userWallet, totalFiatBalance, clickIntents)
 
                 addReferralPromoNotification(cardTypesResolver, clickIntents, shouldShowReferralPromo)
 
                 addSepaPromoNotification(userWallet, clickIntents, shouldShowSepaBanner)
 
-                addInformationalNotifications(userWallet, cardTypesResolver, maybeTokenList, clickIntents)
+                addInformationalNotifications(userWallet, cardTypesResolver, flattenCurrencies, clickIntents)
 
-                addWarningNotifications(cardTypesResolver, maybeTokenList, isNeedToBackup, clickIntents)
+                addWarningNotifications(cardTypesResolver, flattenCurrencies, isNeedToBackup, clickIntents)
+
+                addPushReminderNotification(
+                    clickIntents = clickIntents,
+                    shouldShowPushReminderBanner = shouldShowEnablePushesReminderNotification &&
+                        !notificationsRepository.isUserAllowToSubscribeOnPushNotifications(),
+                )
+
+                addYieldSupplyNotifications(flattenCurrencies)
 
                 val hasCriticalOrWarning = any { notification ->
                     notification is WalletNotification.Critical || notification is WalletNotification.Warning
@@ -93,16 +139,16 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
     }
 
     private fun MutableList<WalletNotification>.addUsedOutdatedDataNotification(
-        maybeTokenList: Lce<TokenListError, TokenList>,
+        totalFiatBalance: Lce<TokenListError, TotalFiatBalance>,
     ) {
         addIf(
             element = WalletNotification.UsedOutdatedData,
-            condition = maybeTokenList.fold(
+            condition = totalFiatBalance.fold(
                 ifLoading = {
-                    (it?.totalFiatBalance as? TotalFiatBalance.Loaded)?.source == StatusSource.ONLY_CACHE
+                    (it as? TotalFiatBalance.Loaded)?.source == StatusSource.ONLY_CACHE
                 },
                 ifContent = {
-                    (it.totalFiatBalance as? TotalFiatBalance.Loaded)?.source == StatusSource.ONLY_CACHE
+                    (it as? TotalFiatBalance.Loaded)?.source == StatusSource.ONLY_CACHE
                 },
                 ifError = { false },
             ),
@@ -180,7 +226,7 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
     private fun MutableList<WalletNotification>.addInformationalNotifications(
         userWallet: UserWallet,
         cardTypesResolver: CardTypesResolver?,
-        maybeTokenList: Lce<TokenListError, TokenList>,
+        flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>,
         clickIntents: WalletClickIntents,
     ) {
         addIf(
@@ -188,15 +234,15 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
             condition = cardTypesResolver != null && isDemoCardUseCase(cardId = cardTypesResolver.getCardId()),
         )
 
-        addMissingAddressesNotification(userWallet, maybeTokenList, clickIntents)
+        addMissingAddressesNotification(userWallet, flattenCurrencies, clickIntents)
     }
 
     private fun MutableList<WalletNotification>.addMissingAddressesNotification(
         userWallet: UserWallet,
-        maybeTokenList: Lce<TokenListError, TokenList>,
+        flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>,
         clickIntents: WalletClickIntents,
     ) {
-        val currencies = maybeTokenList.getMissingAddressCurrencies()
+        val currencies = flattenCurrencies.getMissingAddressCurrencies()
             .ifEmpty { return }
 
         addIf(
@@ -211,11 +257,10 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
         )
     }
 
-    private fun Lce<TokenListError, TokenList>.getMissingAddressCurrencies(): List<CryptoCurrency> {
-        val tokenList = getOrNull(isPartialContentAccepted = true) ?: return emptyList()
+    private fun Lce<TokenListError, List<CryptoCurrencyStatus>>.getMissingAddressCurrencies(): List<CryptoCurrency> {
+        val flattenCurrencies = getOrNull(isPartialContentAccepted = true) ?: return emptyList()
 
-        return tokenList
-            .flattenCurrencies()
+        return flattenCurrencies
             .filter { it.value is CryptoCurrencyStatus.MissedDerivation }
             .map(CryptoCurrencyStatus::currency)
     }
@@ -266,9 +311,18 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
         )
     }
 
+    private fun MutableList<WalletNotification>.addYieldSupplyNotifications(
+        flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>,
+    ) {
+        addIf(
+            element = WalletNotification.Warning.YeildSupplyApprove,
+            condition = flattenCurrencies.hasTokensWithActivatedSupplyWithoutApprove(),
+        )
+    }
+
     private fun MutableList<WalletNotification>.addWarningNotifications(
         cardTypesResolver: CardTypesResolver?,
-        tokenList: Lce<TokenListError, TokenList>,
+        flattenCurrencies: Lce<TokenListError, List<CryptoCurrencyStatus>>,
         isNeedToBackup: Boolean,
         clickIntents: WalletClickIntents,
     ) {
@@ -286,14 +340,35 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
 
         addIf(
             element = WalletNotification.Warning.SomeNetworksUnreachable,
-            condition = tokenList.hasUnreachableNetworks(),
+            condition = flattenCurrencies.hasUnreachableNetworks(),
         )
     }
 
-    private fun Lce<TokenListError, TokenList>.hasUnreachableNetworks(): Boolean {
-        val tokenList = getOrNull(isPartialContentAccepted = false) ?: return false
+    private fun MutableList<WalletNotification>.addPushReminderNotification(
+        clickIntents: WalletClickIntents,
+        shouldShowPushReminderBanner: Boolean,
+    ) {
+        addIf(
+            element = WalletNotification.PushNotifications(
+                onCloseClick = clickIntents::onDenyPermissions,
+                onEnabledClick = clickIntents::onAllowPermissions,
+            ),
+            condition = shouldShowPushReminderBanner,
+        )
+    }
 
-        return tokenList.flattenCurrencies().any { it.value is CryptoCurrencyStatus.Unreachable }
+    private fun Lce<TokenListError, List<CryptoCurrencyStatus>>.hasUnreachableNetworks(): Boolean {
+        val flattenCurrencies = getOrNull(isPartialContentAccepted = false) ?: return false
+
+        return flattenCurrencies.any { it.value is CryptoCurrencyStatus.Unreachable }
+    }
+
+    private fun Lce<TokenListError, List<CryptoCurrencyStatus>>.hasTokensWithActivatedSupplyWithoutApprove(): Boolean {
+        val flattenCurrencies = getOrNull(isPartialContentAccepted = false) ?: return false
+        val yieldSupplyEnabled = yieldSupplyFeatureToggles.isYieldSupplyFeatureEnabled
+        return yieldSupplyEnabled && flattenCurrencies.any {
+            it.value.yieldSupplyStatus?.isAllowedToSpend == false
+        }
     }
 
     private fun MutableList<WalletNotification>.addRateTheAppNotification(
@@ -310,44 +385,45 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
         )
     }
 
+    private fun TotalFiatBalance?.getFinishWalletActivationType(): WalletActivationBannerType {
+        return if ((this as? TotalFiatBalance.Loaded)?.amount?.isPositive() == true) {
+            WalletActivationBannerType.Warning
+        } else {
+            WalletActivationBannerType.Attention
+        }
+    }
+
     private fun MutableList<WalletNotification>.addFinishWalletActivationNotification(
         userWallet: UserWallet,
-        maybeTokenList: Lce<TokenListError, TokenList>,
+        totalFiatBalance: Lce<TokenListError, TotalFiatBalance>,
         clickIntents: WalletClickIntents,
     ) {
         if (userWallet !is UserWallet.Hot) return
 
         val shouldShowFinishActivation = !userWallet.backedUp
 
-        val iconTint = maybeTokenList.fold(
-            ifLoading = {
-                if ((it?.totalFiatBalance as? TotalFiatBalance.Loaded)?.amount?.isPositive() == true) {
-                    IconTint.Warning
-                } else {
-                    IconTint.Attention
-                }
-            },
-            ifContent = {
-                if ((it.totalFiatBalance as? TotalFiatBalance.Loaded)?.amount?.isPositive() == true) {
-                    IconTint.Warning
-                } else {
-                    IconTint.Attention
-                }
-            },
-            ifError = { IconTint.Attention },
+        val type = totalFiatBalance.fold(
+            ifLoading = { it.getFinishWalletActivationType() },
+            ifContent = { it.getFinishWalletActivationType() },
+            ifError = { WalletActivationBannerType.Attention },
         )
 
+        val tint = when (type) {
+            WalletActivationBannerType.Attention -> IconTint.Attention
+            WalletActivationBannerType.Warning -> IconTint.Warning
+        }
+
         addIf(
             element = WalletNotification.FinishWalletActivation(
-                iconTint = iconTint,
-                buttonsState = when (iconTint) {
-                    IconTint.Warning -> ButtonsState.PrimaryButtonConfig(
+                iconTint = tint,
+                buttonsState = when (type) {
+                    WalletActivationBannerType.Warning -> ButtonsState.PrimaryButtonConfig(
                         text = resourceReference(R.string.hw_activation_need_finish),
-                        onClick = clickIntents::onFinishWalletActivationClick,
+                        onClick = { clickIntents.onFinishWalletActivationClick(type) },
                     )
                     else -> ButtonsState.SecondaryButtonConfig(
                         text = resourceReference(R.string.hw_activation_need_finish),
-                        onClick = clickIntents::onFinishWalletActivationClick,
+                        onClick = { clickIntents.onFinishWalletActivationClick(type) },
                     )
                 },
             ),
@@ -355,10 +431,6 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
         )
     }
 
-    private fun MutableList<WalletNotification>.addIf(element: WalletNotification, condition: Boolean) {
-        if (condition) add(element = element)
-    }
-
     private companion object {
         const val MAX_REMAINING_SIGNATURES_COUNT = 10
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetSingleWalletWarningsFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetSingleWalletWarningsFactory.kt
index 64d80d9754..618c5730c3 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetSingleWalletWarningsFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetSingleWalletWarningsFactory.kt
@@ -15,6 +15,7 @@ import com.tangem.domain.wallets.usecase.GetWalletsUseCase
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
+import com.tangem.utils.extensions.addIf
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.*
@@ -204,14 +205,15 @@ internal class GetSingleWalletWarningsFactory @Inject constructor(
     }
 
     private fun MutableList<WalletNotification>.addIf(element: WalletNotification, condition: Boolean) {
-        if (condition) {
-            add(element = element)
+        addIf(condition) {
             if (element is WalletNotification.Critical ||
                 element is WalletNotification.Warning ||
                 element is WalletNotification.NoteMigration
             ) {
                 readyForRateAppNotification = false
             }
+
+            element
         }
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt
index 15dc39b149..bda79ff305 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/Wallet2CobrandImage.kt
@@ -351,6 +351,12 @@ internal enum class Wallet2CobrandImage(
         batchIds = setOf("AF85", "AF86", "AF87", "AF990013", "AF990012", "AF990011"),
     ),
 
+    WinterSakura(
+        cards2ResId = R.drawable.ill_winter_sakura_card2_120_106,
+        cards3ResId = R.drawable.ill_winter_sakura_card3_120_106,
+        batchIds = setOf("AF990053", "AF990054", "AF990055"),
+    ),
+
     LockedMoney(
         cards2ResId = R.drawable.ill_locked_money_card2_120_106,
         cards3ResId = R.drawable.ill_locked_money_card3_120_106,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
index 134e5086fd..31fffb5d04 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletAdditionalInfoFactory.kt
@@ -99,7 +99,10 @@ internal object WalletAdditionalInfoFactory {
             TextReference.EMPTY
         }
 
-        return WalletAdditionalInfo(hideable = false, content = content)
+        return WalletAdditionalInfo(
+            hideable = false,
+            content = content,
+        )
     }
 
     private fun getBackupInfoTextReference(count: Int): TextReference {
@@ -112,12 +115,18 @@ internal object WalletAdditionalInfoFactory {
 
     private fun UserWallet.Cold.resolveSingleCurrencyInfo(currencyAmount: BigDecimal?): WalletAdditionalInfo {
         return if (isLocked) {
-            WalletAdditionalInfo(hideable = false, content = TextReference.Res(R.string.common_locked))
+            WalletAdditionalInfo(
+                hideable = false,
+                content = TextReference.Res(R.string.common_locked),
+            )
         } else {
             val blockchain = scanResponse.cardTypesResolver.getBlockchain()
             val amount = currencyAmount?.format { crypto(blockchain.currency, blockchain.decimals()) }
 
-            WalletAdditionalInfo(hideable = true, content = TextReference.Str(value = amount.orEmpty()))
+            WalletAdditionalInfo(
+                hideable = true,
+                content = TextReference.Str(value = amount.orEmpty()),
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletNameMigrationUseCase.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletNameMigrationUseCase.kt
index 3f365ebc8a..064c5030cf 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletNameMigrationUseCase.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletNameMigrationUseCase.kt
@@ -1,8 +1,8 @@
 package com.tangem.feature.wallet.presentation.wallet.domain
 
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.wallet.copy
-import com.tangem.domain.core.wallets.UserWalletsListRepository
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletNamesMigrationRepository
 import timber.log.Timber
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoader.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoader.kt
index addbcb2860..0aee41a87b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoader.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoader.kt
@@ -10,6 +10,7 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -19,6 +20,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenList
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.*
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 
 @Suppress("LongParameterList")
 @ModelScoped
@@ -40,6 +42,8 @@ internal class MultiWalletContentLoader(
     private val getStoryContentUseCase: GetStoryContentUseCase,
     private val walletsRepository: WalletsRepository,
     private val currenciesRepository: CurrenciesRepository,
+    private val accountDependencies: AccountDependencies,
+    private val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
 ) : WalletContentLoader(id = userWallet.walletId) {
 
     override fun create(): List<WalletSubscriber> {
@@ -54,6 +58,8 @@ internal class MultiWalletContentLoader(
                 getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
                 applyTokenListSortingUseCase = applyTokenListSortingUseCase,
                 runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
+                accountDependencies = accountDependencies,
+                yieldSupplyApyFlowUseCase = yieldSupplyApyFlowUseCase,
             ).let(::add)
 
             WalletNFTListSubscriber(
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoaderFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoaderFactory.kt
index bed5d3487d..2def028fe4 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoaderFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/MultiWalletContentLoaderFactory.kt
@@ -10,6 +10,7 @@ import com.tangem.domain.tokens.repository.CurrenciesRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -18,6 +19,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarnin
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import javax.inject.Inject
 
 @Suppress("LongParameterList")
@@ -38,6 +40,8 @@ internal class MultiWalletContentLoaderFactory @Inject constructor(
     private val walletsRepository: WalletsRepository,
     private val getNFTCollectionsUseCase: GetNFTCollectionsUseCase,
     private val currenciesRepository: CurrenciesRepository,
+    private val accountDependencies: AccountDependencies,
+    private val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
 ) {
 
     fun create(userWallet: UserWallet, clickIntents: WalletClickIntents): WalletContentLoader {
@@ -59,6 +63,8 @@ internal class MultiWalletContentLoaderFactory @Inject constructor(
             walletsRepository = walletsRepository,
             getNFTCollectionsUseCase = getNFTCollectionsUseCase,
             currenciesRepository = currenciesRepository,
+            accountDependencies = accountDependencies,
+            yieldSupplyApyFlowUseCase = yieldSupplyApyFlowUseCase,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoader.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoader.kt
index b6d7259fc8..f4d089e864 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoader.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoader.kt
@@ -12,6 +12,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
@@ -35,6 +36,7 @@ internal class SingleWalletContentLoader(
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val analyticsEventHandler: AnalyticsEventHandler,
     private val walletWarningsAnalyticsSender: WalletWarningsAnalyticsSender,
+    private val accountDependencies: AccountDependencies,
 ) : WalletContentLoader(id = userWallet.walletId) {
 
     override fun create(): List<WalletSubscriber> {
@@ -53,6 +55,7 @@ internal class SingleWalletContentLoader(
                 clickIntents = clickIntents,
                 getSingleCryptoCurrencyStatusUseCase = getSingleCryptoCurrencyStatusUseCase,
                 getCryptoCurrencyActionsUseCase = getCryptoCurrencyActionsUseCase,
+                accountDependencies = accountDependencies,
             ),
             SingleWalletNotificationsSubscriber(
                 userWallet = userWallet,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoaderFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoaderFactory.kt
index a764909269..e5fe7a2155 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoaderFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletContentLoaderFactory.kt
@@ -13,6 +13,7 @@ import com.tangem.domain.txhistory.usecase.GetTxHistoryItemsUseCase
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.GetSingleWalletWarningsFactory
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
@@ -34,12 +35,14 @@ internal class SingleWalletContentLoaderFactory @Inject constructor(
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val analyticsEventHandler: AnalyticsEventHandler,
     private val walletWarningsAnalyticsSender: WalletWarningsAnalyticsSender,
+    private val accountDependencies: AccountDependencies,
 ) {
 
     fun create(userWallet: UserWallet.Cold, clickIntents: WalletClickIntents, isRefresh: Boolean): WalletContentLoader {
         return SingleWalletContentLoader(
             userWallet = userWallet,
             clickIntents = clickIntents,
+            accountDependencies = accountDependencies,
             isRefresh = isRefresh,
             stateHolder = stateHolder,
             getSingleCryptoCurrencyStatusUseCase = getSingleCryptoCurrencyStatusUseCase,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoader.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoader.kt
index 451148fb94..4bbae24b19 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoader.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoader.kt
@@ -5,6 +5,7 @@ import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -14,6 +15,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenList
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.subscribers.*
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 
 @Suppress("LongParameterList")
 internal class SingleWalletWithTokenContentLoader(
@@ -30,6 +32,8 @@ internal class SingleWalletWithTokenContentLoader(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
+    private val accountDependencies: AccountDependencies,
+    private val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
 ) : WalletContentLoader(id = userWallet.walletId) {
 
     override fun create(): List<WalletSubscriber> {
@@ -43,6 +47,8 @@ internal class SingleWalletWithTokenContentLoader(
                 tokenListStore = tokenListStore,
                 getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
                 runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
+                accountDependencies = accountDependencies,
+                yieldSupplyApyFlowUseCase = yieldSupplyApyFlowUseCase,
             ).let(::add)
             MultiWalletWarningsSubscriber(
                 userWallet = userWallet,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoaderFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoaderFactory.kt
index ed316595dd..743e1bf3c8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoaderFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/loaders/implementors/SingleWalletWithTokenContentLoaderFactory.kt
@@ -6,6 +6,7 @@ import com.tangem.domain.promo.GetStoryContentUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.WalletWarningsAnalyticsSender
@@ -14,6 +15,7 @@ import com.tangem.feature.wallet.presentation.wallet.domain.GetMultiWalletWarnin
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import javax.inject.Inject
 
 // TODO: Refactor
@@ -31,6 +33,8 @@ internal class SingleWalletWithTokenContentLoaderFactory @Inject constructor(
     private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
     private val shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val getStoryContentUseCase: GetStoryContentUseCase,
+    private val accountDependencies: AccountDependencies,
+    private val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
 ) {
 
     fun create(userWallet: UserWallet.Cold, clickIntents: WalletClickIntents): SingleWalletWithTokenContentLoader {
@@ -48,6 +52,8 @@ internal class SingleWalletWithTokenContentLoaderFactory @Inject constructor(
             runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
             getStoryContentUseCase = getStoryContentUseCase,
             shouldSaveUserWalletsUseCase = shouldSaveUserWalletsUseCase,
+            accountDependencies = accountDependencies,
+            yieldSupplyApyFlowUseCase = yieldSupplyApyFlowUseCase,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/TangemPayState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/TangemPayState.kt
new file mode 100644
index 0000000000..61e1574f8b
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/TangemPayState.kt
@@ -0,0 +1,25 @@
+package com.tangem.feature.wallet.presentation.wallet.state.model
+
+import androidx.annotation.DrawableRes
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+
+@Immutable
+internal sealed class TangemPayState {
+
+    object Empty : TangemPayState()
+
+    data class Progress(
+        val title: TextReference,
+        val buttonText: TextReference,
+        @DrawableRes val iconRes: Int,
+        val onButtonClick: () -> Unit,
+        val showProgress: Boolean = false,
+    ) : TangemPayState()
+
+    data class Card(
+        val lastFourDigits: TextReference,
+        val balanceText: TextReference,
+        val onClick: () -> Unit,
+    ) : TangemPayState()
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletDialogConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletDialogConfig.kt
index 9bce963c5f..4042c8b37e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletDialogConfig.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletDialogConfig.kt
@@ -1,7 +1,9 @@
 package com.tangem.feature.wallet.presentation.wallet.state.model
 
 import com.tangem.domain.models.TokenReceiveConfig
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.tokens.model.details.TokenAction
 import kotlinx.serialization.Serializable
 
 /**
@@ -23,4 +25,11 @@ internal sealed interface WalletDialogConfig {
 
     @Serializable
     data class TokenReceive(val tokenReceiveConfig: TokenReceiveConfig) : WalletDialogConfig
+
+    @Serializable
+    data class YieldSupplyWarning(
+        val cryptoCurrency: CryptoCurrency,
+        val tokenAction: TokenAction,
+        val onWarningAcknowledged: (TokenAction) -> Unit,
+    ) : WalletDialogConfig
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletEvent.kt
index 662fdca3de..b3f535d8a2 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletEvent.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletEvent.kt
@@ -30,4 +30,9 @@ internal sealed class WalletEvent {
             RIGHT,
         }
     }
+
+    data class RequestPushPermissions(
+        val onAllow: () -> Unit,
+        val onDeny: () -> Unit,
+    ) : WalletEvent()
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletManageButton.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletManageButton.kt
index af52d510ec..f956593a15 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletManageButton.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletManageButton.kt
@@ -45,8 +45,8 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
                 text = TextReference.Res(id = R.string.common_buy),
                 iconResId = R.drawable.ic_plus_24,
                 onClick = onClick,
-                enabled = enabled,
-                dimContent = dimContent,
+                isEnabled = enabled,
+                shouldDimContent = dimContent,
                 isInProgress = isInProgress,
             ),
         )
@@ -67,8 +67,8 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_send),
             iconResId = R.drawable.ic_arrow_up_24,
             onClick = onClick,
-            enabled = enabled,
-            dimContent = dimContent,
+            isEnabled = enabled,
+            shouldDimContent = dimContent,
         ),
     )
 
@@ -87,8 +87,8 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
         config = ActionButtonConfig(
             text = TextReference.Res(id = R.string.common_receive),
             iconResId = R.drawable.ic_arrow_down_24,
-            enabled = enabled,
-            dimContent = dimContent,
+            isEnabled = enabled,
+            shouldDimContent = dimContent,
             onClick = onClick,
             onLongClick = onLongClick,
         ),
@@ -103,8 +103,8 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_stake),
             iconResId = R.drawable.ic_staking_24,
             onClick = onClick,
-            enabled = enabled,
-            dimContent = dimContent,
+            isEnabled = enabled,
+            shouldDimContent = dimContent,
         ),
     )
 
@@ -125,8 +125,8 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.common_sell),
             iconResId = R.drawable.ic_currency_24,
             onClick = onClick,
-            enabled = enabled,
-            dimContent = dimContent,
+            isEnabled = enabled,
+            shouldDimContent = dimContent,
             isInProgress = isInProgress,
         ),
     )
@@ -149,10 +149,10 @@ internal sealed class WalletManageButton(val config: ActionButtonConfig) {
             text = TextReference.Res(id = R.string.swapping_swap_action),
             iconResId = R.drawable.ic_exchange_vertical_24,
             onClick = onClick,
-            enabled = enabled,
-            dimContent = dimContent,
+            isEnabled = enabled,
+            shouldDimContent = dimContent,
             isInProgress = isInProgress,
-            showBadge = showBadge,
+            shouldShowBadge = showBadge,
         ),
     )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt
index c7bfe00b92..1479c155dd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt
@@ -138,6 +138,11 @@ sealed class WalletNotification(val config: NotificationConfig) {
                 formatArgs = wrappedList(count),
             ),
         )
+
+        data object YeildSupplyApprove : Warning(
+            title = resourceReference(R.string.yield_module_main_view_approve_notification_title),
+            subtitle = resourceReference(R.string.yield_module_main_view_approve_notification_description),
+        )
     }
 
     sealed class Informational(
@@ -309,4 +314,23 @@ sealed class WalletNotification(val config: NotificationConfig) {
             iconSize = 54.dp,
         ),
     )
+
+    data class PushNotifications(
+        val onCloseClick: () -> Unit,
+        val onEnabledClick: () -> Unit,
+    ) : WalletNotification(
+        config = NotificationConfig(
+            title = resourceReference(R.string.user_push_notification_banner_title),
+            subtitle = resourceReference(R.string.user_push_notification_banner_subtitle),
+            iconResId = R.drawable.img_push_reminder,
+            onCloseClick = onCloseClick,
+            buttonsState = NotificationConfig.ButtonsState.PairButtonsConfig(
+                primaryText = resourceReference(id = R.string.common_enable),
+                onPrimaryClick = onEnabledClick,
+                secondaryText = resourceReference(id = R.string.common_later),
+                onSecondaryClick = onCloseClick,
+            ),
+            iconSize = 54.dp,
+        ),
+    )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
index df260b5856..e142c4af9d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletScreenState.kt
@@ -14,4 +14,5 @@ internal data class WalletScreenState(
     val isHidingMode: Boolean,
     val showMarketsOnboarding: Boolean,
     val onDismissMarketsOnboarding: () -> Unit,
+    val tangemPayState: TangemPayState = TangemPayState.Empty,
 )
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt
index cd4ed81df9..86df278ce6 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt
@@ -23,6 +23,7 @@ internal sealed interface WalletState : WalletStateHolder {
 
         abstract val tokensListState: WalletTokensListState
         abstract val nftState: WalletNFTItemUM
+        abstract val type: WalletType
 
         data class Content(
             override val pullToRefreshConfig: PullToRefreshConfig,
@@ -32,12 +33,14 @@ internal sealed interface WalletState : WalletStateHolder {
             override val bottomSheetConfig: TangemBottomSheetConfig?,
             override val tokensListState: WalletTokensListState,
             override val nftState: WalletNFTItemUM,
+            override val type: WalletType,
         ) : MultiCurrency()
 
         data class Locked(
             override val walletCardState: WalletCardState,
             override val buttons: PersistentList<WalletManageButton>,
             override val bottomSheetConfig: TangemBottomSheetConfig?,
+            override val type: WalletType,
             val onUnlockNotificationClick: () -> Unit,
         ) : MultiCurrency(),
             WalletStateHolder by LockedWalletStateHolder(
@@ -50,6 +53,11 @@ internal sealed interface WalletState : WalletStateHolder {
             override val tokensListState = WalletTokensListState.ContentState.Locked
             override val nftState: WalletNFTItemUM = WalletNFTItemUM.Hidden
         }
+
+        enum class WalletType {
+            Hot,
+            Cold,
+        }
     }
 
     sealed class SingleCurrency : WalletState, TxHistoryStateHolder {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt
index 8cac86072f..3c7788f3fd 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/InitializeWalletsTransformer.kt
@@ -9,6 +9,7 @@ import com.tangem.feature.wallet.presentation.wallet.state.model.*
 import com.tangem.feature.wallet.presentation.wallet.state.utils.WalletLoadingStateFactory
 import com.tangem.feature.wallet.presentation.wallet.state.utils.createStateByWalletType
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState.MultiCurrency.WalletType
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -61,6 +62,10 @@ internal class InitializeWalletsTransformer(
                     buttons = createMultiWalletEnabledButtons(userWallet),
                     bottomSheetConfig = null,
                     onUnlockNotificationClick = clickIntents::onOpenUnlockWalletsBottomSheetClick,
+                    type = when (userWallet) {
+                        is UserWallet.Cold -> WalletType.Cold
+                        is UserWallet.Hot -> WalletType.Hot
+                    },
                 )
             },
             singleCurrencyCreator = {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt
index 43f812b0dd..9565609246 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetCryptoCurrencyActionsTransformer.kt
@@ -1,6 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
 import com.tangem.domain.tokens.model.TokenActionsState
 import com.tangem.domain.models.wallet.UserWallet
@@ -14,6 +15,7 @@ import timber.log.Timber
 internal class SetCryptoCurrencyActionsTransformer(
     private val tokenActionsState: TokenActionsState,
     private val userWallet: UserWallet,
+    private val portfolioId: PortfolioId,
     private val clickIntents: WalletClickIntents,
 ) : WalletStateTransformer(userWallet.walletId) {
 
@@ -48,6 +50,7 @@ internal class SetCryptoCurrencyActionsTransformer(
                             dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                             onClick = {
                                 clickIntents.onBuyClick(
+                                    portfolioId = portfolioId,
                                     cryptoCurrencyStatus = cryptoCurrencyStatus,
                                     unavailabilityReason = action.unavailabilityReason,
                                 )
@@ -59,7 +62,7 @@ internal class SetCryptoCurrencyActionsTransformer(
                             enabled = true,
                             dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                             onClick = {
-                                clickIntents.onReceiveClick(cryptoCurrencyStatus = cryptoCurrencyStatus)
+                                clickIntents.onReceiveClick(portfolioId, cryptoCurrencyStatus = cryptoCurrencyStatus)
                             },
                             onLongClick = {
                                 clickIntents.onCopyAddressLongClick(cryptoCurrencyStatus = cryptoCurrencyStatus)
@@ -84,6 +87,7 @@ internal class SetCryptoCurrencyActionsTransformer(
                             dimContent = action.unavailabilityReason != ScenarioUnavailabilityReason.None,
                             onClick = {
                                 clickIntents.onSendClick(
+                                    portfolioId = portfolioId,
                                     cryptoCurrencyStatus = cryptoCurrencyStatus,
                                     unavailabilityReason = action.unavailabilityReason,
                                 )
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt
index e8b3b2446f..9b15ca02a0 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt
@@ -1,7 +1,6 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers
 
 import com.tangem.domain.appcurrency.model.AppCurrency
-import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState
@@ -13,10 +12,11 @@ import com.tangem.feature.wallet.presentation.wallet.state.utils.enableButtons
 import timber.log.Timber
 
 internal class SetTokenListTransformer(
-    private val tokenList: TokenList,
+    private val params: TokenConverterParams,
     private val userWallet: UserWallet,
     private val appCurrency: AppCurrency,
     private val clickIntents: WalletClickIntents,
+    private val yieldSupplyApyMap: Map<String, String> = emptyMap(),
 ) : WalletStateTransformer(userWallet.walletId) {
 
     override fun transform(prevState: WalletState): WalletState {
@@ -42,8 +42,12 @@ internal class SetTokenListTransformer(
     }
 
     private fun WalletCardState.toLoadedState(): WalletCardState {
+        val fiatBalance = when (params) {
+            is TokenConverterParams.Account -> params.accountList.totalFiatBalance
+            is TokenConverterParams.Wallet -> params.tokenList.totalFiatBalance
+        }
         return MultiWalletCardStateConverter(
-            fiatBalance = tokenList.totalFiatBalance,
+            fiatBalance = fiatBalance,
             selectedWallet = userWallet,
             appCurrency = appCurrency,
         ).convert(value = this)
@@ -51,10 +55,11 @@ internal class SetTokenListTransformer(
 
     private fun WalletTokensListState.toLoadedState(): WalletTokensListState {
         return TokenListStateConverter(
-            tokenList = tokenList,
+            params = params,
             selectedWallet = userWallet,
             appCurrency = appCurrency,
             clickIntents = clickIntents,
+            apyMap = yieldSupplyApyMap,
         ).convert(value = this)
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountTransformer.kt
index ef1b1961e2..ccc3c60815 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTxHistoryCountTransformer.kt
@@ -59,8 +59,8 @@ internal class SetTxHistoryCountTransformer(
     private fun createLoadingItems(): List<TxHistoryState.TxHistoryItemState> {
         return buildList {
             add(TxHistoryState.TxHistoryItemState.Title(onExploreClick = clickIntents::onExploreClick))
-            (1..transactionsCount).forEach {
-                add(TxHistoryState.TxHistoryItemState.Transaction(state = TransactionState.Loading(it.toString())))
+            for (i in 1..transactionsCount) {
+                add(TxHistoryState.TxHistoryItemState.Transaction(state = TransactionState.Loading(i.toString())))
             }
         }
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt
index 751185ccf4..18974cedeb 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetVisaInfoTransformer.kt
@@ -9,6 +9,7 @@ import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.fiat
 import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.card.common.util.getCardsCount
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.visa.exception.RefreshTokenExpiredException
@@ -105,7 +106,10 @@ internal class SetVisaInfoTransformer(
             },
         )
 
-        return WalletAdditionalInfo(hideable = true, infoContent)
+        return WalletAdditionalInfo(
+            hideable = true,
+            content = infoContent,
+        )
     }
 
     private fun getRefreshTokenExpiredState(prevState: WalletState.Visa.Content): WalletState {
@@ -148,7 +152,11 @@ internal class SetVisaInfoTransformer(
                 enabled = true,
                 dimContent = false,
                 onClick = {
-                    clickIntents.onReceiveClick(cryptoCurrencyStatus, MainScreenAnalyticsEvent.ButtonReceive)
+                    clickIntents.onReceiveClick(
+                        portfolioId = PortfolioId(userWalletId), // todo account Visa use Main account?
+                        cryptoCurrencyStatus = cryptoCurrencyStatus,
+                        event = MainScreenAnalyticsEvent.ButtonReceive,
+                    )
                 },
                 onLongClick = {
                     clickIntents.onCopyAddressLongClick(cryptoCurrencyStatus)
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TangemPayStateTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TangemPayStateTransformer.kt
new file mode 100644
index 0000000000..9e367377ba
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TangemPayStateTransformer.kt
@@ -0,0 +1,79 @@
+package com.tangem.feature.wallet.presentation.wallet.state.transformers
+
+import com.tangem.common.ui.R
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.pay.model.CustomerInfo.CardInfo
+import com.tangem.domain.pay.model.MainScreenCustomerInfo
+import com.tangem.domain.pay.model.OrderStatus.CANCELED
+import com.tangem.domain.pay.model.OrderStatus.NOT_ISSUED
+import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState
+import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState.Progress
+import com.tangem.feature.wallet.presentation.wallet.state.model.WalletScreenState
+import java.util.Currency
+
+internal class TangemPayStateTransformer(
+    private val value: MainScreenCustomerInfo? = null,
+    private val onIssueOrderClick: () -> Unit = {},
+    private val onContinueKycClick: () -> Unit = {},
+    private val openDetails: (customerWalletAddress: String, cardNumberEnd: String) -> Unit = { _, _ -> },
+    private val issueProgressState: Boolean = false,
+    private val issueState: Boolean = false,
+) : WalletScreenStateTransformer {
+
+    override fun transform(prevState: WalletScreenState): WalletScreenState {
+        val tangemPayState = when {
+            issueProgressState -> createIssueProgressState()
+            issueState -> createIssueState()
+            else -> createInitialState()
+        }
+        return prevState.copy(tangemPayState = tangemPayState)
+    }
+
+    private fun createInitialState(): TangemPayState {
+        val cardInfo = value?.info?.cardInfo
+        return when {
+            value == null -> TangemPayState.Empty
+            !value.info.isKycApproved() -> createKycInProgressState(onContinueKycClick)
+            cardInfo != null -> getCardInfoState(cardInfo)
+            value.orderStatus == NOT_ISSUED || value.orderStatus == CANCELED -> createIssueState()
+            else -> createIssueProgressState()
+        }
+    }
+
+    private fun createIssueProgressState(): TangemPayState = Progress(
+        title = TextReference.Res(R.string.tangempay_issue_card_notification_title),
+        buttonText = TextReference.EMPTY,
+        iconRes = R.drawable.ic_tangem_pay_promo_card_36,
+        onButtonClick = {},
+        showProgress = true,
+    )
+
+    private fun createIssueState() = Progress(
+        title = TextReference.Res(R.string.tangempay_issue_card_notification_title),
+        buttonText = TextReference.Res(R.string.common_continue),
+        iconRes = R.drawable.ic_tangem_pay_promo_card_36,
+        onButtonClick = onIssueOrderClick,
+    )
+
+    private fun createKycInProgressState(onContinueKycClick: () -> Unit): TangemPayState = Progress(
+        title = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_title),
+        buttonText = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_button),
+        iconRes = R.drawable.ic_promo_kyc_36,
+        onButtonClick = onContinueKycClick,
+    )
+
+    private fun getCardInfoState(cardInfo: CardInfo): TangemPayState = TangemPayState.Card(
+        lastFourDigits = TextReference.Str("*${cardInfo.lastFourDigits}"),
+        balanceText = TextReference.Str(getBalanceText(cardInfo)),
+        onClick = { openDetails(cardInfo.customerWalletAddress, cardInfo.lastFourDigits) },
+    )
+
+    private fun getBalanceText(cardInfo: CardInfo): String {
+        val currency = Currency.getInstance(cardInfo.currencyCode)
+        return cardInfo.balance.format {
+            fiat(fiatCurrencyCode = currency.currencyCode, fiatCurrencySymbol = currency.symbol)
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TokenConverterParams.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TokenConverterParams.kt
new file mode 100644
index 0000000000..fd8229e5e8
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/TokenConverterParams.kt
@@ -0,0 +1,18 @@
+package com.tangem.feature.wallet.presentation.wallet.state.transformers
+
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.tokenlist.TokenList
+
+sealed interface TokenConverterParams {
+    data class Wallet(
+        val portfolioId: PortfolioId,
+        val tokenList: TokenList,
+    ) : TokenConverterParams
+
+    data class Account(
+        val accountList: AccountStatusList,
+        val expandedAccounts: Set<AccountId>,
+    ) : TokenConverterParams
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt
index 97a13ed361..6a88f70616 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/MultiWalletCurrencyActionsConverter.kt
@@ -3,6 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers.convert
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.model.ScenarioUnavailabilityReason
@@ -17,6 +18,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 internal class MultiWalletCurrencyActionsConverter(
     private val userWallet: UserWallet,
+    private val portfolioId: PortfolioId,
     private val clickIntents: WalletCurrencyActionsClickIntents,
 ) : Converter<TokenActionsState, ImmutableList<TokenActionButtonConfig>> {
 
@@ -46,7 +48,7 @@ internal class MultiWalletCurrencyActionsConverter(
         if (actionsState is TokenActionsState.ActionState.Send && cryptoCurrencyStatus.value.amount.isNullOrZero()) {
             return null
         }
-
+        val noneReason = ScenarioUnavailabilityReason.None
         val title: TextReference
         val icon: Int
         val action: () -> Unit
@@ -54,27 +56,27 @@ internal class MultiWalletCurrencyActionsConverter(
             is TokenActionsState.ActionState.Buy -> {
                 title = resourceReference(R.string.common_buy)
                 icon = R.drawable.ic_plus_24
-                action = { clickIntents.onBuyClick(cryptoCurrencyStatus, ScenarioUnavailabilityReason.None) }
+                action = { clickIntents.onBuyClick(portfolioId, cryptoCurrencyStatus, noneReason) }
             }
             is TokenActionsState.ActionState.Receive -> {
                 title = resourceReference(R.string.common_receive)
                 icon = R.drawable.ic_arrow_down_24
-                action = { clickIntents.onReceiveClick(cryptoCurrencyStatus) }
+                action = { clickIntents.onReceiveClick(portfolioId, cryptoCurrencyStatus) }
             }
             is TokenActionsState.ActionState.Stake -> {
                 title = resourceReference(R.string.common_stake)
                 icon = R.drawable.ic_staking_24
-                action = { clickIntents.onStakeClick(cryptoCurrencyStatus, actionsState.yield) }
+                action = { clickIntents.onStakeClick(portfolioId, cryptoCurrencyStatus, actionsState.yield) }
             }
             is TokenActionsState.ActionState.Sell -> {
                 title = resourceReference(R.string.common_sell)
                 icon = R.drawable.ic_currency_24
-                action = { clickIntents.onSellClick(cryptoCurrencyStatus, ScenarioUnavailabilityReason.None) }
+                action = { clickIntents.onSellClick(cryptoCurrencyStatus, noneReason) }
             }
             is TokenActionsState.ActionState.Send -> {
                 title = resourceReference(R.string.common_send)
                 icon = R.drawable.ic_arrow_up_24
-                action = { clickIntents.onSendClick(cryptoCurrencyStatus, ScenarioUnavailabilityReason.None) }
+                action = { clickIntents.onSendClick(portfolioId, cryptoCurrencyStatus, noneReason) }
             }
             is TokenActionsState.ActionState.Swap -> {
                 title = resourceReference(R.string.swapping_swap_action)
@@ -82,20 +84,20 @@ internal class MultiWalletCurrencyActionsConverter(
                 action = {
                     clickIntents.onSwapClick(
                         cryptoCurrencyStatus = cryptoCurrencyStatus,
-                        userWalletId = userWallet.walletId,
-                        unavailabilityReason = ScenarioUnavailabilityReason.None,
+                        portfolioId = portfolioId,
+                        unavailabilityReason = noneReason,
                     )
                 }
             }
             is TokenActionsState.ActionState.CopyAddress -> {
                 title = resourceReference(R.string.common_copy_address)
                 icon = R.drawable.ic_copy_24
-                action = { clickIntents.onCopyAddressClick(cryptoCurrencyStatus) }
+                action = { clickIntents.onCopyAddressClick(portfolioId, cryptoCurrencyStatus) }
             }
             is TokenActionsState.ActionState.HideToken -> {
                 title = resourceReference(R.string.token_details_hide_token)
                 icon = R.drawable.ic_hide_24
-                action = { clickIntents.onHideTokensClick(cryptoCurrencyStatus) }
+                action = { clickIntents.onHideTokensClick(portfolioId, cryptoCurrencyStatus) }
             }
             is TokenActionsState.ActionState.Analytics -> {
                 title = resourceReference(R.string.common_analytics)
@@ -109,7 +111,7 @@ internal class MultiWalletCurrencyActionsConverter(
             iconResId = icon,
             onClick = action,
             isWarning = actionsState is TokenActionsState.ActionState.HideToken,
-            enabled = actionsState.unavailabilityReason == ScenarioUnavailabilityReason.None,
+            enabled = actionsState.unavailabilityReason == noneReason,
         )
     }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
index ec332f336e..931921c425 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenListStateConverter.kt
@@ -1,12 +1,20 @@
 package com.tangem.feature.wallet.presentation.wallet.state.transformers.converter
 
+import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter
 import com.tangem.common.ui.tokens.TokenItemStateConverter
+import com.tangem.core.ui.components.token.state.TokenItemState
+import com.tangem.core.ui.components.tokenlist.state.PortfolioTokensListItemUM
 import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.card.common.util.cardTypesResolver
+import com.tangem.domain.models.PortfolioId
 import com.tangem.domain.models.TotalFiatBalance
+import com.tangem.domain.models.account.Account
+import com.tangem.domain.models.account.AccountId
+import com.tangem.domain.models.account.AccountStatus
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.tokenlist.TokenList.GroupedByNetwork.NetworkGroup
@@ -14,54 +22,134 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState
+import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState.OrganizeTokensButtonConfig
+import com.tangem.feature.wallet.presentation.wallet.state.transformers.TokenConverterParams
 import com.tangem.utils.converter.Converter
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.mutate
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState.OrganizeTokensButtonConfig as WalletOrganizeTokensButtonConfig
 
 internal class TokenListStateConverter(
-    appCurrency: AppCurrency,
-    private val tokenList: TokenList,
+    private val appCurrency: AppCurrency,
+    private val params: TokenConverterParams,
     private val selectedWallet: UserWallet,
     private val clickIntents: WalletClickIntents,
+    private val apyMap: Map<String, String> = emptyMap(),
 ) : Converter<WalletTokensListState, WalletTokensListState> {
 
-    private val tokenStatusConverter = TokenItemStateConverter(
+    private val onTokenClick: (accountId: AccountId?, currencyStatus: CryptoCurrencyStatus) -> Unit =
+        { accountId, currencyStatus ->
+            val id = accountId?.let { PortfolioId(accountId) } ?: PortfolioId(selectedWallet.walletId)
+            clickIntents.onTokenItemClick(id, currencyStatus)
+        }
+
+    private val onTokenLongClick: (accountId: AccountId?, currencyStatus: CryptoCurrencyStatus) -> Unit =
+        { accountId, currencyStatus ->
+            val id = accountId?.let { PortfolioId(accountId) } ?: PortfolioId(selectedWallet.walletId)
+            clickIntents.onTokenItemLongClick(id, currencyStatus)
+        }
+
+    private fun tokenStatusConverter(accountId: AccountId? = null) = TokenItemStateConverter(
         appCurrency = appCurrency,
-        onItemClick = { _, status -> clickIntents.onTokenItemClick(status) },
-        onItemLongClick = { _, status -> clickIntents.onTokenItemLongClick(status) },
+        onItemClick = { _, status -> onTokenClick(accountId, status) },
+        onItemLongClick = { _, status -> onTokenLongClick(accountId, status) },
     )
 
     override fun convert(value: WalletTokensListState): WalletTokensListState {
-        return when (tokenList) {
+        return when (params) {
+            is TokenConverterParams.Account -> convertAccountList(params)
+            is TokenConverterParams.Wallet -> convertTokenList(
+                tokenConverter = tokenStatusConverter((params.portfolioId as? PortfolioId.Account)?.accountId),
+                tokenList = params.tokenList,
+            )
+        }
+    }
+
+    private fun convertTokenList(tokenConverter: TokenItemStateConverter, tokenList: TokenList): WalletTokensListState =
+        when (tokenList) {
             is TokenList.Empty -> WalletTokensListState.Empty
             is TokenList.GroupedByNetwork -> WalletTokensListState.ContentState.Content(
-                items = tokenList.toGroupedItems(),
-                organizeTokensButtonConfig = getOrganizeTokensButtonState(
-                    currenciesSize = tokenList.groups.flatMap(NetworkGroup::currencies).size,
-                ),
+                items = tokenList.toGroupedItems(tokenConverter),
+                organizeTokensButtonConfig = getOrganizeTokensButtonState(tokenList = tokenList),
             )
             is TokenList.Ungrouped -> WalletTokensListState.ContentState.Content(
-                items = tokenList.toUngroupedItems(),
-                organizeTokensButtonConfig = getOrganizeTokensButtonState(currenciesSize = tokenList.currencies.size),
+                items = tokenList.toUngroupedItems(tokenConverter),
+                organizeTokensButtonConfig = getOrganizeTokensButtonState(tokenList = tokenList),
             )
         }
+
+    private fun convertAccountList(params: TokenConverterParams.Account): WalletTokensListState {
+        val accountList = params.accountList
+        // todo account null for firs iteration?
+        val organizeTokensButtonConfig: OrganizeTokensButtonConfig? = null
+
+        fun AccountStatus.CryptoPortfolio.map(): TokensListItemUM.Portfolio {
+            val tokenList: TokenList = this.tokenList
+            val account: Account.CryptoPortfolio = this.account
+            val isExtend = params.expandedAccounts.contains(account.accountId)
+            val onItemClick: (Account.CryptoPortfolio) -> Unit = {
+                if (isExtend) {
+                    clickIntents.onAccountCollapseClick(it)
+                } else {
+                    clickIntents.onAccountExpandClick(it)
+                }
+            }
+            val converter = AccountCryptoPortfolioItemStateConverter(
+                appCurrency = appCurrency,
+                account = account,
+                onItemClick = onItemClick,
+            )
+            val accountItem = converter.convert(tokenList.totalFiatBalance)
+            val tokenConverter = tokenStatusConverter(account.accountId)
+            val tokensListState = convertTokenList(tokenConverter, tokenList)
+            val items = when (tokensListState) {
+                is WalletTokensListState.ContentState.PortfolioContent -> tokensListState.items
+                is WalletTokensListState.ContentState.Content -> tokensListState.items
+                is WalletTokensListState.ContentState.Loading -> tokensListState.items
+                is WalletTokensListState.ContentState.Locked -> tokensListState.items
+                is WalletTokensListState.Empty -> listOf()
+            }
+            return TokensListItemUM.Portfolio(
+                state = accountItem,
+                isExpanded = isExtend,
+                tokens = items.filterIsInstance<PortfolioTokensListItemUM>(),
+            )
+        }
+
+        val accountItems = accountList.accountStatuses
+            .map { accountStatus ->
+                when (accountStatus) {
+                    is AccountStatus.CryptoPortfolio -> accountStatus.map()
+                }
+            }
+        return WalletTokensListState.ContentState.PortfolioContent(
+            items = accountItems.toPersistentList(),
+            organizeTokensButtonConfig = organizeTokensButtonConfig,
+        )
     }
 
-    private fun TokenList.GroupedByNetwork.toGroupedItems(): PersistentList<TokensListItemUM> {
+    private fun TokenList.GroupedByNetwork.toGroupedItems(
+        tokenConverter: TokenItemStateConverter,
+    ): PersistentList<TokensListItemUM> {
         return groups.fold(initial = persistentListOf()) { acc, group ->
-            acc.mutate { it.addGroup(group) }
+            acc.mutate { it.addGroup(tokenConverter, group) }
         }
     }
 
-    private fun TokenList.Ungrouped.toUngroupedItems(): PersistentList<TokensListItemUM> {
+    private fun TokenList.Ungrouped.toUngroupedItems(
+        tokenConverter: TokenItemStateConverter,
+    ): PersistentList<TokensListItemUM> {
         return currencies.fold(initial = persistentListOf()) { acc, token ->
-            acc.mutate { it.addToken(token) }
+            acc.mutate { it.addToken(tokenConverter, token) }
         }
     }
 
-    private fun MutableList<TokensListItemUM>.addGroup(group: NetworkGroup): List<TokensListItemUM> {
+    private fun MutableList<TokensListItemUM>.addGroup(
+        tokenConverter: TokenItemStateConverter,
+        group: NetworkGroup,
+    ): List<TokensListItemUM> {
         val groupTitle = TokensListItemUM.GroupTitle(
             id = group.network.hashCode(),
             text = resourceReference(
@@ -71,19 +159,70 @@ internal class TokenListStateConverter(
         )
 
         add(groupTitle)
-        group.currencies.forEach { token -> addToken(token) }
+        group.currencies.forEach { token -> addToken(tokenConverter, token) }
 
         return this
     }
 
-    private fun MutableList<TokensListItemUM>.addToken(token: CryptoCurrencyStatus): List<TokensListItemUM> {
-        val tokenItemState = tokenStatusConverter.convert(token)
+    private fun MutableList<TokensListItemUM>.addToken(
+        tokenConverter: TokenItemStateConverter,
+        token: CryptoCurrencyStatus,
+    ): List<TokensListItemUM> {
+        val tokenItemState = tokenConverter.convert(token).withEarnApyBadge(token)
+
         add(TokensListItemUM.Token(tokenItemState))
 
         return this
     }
 
-    private fun getOrganizeTokensButtonState(currenciesSize: Int): WalletOrganizeTokensButtonConfig? {
+    private fun TokenItemState.withEarnApyBadge(cryptoCurrencyStatus: CryptoCurrencyStatus): TokenItemState {
+        val apy: String? = resolveEarnApy(cryptoCurrencyStatus)
+
+        val shouldApply = apy != null && this.titleState is TokenItemState.TitleState.Content
+
+        return if (!shouldApply) {
+            this
+        } else {
+            val contentTitle = this.titleState as TokenItemState.TitleState.Content
+            val newTitle = contentTitle.copy(
+                earnApy = resourceReference(
+                    R.string.yield_module_earn_badge,
+                    wrappedList(apy),
+                ),
+            )
+
+            when (this) {
+                is TokenItemState.Content -> this.copy(titleState = newTitle)
+                is TokenItemState.Unreachable -> this.copy(titleState = newTitle)
+                is TokenItemState.NoAddress -> this.copy(titleState = newTitle)
+                is TokenItemState.Loading -> this.copy(titleState = newTitle)
+                is TokenItemState.Draggable -> this.copy(titleState = newTitle)
+                is TokenItemState.Locked -> this
+            }
+        }
+    }
+
+    private fun resolveEarnApy(cryptoCurrencyStatus: CryptoCurrencyStatus): String? {
+        if (apyMap.isEmpty()) return null
+
+        val isYieldSupplyActive = (cryptoCurrencyStatus.value as? CryptoCurrencyStatus.Loaded)
+            ?.yieldSupplyStatus?.isActive == true
+        if (isYieldSupplyActive) return null
+
+        val contract = (cryptoCurrencyStatus.currency as? CryptoCurrency.Token)
+            ?.contractAddress
+            ?.lowercase() ?: return null
+
+        val yieldSupplyKey = "${cryptoCurrencyStatus.currency.network.backendId}_$contract"
+        return apyMap[yieldSupplyKey]
+    }
+
+    private fun getOrganizeTokensButtonState(tokenList: TokenList): WalletOrganizeTokensButtonConfig? {
+        val currenciesSize = when (tokenList) {
+            TokenList.Empty -> return null
+            is TokenList.GroupedByNetwork -> tokenList.groups.flatMap(NetworkGroup::currencies).size
+            is TokenList.Ungrouped -> tokenList.currencies.size
+        }
         return if (currenciesSize > 1 && !isSingleCurrencyWalletWithToken()) {
             WalletOrganizeTokensButtonConfig(
                 isEnabled = tokenList.totalFiatBalance !is TotalFiatBalance.Loading,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
index 23364277ba..5db8fb0058 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TxHistoryItemStateConverter.kt
@@ -61,6 +61,7 @@ internal class TxHistoryItemStateConverter(
             is TransactionType.Operation,
             is TransactionType.Swap,
             is TransactionType.Transfer,
+            is TransactionType.YieldSupply,
             is TransactionType.UnknownOperation,
             -> if (isOutgoing) R.drawable.ic_arrow_up_24 else R.drawable.ic_arrow_down_24
         }
@@ -70,7 +71,9 @@ internal class TxHistoryItemStateConverter(
         is TransactionType.Approve -> resourceReference(R.string.common_approval)
         is TransactionType.Operation -> stringReference(type.name)
         is TransactionType.Swap -> resourceReference(R.string.common_swap)
-        is TransactionType.Transfer -> resourceReference(R.string.common_transfer)
+        is TransactionType.YieldSupply,
+        is TransactionType.Transfer,
+        -> resourceReference(R.string.common_transfer)
         is TransactionType.Staking.Stake -> resourceReference(R.string.common_stake)
         is TransactionType.Staking.Unstake -> resourceReference(R.string.common_unstake)
         is TransactionType.Staking.Vote -> resourceReference(R.string.staking_vote)
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt
index a475345feb..ea2b92e829 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt
@@ -54,6 +54,7 @@ internal class WalletLoadingStateFactory(
             bottomSheetConfig = null,
             tokensListState = WalletTokensListState.ContentState.Loading,
             nftState = WalletNFTItemUM.Hidden,
+            type = WalletState.MultiCurrency.WalletType.Hot,
         )
     }
 
@@ -66,6 +67,7 @@ internal class WalletLoadingStateFactory(
             bottomSheetConfig = null,
             tokensListState = WalletTokensListState.ContentState.Loading,
             nftState = WalletNFTItemUM.Hidden,
+            type = WalletState.MultiCurrency.WalletType.Cold,
         )
     }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt
index 08c415f5b9..b9b464642d 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/BasicTokenListSubscriber.kt
@@ -1,50 +1,64 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
 import arrow.core.getOrElse
+import com.tangem.domain.account.models.AccountStatusList
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
 import com.tangem.domain.core.utils.getOrElse
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.account.AccountStatus
 import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetTokenListErrorTransformer
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetTokenListTransformer
+import com.tangem.feature.wallet.presentation.wallet.state.transformers.TokenConverterParams
 import com.tangem.utils.coroutines.JobHolder
 import com.tangem.utils.coroutines.saveIn
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 @Suppress("LongParameterList")
-internal abstract class BasicTokenListSubscriber(
-    private val userWallet: UserWallet,
-    private val stateHolder: WalletStateController,
-    private val clickIntents: WalletClickIntents,
-    private val tokenListAnalyticsSender: TokenListAnalyticsSender,
-    private val walletWithFundsChecker: WalletWithFundsChecker,
-    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
-    private val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-) : WalletSubscriber() {
+internal abstract class BasicTokenListSubscriber : WalletSubscriber() {
+    protected abstract val userWallet: UserWallet
+    protected abstract val stateHolder: WalletStateController
+    protected abstract val clickIntents: WalletClickIntents
+    protected abstract val tokenListAnalyticsSender: TokenListAnalyticsSender
+    protected abstract val walletWithFundsChecker: WalletWithFundsChecker
+    protected abstract val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase
+    protected abstract val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase
+    protected abstract val accountDependencies: AccountDependencies
+    protected abstract val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase
 
     private val sendAnalyticsJobHolder = JobHolder()
     private val onTokenListReceivedJobHolder = JobHolder()
+    protected val isAccountsEnabled get() = accountDependencies.accountsFeatureToggles.isFeatureEnabled
 
     protected abstract fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList>
 
-    protected abstract suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>)
+    protected abstract fun accountListFlow(coroutineScope: CoroutineScope): Flow<AccountStatusList>
 
-    override fun create(coroutineScope: CoroutineScope): Flow<*> {
+    protected abstract suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>)
+    protected open suspend fun onAccountListReceived() = {
+        // todo account updateSortingIfNeeded? like [onTokenListReceived]
+    }
+
+    override fun create(coroutineScope: CoroutineScope): Flow<*> =
+        if (isAccountsEnabled) createAccountListFlow(coroutineScope) else createTokenListFlow(coroutineScope)
+
+    private fun createTokenListFlow(coroutineScope: CoroutineScope): Flow<*> {
         return combine(
             flow = tokenListFlow(coroutineScope)
                 .onEach { maybeTokenList ->
@@ -60,42 +74,56 @@ internal abstract class BasicTokenListSubscriber(
 
                     coroutineScope.launch { startCheck(maybeTokenList) }
                 },
-            flow2 = getSelectedAppCurrencyUseCase().distinctUntilChanged(),
-            transform = { maybeTokenList, maybeAppCurrency ->
-                val appCurrency = maybeAppCurrency.getOrElse { e ->
-                    Timber.e("Failed to load app currency: $e")
-                    AppCurrency.Default
-                }
-
-                val tokenList = maybeTokenList.getOrElse(
-                    ifLoading = { maybeContent ->
-                        val isRefreshing = stateHolder.getWalletState(userWallet.walletId)
-                            ?.pullToRefreshConfig
-                            ?.isRefreshing == true
-
-                        maybeContent
-                            ?.takeIf { !isRefreshing }
-                            ?: return@combine
-                    },
-                    ifError = { e ->
-                        Timber.e("Failed to load token list: $e")
-                        stateHolder.update(
-                            SetTokenListErrorTransformer(
-                                selectedWallet = userWallet,
-                                error = e,
-                                appCurrency = appCurrency,
-                            ),
-                        )
-                        return@combine
-                    },
+            flow2 = appCurrencyFlow(),
+            flow3 = yieldSupplyApyFlow(),
+            transform = { maybeTokenList, appCurrency, yieldSupplyApyMap ->
+                singleAccountTransform(
+                    maybeTokenList = maybeTokenList,
+                    appCurrency = appCurrency,
+                    portfolioId = PortfolioId(userWallet.walletId),
+                    yieldSupplyApyMap = yieldSupplyApyMap,
                 )
-
-                updateContent(tokenList, appCurrency)
-                walletWithFundsChecker.check(tokenList)
             },
         )
     }
 
+    private suspend fun singleAccountTransform(
+        maybeTokenList: Lce<TokenListError, TokenList>,
+        appCurrency: AppCurrency,
+        portfolioId: PortfolioId,
+        yieldSupplyApyMap: Map<String, String>,
+    ) {
+        val tokenList = maybeTokenList.getOrElse(
+            ifLoading = { maybeContent ->
+                val isRefreshing = stateHolder.getWalletState(userWallet.walletId)
+                    ?.pullToRefreshConfig
+                    ?.isRefreshing == true
+
+                maybeContent
+                    ?.takeIf { !isRefreshing }
+                    ?: return
+            },
+            ifError = { e ->
+                Timber.e("Failed to load token list: $e")
+                stateHolder.update(
+                    SetTokenListErrorTransformer(
+                        selectedWallet = userWallet,
+                        error = e,
+                        appCurrency = appCurrency,
+                    ),
+                )
+                return
+            },
+        )
+        updateContent(
+            params = TokenConverterParams.Wallet(portfolioId, tokenList),
+            appCurrency = appCurrency,
+            yieldSupplyApyMap = yieldSupplyApyMap,
+        )
+
+        walletWithFundsChecker.check(tokenList)
+    }
+
     private suspend fun startCheck(maybeTokenList: Lce<TokenListError, TokenList>) {
         // Run Polkadot account health check
         maybeTokenList.getOrNull()?.let { tokenList ->
@@ -110,6 +138,75 @@ internal abstract class BasicTokenListSubscriber(
         }
     }
 
+    private fun createAccountListFlow(coroutineScope: CoroutineScope): Flow<*> = combine(
+        flow = accountListFlow(coroutineScope)
+            // todo account analytics for account total balance
+            /*.onEach { maybeTokenList ->
+                coroutineScope.launch {
+                    sendTokenListAnalytics(maybeTokenList)
+                }.saveIn(sendAnalyticsJobHolder)
+            }*/
+            .distinctUntilChanged()
+            .onEach { accountList ->
+                // todo account see[onAccountListReceived]
+                // coroutineScope.launch { onAccountListReceived() }.saveIn(onTokenListReceivedJobHolder)
+
+                accountList.flattenTokens()
+                    .forEach { tokenList -> startCheck(Lce.Content(tokenList)) }
+            },
+        flow2 = appCurrencyFlow(),
+        flow3 = accountDependencies.expandedAccountsHolder.expandedAccounts(userWallet),
+        flow4 = accountDependencies.isAccountsModeEnabledUseCase(),
+        flow5 = yieldSupplyApyFlow(),
+        transform = { accountList, appCurrency, expandedAccounts, isAccountMode, yieldSupplyApyMap ->
+            val accountFlattenTokensList = accountList.flattenTokens()
+            val accountFlattenCurrencies = accountFlattenTokensList
+                .map { it.flattenCurrencies() }
+                .flatten()
+            val mainAccount: AccountStatus.CryptoPortfolio = when (val mainAccount = accountList.mainAccount) {
+                is AccountStatus.CryptoPortfolio -> mainAccount
+            }
+
+            suspend fun singleAccountTransform(maybeTokenList: Lce<TokenListError, TokenList>) =
+                this.singleAccountTransform(
+                    maybeTokenList,
+                    appCurrency,
+                    PortfolioId(mainAccount.account.accountId),
+                    yieldSupplyApyMap,
+                )
+
+            when {
+                !isAccountMode -> when (mainAccount.tokenList.flattenCurrencies().isEmpty()) {
+                    true -> singleAccountTransform(Lce.Error(TokenListError.EmptyTokens))
+                    false -> singleAccountTransform(Lce.Content(mainAccount.tokenList))
+                }
+
+                isAccountMode -> when (accountFlattenCurrencies.isEmpty()) {
+                    true -> stateHolder.update(
+                        SetTokenListErrorTransformer(
+                            selectedWallet = userWallet,
+                            error = TokenListError.EmptyTokens,
+                            appCurrency = appCurrency,
+                        ),
+                    )
+                    false -> {
+                        val convertParams = TokenConverterParams.Account(accountList, expandedAccounts)
+                        updateContent(convertParams, appCurrency, yieldSupplyApyMap)
+                        accountFlattenTokensList
+                            .map { tokenList -> coroutineScope.launch { walletWithFundsChecker.check(tokenList) } }
+                            .joinAll()
+                    }
+                }
+            }
+        },
+    )
+
+    private fun AccountStatusList.flattenTokens(): List<TokenList> = this.accountStatuses.map {
+        when (it) {
+            is AccountStatus.CryptoPortfolio -> it.tokenList
+        }
+    }
+
     private suspend fun sendTokenListAnalytics(maybeTokenList: Lce<TokenListError, TokenList>) {
         val displayedState = stateHolder.getWalletStateIfSelected(userWallet.walletId)
 
@@ -120,14 +217,31 @@ internal abstract class BasicTokenListSubscriber(
         )
     }
 
-    private fun updateContent(tokenList: TokenList, appCurrency: AppCurrency) {
+    private fun updateContent(
+        params: TokenConverterParams,
+        appCurrency: AppCurrency,
+        yieldSupplyApyMap: Map<String, String>,
+    ) {
         stateHolder.update(
             SetTokenListTransformer(
-                tokenList = tokenList,
+                params = params,
                 userWallet = userWallet,
                 appCurrency = appCurrency,
                 clickIntents = clickIntents,
+                yieldSupplyApyMap = yieldSupplyApyMap,
             ),
         )
     }
+
+    private fun appCurrencyFlow(): Flow<AppCurrency> = getSelectedAppCurrencyUseCase()
+        .map {
+            it.getOrElse { e ->
+                Timber.e("Failed to load app currency: $e")
+                AppCurrency.Default
+            }
+        }
+        .distinctUntilChanged()
+
+    private fun yieldSupplyApyFlow(): Flow<Map<String, String>> = yieldSupplyApyFlowUseCase()
+        .distinctUntilChanged()
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletTokenListSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletTokenListSubscriber.kt
index b719923f57..f56709b1d7 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletTokenListSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/MultiWalletTokenListSubscriber.kt
@@ -1,5 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
@@ -11,33 +13,30 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.ApplyTokenListSortingUseCase
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
 
 @Suppress("LongParameterList")
 internal class MultiWalletTokenListSubscriber(
-    private val userWallet: UserWallet,
+    override val userWallet: UserWallet,
     private val tokenListStore: MultiWalletTokenListStore,
     private val applyTokenListSortingUseCase: ApplyTokenListSortingUseCase,
-    stateHolder: WalletStateController,
-    clickIntents: WalletClickIntents,
-    tokenListAnalyticsSender: TokenListAnalyticsSender,
-    walletWithFundsChecker: WalletWithFundsChecker,
-    getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
-    runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-) : BasicTokenListSubscriber(
-    userWallet = userWallet,
-    stateHolder = stateHolder,
-    clickIntents = clickIntents,
-    tokenListAnalyticsSender = tokenListAnalyticsSender,
-    walletWithFundsChecker = walletWithFundsChecker,
-    getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
-    runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-) {
+    override val stateHolder: WalletStateController,
+    override val clickIntents: WalletClickIntents,
+    override val tokenListAnalyticsSender: TokenListAnalyticsSender,
+    override val walletWithFundsChecker: WalletWithFundsChecker,
+    override val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    override val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
+    override val accountDependencies: AccountDependencies,
+    override val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
+) : BasicTokenListSubscriber() {
 
     override fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList> {
         tokenListStore.addIfNot(userWallet.walletId, coroutineScope)
@@ -45,6 +44,11 @@ internal class MultiWalletTokenListSubscriber(
         return tokenListStore.getOrThrow(userWallet.walletId)
     }
 
+    override fun accountListFlow(coroutineScope: CoroutineScope): Flow<AccountStatusList> {
+        val params = SingleAccountStatusListProducer.Params(userWallet.walletId)
+        return accountDependencies.singleAccountStatusListSupplier(params)
+    }
+
     override suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>) {
         updateSortingIfNeeded(maybeTokenList)
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletButtonsSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletButtonsSubscriber.kt
index 3257952b84..830f1f9b69 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletButtonsSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletButtonsSubscriber.kt
@@ -1,10 +1,13 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.GetCryptoCurrencyActionsUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.tokens.model.TokenActionsState
-import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.domain.collectLatest
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import com.tangem.feature.wallet.presentation.wallet.state.transformers.SetCryptoCurrencyActionsTransformer
@@ -17,28 +20,39 @@ internal class SingleWalletButtonsSubscriber(
     private val clickIntents: WalletClickIntents,
     private val getSingleCryptoCurrencyStatusUseCase: GetSingleCryptoCurrencyStatusUseCase,
     private val getCryptoCurrencyActionsUseCase: GetCryptoCurrencyActionsUseCase,
+    private val accountDependencies: AccountDependencies,
 ) : WalletSubscriber() {
 
     override fun create(coroutineScope: CoroutineScope): Flow<TokenActionsState> {
         return channelFlow {
             getSingleCryptoCurrencyStatusUseCase.collectLatest(userWalletId = userWallet.walletId) { status ->
-                getCryptoCurrencyActionsUseCase(userWallet = userWallet, cryptoCurrencyStatus = status)
-                    .conflate()
-                    .distinctUntilChanged()
-                    .firstOrNull()
+                getCryptoCurrencyActionsUseCase(userWallet = userWallet, status = status)
                     ?.let { send(it) }
             }
         }
-            .onEach(::updateContent)
+            .onEach { actions ->
+                val portfolioId = when (accountDependencies.accountsFeatureToggles.isFeatureEnabled) {
+                    true -> TODO("account") // get main account id for single wallet
+                    false -> PortfolioId(userWallet.walletId)
+                }
+                updateContent(actions, portfolioId)
+            }
     }
 
-    private fun updateContent(tokenActionsState: TokenActionsState) {
+    private fun updateContent(tokenActionsState: TokenActionsState, portfolioId: PortfolioId) {
         stateHolder.update(
             SetCryptoCurrencyActionsTransformer(
                 tokenActionsState = tokenActionsState,
                 userWallet = userWallet,
                 clickIntents = clickIntents,
+                portfolioId = portfolioId,
             ),
         )
     }
+
+    private suspend fun getCryptoCurrencyActionsUseCase(userWallet: UserWallet, status: CryptoCurrencyStatus) =
+        this.getCryptoCurrencyActionsUseCase(userWallet = userWallet, cryptoCurrencyStatus = status)
+            .conflate()
+            .distinctUntilChanged()
+            .firstOrNull()
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenListSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenListSubscriber.kt
index 80027a5ec1..6866fdbf8f 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenListSubscriber.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/SingleWalletWithTokenListSubscriber.kt
@@ -1,5 +1,7 @@
 package com.tangem.feature.wallet.presentation.wallet.subscribers
 
+import com.tangem.domain.account.models.AccountStatusList
+import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.core.lce.Lce
 import com.tangem.domain.core.lce.LceFlow
@@ -7,32 +9,29 @@ import com.tangem.domain.models.tokenlist.TokenList
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.tokens.RunPolkadotAccountHealthCheckUseCase
 import com.tangem.domain.tokens.error.TokenListError
+import com.tangem.domain.yield.supply.usecase.YieldSupplyApyFlowUseCase
 import com.tangem.feature.wallet.child.wallet.model.intents.WalletClickIntents
+import com.tangem.feature.wallet.presentation.account.AccountDependencies
 import com.tangem.feature.wallet.presentation.wallet.analytics.utils.TokenListAnalyticsSender
 import com.tangem.feature.wallet.presentation.wallet.domain.MultiWalletTokenListStore
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletWithFundsChecker
 import com.tangem.feature.wallet.presentation.wallet.state.WalletStateController
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
 
 @Suppress("LongParameterList")
 internal class SingleWalletWithTokenListSubscriber(
-    private val userWallet: UserWallet.Cold,
+    override val userWallet: UserWallet.Cold,
     private val tokenListStore: MultiWalletTokenListStore,
-    stateHolder: WalletStateController,
-    clickIntents: WalletClickIntents,
-    tokenListAnalyticsSender: TokenListAnalyticsSender,
-    walletWithFundsChecker: WalletWithFundsChecker,
-    getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
-    runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
-) : BasicTokenListSubscriber(
-    userWallet = userWallet,
-    stateHolder = stateHolder,
-    clickIntents = clickIntents,
-    tokenListAnalyticsSender = tokenListAnalyticsSender,
-    walletWithFundsChecker = walletWithFundsChecker,
-    getSelectedAppCurrencyUseCase = getSelectedAppCurrencyUseCase,
-    runPolkadotAccountHealthCheckUseCase = runPolkadotAccountHealthCheckUseCase,
-) {
+    override val stateHolder: WalletStateController,
+    override val clickIntents: WalletClickIntents,
+    override val tokenListAnalyticsSender: TokenListAnalyticsSender,
+    override val walletWithFundsChecker: WalletWithFundsChecker,
+    override val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    override val runPolkadotAccountHealthCheckUseCase: RunPolkadotAccountHealthCheckUseCase,
+    override val accountDependencies: AccountDependencies,
+    override val yieldSupplyApyFlowUseCase: YieldSupplyApyFlowUseCase,
+) : BasicTokenListSubscriber() {
 
     override fun tokenListFlow(coroutineScope: CoroutineScope): LceFlow<TokenListError, TokenList> {
         tokenListStore.addIfNot(userWallet.walletId, coroutineScope)
@@ -40,5 +39,10 @@ internal class SingleWalletWithTokenListSubscriber(
         return tokenListStore.getOrThrow(userWallet.walletId)
     }
 
+    override fun accountListFlow(coroutineScope: CoroutineScope): Flow<AccountStatusList> {
+        val params = SingleAccountStatusListProducer.Params(userWallet.walletId)
+        return accountDependencies.singleAccountStatusListSupplier(params)
+    }
+
     override suspend fun onTokenListReceived(maybeTokenList: Lce<TokenListError, TokenList>) = Unit
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt
index de71152155..9ad537bad7 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt
@@ -41,7 +41,7 @@ private fun BasicAlert(state: WalletAlertState.Basic, onDismiss: () -> Unit) {
     if (onActionClick != null) {
         confirmButton = DialogButtonUM(
             title = state.confirmButtonText.resolveReference(),
-            warning = state.isWarningConfirmButton,
+            isWarning = state.isWarningConfirmButton,
             onClick = {
                 onActionClick()
                 onDismiss()
@@ -54,7 +54,7 @@ private fun BasicAlert(state: WalletAlertState.Basic, onDismiss: () -> Unit) {
     } else {
         confirmButton = DialogButtonUM(
             title = state.confirmButtonText.resolveReference(),
-            warning = state.isWarningConfirmButton,
+            isWarning = state.isWarningConfirmButton,
             onClick = onDismiss,
         )
         dismissButton = null
@@ -77,7 +77,7 @@ private fun TextInputAlert(state: WalletAlertState.TextInput, onDismiss: () -> U
         fieldValue = value,
         confirmButton = DialogButtonUM(
             title = state.confirmButtonText.resolveReference(),
-            enabled = value.text.isNotEmpty() &&
+            isEnabled = value.text.isNotEmpty() &&
                 value.text != state.text &&
                 state.errorTextProvider(value.text) == null,
             onClick = {
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt
index 6553a234d3..f1e5840afa 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt
@@ -3,19 +3,20 @@ package com.tangem.feature.wallet.presentation.wallet.ui
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalContext
 import com.tangem.core.res.getStringSafe
 import com.tangem.core.ui.event.EventEffect
 import com.tangem.core.ui.event.StateEvent
 import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.utils.requestPermission
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletAlertState
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletEvent
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.ReviewManagerRequester
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.animateScrollByIndex
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.demonstrateScrolling
+import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
 
 @Composable
 internal fun WalletEventEffect(
@@ -28,6 +29,13 @@ internal fun WalletEventEffect(
     val coroutineScope = rememberCoroutineScope()
     val context = LocalContext.current
     val resources = LocalContext.current.resources
+
+    var showPermissionRequest by remember { mutableStateOf<Pair<() -> Unit, () -> Unit>?>(null) }
+    HandlePermissionRequest(
+        permissionRequestParams = showPermissionRequest,
+        onPermissionRequestResult = { showPermissionRequest = null },
+    )
+
     EventEffect(
         event = event,
         onTrigger = { value ->
@@ -56,7 +64,34 @@ internal fun WalletEventEffect(
                 is WalletEvent.DemonstrateWalletsScrollPreview -> {
                     walletsListState.demonstrateScrolling(coroutineScope = coroutineScope, direction = value.direction)
                 }
+                is WalletEvent.RequestPushPermissions -> {
+                    showPermissionRequest = value.onAllow to value.onDeny
+                }
             }
         },
     )
+}
+
+@Composable
+private fun HandlePermissionRequest(
+    permissionRequestParams: Pair<() -> Unit, () -> Unit>?,
+    onPermissionRequestResult: () -> Unit,
+) {
+    val actualPermissionLauncher = permissionRequestParams?.let { (onAllowExternal, onDenyExternal) ->
+        requestPermission(
+            onAllow = {
+                onAllowExternal()
+                onPermissionRequestResult()
+            },
+            onDeny = {
+                onDenyExternal()
+                onPermissionRequestResult()
+            },
+            permission = PUSH_PERMISSION,
+        )
+    }
+
+    LaunchedEffect(permissionRequestParams) {
+        actualPermissionLauncher?.invoke()
+    }
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
index 133702c815..073d32efd8 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt
@@ -79,6 +79,7 @@ import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency
 import com.tangem.feature.wallet.presentation.wallet.ui.components.multicurrency.organizeTokensButton
 import com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency.marketPriceBlock
 import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.BalancesAndLimitsBottomSheet
+import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.TangemPayMainScreenBlock
 import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.VisaTxDetailsBottomSheet
 import com.tangem.feature.wallet.presentation.wallet.ui.components.visa.balancesAndLimitsBlock
 import com.tangem.feature.wallet.presentation.wallet.ui.utils.changeWalletAnimator
@@ -212,6 +213,11 @@ private fun WalletContent(
 
             notifications(configs = selectedWallet.warnings, modifier = itemModifier)
 
+            item(
+                key = "TangemPayMainScreenBlock",
+                contentType = state.tangemPayState::class.java,
+            ) { TangemPayMainScreenBlock(state.tangemPayState, itemModifier) }
+
             (selectedWallet as? WalletState.SingleCurrency)?.let { walletState ->
                 walletState.marketPriceBlockState?.let { marketPriceBlockState ->
                     marketPriceBlock(state = marketPriceBlockState, modifier = itemModifier)
@@ -291,10 +297,10 @@ private inline fun BaseScaffoldWithMarkets(
     listState: LazyListState,
     selectedWallet: WalletState,
     snackbarHostState: SnackbarHostState,
-    bottomSheetHeaderHeightProvider: () -> Dp,
-    crossinline bottomSheetContent: @Composable () -> Unit,
     alertConfig: WalletAlertState?,
+    bottomSheetHeaderHeightProvider: () -> Dp,
     noinline onBottomSheetStateChange: (BottomSheetState) -> Unit,
+    crossinline bottomSheetContent: @Composable () -> Unit,
     crossinline content: @Composable (PaddingValues) -> Unit,
 ) {
     val bottomSheetState = rememberTangemStandardBottomSheetState()
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
index 08f52280ea..02aaf086d1 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt
@@ -350,6 +350,7 @@ private fun AdditionalInfoText(text: TextReference) {
         maxLines = 1,
         overflow = TextOverflow.Ellipsis,
         style = TangemTheme.typography.caption2,
+        modifier = Modifier.testTag(MainScreenTestTags.DEVICES_COUNT),
     )
 }
 
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAction.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAction.kt
index 8465d3fca3..e82c67b4fe 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAction.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyAction.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
@@ -15,7 +14,6 @@ import com.tangem.core.ui.components.buttons.actions.ActionButtonConfig
 import com.tangem.core.ui.components.buttons.actions.ActionButtonContent
 import com.tangem.core.ui.extensions.resolveReference
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.core.ui.test.MainScreenTestTags
 
 /**
 [REDACTED_AUTHOR]
@@ -50,7 +48,7 @@ internal fun MultiCurrencyAction(
                 paddingBetweenIconAndText = 4.dp,
             )
         },
-        modifier = modifier.testTag(MainScreenTestTags.MULTI_CURRENCY_ACTION_BUTTON),
+        modifier = modifier,
         color = TangemTheme.colors.button.secondary,
     )
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
index d207cb203c..da334b825e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/multicurrency/MultiCurrencyOrganizeButton.kt
@@ -31,7 +31,7 @@ internal fun LazyListScope.organizeTokensButton(
                 text = resourceReference(id = R.string.organize_tokens_title),
                 iconResId = R.drawable.ic_filter_24,
                 onClick = onClick,
-                enabled = isEnabled,
+                isEnabled = isEnabled,
             ),
         )
     }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt
new file mode 100644
index 0000000000..c108284448
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/singlecurrency/TangemPayCardMainBlock.kt
@@ -0,0 +1,83 @@
+package com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.tangem.common.ui.R
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState
+
+@Composable
+internal fun TangemPayCardMainBlock(state: TangemPayState.Card, modifier: Modifier = Modifier) {
+    Surface(
+        modifier = modifier.fillMaxWidth(),
+        shape = TangemTheme.shapes.roundedCornersXMedium,
+        color = TangemTheme.colors.background.primary,
+        onClick = state.onClick,
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(IntrinsicSize.Min)
+                .padding(horizontal = 16.dp, vertical = 12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Image(
+                painter = painterResource(R.drawable.img_tangem_pay_card_main_36),
+                contentDescription = null,
+                modifier = Modifier.size(36.dp).clip(CircleShape),
+            )
+
+            Spacer(Modifier.width(12.dp))
+
+            Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.Center,
+            ) {
+                Text(
+                    text = stringResourceSafe(R.string.tangempay_kyc_card_ready_notification_title),
+                    style = TangemTheme.typography.subtitle2,
+                    color = TangemTheme.colors.text.primary1,
+                )
+
+                Spacer(Modifier.height(6.dp))
+
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Image(
+                        painter = painterResource(R.drawable.img_visa_label_26_16),
+                        contentDescription = null,
+                        modifier = Modifier.size(26.dp, 16.dp),
+                    )
+                    Spacer(Modifier.width(4.dp))
+                    Text(
+                        text = state.lastFourDigits.resolveReference(),
+                        style = TangemTheme.typography.caption2,
+                        color = TangemTheme.colors.text.tertiary,
+                    )
+                }
+            }
+            Box(
+                modifier = Modifier.fillMaxHeight(),
+                contentAlignment = Alignment.TopEnd,
+            ) {
+                Text(
+                    text = state.balanceText.resolveReference(),
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.primary1,
+                    textAlign = TextAlign.End,
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBlock.kt
index a37bf1f17f..869d61f559 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBlock.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBlock.kt
@@ -68,11 +68,11 @@ private fun BalancesAndLimitsBlock(state: BalancesAndLimitsBlockState, modifier:
 @Composable
 private inline fun ContentContainer(
     enabled: Boolean,
+    modifier: Modifier = Modifier,
     noinline onClick: () -> Unit,
     crossinline title: @Composable () -> Unit,
     crossinline content: @Composable () -> Unit,
     crossinline endIcon: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Card(
         modifier = modifier.fillMaxWidth(),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBottomSheet.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBottomSheet.kt
index 24b21a963a..c4830fb851 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBottomSheet.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/BalancesAndLimitsBottomSheet.kt
@@ -133,10 +133,10 @@ private fun InfoButton(onClick: () -> Unit, modifier: Modifier = Modifier) {
 
 @Composable
 private inline fun ContentContainer(
+    modifier: Modifier = Modifier,
     title: @Composable BoxScope.() -> Unit,
     firstBlock: @Composable ColumnScope.() -> Unit,
     secondBlock: @Composable ColumnScope.() -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier.background(TangemTheme.colors.background.secondary),
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/Blocks.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/Blocks.kt
index 723fabf3bc..8a2a5d7635 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/Blocks.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/Blocks.kt
@@ -19,8 +19,8 @@ private const val BLOCK_ITEM_VALUE_WEIGHT = .55f
 @Composable
 internal inline fun BlockContent(
     title: TextReference,
-    content: @Composable ColumnScope.() -> Unit,
     modifier: Modifier = Modifier,
+    content: @Composable ColumnScope.() -> Unit,
     description: @Composable RowScope.() -> Unit = {},
 ) {
     Column(
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt
new file mode 100644
index 0000000000..d76ececd2e
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/visa/TangemPayMainScreenBlock.kt
@@ -0,0 +1,89 @@
+package com.tangem.feature.wallet.presentation.wallet.ui.components.visa
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.tangem.common.ui.R
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.components.notifications.NotificationConfig
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState
+import com.tangem.feature.wallet.presentation.wallet.state.model.TangemPayState.Progress
+import com.tangem.feature.wallet.presentation.wallet.ui.components.singlecurrency.TangemPayCardMainBlock
+
+@Composable
+internal fun TangemPayMainScreenBlock(state: TangemPayState, modifier: Modifier = Modifier) {
+    when (state) {
+        is Progress -> {
+            Notification(
+                modifier = modifier
+                    .fillMaxWidth(),
+                config = NotificationConfig(
+                    title = state.title,
+                    iconSize = 36.dp,
+                    subtitle = TextReference.EMPTY,
+                    iconResId = state.iconRes,
+                    buttonsState = NotificationConfig.ButtonsState.SecondaryButtonConfig(
+                        text = state.buttonText,
+                        onClick = state.onButtonClick,
+                        shouldShowProgress = state.showProgress,
+                    ),
+                ),
+            )
+        }
+        is TangemPayState.Card -> TangemPayCardMainBlock(state, modifier)
+        is TangemPayState.Empty -> Unit
+    }
+}
+
+@Preview(showBackground = true)
+@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+private fun ResetCardScreenPreview() {
+    TangemThemePreview {
+        Column(verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8)) {
+            TangemPayMainScreenBlock(
+                Progress(
+                    title = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_title),
+                    buttonText = TextReference.Res(R.string.tangempay_kyc_in_progress_notification_button),
+                    iconRes = R.drawable.ic_promo_kyc_36,
+                    onButtonClick = {},
+                ),
+            )
+
+            TangemPayMainScreenBlock(
+                Progress(
+                    title = TextReference.Res(R.string.tangempay_issue_card_notification_title),
+                    buttonText = TextReference.Res(R.string.common_continue),
+                    iconRes = R.drawable.ic_tangem_pay_promo_card_36,
+                    onButtonClick = {},
+                ),
+            )
+
+            TangemPayMainScreenBlock(
+                Progress(
+                    title = TextReference.Res(R.string.tangempay_issue_card_notification_title),
+                    buttonText = TextReference.EMPTY,
+                    iconRes = R.drawable.ic_tangem_pay_promo_card_36,
+                    onButtonClick = {},
+                    showProgress = true,
+                ),
+            )
+
+            TangemPayMainScreenBlock(
+                TangemPayState.Card(
+                    lastFourDigits = TextReference.Str("*1234"),
+                    balanceText = TextReference.Str("$ 0.00"),
+                    onClick = {},
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/WalletFeatureUseCasesFacade.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/WalletFeatureUseCasesFacade.kt
new file mode 100644
index 0000000000..8ab07acad0
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/utils/WalletFeatureUseCasesFacade.kt
@@ -0,0 +1,24 @@
+package com.tangem.feature.wallet.presentation.wallet.utils
+
+import com.tangem.domain.models.PortfolioId
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.tokens.IsCryptoCurrencyCoinCouldHideUseCase
+import com.tangem.domain.tokens.RemoveCurrencyUseCase
+import javax.inject.Inject
+
+class WalletFeatureUseCasesFacade @Inject constructor(
+    private val isCryptoCurrencyCoinCouldHide: IsCryptoCurrencyCoinCouldHideUseCase,
+    private val removeCurrencyUseCase: RemoveCurrencyUseCase,
+) {
+
+    suspend fun isCryptoCurrencyCoinCouldHide(portfolioId: PortfolioId, cryptoCurrencyCoin: CryptoCurrency.Coin) =
+        when (portfolioId) {
+            is PortfolioId.Account -> TODO("account")
+            is PortfolioId.Wallet -> isCryptoCurrencyCoinCouldHide(portfolioId.userWalletId, cryptoCurrencyCoin)
+        }
+
+    suspend fun removeCurrencyUseCase(portfolioId: PortfolioId, currency: CryptoCurrency) = when (portfolioId) {
+        is PortfolioId.Account -> TODO("account")
+        is PortfolioId.Wallet -> removeCurrencyUseCase(portfolioId.userWalletId, currency)
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card2_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card2_120_106.webp
new file mode 100644
index 0000000000..c4b16e6d24
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card2_120_106.webp differ
diff --git a/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card3_120_106.webp b/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card3_120_106.webp
new file mode 100644
index 0000000000..27abb1127e
Binary files /dev/null and b/features/wallet/impl/src/main/res/drawable/ill_winter_sakura_card3_120_106.webp differ
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectedAppInfoModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectedAppInfoModel.kt
index 6b0bb827d2..4d36530516 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectedAppInfoModel.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectedAppInfoModel.kt
@@ -45,7 +45,7 @@ internal class WcConnectedAppInfoModel @Inject constructor(
 
     private val params = paramsContainer.require<WcConnectedAppInfoContainerComponent.Params>()
     val uiState: StateFlow<WcConnectedAppInfoUM?>
-    field = MutableStateFlow<WcConnectedAppInfoUM?>(null)
+        field = MutableStateFlow<WcConnectedAppInfoUM?>(null)
 
     val stackNavigation = StackNavigation<ConnectedAppInfoRoutes>()
 
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectionsModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectionsModel.kt
index 666eb2eb8f..578b261be3 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectionsModel.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcConnectionsModel.kt
@@ -55,7 +55,7 @@ internal class WcConnectionsModel @Inject constructor(
 
     private val params = paramsContainer.require<WcConnectionsComponent.Params>()
     val uiState: StateFlow<WcConnectionsState>
-    field = MutableStateFlow<WcConnectionsState>(getInitialState())
+        field = MutableStateFlow<WcConnectionsState>(getInitialState())
     val bottomSheetNavigation: SlotNavigation<WcConnectionsBottomSheetConfig> = SlotNavigation()
 
     init {
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt
index bf416fe8f2..5dab9f0577 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcPairModel.kt
@@ -80,7 +80,7 @@ internal class WcPairModel @Inject constructor(
     private val dAppVerifiedStateConverter = WcDAppVerifiedStateConverter(onVerifiedClick = ::showVerifiedAlert)
 
     val appInfoUiState: StateFlow<WcAppInfoUM>
-    field = MutableStateFlow<WcAppInfoUM>(createLoadingState())
+        field = MutableStateFlow<WcAppInfoUM>(createLoadingState())
 
     init {
         loadDAppInfo()
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectNetworksModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectNetworksModel.kt
index 06a987c536..f87b309971 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectNetworksModel.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectNetworksModel.kt
@@ -37,7 +37,7 @@ internal class WcSelectNetworksModel @Inject constructor(
     )
 
     val state: StateFlow<WcSelectNetworksUM>
-    field = MutableStateFlow(getInitialState())
+        field = MutableStateFlow(getInitialState())
 
     private fun onCheckedChange(isChecked: Boolean, network: Network) {
         additionallyEnabledNetworks.update {
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectWalletModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectWalletModel.kt
index 1b79e19e65..e9f6c92a3b 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectWalletModel.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/model/WcSelectWalletModel.kt
@@ -32,12 +32,12 @@ internal class WcSelectWalletModel @Inject constructor(
     private val params = paramsContainer.require<WcSelectWalletParams>()
 
     internal val state: StateFlow<WcAppInfoWalletUM>
-    field = MutableStateFlow<WcAppInfoWalletUM>(
-        WcAppInfoWalletUM(
-            wallets = persistentListOf(),
-            selectedUserWalletId = params.selectedWalletId,
-        ),
-    )
+        field = MutableStateFlow<WcAppInfoWalletUM>(
+            WcAppInfoWalletUM(
+                wallets = persistentListOf(),
+                selectedUserWalletId = params.selectedWalletId,
+            ),
+        )
 
     private val userWalletsFetcher = WcUserWalletsFetcher(
         userWalletsFetcherFactory = userWalletsFetcherFactory,
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/chain/WcSwitchNetworkComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/chain/WcSwitchNetworkComponent.kt
index 9bf945bd89..086bd0578e 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/chain/WcSwitchNetworkComponent.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/chain/WcSwitchNetworkComponent.kt
@@ -13,6 +13,7 @@ internal class WcSwitchNetworkComponent(
     params: WcTransactionModelParams,
 ) : AppComponentContext by appComponentContext, ComposableContentComponent {
 
+    @Suppress("UnusedPrivateProperty")
     private val model: WcSwitchNetworkModel = getOrCreateModel(params = params)
 
     @Composable
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt
index 5be85fef22..dd7da71fa0 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt
@@ -4,6 +4,7 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.domain.walletconnect.WcAnalyticEvents
 import com.tangem.features.send.v2.api.FeeSelectorComponent
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.params.FeeSelectorParams.FeeDisplaySource
 import com.tangem.features.send.v2.api.params.FeeSelectorParams.FeeSelectorDetailsParams
 import com.tangem.features.walletconnect.connections.components.AlertsComponentV2
@@ -55,6 +56,7 @@ internal fun getWcCommonScreen(
                     feeStateConfiguration = model.feeStateConfiguration,
                     feeDisplaySource = FeeDisplaySource.BottomSheet,
                     analyticsCategoryName = WcAnalyticEvents.WC_CATEGORY_NAME,
+                    analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.WalletConnect,
                 ),
             )
         }
diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt
index c5b943b9b4..abb3dcce53 100644
--- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt
+++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt
@@ -8,6 +8,7 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.domain.walletconnect.WcAnalyticEvents
 import com.tangem.features.send.v2.api.FeeSelectorBlockComponent
+import com.tangem.features.send.v2.api.analytics.CommonSendAnalyticEvents
 import com.tangem.features.send.v2.api.entity.FeeSelectorUM
 import com.tangem.features.send.v2.api.params.FeeSelectorParams
 import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState
@@ -74,6 +75,7 @@ internal class WcSendTransactionComponent(
                     feeStateConfiguration = model.feeStateConfiguration,
                     feeDisplaySource = FeeSelectorParams.FeeDisplaySource.BottomSheet,
                     analyticsCategoryName = WcAnalyticEvents.WC_CATEGORY_NAME,
+                    analyticsSendSource = CommonSendAnalyticEvents.CommonSendSource.WalletConnect,
                 ),
                 onResult = model::updateFee,
             )
diff --git a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
index 4b7bdf5496..47c65b451a 100644
--- a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
+++ b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
@@ -13,8 +13,8 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.SnackbarMessage
-import com.tangem.domain.core.wallets.UserWalletsListRepository
-import com.tangem.domain.core.wallets.error.UnlockWalletError
+import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.common.wallets.error.UnlockWalletError
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
@@ -50,7 +50,7 @@ internal class WelcomeModel @Inject constructor(
 ) : Model() {
 
     val uiState: StateFlow<WelcomeUM>
-    field = MutableStateFlow<WelcomeUM>(WelcomeUM.Plain)
+        field = MutableStateFlow<WelcomeUM>(WelcomeUM.Plain)
 
     private val walletsFetcher = userWalletsFetcherFactory.create(
         messageSender = uiMessageSender,
diff --git a/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyComponent.kt b/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyComponent.kt
new file mode 100644
index 0000000000..af868285e3
--- /dev/null
+++ b/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyComponent.kt
@@ -0,0 +1,16 @@
+package com.tangem.features.yield.supply.api
+
+import com.tangem.core.decompose.factory.ComponentFactory
+import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
+
+interface YieldSupplyComponent : ComposableContentComponent {
+
+    data class Params(
+        val userWalletId: UserWalletId,
+        val cryptoCurrency: CryptoCurrency,
+    )
+
+    interface Factory : ComponentFactory<Params, YieldSupplyComponent>
+}
\ No newline at end of file
diff --git a/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyDepositedWarningComponent.kt b/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyDepositedWarningComponent.kt
index de39187872..086fd34e5d 100644
--- a/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyDepositedWarningComponent.kt
+++ b/features/yield-supply/api/src/main/java/com/tangem/features/yield/supply/api/YieldSupplyDepositedWarningComponent.kt
@@ -4,17 +4,19 @@ import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.factory.ComponentFactory
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.tokens.model.details.TokenAction
 
 interface YieldSupplyDepositedWarningComponent : ComposableBottomSheetComponent {
 
     data class Params(
         val cryptoCurrency: CryptoCurrency,
+        val tokenAction: TokenAction,
         val modelCallback: ModelCallback,
         val onDismiss: () -> Unit,
     )
 
     interface ModelCallback {
-        fun onYieldSupplyWarningAcknowledged()
+        fun onYieldSupplyWarningAcknowledged(tokenAction: TokenAction)
     }
 
     interface Factory : ComponentFactory<Params, YieldSupplyDepositedWarningComponent> {
diff --git a/features/yield-supply/impl/build.gradle.kts b/features/yield-supply/impl/build.gradle.kts
index 0944ea2a33..02c2af1cb6 100644
--- a/features/yield-supply/impl/build.gradle.kts
+++ b/features/yield-supply/impl/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
 
     /** Feature */
     implementation(projects.features.yieldSupply.api)
-    implementation(projects.features.sendV2.api)
 
     /** Core */
     implementation(projects.core.configToggles)
@@ -23,6 +22,11 @@ dependencies {
     implementation(projects.core.ui)
     implementation(projects.core.navigation)
 
+    /** Compose */
+    implementation(tangemDeps.vico.core)
+    implementation(tangemDeps.vico.compose)
+    implementation(tangemDeps.vico.compose.m3)
+
     /** Common */
     implementation(projects.common.ui)
     implementation(projects.common.routing)
@@ -42,7 +46,13 @@ dependencies {
     implementation(projects.domain.tokens)
     implementation(projects.domain.transaction.models)
     implementation(projects.domain.transaction)
+    implementation(projects.domain.yieldSupply.models)
     implementation(projects.domain.yieldSupply)
+    implementation(projects.domain.feedback.models)
+    implementation(projects.domain.feedback)
+    implementation(projects.domain.balanceHiding.models)
+    implementation(projects.domain.balanceHiding)
+    implementation(projects.libs.crypto)
 
     /** Compose */
     implementation(deps.compose.foundation)
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/YieldSupplyApyComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/YieldSupplyApyComponent.kt
new file mode 100644
index 0000000000..7fde37766d
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/YieldSupplyApyComponent.kt
@@ -0,0 +1,61 @@
+package com.tangem.features.yield.supply.impl.apy
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.child
+import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.features.yield.supply.impl.apy.ui.YieldSupplyApyContent
+import com.tangem.features.yield.supply.impl.chart.DefaultYieldSupplyChartComponent
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+
+internal class YieldSupplyApyComponent(
+    private val appComponentContext: AppComponentContext,
+    private val params: Params,
+) : ComposableBottomSheetComponent, AppComponentContext by appComponentContext {
+
+    val loadingState: StateFlow<Boolean>
+        field = MutableStateFlow<Boolean>(true)
+    private val chartComponent = DefaultYieldSupplyChartComponent(
+        appComponentContext = child("chartComponent"),
+        params = DefaultYieldSupplyChartComponent.Params(
+            cryptoCurrency = params.cryptoCurrency as CryptoCurrency.Token,
+            callback = object : DefaultYieldSupplyChartComponent.ModelCallback {
+                override fun onStartLoading() {
+                    loadingState.update { true }
+                }
+
+                override fun onSuccessLoad() {
+                    loadingState.update { false }
+                }
+
+                override fun onLoadFail() {
+                    loadingState.update { false }
+                }
+            },
+        ),
+    )
+
+    override fun dismiss() {
+        params.onBackClick()
+    }
+
+    @Composable
+    override fun BottomSheet() {
+        val state by loadingState.collectAsState()
+        YieldSupplyApyContent(
+            isLoading = state,
+            onBackClick = params.onBackClick,
+            chartComponent = chartComponent,
+        )
+    }
+
+    data class Params(
+        val cryptoCurrency: CryptoCurrency,
+        val onBackClick: () -> Unit,
+    )
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/ui/YieldSupplyApyContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/ui/YieldSupplyApyContent.kt
new file mode 100644
index 0000000000..8d419ff256
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/apy/ui/YieldSupplyApyContent.kt
@@ -0,0 +1,195 @@
+package com.tangem.features.yield.supply.impl.apy.ui
+
+import android.content.res.Configuration
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.InlineTextContent
+import androidx.compose.foundation.text.appendInlineContent
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.components.SecondaryButton
+import com.tangem.core.ui.components.SpacerH12
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH2
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerH8
+import com.tangem.core.ui.components.SpacerW4
+import com.tangem.core.ui.components.TextShimmer
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent
+import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheet
+import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
+import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.features.yield.supply.impl.R
+
+@Suppress("LongMethod")
+@Composable
+internal fun YieldSupplyApyContent(
+    isLoading: Boolean,
+    onBackClick: () -> Unit,
+    chartComponent: ComposableContentComponent,
+) {
+    TangemModalBottomSheet<TangemBottomSheetConfigContent.Empty>(
+        config = TangemBottomSheetConfig(
+            isShown = true,
+            onDismissRequest = onBackClick,
+            content = TangemBottomSheetConfigContent.Empty,
+        ),
+        onBack = onBackClick,
+        containerColor = TangemTheme.colors.background.tertiary,
+        title = {
+            TangemModalBottomSheetTitle(
+                endIconRes = com.tangem.core.ui.R.drawable.ic_close_24,
+                onEndClick = onBackClick,
+            )
+        },
+        content = {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+            ) {
+                Text(
+                    text = stringResourceSafe(R.string.yield_module_rate_info_sheet_title),
+                    style = TangemTheme.typography.h3,
+                    color = TangemTheme.colors.text.primary1,
+                )
+                SpacerH8()
+                Text(
+                    text = stringResourceSafe(R.string.yield_module_rate_info_sheet_description),
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.secondary,
+                    textAlign = TextAlign.Center,
+                )
+                SpacerH12()
+                val inlineIconId = "aaveIcon"
+                Text(
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.tertiary,
+                    textAlign = TextAlign.Center,
+                    text = buildAnnotatedString {
+                        append(stringResourceSafe(R.string.yield_module_rate_info_sheet_powered_by))
+                        append(" ")
+                        appendInlineContent(inlineIconId, "[icon]")
+                        append("Aave")
+                    },
+                    inlineContent = mapOf(
+                        inlineIconId to InlineTextContent(
+                            Placeholder(
+                                width = 16.sp,
+                                height = 16.sp,
+                                placeholderVerticalAlign = PlaceholderVerticalAlign.Center,
+                            ),
+                        ) {
+                            Image(
+                                painter = painterResource(id = R.drawable.img_aave_22),
+                                contentDescription = null,
+                            )
+                        },
+                    ),
+                )
+                SpacerH24()
+
+                ApyChart(
+                    isChartLoading = isLoading,
+                    chartComponent = chartComponent,
+                    modifier = Modifier.padding(horizontal = 12.dp),
+                )
+
+                SpacerH16()
+
+                SecondaryButton(
+                    text = stringResourceSafe(R.string.common_got_it),
+                    onClick = onBackClick,
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                )
+            }
+        },
+    )
+}
+
+@Composable
+private fun ApyChart(
+    isChartLoading: Boolean,
+    chartComponent: ComposableContentComponent,
+    modifier: Modifier = Modifier,
+) {
+    Column(modifier = modifier.fillMaxWidth()) {
+        if (isChartLoading) {
+            TextShimmer(
+                text = stringResourceSafe(R.string.yield_module_historical_returns),
+                style = TangemTheme.typography.subtitle1,
+            )
+            SpacerH2()
+            TextShimmer(
+                text = stringResourceSafe(R.string.yield_module_supply_apr),
+                style = TangemTheme.typography.subtitle2,
+            )
+        } else {
+            Text(
+                text = stringResourceSafe(R.string.yield_module_historical_returns),
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH2()
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                AccentDot()
+                SpacerW4()
+                Text(
+                    text = stringResourceSafe(R.string.yield_module_supply_apr),
+                    style = TangemTheme.typography.subtitle2,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            }
+        }
+        SpacerH12()
+        chartComponent.Content(Modifier)
+    }
+}
+
+@Composable
+private fun AccentDot(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .padding(4.dp)
+            .size(TangemTheme.dimens.size8)
+            .background(color = TangemTheme.colors.icon.accent, shape = CircleShape),
+    )
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun YieldSupplyApyContentContentPreview() {
+    TangemThemePreview {
+        YieldSupplyApyContent(
+            isLoading = false,
+            onBackClick = {},
+            chartComponent = ComposableContentComponent.EMPTY,
+        )
+    }
+}
+// endregion
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/DefaultYieldSupplyChartComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/DefaultYieldSupplyChartComponent.kt
new file mode 100644
index 0000000000..c98ec76f41
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/DefaultYieldSupplyChartComponent.kt
@@ -0,0 +1,48 @@
+package com.tangem.features.yield.supply.impl.chart
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.features.yield.supply.impl.chart.model.YieldSupplyChartModel
+import com.tangem.features.yield.supply.impl.chart.ui.YieldSupplyChartContent
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+
+internal class DefaultYieldSupplyChartComponent @AssistedInject constructor(
+    @Assisted private val appComponentContext: AppComponentContext,
+    @Assisted private val params: Params,
+) : ComposableContentComponent, AppComponentContext by appComponentContext {
+
+    private val model: YieldSupplyChartModel = getOrCreateModel(params = params)
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val state by model.uiState.collectAsStateWithLifecycle()
+        YieldSupplyChartContent(
+            state = state,
+            modifier = modifier,
+        )
+    }
+
+    @AssistedFactory
+    internal interface Factory {
+        fun create(context: AppComponentContext, params: Params): DefaultYieldSupplyChartComponent
+    }
+
+    internal data class Params(
+        val cryptoCurrency: CryptoCurrency.Token,
+        val callback: ModelCallback? = null,
+    )
+
+    internal interface ModelCallback {
+        fun onStartLoading()
+        fun onSuccessLoad()
+        fun onLoadFail()
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/di/YieldSupplyChartModule.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/di/YieldSupplyChartModule.kt
new file mode 100644
index 0000000000..a724d05b01
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/di/YieldSupplyChartModule.kt
@@ -0,0 +1,20 @@
+package com.tangem.features.yield.supply.impl.chart.di
+
+import com.tangem.core.decompose.di.ModelComponent
+import com.tangem.core.decompose.model.Model
+import com.tangem.features.yield.supply.impl.chart.model.YieldSupplyChartModel
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+@InstallIn(ModelComponent::class)
+internal interface YieldSupplyChartModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(YieldSupplyChartModel::class)
+    fun bindYieldSupplyChartModel(impl: YieldSupplyChartModel): Model
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/entity/YieldSupplyChartUM.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/entity/YieldSupplyChartUM.kt
new file mode 100644
index 0000000000..3bba6034ce
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/entity/YieldSupplyChartUM.kt
@@ -0,0 +1,42 @@
+package com.tangem.features.yield.supply.impl.chart.entity
+
+import androidx.compose.runtime.Immutable
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+
+@Immutable
+internal sealed class YieldSupplyChartUM {
+
+    @Immutable
+    data object Loading : YieldSupplyChartUM()
+
+    @Immutable
+    data class Error(val onRetry: () -> Unit) : YieldSupplyChartUM()
+
+    @Immutable
+    data class Data(
+        val chartData: YieldSupplyMarketChartDataUM,
+        val monthLables: ImmutableList<String>,
+    ) : YieldSupplyChartUM()
+}
+
+@Immutable
+internal data class YieldSupplyMarketChartDataUM(
+    val y: ImmutableList<Double>,
+    val x: ImmutableList<Double>,
+    val avr: Double,
+    val percentFormat: String,
+) {
+    companion object {
+        @Suppress("MagicNumber")
+        fun mock(): YieldSupplyMarketChartDataUM {
+            val y = listOf(
+                4.6, 4.0, 4.2, 3.3, 2.5, 5.6, 4.2, 6.7, 3.5, 2.5, 4.5, 3.4,
+                4.6, 4.0, 4.2, 3.3, 2.5, 5.6, 4.2, 6.7, 3.5, 2.5, 4.5, 3.4,
+                4.2, 6.7, 3.5, 2.5, 4.5, 3.4,
+            ).toImmutableList()
+            val x = List(y.size) { 1.0 }.toImmutableList()
+            return YieldSupplyMarketChartDataUM(y = y, x = x, avr = 5.15, "%.1f")
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/model/YieldSupplyChartModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/model/YieldSupplyChartModel.kt
new file mode 100644
index 0000000000..8a5df343d6
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/model/YieldSupplyChartModel.kt
@@ -0,0 +1,97 @@
+package com.tangem.features.yield.supply.impl.chart.model
+
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.domain.yield.supply.models.YieldSupplyMarketChartData
+import com.tangem.domain.yield.supply.usecase.YieldSupplyGetChartUseCase
+import com.tangem.features.yield.supply.impl.chart.DefaultYieldSupplyChartComponent
+import com.tangem.features.yield.supply.impl.chart.entity.YieldSupplyChartUM
+import com.tangem.features.yield.supply.impl.chart.entity.YieldSupplyMarketChartDataUM
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+
+@ModelScoped
+internal class YieldSupplyChartModel @Inject constructor(
+    paramsContainer: ParamsContainer,
+    override val dispatchers: CoroutineDispatcherProvider,
+    private val yieldSupplyGetChartUseCase: YieldSupplyGetChartUseCase,
+) : Model() {
+
+    private val params: DefaultYieldSupplyChartComponent.Params = paramsContainer.require()
+
+    val uiState: StateFlow<YieldSupplyChartUM>
+        field = MutableStateFlow<YieldSupplyChartUM>(YieldSupplyChartUM.Loading)
+
+    init {
+        loadChart()
+    }
+
+    private fun loadChart() {
+        modelScope.launch(dispatchers.default) {
+            params.callback?.onStartLoading()
+            yieldSupplyGetChartUseCase(params.cryptoCurrency).onRight { chartData ->
+                if (chartData.y.isEmpty()) {
+                    uiState.update {
+                        YieldSupplyChartUM.Error({
+                            uiState.update { YieldSupplyChartUM.Loading }
+                            loadChart()
+                        })
+                    }
+                    params.callback?.onLoadFail()
+                } else {
+                    uiState.update {
+                        YieldSupplyChartUM.Data(
+                            chartData = YieldSupplyMarketChartDataUM(
+                                y = chartData.y.toImmutableList(),
+                                x = chartData.x.toImmutableList(),
+                                avr = chartData.avr,
+                                percentFormat = getPercentFormatPattern(chartData),
+                            ),
+                            monthLables = lastMonthLabels().toImmutableList(),
+                        )
+                    }
+                    params.callback?.onSuccessLoad()
+                }
+            }.onLeft {
+                uiState.update {
+                    YieldSupplyChartUM.Error({
+                        uiState.update { YieldSupplyChartUM.Loading }
+                        loadChart()
+                    })
+                }
+                params.callback?.onLoadFail()
+            }
+        }
+    }
+
+    @Suppress("MagicNumber")
+    private fun getPercentFormatPattern(chartData: YieldSupplyMarketChartData): String {
+        return when {
+            chartData.y.all { it < 1.0 } -> "%.1f"
+            chartData.y.all { it < 0.1 } -> "%.2f"
+            else -> "%.0f"
+        }
+    }
+    private fun lastMonthLabels(n: Int = MONTH_LABELS_COUNT, locale: Locale = Locale.getDefault()): List<String> {
+        val calendar = Calendar.getInstance()
+        val formatter = SimpleDateFormat("MMM", locale)
+
+        return (n downTo 1).map {
+            calendar.add(Calendar.MONTH, -1)
+            formatter.format(calendar.time)
+        }.reversed()
+    }
+
+    companion object {
+        private const val MONTH_LABELS_COUNT = 5
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/ui/YieldSupplyChartContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/ui/YieldSupplyChartContent.kt
new file mode 100644
index 0000000000..f820ca39a4
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/chart/ui/YieldSupplyChartContent.kt
@@ -0,0 +1,343 @@
+package com.tangem.features.yield.supply.impl.chart.ui
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.State
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.patrykandpatrick.vico.compose.cartesian.CartesianChartHost
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberAxisLabelComponent
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberBottomAxis
+import com.patrykandpatrick.vico.compose.cartesian.axis.rememberCustomStartAxis
+import com.patrykandpatrick.vico.compose.cartesian.decoration.rememberHorizontalLine
+import com.patrykandpatrick.vico.compose.cartesian.layer.grouped
+import com.patrykandpatrick.vico.compose.cartesian.rememberCartesianChart
+import com.patrykandpatrick.vico.compose.cartesian.rememberVicoScrollState
+import com.patrykandpatrick.vico.compose.cartesian.rememberVicoZoomState
+import com.patrykandpatrick.vico.compose.cartesian.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.cartesian.segmented
+import com.patrykandpatrick.vico.compose.common.component.rememberLineComponent
+import com.patrykandpatrick.vico.compose.common.shape.dashed
+import com.patrykandpatrick.vico.core.cartesian.HorizontalLayout
+import com.patrykandpatrick.vico.core.cartesian.Zoom
+import com.patrykandpatrick.vico.core.cartesian.axis.AxisPosition
+import com.patrykandpatrick.vico.core.cartesian.axis.HorizontalAxis
+import com.patrykandpatrick.vico.core.cartesian.axis.VerticalAxis
+import com.patrykandpatrick.vico.core.cartesian.data.CartesianValueFormatter
+import com.patrykandpatrick.vico.core.cartesian.data.CartesianChartModel
+import com.patrykandpatrick.vico.core.cartesian.data.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.cartesian.decoration.HorizontalLine
+import com.patrykandpatrick.vico.core.cartesian.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.cartesian.layer.ColumnCartesianLayer.MergeMode
+import com.patrykandpatrick.vico.core.common.shape.Shape
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.SpacerH12
+import com.tangem.core.ui.components.TextShimmer
+import com.tangem.core.ui.components.buttons.SecondarySmallButton
+import com.tangem.core.ui.components.buttons.SmallButtonConfig
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.features.yield.supply.impl.chart.entity.YieldSupplyChartUM
+import com.tangem.features.yield.supply.impl.chart.entity.YieldSupplyMarketChartDataUM
+import kotlinx.collections.immutable.persistentListOf
+import java.util.Locale
+
+@Composable
+internal fun YieldSupplyChartContent(state: YieldSupplyChartUM, modifier: Modifier = Modifier) {
+    val itemModifier = modifier
+        .height(105.dp)
+        .fillMaxWidth()
+    when (state) {
+        is YieldSupplyChartUM.Loading -> YieldSupplyChartLoading(modifier = itemModifier)
+        is YieldSupplyChartUM.Error -> {
+            Column(
+                modifier = itemModifier,
+                verticalArrangement = Arrangement.Center,
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                Text(
+                    text = stringResourceSafe(R.string.markets_loading_error_title),
+                    style = TangemTheme.typography.caption1,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+                SpacerH12()
+                SecondarySmallButton(
+                    config = SmallButtonConfig(
+                        text = resourceReference(R.string.try_to_load_data_again_button_title),
+                        onClick = state.onRetry,
+                    ),
+                )
+            }
+        }
+        is YieldSupplyChartUM.Data -> YieldSupplyChartData(state = state, modifier = itemModifier)
+    }
+}
+
+@Suppress("MagicNumber")
+@Composable
+private fun YieldSupplyChartLoading(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 12.dp),
+        ) {
+            repeat(4) { index ->
+                TextShimmer(
+                    modifier = Modifier
+                        .size(16.dp),
+                    radius = 4.dp,
+                    style = TangemTheme.typography.body1,
+                )
+                Spacer(modifier = Modifier.height(6.dp))
+            }
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 24.dp),
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+            ) {
+                repeat(5) {
+                    TextShimmer(
+                        modifier = Modifier
+                            .weight(1f)
+                            .height(16.dp),
+                        radius = 4.dp,
+                        style = TangemTheme.typography.body1,
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Suppress("MagicNumber")
+@Composable
+private fun YieldSupplyChartData(state: YieldSupplyChartUM.Data, modifier: Modifier = Modifier) {
+    val model = rememberChartModel(state.chartData)
+
+    val columnsLayer = rememberColumnsLayer(accentColor = TangemTheme.colors.text.accent)
+
+    val startAxis: VerticalAxis<AxisPosition.Vertical.Start> = rememberStartAxis(
+        labelColor = TangemTheme.colors.text.tertiary,
+        percentFormat = state.chartData.percentFormat,
+    )
+
+    val bottomAxis: HorizontalAxis<AxisPosition.Horizontal.Bottom> = rememberBottomAxis(
+        labelColor = TangemTheme.colors.text.tertiary,
+    )
+
+    val referenceLineThickness = 2.dp
+    val referenceLine = rememberReferenceLine(
+        average = state.chartData.avr,
+        color = TangemTheme.colors.icon.primary1,
+        thickness = referenceLineThickness,
+    )
+
+    val chart = rememberCartesianChart(
+        columnsLayer,
+        startAxis = startAxis,
+        bottomAxis = bottomAxis,
+        decorations = listOf(referenceLine),
+        horizontalLayout = HorizontalLayout.segmented(),
+    )
+
+    val averageLabelTopPadding by rememberAverageLabelTopPadding(state.chartData)
+
+    Box(modifier = modifier) {
+        MonthLabelsRow(labels = state.monthLables, modifier = Modifier.align(Alignment.BottomEnd))
+        CartesianChartHost(
+            modifier = Modifier.padding(bottom = 4.dp),
+            chart = chart,
+            model = model,
+            zoomState = rememberVicoZoomState(initialZoom = Zoom.Content, zoomEnabled = false),
+            scrollState = rememberVicoScrollState(scrollEnabled = false),
+        )
+        AverageLabel(
+            modifier = Modifier
+                .padding(start = 36.dp, top = averageLabelTopPadding)
+                .height(24.dp),
+            avr = state.chartData.avr.toString(),
+        )
+    }
+}
+
+@Composable
+private fun rememberChartModel(data: YieldSupplyMarketChartDataUM): CartesianChartModel {
+    return remember(data.y) {
+        CartesianChartModel(
+            ColumnCartesianLayerModel.build {
+                series(data.y)
+            },
+        )
+    }
+}
+
+@Suppress("MagicNumber")
+@Composable
+private fun rememberColumnsLayer(accentColor: Color): ColumnCartesianLayer {
+    val column = rememberLineComponent(
+        color = accentColor,
+        thickness = 6.dp,
+        shape = Shape.rounded(40),
+    )
+    return rememberColumnCartesianLayer(
+        columnProvider = ColumnCartesianLayer.ColumnProvider.series(column),
+        columnCollectionSpacing = 3.dp,
+        mergeMode = { MergeMode.grouped() },
+    )
+}
+
+@Composable
+private fun rememberStartAxis(labelColor: Color, percentFormat: String): VerticalAxis<AxisPosition.Vertical.Start> {
+    return rememberCustomStartAxis(
+        label = rememberAxisLabelComponent(color = labelColor),
+        valueFormatter = CartesianValueFormatter { value, _, _ ->
+            val pct = String.format(Locale.getDefault(), percentFormat, value)
+            "$pct%"
+        },
+        guideline = null,
+        tick = null,
+        line = null,
+    )
+}
+
+@Composable
+private fun rememberBottomAxis(labelColor: Color): HorizontalAxis<AxisPosition.Horizontal.Bottom> {
+    return rememberBottomAxis(
+        label = rememberAxisLabelComponent(color = labelColor),
+        guideline = null,
+        tick = null,
+        line = null,
+        valueFormatter = CartesianValueFormatter { _, _, _ ->
+            ""
+        },
+    )
+}
+
+@Composable
+private fun rememberReferenceLine(average: Double, color: Color, thickness: Dp): HorizontalLine {
+    return rememberHorizontalLine(
+        y = { average },
+        line = rememberLineComponent(
+            color = color,
+            thickness = thickness,
+            shape = Shape.dashed(Shape.Pill, 4.dp, 2.dp),
+        ),
+    )
+}
+
+@Composable
+private fun rememberAverageLabelTopPadding(data: YieldSupplyMarketChartDataUM): State<Dp> {
+    return remember(data.y, data.avr) {
+        derivedStateOf {
+            val chartHeight = 105.dp
+            val labelHeight = 24.dp
+            val referenceLineThickness = 2.dp
+            val desiredGap = 3.dp
+            val opticalNudge = 1.dp
+            val extraPaddingAboveLine = 2.dp
+            val gapAboveLine = desiredGap + referenceLineThickness / 2 + opticalNudge + extraPaddingAboveLine
+            val chartContentBottomInset = 10.dp
+
+            val maxValueInSeries = (data.y.maxOrNull() ?: 0.0).coerceAtLeast(data.avr)
+            val averageRatio = if (maxValueInSeries == 0.0) {
+                0f
+            } else {
+                (data.avr / maxValueInSeries).coerceIn(0.0, 1.0).toFloat()
+            }
+            val computedTopPadding = (chartHeight - chartContentBottomInset) * (1f - averageRatio)
+            -labelHeight - gapAboveLine
+            if (computedTopPadding < 2.dp) 2.dp else computedTopPadding
+        }
+    }
+}
+
+@Composable
+private fun MonthLabelsRow(labels: kotlinx.collections.immutable.ImmutableList<String>, modifier: Modifier = Modifier) {
+    Row(
+        modifier = modifier
+            .padding(start = 38.dp, top = 4.dp)
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        repeat(labels.size) { index ->
+            Text(
+                text = labels[index],
+                modifier = Modifier
+                    .weight(1f)
+                    .height(16.dp),
+                style = TangemTheme.typography.caption2,
+                color = TangemTheme.colors.text.tertiary,
+            )
+        }
+    }
+}
+
+@Composable
+private fun AverageLabel(avr: String, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier.background(
+            color = TangemTheme.colors.icon.primary1,
+            shape = TangemTheme.shapes.roundedCornersSmall2,
+        ),
+    ) {
+        Text(
+            text = stringResourceSafe(R.string.yield_module_rate_info_sheet_chart_average, avr),
+            style = TangemTheme.typography.caption1,
+            color = TangemTheme.colors.text.primary2,
+            modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp),
+        )
+    }
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun YieldSupplyChartContent_Preview(
+    @PreviewParameter(YieldSupplyChartPreviewProvider::class) state: YieldSupplyChartUM,
+) {
+    TangemThemePreview {
+        YieldSupplyChartContent(state = state)
+    }
+}
+
+private class YieldSupplyChartPreviewProvider : PreviewParameterProvider<YieldSupplyChartUM> {
+    override val values: Sequence<YieldSupplyChartUM>
+        get() = sequenceOf(
+            YieldSupplyChartUM.Loading,
+            YieldSupplyChartUM.Error(onRetry = {}),
+            YieldSupplyChartUM.Data(
+                chartData = YieldSupplyMarketChartDataUM.mock(),
+                monthLables = persistentListOf("Jul", "Sep", "Nov", "Feb", "May"),
+            ),
+        )
+}
+// endregion
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt
new file mode 100644
index 0000000000..00958d2ec1
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/YieldSupplyAlertFactory.kt
@@ -0,0 +1,94 @@
+package com.tangem.features.yield.supply.impl.common
+
+import com.tangem.common.ui.alerts.TransactionErrorAlertConverter
+import com.tangem.common.ui.alerts.models.AlertDemoModeUM
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.ui.UiMessageSender
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.message.DialogMessage
+import com.tangem.core.ui.message.EventMessageAction
+import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
+import com.tangem.domain.feedback.SaveBlockchainErrorUseCase
+import com.tangem.domain.feedback.SendFeedbackEmailUseCase
+import com.tangem.domain.feedback.models.BlockchainErrorInfo
+import com.tangem.domain.feedback.models.FeedbackEmailType
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.transaction.error.SendTransactionError
+import com.tangem.features.yield.supply.impl.R
+import javax.inject.Inject
+
+@ModelScoped
+class YieldSupplyAlertFactory @Inject constructor(
+    private val uiMessageSender: UiMessageSender,
+    private val saveBlockchainErrorUseCase: SaveBlockchainErrorUseCase,
+    private val getWalletMetaInfoUseCase: GetWalletMetaInfoUseCase,
+    private val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase,
+) {
+
+    fun getGenericErrorState(onFailedTxEmailClick: () -> Unit, popBack: () -> Unit = {}) {
+        uiMessageSender.send(
+            DialogMessage(
+                title = resourceReference(id = R.string.send_alert_transaction_failed_title),
+                message = resourceReference(id = R.string.common_unknown_error),
+                onDismissRequest = popBack,
+                firstAction = EventMessageAction(
+                    title = resourceReference(R.string.common_support),
+                    onClick = onFailedTxEmailClick,
+                ),
+            ),
+        )
+    }
+
+    fun getSendTransactionErrorState(
+        error: SendTransactionError?,
+        popBack: () -> Unit,
+        onFailedTxEmailClick: (String) -> Unit,
+    ) {
+        val transactionErrorAlertConverter = TransactionErrorAlertConverter(
+            popBackStack = popBack,
+            onFailedTxEmailClick = onFailedTxEmailClick,
+        )
+
+        val errorAlert = error?.let { transactionErrorAlertConverter.convert(error) } ?: return
+        val onConfirmClick = errorAlert.onConfirmClick ?: return
+
+        uiMessageSender.send(
+            DialogMessage.Companion(
+                title = errorAlert.title,
+                message = errorAlert.message,
+                firstActionBuilder = {
+                    EventMessageAction(
+                        title = errorAlert.confirmButtonText,
+                        onClick = onConfirmClick,
+                    )
+                },
+                secondActionBuilder = if (errorAlert !is AlertDemoModeUM) {
+                    { cancelAction() }
+                } else {
+                    null
+                },
+            ),
+        )
+    }
+
+    suspend fun onFailedTxEmailClick(userWallet: UserWallet, cryptoCurrency: CryptoCurrency?, errorMessage: String?) {
+        saveBlockchainErrorUseCase(
+            error = BlockchainErrorInfo(
+                errorMessage = errorMessage.orEmpty(),
+                blockchainId = cryptoCurrency?.network?.rawId.orEmpty(),
+                derivationPath = cryptoCurrency?.network?.derivationPath?.value.orEmpty(),
+                tokenSymbol = cryptoCurrency?.symbol.orEmpty(),
+                destinationAddress = "",
+                amount = "",
+                fee = "",
+            ),
+        )
+
+        val metaInfo = getWalletMetaInfoUseCase(userWallet.walletId).getOrNull() ?: return
+
+        sendFeedbackEmailUseCase(
+            type = FeedbackEmailType.TransactionSendingProblem(metaInfo),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
index 9c30cb4f8e..14baa04a9a 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/YieldSupplyFeeUM.kt
@@ -13,6 +13,8 @@ internal sealed class YieldSupplyFeeUM {
     data class Content(
         val transactionDataList: ImmutableList<TransactionData.Uncompiled>,
         val feeValue: TextReference,
+        val currentNetworkFeeValue: TextReference,
+        val maxNetworkFeeValue: TextReference,
     ) : YieldSupplyFeeUM()
 }
 
@@ -20,7 +22,9 @@ internal data class YieldSupplyActionUM(
     val title: TextReference,
     val subtitle: TextReference,
     val footer: TextReference,
+    val footerLink: TextReference,
     val currencyIconState: CurrencyIconState,
     val yieldSupplyFeeUM: YieldSupplyFeeUM,
     val isPrimaryButtonEnabled: Boolean,
+    val isTransactionSending: Boolean,
 )
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionInProgressTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionInProgressTransformer.kt
new file mode 100644
index 0000000000..0940c5be50
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionInProgressTransformer.kt
@@ -0,0 +1,13 @@
+package com.tangem.features.yield.supply.impl.common.entity.transformer
+
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.utils.transformer.Transformer
+
+internal object YieldSupplyTransactionInProgressTransformer : Transformer<YieldSupplyActionUM> {
+    override fun transform(prevState: YieldSupplyActionUM): YieldSupplyActionUM {
+        return prevState.copy(
+            isPrimaryButtonEnabled = false,
+            isTransactionSending = true,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionReadyTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionReadyTransformer.kt
new file mode 100644
index 0000000000..9652d1abd0
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/entity/transformer/YieldSupplyTransactionReadyTransformer.kt
@@ -0,0 +1,13 @@
+package com.tangem.features.yield.supply.impl.common.entity.transformer
+
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.utils.transformer.Transformer
+
+internal object YieldSupplyTransactionReadyTransformer : Transformer<YieldSupplyActionUM> {
+    override fun transform(prevState: YieldSupplyActionUM): YieldSupplyActionUM {
+        return prevState.copy(
+            isPrimaryButtonEnabled = true,
+            isTransactionSending = false,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
index 98746a3d45..aea87550b9 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyActionContent.kt
@@ -3,21 +3,24 @@ package com.tangem.features.yield.supply.impl.common.ui
 import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.key
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.*
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerH8
 import com.tangem.core.ui.components.containers.FooterContainer
 import com.tangem.core.ui.components.currency.icon.CurrencyIcon
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
+import com.tangem.core.ui.decompose.ComposableContentComponent
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
@@ -30,12 +33,15 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 internal fun YieldSupplyActionContent(
     yieldSupplyActionUM: YieldSupplyActionUM,
+    onFooterClick: () -> Unit,
+    yieldSupplyNotificationsComponent: ComposableContentComponent,
     modifier: Modifier = Modifier,
+    enableFooterClick: Boolean = true,
     iconContent: @Composable ColumnScope.() -> Unit,
 ) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier.padding(bottom = 16.dp, start = 16.dp, end = 16.dp),
+        modifier = modifier.padding(bottom = 8.dp, start = 16.dp, end = 16.dp),
     ) {
         iconContent()
         SpacerH24()
@@ -53,49 +59,43 @@ internal fun YieldSupplyActionContent(
             modifier = Modifier.padding(horizontal = 16.dp),
         )
         SpacerH24()
-        FooterContainer(
-            footer = yieldSupplyActionUM.footer,
-            paddingValues = PaddingValues(
-                start = 12.dp,
-                end = 12.dp,
-                top = 8.dp,
-            ),
-        ) {
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .clip(RoundedCornerShape(14.dp))
-                    .background(TangemTheme.colors.background.action)
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-            ) {
-                Text(
-                    text = stringResourceSafe(R.string.common_network_fee_title),
-                    style = TangemTheme.typography.body1,
-                    color = TangemTheme.colors.text.primary1,
-                )
-                SpacerWMax()
-                when (val fee = yieldSupplyActionUM.yieldSupplyFeeUM) {
-                    is YieldSupplyFeeUM.Content -> Text(
-                        text = fee.feeValue.resolveReference(),
-                        style = TangemTheme.typography.body1,
-                        color = TangemTheme.colors.text.tertiary,
-                    )
-                    YieldSupplyFeeUM.Error -> Text(
-                        text = stringResourceSafe(R.string.common_fee_error),
-                        style = TangemTheme.typography.body1,
-                        color = TangemTheme.colors.text.attention,
-                    )
-                    YieldSupplyFeeUM.Loading -> {
-                        TextShimmer(
-                            style = TangemTheme.typography.body1,
-                            text = stringResourceSafe(R.string.common_fee_error),
+        key(enableFooterClick) {
+            FooterContainer(
+                footer = annotatedReference {
+                    append(yieldSupplyActionUM.footer.resolveReference())
+                    appendSpace()
+                    if (enableFooterClick) {
+                        withLink(link = LinkAnnotation.Clickable("LINK_TAG") { onFooterClick() }) {
+                            appendColored(
+                                text = yieldSupplyActionUM.footerLink.resolveReference(),
+                                color = TangemTheme.colors.icon.accent,
+                            )
+                        }
+                    } else {
+                        appendColored(
+                            text = yieldSupplyActionUM.footerLink.resolveReference(),
+                            color = TangemTheme.colors.text.disabled,
                         )
                     }
+                },
+                paddingValues = PaddingValues(
+                    start = 12.dp,
+                    end = 12.dp,
+                    top = 8.dp,
+                ),
+            ) {
+                val fee = when (val yieldSupplyFeeUM = yieldSupplyActionUM.yieldSupplyFeeUM) {
+                    is YieldSupplyFeeUM.Content -> yieldSupplyFeeUM.feeValue
+                    YieldSupplyFeeUM.Error -> stringReference(StringsSigns.DASH_SIGN)
+                    YieldSupplyFeeUM.Loading -> null
                 }
+                YieldSupplyFeeRow(
+                    title = resourceReference(R.string.common_network_fee_title),
+                    value = fee,
+                )
             }
         }
+        yieldSupplyNotificationsComponent.Content(Modifier)
     }
 }
 
@@ -109,6 +109,9 @@ private fun YieldSupplyActionContent_Preview(
     TangemThemePreview {
         YieldSupplyActionContent(
             yieldSupplyActionUM = params,
+            onFooterClick = {},
+            yieldSupplyNotificationsComponent = ComposableContentComponent.EMPTY,
+            enableFooterClick = false,
             modifier = Modifier.background(TangemTheme.colors.background.tertiary),
         ) {
             CurrencyIcon(
@@ -130,17 +133,17 @@ private class YieldSupplyActionContentPreviewProvider : PreviewParameterProvider
                     R.string.yield_module_start_earning_sheet_description,
                     wrappedList("USDT"),
                 ),
-                footer = combinedReference(
-                    resourceReference(R.string.yield_module_start_earning_sheet_next_deposits),
-                    stringReference(StringsSigns.WHITE_SPACE),
-                    resourceReference(R.string.yield_module_start_earning_sheet_fee_policy),
-                ),
+                footer = resourceReference(R.string.yield_module_start_earning_sheet_next_deposits),
+                footerLink = resourceReference(R.string.yield_module_start_earning_sheet_fee_policy),
                 currencyIconState = CurrencyIconState.Loading,
                 yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
                     transactionDataList = persistentListOf(),
                     feeValue = stringReference("0.00020 ETH • \$0.99"),
+                    currentNetworkFeeValue = stringReference("1.45 USDT • \$1.45"),
+                    maxNetworkFeeValue = stringReference("8.50 USDT • \$8.50"),
                 ),
                 isPrimaryButtonEnabled = false,
+                isTransactionSending = false,
             ),
         )
 }
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyFeeRow.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyFeeRow.kt
new file mode 100644
index 0000000000..2f2901b79d
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/common/ui/YieldSupplyFeeRow.kt
@@ -0,0 +1,58 @@
+package com.tangem.features.yield.supply.impl.common.ui
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SpacerWMax
+import com.tangem.core.ui.components.TextShimmer
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.features.yield.supply.impl.R
+
+@Composable
+internal fun YieldSupplyFeeRow(title: TextReference, value: TextReference?) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(14.dp))
+            .background(TangemTheme.colors.background.action)
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+    ) {
+        Text(
+            text = title.resolveReference(),
+            style = TangemTheme.typography.body1,
+            color = TangemTheme.colors.text.primary1,
+        )
+        SpacerWMax()
+        AnimatedContent(
+            targetState = value,
+        ) { targetValue ->
+            if (targetValue != null) {
+                Text(
+                    text = targetValue.resolveReference(),
+                    style = TangemTheme.typography.body1,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            } else {
+                TextShimmer(
+                    style = TangemTheme.typography.body1,
+                    text = stringResourceSafe(R.string.common_fee_error),
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/DefaultYieldSupplyComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/DefaultYieldSupplyComponent.kt
new file mode 100644
index 0000000000..bfc0e7857d
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/DefaultYieldSupplyComponent.kt
@@ -0,0 +1,67 @@
+package com.tangem.features.yield.supply.impl.main
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.arkivanov.decompose.ComponentContext
+import com.arkivanov.decompose.extensions.compose.subscribeAsState
+import com.arkivanov.decompose.router.slot.childSlot
+import com.arkivanov.decompose.router.slot.dismiss
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.childByContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
+import com.tangem.features.yield.supply.api.YieldSupplyComponent
+import com.tangem.features.yield.supply.impl.main.model.YieldSupplyModel
+import com.tangem.features.yield.supply.impl.main.ui.YieldSupplyBlockContent
+import com.tangem.features.yield.supply.impl.subcomponents.active.YieldSupplyActiveEntryComponent
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+
+internal class DefaultYieldSupplyComponent @AssistedInject constructor(
+    @Assisted private val appComponentContext: AppComponentContext,
+    @Assisted private val params: YieldSupplyComponent.Params,
+) : YieldSupplyComponent, AppComponentContext by appComponentContext {
+
+    private val model: YieldSupplyModel = getOrCreateModel(params = params)
+
+    private val bottomSheetSlot = childSlot(
+        source = model.bottomSheetNavigation,
+        serializer = null,
+        handleBackButton = false,
+        childFactory = { _, context -> bottomSheetChild(context) },
+    )
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val yieldSupplyUM by model.uiState.collectAsStateWithLifecycle()
+        val bottomSheet by bottomSheetSlot.subscribeAsState()
+        val isBalanceHidden by model.isBalanceHiddenFlow.collectAsStateWithLifecycle()
+
+        YieldSupplyBlockContent(yieldSupplyUM = yieldSupplyUM, isBalanceHidden = isBalanceHidden, modifier = modifier)
+
+        bottomSheet.child?.instance?.BottomSheet()
+    }
+
+    private fun bottomSheetChild(componentContext: ComponentContext): ComposableBottomSheetComponent {
+        return YieldSupplyActiveEntryComponent(
+            appComponentContext = childByContext(componentContext),
+            params = YieldSupplyActiveEntryComponent.Params(
+                userWallet = model.userWallet,
+                cryptoCurrencyStatusFlow = model.cryptoCurrencyStatusFlow,
+                isBalanceHiddenFlow = model.isBalanceHiddenFlow,
+                onDismiss = model.bottomSheetNavigation::dismiss,
+            ),
+        )
+    }
+
+    @AssistedFactory
+    interface Factory : YieldSupplyComponent.Factory {
+        override fun create(
+            context: AppComponentContext,
+            params: YieldSupplyComponent.Params,
+        ): DefaultYieldSupplyComponent
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/di/YieldSupplyBindsModule.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/di/YieldSupplyBindsModule.kt
new file mode 100644
index 0000000000..8bee792210
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/di/YieldSupplyBindsModule.kt
@@ -0,0 +1,32 @@
+package com.tangem.features.yield.supply.impl.main.di
+
+import com.tangem.core.decompose.di.ModelComponent
+import com.tangem.core.decompose.model.Model
+import com.tangem.features.yield.supply.api.YieldSupplyComponent
+import com.tangem.features.yield.supply.impl.main.DefaultYieldSupplyComponent
+import com.tangem.features.yield.supply.impl.main.model.YieldSupplyModel
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal interface YieldSupplyBindsModule {
+    @Binds
+    @Singleton
+    fun provideYieldSupplyComponentFactory(impl: DefaultYieldSupplyComponent.Factory): YieldSupplyComponent.Factory
+}
+
+@Module
+@InstallIn(ModelComponent::class)
+internal interface YieldSupplyModelModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(YieldSupplyModel::class)
+    fun provideYieldSupplyModel(impl: YieldSupplyModel): Model
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt
new file mode 100644
index 0000000000..de7a778530
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt
@@ -0,0 +1,30 @@
+package com.tangem.features.yield.supply.impl.main.entity
+
+import androidx.compose.runtime.Immutable
+import com.tangem.core.ui.extensions.TextReference
+
+@Immutable
+internal sealed class YieldSupplyUM {
+
+    data class Initial(
+        val title: TextReference,
+        val onClick: () -> Unit,
+    ) : YieldSupplyUM()
+
+    data object Loading : YieldSupplyUM()
+
+    data object Unavailable : YieldSupplyUM()
+
+    data class Content(
+        val rewardsBalance: TextReference,
+        val rewardsApy: TextReference,
+        val onClick: () -> Unit,
+        val isAllowedToSpend: Boolean,
+    ) : YieldSupplyUM()
+
+    @Immutable
+    sealed class Processing : YieldSupplyUM() {
+        data object Enter : Processing()
+        data object Exit : Processing()
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyClickIntents.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyClickIntents.kt
new file mode 100644
index 0000000000..a13e1b98fe
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyClickIntents.kt
@@ -0,0 +1,6 @@
+package com.tangem.features.yield.supply.impl.main.model
+
+interface YieldSupplyClickIntents {
+    fun onStartEarningClick()
+    fun onActiveClick()
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt
new file mode 100644
index 0000000000..d4c2c34325
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt
@@ -0,0 +1,189 @@
+package com.tangem.features.yield.supply.impl.main.model
+
+import com.arkivanov.decompose.router.slot.SlotNavigation
+import com.arkivanov.decompose.router.slot.activate
+import com.tangem.common.routing.AppRoute.YieldSupplyPromo
+import com.tangem.common.routing.AppRouter
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.network.TxInfo
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.tokens.FetchCurrencyStatusUseCase
+import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
+import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyGetTokenStatusUseCase
+import com.tangem.features.yield.supply.api.YieldSupplyComponent
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.main.entity.YieldSupplyUM
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.DelayedWork
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+import kotlin.properties.Delegates
+
+@Suppress("LongParameterList")
+@ModelScoped
+internal class YieldSupplyModel @Inject constructor(
+    paramsContainer: ParamsContainer,
+    override val dispatchers: CoroutineDispatcherProvider,
+    private val appRouter: AppRouter,
+    private val getUserWalletUseCase: GetUserWalletUseCase,
+    private val getSingleCryptoCurrencyStatusUseCase: GetSingleCryptoCurrencyStatusUseCase,
+    private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
+    @DelayedWork private val coroutineScope: CoroutineScope,
+    private val getBalanceHidingSettingsUseCase: GetBalanceHidingSettingsUseCase,
+    private val yieldSupplyGetTokenStatusUseCase: YieldSupplyGetTokenStatusUseCase,
+) : Model(), YieldSupplyClickIntents {
+
+    private val params = paramsContainer.require<YieldSupplyComponent.Params>()
+
+    val uiState: StateFlow<YieldSupplyUM>
+        field = MutableStateFlow<YieldSupplyUM>(YieldSupplyUM.Loading)
+
+    val bottomSheetNavigation: SlotNavigation<Unit> = SlotNavigation()
+
+    private val cryptoCurrency = params.cryptoCurrency
+    var userWallet: UserWallet by Delegates.notNull()
+
+    val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = params.cryptoCurrency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
+
+    val isBalanceHiddenFlow: StateFlow<Boolean>
+        field = MutableStateFlow(false)
+
+    init {
+        subscribeOnCurrencyStatusUpdates()
+        subscribeOnBalanceHidden()
+    }
+
+    private fun subscribeOnCurrencyStatusUpdates() {
+        modelScope.launch {
+            getUserWalletUseCase(params.userWalletId).fold(
+                ifRight = { wallet ->
+                    userWallet = wallet
+
+                    getSingleCryptoCurrencyStatusUseCase.invokeMultiWallet(
+                        userWalletId = params.userWalletId,
+                        currencyId = cryptoCurrency.id,
+                        isSingleWalletWithTokens = false,
+                    ).onEach { maybeCryptoCurrency ->
+                        maybeCryptoCurrency.fold(
+                            ifRight = { cryptoCurrencyStatus ->
+                                cryptoCurrencyStatusFlow.update { cryptoCurrencyStatus }
+                                onDataLoaded(cryptoCurrencyStatus)
+                            },
+                            ifLeft = {
+                                Timber.w(it.toString())
+                            },
+                        )
+                    }.launchIn(modelScope)
+                },
+                ifLeft = {
+                    Timber.w(it.toString())
+                    return@launch
+                },
+            )
+        }
+    }
+
+    private fun loadTokenStatus(cryptoCurrency: CryptoCurrency.Token) {
+        modelScope.launch(dispatchers.default) {
+            yieldSupplyGetTokenStatusUseCase(cryptoCurrency)
+                .onRight { tokenStatus ->
+                    val newState = if (tokenStatus.isActive) {
+                        YieldSupplyUM.Initial(
+                            title = resourceReference(
+                                id = R.string.yield_module_token_details_earn_notification_title,
+                                formatArgs = wrappedList(tokenStatus.apy),
+                            ),
+                            onClick = ::onStartEarningClick,
+                        )
+                    } else {
+                        YieldSupplyUM.Unavailable
+                    }
+                    uiState.update { newState }
+                }.onLeft {
+                    uiState.update { YieldSupplyUM.Unavailable }
+                }
+        }
+    }
+
+    override fun onStartEarningClick() {
+        appRouter.push(
+            YieldSupplyPromo(
+                userWalletId = params.userWalletId,
+                cryptoCurrency = params.cryptoCurrency,
+            ),
+        )
+    }
+
+    override fun onActiveClick() {
+        bottomSheetNavigation.activate(Unit)
+    }
+
+    private fun subscribeOnBalanceHidden() {
+        getBalanceHidingSettingsUseCase()
+            .conflate()
+            .distinctUntilChanged()
+            .onEach {
+                isBalanceHiddenFlow.value = it.isBalanceHidden
+            }
+            .flowOn(dispatchers.default)
+            .launchIn(modelScope)
+    }
+
+    private fun onDataLoaded(cryptoCurrencyStatus: CryptoCurrencyStatus) {
+        val yieldSupplyStatus = cryptoCurrencyStatus.value.yieldSupplyStatus
+        val hasActiveTransaction = cryptoCurrencyStatus.value.hasCurrentNetworkTransactions
+        val yieldTransaction = cryptoCurrencyStatus.value.pendingTransactions.firstOrNull {
+            it.type is TxInfo.TransactionType.YieldSupply
+        }?.type as? TxInfo.TransactionType.YieldSupply
+
+        val yieldSupplyUM = when {
+            hasActiveTransaction && yieldTransaction != null -> {
+                coroutineScope.launch(dispatchers.io) {
+                    delay(PROCESSING_UPDATE_DELAY)
+                    fetchCurrencyStatusUseCase(userWalletId = userWallet.walletId, cryptoCurrency.id)
+                }
+                when (yieldTransaction) {
+                    TxInfo.TransactionType.YieldSupply.Enter -> YieldSupplyUM.Processing.Enter
+                    TxInfo.TransactionType.YieldSupply.Exit -> YieldSupplyUM.Processing.Exit
+                }
+            }
+            yieldSupplyStatus?.isActive == true ->
+                YieldSupplyUM.Content(
+                    rewardsBalance = TextReference.EMPTY,
+                    rewardsApy = TextReference.EMPTY,
+                    onClick = ::onActiveClick,
+                    isAllowedToSpend = yieldSupplyStatus.isAllowedToSpend,
+                )
+            else -> YieldSupplyUM.Loading
+        }
+
+        uiState.update { yieldSupplyUM }
+
+        if (yieldSupplyUM is YieldSupplyUM.Loading) {
+            (cryptoCurrency as? CryptoCurrency.Token)?.let(::loadTokenStatus)
+        }
+    }
+
+    private companion object {
+        const val PROCESSING_UPDATE_DELAY = 10_000L
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
new file mode 100644
index 0000000000..df41b8fb28
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
@@ -0,0 +1,320 @@
+package com.tangem.features.yield.supply.impl.main.ui
+
+import android.content.res.Configuration
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SecondaryButton
+import com.tangem.core.ui.components.SpacerW8
+import com.tangem.core.ui.components.TextShimmer
+import com.tangem.core.ui.components.buttons.common.TangemButtonSize
+import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.main.entity.YieldSupplyUM
+import com.tangem.utils.StringsSigns
+
+@Composable
+internal fun YieldSupplyBlockContent(
+    yieldSupplyUM: YieldSupplyUM,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    AnimatedContent(
+        targetState = yieldSupplyUM,
+        modifier = modifier,
+    ) { supplyUM ->
+        when (supplyUM) {
+            is YieldSupplyUM.Initial -> SupplyInitial(supplyUM)
+            YieldSupplyUM.Loading -> SupplyLoading()
+            is YieldSupplyUM.Content -> SupplyContent(supplyUM, isBalanceHidden)
+            YieldSupplyUM.Processing.Enter -> SupplyProcessing(
+                resourceReference(R.string.yield_module_token_details_earn_notification_processing),
+            )
+            YieldSupplyUM.Processing.Exit -> SupplyProcessing(
+                resourceReference(R.string.yield_module_stop_earning),
+            )
+            YieldSupplyUM.Unavailable -> SupplyUnavailable()
+        }
+    }
+}
+
+@Composable
+private fun SupplyInitial(supplyUM: YieldSupplyUM.Initial) {
+    SupplyInfo(
+        title = supplyUM.title,
+        subtitle = resourceReference(R.string.yield_module_token_details_earn_notification_description),
+        iconTint = TangemTheme.colors.icon.accent,
+        button = {
+            SecondaryButton(
+                text = stringResourceSafe(R.string.common_learn_more),
+                onClick = supplyUM.onClick,
+                size = TangemButtonSize.WideAction,
+                modifier = Modifier.fillMaxWidth(),
+            )
+        },
+    )
+}
+
+@Composable
+private fun SupplyUnavailable() {
+    SupplyInfo(
+        title = resourceReference(R.string.yield_module_unavailable_title),
+        subtitle = resourceReference(R.string.yield_module_unavailable_subtitle),
+        iconTint = TangemTheme.colors.icon.inactive,
+        button = null,
+    )
+}
+
+@Composable
+private fun SupplyContent(supplyUM: YieldSupplyUM.Content, isBalanceHidden: Boolean) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .clip(RoundedCornerShape(16.dp))
+            .background(TangemTheme.colors.background.primary)
+            .clickable(onClick = supplyUM.onClick)
+            .padding(12.dp),
+    ) {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            modifier = Modifier.weight(1f),
+        ) {
+            Text(
+                text = stringResourceSafe(
+                    R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
+                ),
+                style = TangemTheme.typography.subtitle2,
+                color = TangemTheme.colors.text.tertiary,
+            )
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(4.dp),
+            ) {
+                Text(
+                    text = supplyUM.rewardsBalance.orMaskWithStars(isBalanceHidden).resolveReference(),
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.primary1,
+                )
+                Text(
+                    text = StringsSigns.DOT,
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+                Text(
+                    text = supplyUM.rewardsApy.resolveReference(),
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            }
+        }
+        SpacerW8()
+        AnimatedVisibility(supplyUM.isAllowedToSpend.not()) {
+            Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.ic_alert_triangle_20),
+                contentDescription = null,
+                tint = TangemTheme.colors.icon.attention,
+            )
+        }
+        Icon(
+            imageVector = ImageVector.vectorResource(R.drawable.ic_chevron_right_24),
+            contentDescription = null,
+            tint = TangemTheme.colors.icon.informative,
+            modifier = Modifier.size(20.dp),
+        )
+    }
+}
+
+@Composable
+private fun SupplyProcessing(text: TextReference) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(4.dp),
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(16.dp))
+            .background(TangemTheme.colors.background.primary)
+            .padding(12.dp),
+    ) {
+        Text(
+            text = stringResourceSafe(
+                R.string.yield_module_token_details_earn_notification_earning_on_your_balance_title,
+            ),
+            style = TangemTheme.typography.subtitle2,
+            color = TangemTheme.colors.text.tertiary,
+        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+        ) {
+            Text(
+                text = text.resolveReference(),
+                style = TangemTheme.typography.body1,
+                color = TangemTheme.colors.text.tertiary,
+            )
+            CircularProgressIndicator(
+                modifier = Modifier.size(16.dp),
+                color = TangemTheme.colors.icon.accent,
+                strokeWidth = 2.dp,
+            )
+        }
+    }
+}
+
+@Composable
+private fun SupplyLoading() {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+            .clip(RoundedCornerShape(16.dp))
+            .background(TangemTheme.colors.background.primary)
+            .padding(12.dp),
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.ic_analytics_up_24),
+                contentDescription = null,
+                tint = TangemTheme.colors.icon.inactive,
+                modifier = Modifier
+                    .background(TangemTheme.colors.icon.inactive.copy(alpha = 0.1f), CircleShape)
+                    .padding(6.dp)
+                    .size(24.dp),
+            )
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+            ) {
+                TextShimmer(
+                    text = stringResourceSafe(R.string.yield_module_unavailable_title),
+                    style = TangemTheme.typography.button,
+                )
+                TextShimmer(
+                    modifier = Modifier.fillMaxWidth(),
+                    text = stringResourceSafe(R.string.yield_module_unavailable_subtitle),
+                    style = TangemTheme.typography.caption2,
+                )
+                TextShimmer(
+                    modifier = Modifier.width(100.dp),
+                    text = stringResourceSafe(R.string.yield_module_unavailable_subtitle),
+                    style = TangemTheme.typography.caption2,
+                )
+            }
+        }
+        SecondaryButton(
+            text = stringResourceSafe(R.string.common_learn_more),
+            onClick = { },
+            showProgress = true,
+            enabled = false,
+            size = TangemButtonSize.WideAction,
+            modifier = Modifier.fillMaxWidth(),
+        )
+    }
+}
+
+@Composable
+private fun SupplyInfo(
+    title: TextReference,
+    subtitle: TextReference,
+    iconTint: Color,
+    modifier: Modifier = Modifier,
+    button: (@Composable () -> Unit)? = null,
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .clip(RoundedCornerShape(16.dp))
+            .background(TangemTheme.colors.background.primary)
+            .padding(12.dp),
+    ) {
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.ic_analytics_up_24),
+                contentDescription = null,
+                tint = iconTint,
+                modifier = Modifier
+                    .background(iconTint.copy(alpha = 0.1f), CircleShape)
+                    .padding(6.dp)
+                    .size(24.dp),
+            )
+            Column(
+                verticalArrangement = Arrangement.spacedBy(2.dp),
+            ) {
+                Text(
+                    text = title.resolveReference(),
+                    style = TangemTheme.typography.button,
+                    color = TangemTheme.colors.text.primary1,
+                )
+                Text(
+                    text = subtitle.resolveReference(),
+                    style = TangemTheme.typography.caption2,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            }
+        }
+        button?.invoke()
+    }
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun YieldSupplyBlockContent_Preview(@PreviewParameter(PreviewProvider::class) params: YieldSupplyUM) {
+    TangemThemePreview {
+        YieldSupplyBlockContent(params, true)
+    }
+}
+
+private class PreviewProvider : PreviewParameterProvider<YieldSupplyUM> {
+    override val values: Sequence<YieldSupplyUM>
+        get() = sequenceOf(
+            YieldSupplyUM.Initial(
+                title = TextReference.Res(
+                    R.string.yield_module_token_details_earn_notification_title,
+                    wrappedList("5.1"),
+                ),
+                onClick = {},
+            ),
+            YieldSupplyUM.Content(
+                rewardsBalance = stringReference("1 USDT"),
+                rewardsApy = stringReference("5.1 % APY"),
+                onClick = {},
+                isAllowedToSpend = false,
+            ),
+            YieldSupplyUM.Content(
+                rewardsBalance = stringReference("1 USDT"),
+                rewardsApy = stringReference("5.1 % APY"),
+                onClick = {},
+                isAllowedToSpend = true,
+            ),
+            YieldSupplyUM.Loading,
+            YieldSupplyUM.Processing.Enter,
+            YieldSupplyUM.Processing.Exit,
+            YieldSupplyUM.Unavailable,
+        )
+}
+// endregion
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/promo/DefaultYieldSupplyPromoComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/promo/DefaultYieldSupplyPromoComponent.kt
index 7e9414c4a1..92b54df857 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/promo/DefaultYieldSupplyPromoComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/promo/DefaultYieldSupplyPromoComponent.kt
@@ -3,15 +3,19 @@ package com.tangem.features.yield.supply.impl.promo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import com.arkivanov.decompose.router.slot.childSlot
+import com.arkivanov.decompose.router.slot.dismiss
 import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
-import com.tangem.core.ui.decompose.getEmptyComposableBottomSheetComponent
 import com.tangem.features.yield.supply.api.YieldSupplyPromoComponent
+import com.tangem.features.yield.supply.impl.apy.YieldSupplyApyComponent
 import com.tangem.features.yield.supply.impl.promo.model.YieldSupplyPromoModel
 import com.tangem.features.yield.supply.impl.promo.ui.YieldSupplyPromoContent
+import com.tangem.features.yield.supply.impl.subcomponents.startearning.YieldSupplyStartEarningEntryComponent
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -27,7 +31,7 @@ internal class DefaultYieldSupplyPromoComponent @AssistedInject constructor(
         source = model.bottomSheetNavigation,
         serializer = null,
         handleBackButton = false,
-        childFactory = { _, _ -> bottomSheetChild() },
+        childFactory = { config, componentContext -> bottomSheetChild(config, componentContext) },
     )
 
     @Composable
@@ -44,7 +48,34 @@ internal class DefaultYieldSupplyPromoComponent @AssistedInject constructor(
         bottomSheet.child?.instance?.BottomSheet()
     }
 
-    private fun bottomSheetChild(): ComposableBottomSheetComponent = getEmptyComposableBottomSheetComponent()
+    private fun bottomSheetChild(
+        config: YieldSupplyPromoConfig,
+        componentContext: ComponentContext,
+    ): ComposableBottomSheetComponent = when (config) {
+        YieldSupplyPromoConfig.Apy -> YieldSupplyApyComponent(
+            appComponentContext = childByContext(componentContext),
+            params = YieldSupplyApyComponent.Params(
+                cryptoCurrency = params.currency,
+                onBackClick = {
+                    model.bottomSheetNavigation.dismiss()
+                },
+            ),
+        )
+        YieldSupplyPromoConfig.Action -> YieldSupplyStartEarningEntryComponent(
+            appComponentContext = childByContext(componentContext),
+            params = YieldSupplyStartEarningEntryComponent.Params(
+                userWalletId = params.userWalletId,
+                cryptoCurrency = params.currency,
+                onDismiss = { isProcessing ->
+                    if (isProcessing) {
+                        router.pop()
+                    } else {
+                        model.bottomSheetNavigation.dismiss()
+                    }
+                },
+            ),
+        )
+    }
 
     @AssistedFactory
     interface Factory : YieldSupplyPromoComponent.Factory {
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveComponent.kt
index 2b3bd18f57..4d7abbb513 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveComponent.kt
@@ -35,8 +35,9 @@ internal class YieldSupplyActiveComponent(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+        val isBalanceHidden by params.isBalanceHiddenFlow.collectAsStateWithLifecycle()
 
-        YieldSupplyActiveContent(state = state, modifier = Modifier)
+        YieldSupplyActiveContent(state = state, isBalanceHidden = isBalanceHidden, modifier = Modifier)
     }
 
     @Composable
@@ -53,11 +54,13 @@ internal class YieldSupplyActiveComponent(
     data class Params(
         val userWallet: UserWallet,
         val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
+        val isBalanceHiddenFlow: StateFlow<Boolean>,
         val callback: ModelCallback,
     )
 
     interface ModelCallback {
         fun onBackClick()
         fun onStopEarning()
+        fun onApprove()
     }
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveEntryComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveEntryComponent.kt
index 258da13fe2..59616762c7 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveEntryComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/YieldSupplyActiveEntryComponent.kt
@@ -17,6 +17,7 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.features.yield.supply.impl.subcomponents.active.model.YieldSupplyActiveEntryModel
 import com.tangem.features.yield.supply.impl.subcomponents.active.model.YieldSupplyActiveRoute
 import com.tangem.features.yield.supply.impl.subcomponents.active.ui.YieldSupplyActiveEntryBottomSheet
+import com.tangem.features.yield.supply.impl.subcomponents.approve.YieldSupplyApproveComponent
 import com.tangem.features.yield.supply.impl.subcomponents.stopearning.YieldSupplyStopEarningComponent
 import kotlinx.coroutines.flow.StateFlow
 
@@ -74,10 +75,11 @@ internal class YieldSupplyActiveEntryComponent(
             params = YieldSupplyActiveComponent.Params(
                 userWallet = params.userWallet,
                 cryptoCurrencyStatusFlow = params.cryptoCurrencyStatusFlow,
+                isBalanceHiddenFlow = params.isBalanceHiddenFlow,
                 callback = model,
             ),
         )
-        YieldSupplyActiveRoute.Action -> YieldSupplyStopEarningComponent(
+        YieldSupplyActiveRoute.Exit -> YieldSupplyStopEarningComponent(
             appComponentContext = factoryContext,
             params = YieldSupplyStopEarningComponent.Params(
                 userWallet = params.userWallet,
@@ -85,6 +87,14 @@ internal class YieldSupplyActiveEntryComponent(
                 callback = model,
             ),
         )
+        YieldSupplyActiveRoute.Approve -> YieldSupplyApproveComponent(
+            appComponentContext = factoryContext,
+            params = YieldSupplyApproveComponent.Params(
+                userWallet = params.userWallet,
+                cryptoCurrencyStatusFlow = params.cryptoCurrencyStatusFlow,
+                callback = model,
+            ),
+        )
     }
 
     private fun onChildBack() {
@@ -98,6 +108,7 @@ internal class YieldSupplyActiveEntryComponent(
     data class Params(
         val userWallet: UserWallet,
         val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
+        val isBalanceHiddenFlow: StateFlow<Boolean>,
         val onDismiss: () -> Unit,
     )
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/entity/YieldSupplyActiveContentUM.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/entity/YieldSupplyActiveContentUM.kt
index fe2157d2ef..7cda12cb63 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/entity/YieldSupplyActiveContentUM.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/entity/YieldSupplyActiveContentUM.kt
@@ -1,10 +1,13 @@
 package com.tangem.features.yield.supply.impl.subcomponents.active.entity
 
+import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.core.ui.extensions.TextReference
 
 internal data class YieldSupplyActiveContentUM(
     val totalEarnings: TextReference,
-    val availableBalance: TextReference,
+    val availableBalance: TextReference?,
     val providerTitle: TextReference,
     val subtitle: TextReference,
+    val subtitleLink: TextReference,
+    val notificationUM: NotificationUM?,
 )
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveEntryModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveEntryModel.kt
index 57878b486a..1d60926512 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveEntryModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveEntryModel.kt
@@ -6,6 +6,7 @@ import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.features.yield.supply.impl.subcomponents.active.YieldSupplyActiveComponent
 import com.tangem.features.yield.supply.impl.subcomponents.active.YieldSupplyActiveEntryComponent
+import com.tangem.features.yield.supply.impl.subcomponents.approve.YieldSupplyApproveComponent
 import com.tangem.features.yield.supply.impl.subcomponents.stopearning.YieldSupplyStopEarningComponent
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import javax.inject.Inject
@@ -15,12 +16,14 @@ internal class YieldSupplyActiveEntryModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     paramsContainer: ParamsContainer,
     private val router: Router,
-) : Model(), YieldSupplyActiveComponent.ModelCallback, YieldSupplyStopEarningComponent.ModelCallback {
+) : Model(), YieldSupplyActiveComponent.ModelCallback,
+    YieldSupplyStopEarningComponent.ModelCallback,
+    YieldSupplyApproveComponent.ModelCallback {
 
     private val params = paramsContainer.require<YieldSupplyActiveEntryComponent.Params>()
 
     override fun onStopEarning() {
-        router.push(YieldSupplyActiveRoute.Action)
+        router.push(YieldSupplyActiveRoute.Exit)
     }
 
     override fun onBackClick() {
@@ -30,4 +33,8 @@ internal class YieldSupplyActiveEntryModel @Inject constructor(
     override fun onTransactionSent() {
         params.onDismiss()
     }
+
+    override fun onApprove() {
+        router.push(YieldSupplyActiveRoute.Approve)
+    }
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt
index 698ba4b032..4b38fbb125 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt
@@ -1,26 +1,29 @@
 package com.tangem.features.yield.supply.impl.subcomponents.active.model
 
+import com.tangem.common.ui.notifications.NotificationUM
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
-import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.components.notifications.NotificationConfig
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
 import com.tangem.core.ui.format.bigdecimal.crypto
 import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.yield.supply.usecase.YieldSupplyGetProtocolBalanceUseCase
 import com.tangem.features.yield.supply.impl.R
 import com.tangem.features.yield.supply.impl.subcomponents.active.YieldSupplyActiveComponent
 import com.tangem.features.yield.supply.impl.subcomponents.active.entity.YieldSupplyActiveContentUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @ModelScoped
 internal class YieldSupplyActiveModel @Inject constructor(
     paramsContainer: ParamsContainer,
     override val dispatchers: CoroutineDispatcherProvider,
+    private val yieldSupplyGetProtocolBalanceUseCase: YieldSupplyGetProtocolBalanceUseCase,
 ) : Model() {
 
     private val params: YieldSupplyActiveComponent.Params = paramsContainer.require()
@@ -29,22 +32,79 @@ internal class YieldSupplyActiveModel @Inject constructor(
     private val cryptoCurrency = cryptoCurrencyStatusFlow.value.currency
 
     val uiState: StateFlow<YieldSupplyActiveContentUM>
-    field = MutableStateFlow(
-        YieldSupplyActiveContentUM(
-            totalEarnings = stringReference("0"),
-            availableBalance = stringReference(
-                cryptoCurrencyStatusFlow.value.value.amount.format {
-                    crypto(cryptoCurrency = cryptoCurrencyStatusFlow.value.currency)
-                },
-            ),
-            providerTitle = resourceReference(R.string.yield_module_provider),
-            subtitle = combinedReference(
-                resourceReference(
+        field = MutableStateFlow(
+            YieldSupplyActiveContentUM(
+                totalEarnings = stringReference("0"),
+                availableBalance = null,
+                providerTitle = resourceReference(R.string.yield_module_provider),
+                subtitle = resourceReference(
                     id = R.string.yield_module_earn_sheet_provider_description,
                     formatArgs = wrappedList(cryptoCurrency.symbol, cryptoCurrency.symbol),
                 ),
-                resourceReference(R.string.common_read_more),
+                subtitleLink = resourceReference(R.string.common_read_more),
+                notificationUM = null,
             ),
-        ),
-    )
+        )
+
+    init {
+        subscribeOnCurrencyUpdates()
+
+        modelScope.launch(dispatchers.default) {
+            val protocolBalance = yieldSupplyGetProtocolBalanceUseCase(
+                userWalletId = params.userWallet.walletId,
+                cryptoCurrency = cryptoCurrency,
+            ).getOrNull()
+
+            stringReference(
+                protocolBalance.format {
+                    crypto(
+                        symbol = AAVEV3_PREFIX + cryptoCurrency.symbol,
+                        decimals = cryptoCurrency.decimals,
+                    )
+                },
+            )
+        }
+    }
+
+    private fun subscribeOnCurrencyUpdates() {
+        cryptoCurrencyStatusFlow.onEach { cryptoCurrencyStatus ->
+            val protocolBalance = yieldSupplyGetProtocolBalanceUseCase(
+                userWalletId = params.userWallet.walletId,
+                cryptoCurrency = cryptoCurrency,
+            ).getOrNull()
+
+            val approvalNotification = if (cryptoCurrencyStatus.value.yieldSupplyStatus?.isAllowedToSpend != true) {
+                NotificationUM.Error(
+                    title = resourceReference(R.string.yield_module_approve_needed_notification_title),
+                    subtitle = resourceReference(R.string.yield_module_approve_needed_notification_description),
+                    iconResId = R.drawable.ic_alert_triangle_20,
+                    buttonState = NotificationConfig.ButtonsState.PrimaryButtonConfig(
+                        text = resourceReference(R.string.yield_module_approve_needed_notification_cta),
+                        onClick = params.callback::onApprove,
+                    ),
+                )
+            } else {
+                null
+            }
+
+            uiState.update {
+                it.copy(
+                    notificationUM = approvalNotification,
+                    availableBalance = stringReference(
+                        protocolBalance.format {
+                            crypto(
+                                symbol = AAVEV3_PREFIX + cryptoCurrency.symbol,
+                                decimals = cryptoCurrency.decimals,
+                            )
+                        },
+                    ),
+                )
+            }
+        }.flowOn(dispatchers.default)
+            .launchIn(modelScope)
+    }
+
+    private companion object {
+        const val AAVEV3_PREFIX = "a"
+    }
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveRoute.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveRoute.kt
index a143cc777f..800a76040e 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveRoute.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveRoute.kt
@@ -4,5 +4,6 @@ import com.tangem.core.decompose.navigation.Route
 
 internal sealed class YieldSupplyActiveRoute : Route {
     data object Info : YieldSupplyActiveRoute()
-    data object Action : YieldSupplyActiveRoute()
+    data object Exit : YieldSupplyActiveRoute()
+    data object Approve : YieldSupplyActiveRoute()
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
index d0bb88752b..0619e6b7a0 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
@@ -1,6 +1,8 @@
 package com.tangem.features.yield.supply.impl.subcomponents.active.ui
 
 import android.content.res.Configuration
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
@@ -8,19 +10,21 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import com.tangem.core.ui.components.ResizableText
-import com.tangem.core.ui.components.SpacerH4
-import com.tangem.core.ui.components.SpacerH8
-import com.tangem.core.ui.components.SpacerWMax
+import com.tangem.common.ui.notifications.NotificationUM
+import com.tangem.core.ui.components.*
+import com.tangem.core.ui.components.notifications.Notification
 import com.tangem.core.ui.extensions.*
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
@@ -28,7 +32,11 @@ import com.tangem.features.yield.supply.impl.R
 import com.tangem.features.yield.supply.impl.subcomponents.active.entity.YieldSupplyActiveContentUM
 
 @Composable
-internal fun YieldSupplyActiveContent(state: YieldSupplyActiveContentUM, modifier: Modifier = Modifier) {
+internal fun YieldSupplyActiveContent(
+    state: YieldSupplyActiveContentUM,
+    isBalanceHidden: Boolean,
+    modifier: Modifier = Modifier,
+) {
     Column(
         verticalArrangement = Arrangement.spacedBy(14.dp),
         modifier = modifier.padding(
@@ -50,17 +58,26 @@ internal fun YieldSupplyActiveContent(state: YieldSupplyActiveContentUM, modifie
                 color = TangemTheme.colors.text.tertiary,
             )
             ResizableText(
-                text = state.totalEarnings.resolveReference(),
+                text = state.totalEarnings.orMaskWithStars(isBalanceHidden).resolveReference(),
                 style = TangemTheme.typography.h2,
                 color = TangemTheme.colors.text.primary1,
             )
         }
-        YieldSupplyActiveMyFunds(state = state)
+        YieldSupplyActiveMyFunds(state = state, isBalanceHidden = isBalanceHidden)
+
+        AnimatedVisibility(state.notificationUM != null) {
+            val wrappedNotification = remember(this) { requireNotNull(state.notificationUM) }
+            Notification(
+                config = wrappedNotification.config,
+                iconTint = null,
+                containerColor = TangemTheme.colors.background.action,
+            )
+        }
     }
 }
 
 @Composable
-private fun YieldSupplyActiveMyFunds(state: YieldSupplyActiveContentUM) {
+private fun YieldSupplyActiveMyFunds(state: YieldSupplyActiveContentUM, isBalanceHidden: Boolean) {
     Column(
         modifier = Modifier
             .clip(RoundedCornerShape(16.dp))
@@ -90,11 +107,7 @@ private fun YieldSupplyActiveMyFunds(state: YieldSupplyActiveContentUM) {
             )
         }
         SpacerH8()
-        Text(
-            text = state.subtitle.resolveReference(),
-            style = TangemTheme.typography.caption2,
-            color = TangemTheme.colors.text.tertiary,
-        )
+        DescriptionText(state = state)
         SpacerH8()
         HorizontalDivider(
             thickness = 0.5.dp,
@@ -103,6 +116,7 @@ private fun YieldSupplyActiveMyFunds(state: YieldSupplyActiveContentUM) {
         InfoRow(
             title = resourceReference(R.string.yield_module_earn_sheet_transfers_title),
             info = resourceReference(R.string.yield_module_transfer_mode_automatic),
+            isBalanceHidden = false,
         )
         HorizontalDivider(
             thickness = 0.5.dp,
@@ -111,12 +125,38 @@ private fun YieldSupplyActiveMyFunds(state: YieldSupplyActiveContentUM) {
         InfoRow(
             title = resourceReference(R.string.yield_module_earn_sheet_available_title),
             info = state.availableBalance,
+            isBalanceHidden = isBalanceHidden,
         )
     }
 }
 
 @Composable
-private fun InfoRow(title: TextReference, info: TextReference) {
+private fun DescriptionText(state: YieldSupplyActiveContentUM) {
+    val subtitle = annotatedReference {
+        append(state.subtitle.resolveReference())
+        appendSpace()
+        withLink(
+            LinkAnnotation.Clickable(
+                tag = "LINK_TAG",
+                linkInteractionListener = {},
+            ),
+            {
+                appendColored(
+                    text = state.subtitleLink.resolveReference(),
+                    color = TangemTheme.colors.icon.accent,
+                )
+            },
+        )
+    }
+    Text(
+        text = subtitle.resolveAnnotatedReference(),
+        style = TangemTheme.typography.caption2,
+        color = TangemTheme.colors.text.tertiary,
+    )
+}
+
+@Composable
+private fun InfoRow(title: TextReference, isBalanceHidden: Boolean, info: TextReference?) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(12.dp),
         modifier = Modifier.padding(horizontal = 4.dp, vertical = 12.dp),
@@ -127,11 +167,21 @@ private fun InfoRow(title: TextReference, info: TextReference) {
             color = TangemTheme.colors.text.primary1,
         )
         SpacerWMax()
-        Text(
-            text = info.resolveReference(),
-            style = TangemTheme.typography.body1,
-            color = TangemTheme.colors.text.tertiary,
-        )
+
+        AnimatedContent(info) { currentInfo ->
+            if (currentInfo != null) {
+                Text(
+                    text = currentInfo.orMaskWithStars(isBalanceHidden).resolveReference(),
+                    style = TangemTheme.typography.body1,
+                    color = TangemTheme.colors.text.tertiary,
+                )
+            } else {
+                TextShimmer(
+                    text = title.resolveReference(),
+                    style = TangemTheme.typography.body1,
+                )
+            }
+        }
     }
 }
 
@@ -143,7 +193,7 @@ private fun YieldSupplyActiveBottomSheet_Preview(
     @PreviewParameter(YieldSupplyActiveBottomSheetPreviewProvider::class) params: YieldSupplyActiveContentUM,
 ) {
     TangemThemePreview {
-        YieldSupplyActiveContent(params)
+        YieldSupplyActiveContent(params, true)
     }
 }
 
@@ -158,6 +208,8 @@ private class YieldSupplyActiveBottomSheetPreviewProvider : PreviewParameterProv
                     R.string.yield_module_earn_sheet_provider_description,
                     wrappedList("USDT", "USDT"),
                 ),
+                subtitleLink = resourceReference(R.string.common_read_more),
+                notificationUM = NotificationUM.Error.InvalidAmount,
             ),
         )
 }
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/YieldSupplyApproveComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/YieldSupplyApproveComponent.kt
new file mode 100644
index 0000000000..3c1de839bb
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/YieldSupplyApproveComponent.kt
@@ -0,0 +1,111 @@
+package com.tangem.features.yield.supply.impl.subcomponents.approve
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.ui.userwallet.ext.walletInterationIcon
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.child
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.components.PrimaryButtonIconEnd
+import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
+import com.tangem.core.ui.decompose.ComposableModularContentComponent
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.ui.YieldSupplyActionContent
+import com.tangem.features.yield.supply.impl.subcomponents.approve.model.YieldSupplyApproveModel
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
+import kotlinx.coroutines.flow.StateFlow
+
+@Suppress("MagicNumber")
+internal class YieldSupplyApproveComponent(
+    private val appComponentContext: AppComponentContext,
+    private val params: Params,
+) : ComposableModularContentComponent, AppComponentContext by appComponentContext {
+
+    private val model: YieldSupplyApproveModel = getOrCreateModel(params = params)
+
+    private val yieldSupplyNotificationsComponent = YieldSupplyNotificationsComponent(
+        appComponentContext = child("yieldSupplyApproveNotifications"),
+        params = YieldSupplyNotificationsComponent.Params(
+            userWalletId = params.userWallet.walletId,
+            cryptoCurrencyStatusFlow = params.cryptoCurrencyStatusFlow,
+            feeCryptoCurrencyStatusFlow = model.feeCryptoCurrencyStatusFlow,
+            callback = model,
+        ),
+    )
+
+    @Composable
+    override fun Title() {
+        TangemModalBottomSheetTitle(
+            startIconRes = R.drawable.ic_back_24,
+            onStartClick = params.callback::onBackClick,
+        )
+    }
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val state by model.uiState.collectAsStateWithLifecycle()
+        YieldSupplyActionContent(
+            yieldSupplyActionUM = state,
+            onFooterClick = model::onReadMoreClick,
+            yieldSupplyNotificationsComponent = yieldSupplyNotificationsComponent,
+            modifier = modifier,
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(56.dp)
+                    .background(TangemTheme.colors.icon.accent.copy(0.1f), CircleShape),
+            ) {
+                Icon(
+                    imageVector = ImageVector.vectorResource(R.drawable.ic_check_circle_24),
+                    contentDescription = null,
+                    tint = TangemTheme.colors.icon.accent,
+                    modifier = Modifier
+                        .padding(12.dp)
+                        .size(32.dp),
+                )
+            }
+        }
+    }
+
+    @Composable
+    override fun Footer() {
+        val state by model.uiState.collectAsStateWithLifecycle()
+
+        PrimaryButtonIconEnd(
+            text = stringResourceSafe(R.string.common_confirm),
+            onClick = model::onClick,
+            iconResId = walletInterationIcon(params.userWallet),
+            enabled = state.isPrimaryButtonEnabled,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+        )
+    }
+
+    data class Params(
+        val userWallet: UserWallet,
+        val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
+        val callback: ModelCallback,
+    )
+
+    interface ModelCallback {
+        fun onBackClick()
+        fun onTransactionSent()
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/di/YieldSupplyApproveModule.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/di/YieldSupplyApproveModule.kt
new file mode 100644
index 0000000000..ea089f5dba
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/di/YieldSupplyApproveModule.kt
@@ -0,0 +1,20 @@
+package com.tangem.features.yield.supply.impl.subcomponents.approve.di
+
+import com.tangem.core.decompose.di.ModelComponent
+import com.tangem.core.decompose.model.Model
+import com.tangem.features.yield.supply.impl.subcomponents.approve.model.YieldSupplyApproveModel
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+@InstallIn(ModelComponent::class)
+internal interface YieldSupplyApproveModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(YieldSupplyApproveModel::class)
+    fun provideYieldSupplyApproveModel(impl: YieldSupplyApproveModel): Model
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
new file mode 100644
index 0000000000..0e7f24f5a7
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/approve/model/YieldSupplyApproveModel.kt
@@ -0,0 +1,242 @@
+package com.tangem.features.yield.supply.impl.subcomponents.approve.model
+
+import arrow.core.getOrElse
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.navigation.url.UrlOpener
+import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.extensions.*
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.tokens.GetFeePaidCryptoCurrencyStatusSyncUseCase
+import com.tangem.domain.transaction.usecase.CreateApprovalTransactionUseCase
+import com.tangem.domain.transaction.usecase.GetFeeUseCase
+import com.tangem.domain.transaction.usecase.SendTransactionUseCase
+import com.tangem.domain.yield.supply.usecase.YieldSupplyGetContractAddressUseCase
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.YieldSupplyAlertFactory
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionInProgressTransformer
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionReadyTransformer
+import com.tangem.features.yield.supply.impl.subcomponents.approve.YieldSupplyApproveComponent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateTrigger
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.entity.YieldSupplyNotificationData
+import com.tangem.utils.StringsSigns.DOT
+import com.tangem.utils.TangemBlogUrlBuilder
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.transformer.update
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@Suppress("LongParameterList")
+@ModelScoped
+internal class YieldSupplyApproveModel @Inject constructor(
+    override val dispatchers: CoroutineDispatcherProvider,
+    paramsContainer: ParamsContainer,
+    private val urlOpener: UrlOpener,
+    private val yieldSupplyNotificationsUpdateTrigger: YieldSupplyNotificationsUpdateTrigger,
+    private val createApprovalTransactionUseCase: CreateApprovalTransactionUseCase,
+    private val getFeeUseCase: GetFeeUseCase,
+    private val sendTransactionUseCase: SendTransactionUseCase,
+    private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
+    private val getFeePaidCryptoCurrencyStatusSyncUseCase: GetFeePaidCryptoCurrencyStatusSyncUseCase,
+    private val yieldSupplyGetContractAddressUseCase: YieldSupplyGetContractAddressUseCase,
+    private val yieldSupplyAlertFactory: YieldSupplyAlertFactory,
+) : Model(), YieldSupplyNotificationsComponent.ModelCallback {
+
+    private val params: YieldSupplyApproveComponent.Params = paramsContainer.require()
+
+    private val cryptoCurrencyStatus
+        get() = params.cryptoCurrencyStatusFlow.value
+    private val cryptoCurrency = cryptoCurrencyStatus.currency
+    private var userWallet = params.userWallet
+
+    val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                cryptoCurrencyStatus.currency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
+
+    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus
+        get() = feeCryptoCurrencyStatusFlow.value
+
+    private var appCurrency = AppCurrency.Default
+
+    val uiState: StateFlow<YieldSupplyActionUM>
+        field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
+            YieldSupplyActionUM(
+                title = resourceReference(R.string.yield_module_approve_sheet_title),
+                subtitle = resourceReference(
+                    id = R.string.yield_module_approve_sheet_subtitle,
+                    formatArgs = wrappedList(cryptoCurrency.symbol),
+                ),
+                footer = resourceReference(R.string.yield_module_approve_sheet_fee_note),
+                footerLink = resourceReference(R.string.common_read_more),
+                currencyIconState = CryptoCurrencyToIconStateConverter().convert(cryptoCurrency),
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
+                isPrimaryButtonEnabled = false,
+                isTransactionSending = false,
+            ),
+        )
+
+    init {
+        modelScope.launch {
+            appCurrency = getSelectedAppCurrencyUseCase.invokeSync().getOrElse { AppCurrency.Default }
+            subscribeOnCurrencyStatusUpdates()
+            subscribeOnNotificationsErrors()
+        }
+    }
+
+    fun onReadMoreClick() {
+        urlOpener.openUrl(TangemBlogUrlBuilder.FEE_BLOG_LINK)
+    }
+
+    override fun onFeeReload() {
+        modelScope.launch {
+            onLoadFee()
+        }
+    }
+
+    fun onClick() {
+        val yieldSupplyFeeUM = uiState.value.yieldSupplyFeeUM as? YieldSupplyFeeUM.Content ?: return
+        uiState.update(YieldSupplyTransactionInProgressTransformer)
+
+        modelScope.launch(dispatchers.default) {
+            sendTransactionUseCase(
+                txData = yieldSupplyFeeUM.transactionDataList.first(),
+                userWallet = userWallet,
+                network = cryptoCurrency.network,
+            ).fold(
+                ifLeft = { error ->
+                    Timber.e(error.toString())
+                    uiState.update(YieldSupplyTransactionReadyTransformer)
+                    yieldSupplyAlertFactory.getSendTransactionErrorState(
+                        error = error,
+                        popBack = params.callback::onBackClick,
+                        onFailedTxEmailClick = { errorMessage ->
+                            modelScope.launch(dispatchers.default) {
+                                yieldSupplyAlertFactory.onFailedTxEmailClick(
+                                    userWallet = userWallet,
+                                    cryptoCurrency = cryptoCurrency,
+                                    errorMessage = errorMessage,
+                                )
+                            }
+                        },
+                    )
+                },
+                ifRight = {
+                    params.callback.onTransactionSent()
+                },
+            )
+        }
+    }
+
+    private fun subscribeOnCurrencyStatusUpdates() {
+        modelScope.launch {
+            feeCryptoCurrencyStatusFlow.update {
+                getFeePaidCryptoCurrencyStatusSyncUseCase(
+                    userWalletId = userWallet.walletId,
+                    cryptoCurrencyStatus = cryptoCurrencyStatus,
+                ).getOrNull() ?: cryptoCurrencyStatus
+            }
+            onLoadFee()
+        }
+    }
+
+    private suspend fun onLoadFee() {
+        if (cryptoCurrency !is CryptoCurrency.Token || uiState.value.isTransactionSending) return
+
+        val contractAddress = yieldSupplyGetContractAddressUseCase.invoke(
+            userWalletId = userWallet.walletId,
+            cryptoCurrency = cryptoCurrency,
+        ).getOrNull() ?: return
+
+        val approvalTransitionData = createApprovalTransactionUseCase(
+            cryptoCurrencyStatus = cryptoCurrencyStatus,
+            userWalletId = userWallet.walletId,
+            contractAddress = cryptoCurrency.contractAddress,
+            spenderAddress = contractAddress,
+            amount = null,
+        ).getOrElse {
+            Timber.e(it)
+            return
+        }
+
+        uiState.update { it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading) }
+
+        getFeeUseCase(
+            transactionData = approvalTransitionData,
+            userWallet = userWallet,
+            network = cryptoCurrency.network,
+        ).fold(
+            ifLeft = { feeError ->
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = null,
+                        feeError = feeError,
+                    ),
+                )
+                uiState.update {
+                    it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Error)
+                }
+            },
+            ifRight = { fee ->
+                val feeCryptoValue = fee.normal.amount.value
+
+                val feeFiatValue = feeCryptoCurrencyStatus.value.fiatRate?.let { rate ->
+                    feeCryptoValue?.multiply(rate)
+                }
+                val cryptoFee = feeCryptoValue.format { crypto(feeCryptoCurrencyStatus.currency) }
+                val fiatFee = feeFiatValue.format { fiat(appCurrency.code, appCurrency.symbol) }
+
+                uiState.update {
+                    if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
+                        it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
+                    } else {
+                        it.copy(
+                            isPrimaryButtonEnabled = true,
+                            yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
+                                transactionDataList = persistentListOf(approvalTransitionData.copy(fee = fee.normal)),
+                                feeValue = combinedReference(
+                                    stringReference(cryptoFee),
+                                    stringReference(" $DOT "),
+                                    stringReference(fiatFee),
+                                ),
+                                currentNetworkFeeValue = TextReference.EMPTY,
+                                maxNetworkFeeValue = TextReference.EMPTY,
+                            ),
+                        )
+                    }
+                }
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = feeCryptoValue,
+                        feeError = null,
+                    ),
+                )
+            },
+        )
+    }
+
+    private fun subscribeOnNotificationsErrors() {
+        yieldSupplyNotificationsUpdateTrigger.hasErrorFlow
+            .onEach { hasError ->
+                uiState.update {
+                    it.copy(isPrimaryButtonEnabled = !hasError)
+                }
+            }.launchIn(modelScope)
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/YieldSupplyFeePolicyComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/YieldSupplyFeePolicyComponent.kt
new file mode 100644
index 0000000000..2e55b046d0
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/YieldSupplyFeePolicyComponent.kt
@@ -0,0 +1,67 @@
+package com.tangem.features.yield.supply.impl.subcomponents.feepolicy
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.ui.components.SecondaryButton
+import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
+import com.tangem.core.ui.decompose.ComposableModularContentComponent
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.subcomponents.feepolicy.ui.YieldSupplyFeePolicyContent
+import kotlinx.coroutines.flow.StateFlow
+
+internal class YieldSupplyFeePolicyComponent(
+    private val appComponentContext: AppComponentContext,
+    private val params: Params,
+) : ComposableModularContentComponent, AppComponentContext by appComponentContext {
+
+    @Composable
+    override fun Title() {
+        TangemModalBottomSheetTitle(
+            startIconRes = R.drawable.ic_back_24,
+            onStartClick = params.callback::onBackClick,
+        )
+    }
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val uiState by params.yieldSupplyActionUMFlow.collectAsStateWithLifecycle()
+        YieldSupplyFeePolicyContent(
+            yieldSupplyFeeUM = uiState.yieldSupplyFeeUM,
+            tokenSymbol = params.cryptoCurrency.symbol,
+            networkName = params.cryptoCurrency.network.name,
+            modifier = modifier,
+        )
+    }
+
+    @Composable
+    override fun Footer() {
+        SecondaryButton(
+            text = stringResourceSafe(R.string.common_got_it),
+            onClick = params.callback::onBackClick,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+        )
+    }
+
+    data class Params(
+        val userWalletId: UserWalletId,
+        val cryptoCurrency: CryptoCurrency,
+        val yieldSupplyActionUMFlow: StateFlow<YieldSupplyActionUM>,
+        val callback: ModelCallback,
+    )
+
+    interface ModelCallback {
+        fun onBackClick()
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
new file mode 100644
index 0000000000..b90e1b09b4
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/feepolicy/ui/YieldSupplyFeePolicyContent.kt
@@ -0,0 +1,127 @@
+package com.tangem.features.yield.supply.impl.subcomponents.feepolicy.ui
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerH8
+import com.tangem.core.ui.components.containers.FooterContainer
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.stringResourceSafe
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemThemePreview
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.features.yield.supply.impl.common.ui.YieldSupplyFeeRow
+import com.tangem.utils.StringsSigns
+import kotlinx.collections.immutable.persistentListOf
+
+@Composable
+internal fun YieldSupplyFeePolicyContent(
+    yieldSupplyFeeUM: YieldSupplyFeeUM,
+    tokenSymbol: String,
+    networkName: String,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(
+                start = 16.dp,
+                end = 16.dp,
+                top = 16.dp,
+                bottom = 8.dp,
+            ),
+    ) {
+        Text(
+            text = stringResourceSafe(R.string.yield_module_fee_policy_sheet_title),
+            style = TangemTheme.typography.h3,
+            color = TangemTheme.colors.text.primary1,
+        )
+        SpacerH8()
+        Text(
+            text = stringResourceSafe(R.string.yield_module_fee_policy_sheet_description, tokenSymbol),
+            style = TangemTheme.typography.body2,
+            color = TangemTheme.colors.text.secondary,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = 16.dp),
+        )
+        SpacerH24()
+        FooterContainer(
+            footer = resourceReference(
+                id = R.string.yield_module_fee_policy_sheet_current_fee_note,
+                formatArgs = wrappedList(networkName),
+            ),
+            paddingValues = PaddingValues(
+                top = 8.dp,
+                start = 12.dp,
+                end = 12.dp,
+            ),
+        ) {
+            val currentFee = when (yieldSupplyFeeUM) {
+                is YieldSupplyFeeUM.Content -> yieldSupplyFeeUM.currentNetworkFeeValue
+                YieldSupplyFeeUM.Error -> stringReference(StringsSigns.DASH_SIGN)
+                YieldSupplyFeeUM.Loading -> null
+            }
+            YieldSupplyFeeRow(
+                title = resourceReference(R.string.yield_module_fee_policy_sheet_current_fee_title),
+                value = currentFee,
+            )
+        }
+        SpacerH16()
+        FooterContainer(
+            footer = resourceReference(R.string.yield_module_fee_policy_sheet_max_fee_note),
+            paddingValues = PaddingValues(
+                top = 8.dp,
+                start = 12.dp,
+                end = 12.dp,
+            ),
+        ) {
+            val maxFee = when (yieldSupplyFeeUM) {
+                is YieldSupplyFeeUM.Content -> yieldSupplyFeeUM.maxNetworkFeeValue
+                YieldSupplyFeeUM.Error -> stringReference(StringsSigns.DASH_SIGN)
+                YieldSupplyFeeUM.Loading -> null
+            }
+            YieldSupplyFeeRow(
+                title = resourceReference(R.string.yield_module_fee_policy_sheet_max_fee_title),
+                value = maxFee,
+            )
+        }
+    }
+}
+
+// region Preview
+@Composable
+@Preview(showBackground = true, widthDp = 360)
+@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
+private fun YieldSupplyFeePolicyContent_Preview() {
+    TangemThemePreview {
+        YieldSupplyFeePolicyContent(
+            yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
+                transactionDataList = persistentListOf(),
+                feeValue = stringReference("0.0001 ETH • \$1.45"),
+                maxNetworkFeeValue = stringReference("8.50 USDT • \$8.50"),
+                currentNetworkFeeValue = stringReference("1.45 USDT • \$1.45"),
+            ),
+            tokenSymbol = "USDT",
+            networkName = "Ethereum",
+            modifier = Modifier.background(TangemTheme.colors.background.primary),
+
+        )
+    }
+}
+// endregion
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsComponent.kt
new file mode 100644
index 0000000000..366490ead7
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsComponent.kt
@@ -0,0 +1,62 @@
+package com.tangem.features.yield.supply.impl.subcomponents.notifications
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.components.notifications.Notification
+import com.tangem.core.ui.decompose.ComposableContentComponent
+import com.tangem.core.ui.extensions.conditional
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.model.YieldSupplyNotificationsModel
+import kotlinx.coroutines.flow.StateFlow
+
+internal class YieldSupplyNotificationsComponent(
+    private val appComponentContext: AppComponentContext,
+    params: Params,
+) : ComposableContentComponent, AppComponentContext by appComponentContext {
+
+    private val model: YieldSupplyNotificationsModel = getOrCreateModel(params = params)
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val state by model.uiState.collectAsStateWithLifecycle()
+
+        Column(
+            modifier = modifier
+                .fillMaxWidth()
+                .animateContentSize(),
+        ) {
+            state.forEachIndexed { index, item ->
+                Notification(
+                    config = item.config,
+                    modifier = Modifier.conditional(index == 0) {
+                        Modifier.padding(top = 16.dp)
+                    },
+                    containerColor = TangemTheme.colors.background.action,
+                    iconTint = null,
+                )
+            }
+        }
+    }
+
+    data class Params(
+        val userWalletId: UserWalletId,
+        val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
+        val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>,
+        val callback: ModelCallback,
+    )
+
+    interface ModelCallback {
+        fun onFeeReload()
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsUpdateTrigger.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsUpdateTrigger.kt
new file mode 100644
index 0000000000..d1d1c929ee
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/YieldSupplyNotificationsUpdateTrigger.kt
@@ -0,0 +1,44 @@
+package com.tangem.features.yield.supply.impl.subcomponents.notifications
+
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.entity.YieldSupplyNotificationData
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+interface YieldSupplyNotificationsUpdateTrigger {
+
+    /** Flow returns whether there is error notifications */
+    val hasErrorFlow: Flow<Boolean>
+
+    /** Trigger fee check reload */
+    suspend fun triggerUpdate(data: YieldSupplyNotificationData)
+}
+
+interface YieldSupplyNotificationsUpdateListener {
+    /** Flow triggers notifications update */
+    val updateTriggerFlow: Flow<YieldSupplyNotificationData>
+
+    /** Trigger return callback with check result */
+    suspend fun callbackHasError(hasError: Boolean)
+}
+
+@Singleton
+internal class DefaultYieldSupplyNotificationsUpdateTrigger @Inject constructor() :
+    YieldSupplyNotificationsUpdateTrigger,
+    YieldSupplyNotificationsUpdateListener {
+
+    override val hasErrorFlow: Flow<Boolean>
+        field = MutableSharedFlow()
+
+    override val updateTriggerFlow: Flow<YieldSupplyNotificationData>
+        field = MutableSharedFlow()
+
+    override suspend fun triggerUpdate(data: YieldSupplyNotificationData) {
+        updateTriggerFlow.emit(data)
+    }
+
+    override suspend fun callbackHasError(hasError: Boolean) {
+        hasErrorFlow.emit(hasError)
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/di/YieldSupplyNotificationsModule.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/di/YieldSupplyNotificationsModule.kt
new file mode 100644
index 0000000000..315f972093
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/di/YieldSupplyNotificationsModule.kt
@@ -0,0 +1,33 @@
+package com.tangem.features.yield.supply.impl.subcomponents.notifications.di
+
+import com.tangem.core.decompose.di.ModelComponent
+import com.tangem.core.decompose.model.Model
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.DefaultYieldSupplyNotificationsUpdateTrigger
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateListener
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateTrigger
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.model.YieldSupplyNotificationsModel
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+@InstallIn(ModelComponent::class)
+internal interface YieldSupplyNotificationsModule {
+
+    @Binds
+    @IntoMap
+    @ClassKey(YieldSupplyNotificationsModel::class)
+    fun provideYieldSupplyNotificationsModel(impl: YieldSupplyNotificationsModel): Model
+
+    @Binds
+    fun provideYieldSupplyNotificationsUpdateListener(
+        impl: DefaultYieldSupplyNotificationsUpdateTrigger,
+    ): YieldSupplyNotificationsUpdateListener
+
+    @Binds
+    fun provideYieldSupplyNotificationsUpdateTrigger(
+        impl: DefaultYieldSupplyNotificationsUpdateTrigger,
+    ): YieldSupplyNotificationsUpdateTrigger
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/entity/YieldSupplyNotificationData.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/entity/YieldSupplyNotificationData.kt
new file mode 100644
index 0000000000..7b9a1e53ef
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/entity/YieldSupplyNotificationData.kt
@@ -0,0 +1,9 @@
+package com.tangem.features.yield.supply.impl.subcomponents.notifications.entity
+
+import com.tangem.domain.transaction.error.GetFeeError
+import java.math.BigDecimal
+
+data class YieldSupplyNotificationData(
+    val feeValue: BigDecimal?,
+    val feeError: GetFeeError?,
+)
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt
new file mode 100644
index 0000000000..be0223b21d
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/notifications/model/YieldSupplyNotificationsModel.kt
@@ -0,0 +1,89 @@
+package com.tangem.features.yield.supply.impl.subcomponents.notifications.model
+
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.AppRouter
+import com.tangem.common.ui.notifications.NotificationUM
+import com.tangem.common.ui.notifications.NotificationsFactory.addExceedsBalanceNotification
+import com.tangem.common.ui.notifications.NotificationsFactory.addFeeUnreachableNotification
+import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.model.Model
+import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.domain.models.currency.CryptoCurrency
+import com.tangem.domain.tokens.GetBalanceNotEnoughForFeeWarningUseCase
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateListener
+import com.tangem.lib.crypto.BlockchainUtils
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.orZero
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.toPersistentList
+import kotlinx.coroutines.flow.*
+import javax.inject.Inject
+
+@ModelScoped
+internal class YieldSupplyNotificationsModel @Inject constructor(
+    paramsContainer: ParamsContainer,
+    override val dispatchers: CoroutineDispatcherProvider,
+    private val appRouter: AppRouter,
+    private val getBalanceNotEnoughForFeeWarningUseCase: GetBalanceNotEnoughForFeeWarningUseCase,
+    private val yieldSupplyNotificationsUpdateListener: YieldSupplyNotificationsUpdateListener,
+) : Model() {
+
+    private val params: YieldSupplyNotificationsComponent.Params = paramsContainer.require()
+
+    val uiState: StateFlow<ImmutableList<NotificationUM>>
+        field = MutableStateFlow(persistentListOf())
+
+    init {
+        subscribeToNotificationTrigger()
+    }
+
+    private fun subscribeToNotificationTrigger() {
+        yieldSupplyNotificationsUpdateListener.updateTriggerFlow
+            .onEach { data ->
+                val cryptoCurrencyStatus = params.cryptoCurrencyStatusFlow.value
+                val feeCryptoCurrencyStatus = params.feeCryptoCurrencyStatusFlow.value
+
+                val notifications = buildList {
+                    val cryptoCurrencyWarning = getBalanceNotEnoughForFeeWarningUseCase(
+                        fee = data.feeValue.orZero(),
+                        userWalletId = params.userWalletId,
+                        tokenStatus = cryptoCurrencyStatus,
+                        coinStatus = feeCryptoCurrencyStatus,
+                    ).getOrNull()
+
+                    addExceedsBalanceNotification(
+                        cryptoCurrencyWarning = cryptoCurrencyWarning,
+                        cryptoCurrencyStatus = cryptoCurrencyStatus,
+                        shouldMergeFeeNetworkName = BlockchainUtils.isArbitrum(
+                            blockchainId = cryptoCurrencyStatus.currency.network.backendId,
+                        ),
+                        onClick = ::openTokenDetails,
+                        onAnalyticsEvent = { },
+                    )
+
+                    addFeeUnreachableNotification(
+                        tokenStatus = cryptoCurrencyStatus,
+                        coinStatus = feeCryptoCurrencyStatus,
+                        feeError = data.feeError,
+                        onClick = ::openTokenDetails,
+                        onReload = params.callback::onFeeReload,
+                    )
+                }
+
+                uiState.update { notifications.toPersistentList() }
+
+                yieldSupplyNotificationsUpdateListener.callbackHasError(notifications.any())
+            }.launchIn(modelScope)
+    }
+
+    private fun openTokenDetails(cryptoCurrency: CryptoCurrency) {
+        appRouter.push(
+            AppRoute.CurrencyDetails(
+                userWalletId = params.userWalletId,
+                currency = cryptoCurrency,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningComponent.kt
index 99e5075b5f..3d02037617 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningComponent.kt
@@ -13,7 +13,9 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.child
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
@@ -24,8 +26,13 @@ import com.tangem.core.ui.res.TangemTheme
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
 import com.tangem.features.yield.supply.impl.common.ui.YieldSupplyActionContent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.model.YieldSupplyStartEarningModel
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 internal class YieldSupplyStartEarningComponent(
     private val appComponentContext: AppComponentContext,
@@ -34,6 +41,20 @@ internal class YieldSupplyStartEarningComponent(
 
     private val model: YieldSupplyStartEarningModel = getOrCreateModel(params = params)
 
+    private val yieldSupplyNotificationsComponent = YieldSupplyNotificationsComponent(
+        appComponentContext = child("yieldSupplyEnterNotifications"),
+        params = YieldSupplyNotificationsComponent.Params(
+            userWalletId = params.userWalletId,
+            cryptoCurrencyStatusFlow = model.cryptoCurrencyStatusFlow,
+            feeCryptoCurrencyStatusFlow = model.feeCryptoCurrencyStatusFlow,
+            callback = model,
+        ),
+    )
+
+    init {
+        model.uiState.onEach(params.callback::onResult).launchIn(componentScope)
+    }
+
     @Composable
     override fun Title() {
         TangemModalBottomSheetTitle(
@@ -49,6 +70,9 @@ internal class YieldSupplyStartEarningComponent(
 
         YieldSupplyActionContent(
             yieldSupplyActionUM = state,
+            onFooterClick = params.callback::onFeePolicyClick,
+            enableFooterClick = state.yieldSupplyFeeUM is YieldSupplyFeeUM.Content,
+            yieldSupplyNotificationsComponent = yieldSupplyNotificationsComponent,
             modifier = modifier,
         ) {
             Box(
@@ -82,11 +106,17 @@ internal class YieldSupplyStartEarningComponent(
     override fun Footer() {
         val state by model.uiState.collectAsStateWithLifecycle()
 
+        val icon = if (state.isPrimaryButtonEnabled) {
+            walletInterationIcon(model.userWallet)
+        } else {
+            null
+        }
+
         PrimaryButtonIconEnd(
             text = stringResourceSafe(R.string.yield_module_start_earning),
             onClick = model::onClick,
             enabled = state.isPrimaryButtonEnabled,
-            iconResId = R.drawable.ic_tangem_24,
+            iconResId = icon,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(16.dp),
@@ -96,10 +126,12 @@ internal class YieldSupplyStartEarningComponent(
     data class Params(
         val userWalletId: UserWalletId,
         val cryptoCurrency: CryptoCurrency,
+        val yieldSupplyActionUM: YieldSupplyActionUM,
         val callback: ModelCallback,
     )
 
     interface ModelCallback {
+        fun onResult(yieldSupplyActionUM: YieldSupplyActionUM)
         fun onBackClick()
         fun onFeePolicyClick()
         fun onTransactionSent()
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningEntryComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningEntryComponent.kt
index d13e9293d2..77763ea8fc 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningEntryComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/YieldSupplyStartEarningEntryComponent.kt
@@ -12,9 +12,9 @@ import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.decompose.navigation.inner.InnerRouter
 import com.tangem.core.ui.decompose.ComposableBottomSheetComponent
 import com.tangem.core.ui.decompose.ComposableModularContentComponent
-import com.tangem.core.ui.decompose.getEmptyComposableModularContentComponent
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.features.yield.supply.impl.subcomponents.feepolicy.YieldSupplyFeePolicyComponent
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.model.YieldSupplyStartEarningEntryModel
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.ui.YieldSupplyStartEarningBottomSheet
 
@@ -67,12 +67,21 @@ internal class YieldSupplyStartEarningEntryComponent(
         route: YieldSupplyStartEarningRoute,
         factoryContext: AppComponentContext,
     ): ComposableModularContentComponent = when (route) {
-        YieldSupplyStartEarningRoute.FeePolicy -> getEmptyComposableModularContentComponent() // todo fee policy
+        YieldSupplyStartEarningRoute.FeePolicy -> YieldSupplyFeePolicyComponent(
+            appComponentContext = factoryContext,
+            params = YieldSupplyFeePolicyComponent.Params(
+                userWalletId = params.userWalletId,
+                cryptoCurrency = params.cryptoCurrency,
+                yieldSupplyActionUMFlow = model.uiState,
+                callback = model,
+            ),
+        )
         YieldSupplyStartEarningRoute.Action -> YieldSupplyStartEarningComponent(
             appComponentContext = factoryContext,
             params = YieldSupplyStartEarningComponent.Params(
                 userWalletId = params.userWalletId,
                 cryptoCurrency = params.cryptoCurrency,
+                yieldSupplyActionUM = model.uiState.value,
                 callback = model,
             ),
         )
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningEntryModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningEntryModel.kt
index c48e31cac8..b2b2db7f41 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningEntryModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningEntryModel.kt
@@ -4,10 +4,20 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.decompose.navigation.Router
+import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.features.yield.supply.impl.subcomponents.feepolicy.YieldSupplyFeePolicyComponent
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.YieldSupplyStartEarningComponent
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.YieldSupplyStartEarningEntryComponent
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.YieldSupplyStartEarningRoute
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 @ModelScoped
@@ -15,10 +25,31 @@ internal class YieldSupplyStartEarningEntryModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     private val router: Router,
     paramsContainer: ParamsContainer,
-) : Model(), YieldSupplyStartEarningComponent.ModelCallback {
+) : Model(), YieldSupplyStartEarningComponent.ModelCallback, YieldSupplyFeePolicyComponent.ModelCallback {
 
     private val params = paramsContainer.require<YieldSupplyStartEarningEntryComponent.Params>()
 
+    val uiState: StateFlow<YieldSupplyActionUM>
+        field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
+            YieldSupplyActionUM(
+                title = resourceReference(R.string.yield_module_start_earning),
+                subtitle = resourceReference(
+                    R.string.yield_module_start_earning_sheet_description,
+                    wrappedList(params.cryptoCurrency.symbol),
+                ),
+                footer = resourceReference(R.string.yield_module_start_earning_sheet_next_deposits),
+                footerLink = resourceReference(R.string.yield_module_start_earning_sheet_fee_policy),
+                currencyIconState = CryptoCurrencyToIconStateConverter().convert(params.cryptoCurrency),
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
+                isPrimaryButtonEnabled = false,
+                isTransactionSending = false,
+            ),
+        )
+
+    override fun onResult(yieldSupplyActionUM: YieldSupplyActionUM) {
+        uiState.update { yieldSupplyActionUM }
+    }
+
     override fun onBackClick() {
         router.pop()
     }
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
index dd5fee8a5e..a82ff670c8 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/YieldSupplyStartEarningModel.kt
@@ -6,17 +6,13 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
-import com.tangem.core.ui.extensions.combinedReference
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.format.bigdecimal.crypto
-import com.tangem.core.ui.format.bigdecimal.fiat
-import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
+import com.tangem.domain.tokens.FetchCurrencyStatusUseCase
 import com.tangem.domain.tokens.GetFeePaidCryptoCurrencyStatusSyncUseCase
 import com.tangem.domain.tokens.GetSingleCryptoCurrencyStatusUseCase
 import com.tangem.domain.transaction.usecase.SendTransactionUseCase
@@ -24,12 +20,19 @@ import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyEstimateEnterFeeUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyStartEarningUseCase
 import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.YieldSupplyAlertFactory
 import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
 import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionInProgressTransformer
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionReadyTransformer
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateTrigger
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.entity.YieldSupplyNotificationData
 import com.tangem.features.yield.supply.impl.subcomponents.startearning.YieldSupplyStartEarningComponent
-import com.tangem.utils.StringsSigns.DOT
+import com.tangem.features.yield.supply.impl.subcomponents.startearning.model.transformers.YieldSupplyStartEarningFeeContentTransformer
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.collections.immutable.toPersistentList
+import com.tangem.utils.extensions.orZero
+import com.tangem.utils.transformer.update
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -49,45 +52,47 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
     private val yieldSupplyStartEarningUseCase: YieldSupplyStartEarningUseCase,
     private val yieldSupplyEstimateEnterFeeUseCase: YieldSupplyEstimateEnterFeeUseCase,
     private val getSelectedAppCurrencyUseCase: GetSelectedAppCurrencyUseCase,
-) : Model() {
+    private val yieldSupplyNotificationsUpdateTrigger: YieldSupplyNotificationsUpdateTrigger,
+    private val fetchCurrencyStatusUseCase: FetchCurrencyStatusUseCase,
+    private val yieldSupplyAlertFactory: YieldSupplyAlertFactory,
+) : Model(), YieldSupplyNotificationsComponent.ModelCallback {
 
     private val params: YieldSupplyStartEarningComponent.Params = paramsContainer.require()
 
     private val cryptoCurrency = params.cryptoCurrency
-    private var userWallet: UserWallet by Delegates.notNull()
+    var userWallet: UserWallet by Delegates.notNull()
 
-    private val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
-    field = MutableStateFlow(
-        CryptoCurrencyStatus(
-            currency = cryptoCurrency,
-            value = CryptoCurrencyStatus.Loading,
-        ),
-    )
-    private val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
-    field = MutableStateFlow(
-        CryptoCurrencyStatus(
-            currency = cryptoCurrency,
-            value = CryptoCurrencyStatus.Loading,
-        ),
-    )
+    val cryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = cryptoCurrency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
+    val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = cryptoCurrency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
 
     val uiState: StateFlow<YieldSupplyActionUM>
-    field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
-        YieldSupplyActionUM(
-            title = resourceReference(R.string.yield_module_start_earning),
-            subtitle = resourceReference(
-                R.string.yield_module_start_earning_sheet_description,
-                wrappedList(cryptoCurrency.symbol),
+        field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
+            YieldSupplyActionUM(
+                title = resourceReference(R.string.yield_module_start_earning),
+                subtitle = resourceReference(
+                    R.string.yield_module_start_earning_sheet_description,
+                    wrappedList(cryptoCurrency.symbol),
+                ),
+                footer = resourceReference(R.string.yield_module_start_earning_sheet_next_deposits),
+                footerLink = resourceReference(R.string.yield_module_start_earning_sheet_fee_policy),
+                currencyIconState = CryptoCurrencyToIconStateConverter().convert(params.cryptoCurrency),
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
+                isPrimaryButtonEnabled = false,
+                isTransactionSending = false,
             ),
-            footer = combinedReference(
-                resourceReference(R.string.yield_module_start_earning_sheet_next_deposits),
-                resourceReference(R.string.yield_module_start_earning_sheet_fee_policy),
-            ),
-            currencyIconState = CryptoCurrencyToIconStateConverter().convert(params.cryptoCurrency),
-            yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
-            isPrimaryButtonEnabled = false,
-        ),
-    )
+        )
 
     private val cryptoCurrencyStatus
         get() = cryptoCurrencyStatusFlow.value
@@ -97,57 +102,67 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
         modelScope.launch {
             appCurrency = getSelectedAppCurrencyUseCase.invokeSync().getOrElse { AppCurrency.Default }
             subscribeOnCurrencyStatusUpdates()
+            subscribeOnNotificationsErrors()
         }
     }
 
     private suspend fun onLoadFee() {
-        if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) return
+        if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading || uiState.value.isTransactionSending) return
 
         val transactionListData = yieldSupplyStartEarningUseCase(
             userWalletId = userWallet.walletId,
             cryptoCurrencyStatus = cryptoCurrencyStatus,
+            maxNetworkFee = MAX_NETWORK_FEE,
         ).getOrNull() ?: return
 
-        val updatedTransactionList = yieldSupplyEstimateEnterFeeUseCase.invoke(
-            userWallet = userWallet,
-            cryptoCurrency = cryptoCurrency,
-            transactionDataList = transactionListData,
-        ).getOrNull() ?: return
-
-        val feeSum = updatedTransactionList.sumOf {
-            it.fee?.amount?.value ?: BigDecimal.ZERO
-        }
-
-        val crypto = feeSum.format { crypto(feeCryptoCurrencyStatusFlow.value.currency) }
-        val fiatFeeValue = cryptoCurrencyStatus.value.fiatRate?.let { rate ->
-            feeSum.multiply(rate)
-        }
-
-        val fiat = fiatFeeValue.format { fiat(appCurrency.code, appCurrency.symbol) }
-
         uiState.update {
-            if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
-                it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
-            } else {
-                it.copy(
-                    isPrimaryButtonEnabled = true, // todo yield supply check for notifications
-                    yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
-                        transactionDataList = updatedTransactionList.toPersistentList(),
-                        feeValue = combinedReference(
-                            stringReference(crypto),
-                            stringReference(" $DOT "),
-                            stringReference(fiat),
-                        ),
+            it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
+        }
+
+        yieldSupplyEstimateEnterFeeUseCase.invoke(
+            userWallet = userWallet,
+            cryptoCurrency = feeCryptoCurrencyStatusFlow.value.currency,
+            transactionDataList = transactionListData,
+        ).fold(
+            ifLeft = { feeError ->
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = null,
+                        feeError = feeError,
                     ),
                 )
-            }
-        }
+                uiState.update {
+                    it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Error)
+                }
+            },
+            ifRight = { updatedTransactionList ->
+                val feeSum = updatedTransactionList.sumOf {
+                    it.fee?.amount?.value.orZero()
+                }
+                uiState.update(
+                    YieldSupplyStartEarningFeeContentTransformer(
+                        cryptoCurrencyStatus = cryptoCurrencyStatusFlow.value,
+                        feeCryptoCurrencyStatus = feeCryptoCurrencyStatusFlow.value,
+                        appCurrency = appCurrency,
+                        updatedTransactionList = updatedTransactionList,
+                        feeValue = feeSum,
+                        maxNetworkFee = MAX_NETWORK_FEE,
+                    ),
+                )
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = feeSum,
+                        feeError = null,
+                    ),
+                )
+            },
+        )
     }
 
     fun onClick() {
         val yieldSupplyFeeUM = uiState.value.yieldSupplyFeeUM as? YieldSupplyFeeUM.Content ?: return
 
-        uiState.update { it.copy(isPrimaryButtonEnabled = false) }
+        uiState.update(YieldSupplyTransactionInProgressTransformer)
         modelScope.launch(dispatchers.default) {
             sendTransactionUseCase.invoke(
                 txsData = yieldSupplyFeeUM.transactionDataList,
@@ -155,12 +170,28 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
                 network = cryptoCurrency.network,
                 sendMode = TransactionSender.MultipleTransactionSendMode.DEFAULT,
             ).fold(
-                ifLeft = {
-                    Timber.e(it.toString())
-                    uiState.update { it.copy(isPrimaryButtonEnabled = true) }
+                ifLeft = { error ->
+                    Timber.e(error.toString())
+                    uiState.update(YieldSupplyTransactionReadyTransformer)
+                    yieldSupplyAlertFactory.getSendTransactionErrorState(
+                        error = error,
+                        popBack = params.callback::onBackClick,
+                        onFailedTxEmailClick = { errorMessage ->
+                            modelScope.launch(dispatchers.default) {
+                                yieldSupplyAlertFactory.onFailedTxEmailClick(
+                                    userWallet = userWallet,
+                                    cryptoCurrency = cryptoCurrency,
+                                    errorMessage = errorMessage,
+                                )
+                            }
+                        },
+                    )
                 },
                 ifRight = {
-                    params.callback.onTransactionSent()
+                    fetchCurrencyStatusUseCase(userWalletId = userWallet.walletId, cryptoCurrency.id)
+                    modelScope.launch {
+                        params.callback.onTransactionSent()
+                    }
                 },
             )
         }
@@ -175,13 +206,27 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
                 },
                 ifLeft = {
                     Timber.w(it.toString())
-                    // showAlertError() todo yield supply error alert
-                    return@launch
+                    showAlertError()
                 },
             )
         }
     }
 
+    private fun subscribeOnNotificationsErrors() {
+        yieldSupplyNotificationsUpdateTrigger.hasErrorFlow
+            .onEach { hasError ->
+                uiState.update {
+                    it.copy(isPrimaryButtonEnabled = !hasError)
+                }
+            }.launchIn(modelScope)
+    }
+
+    override fun onFeeReload() {
+        modelScope.launch {
+            onLoadFee()
+        }
+    }
+
     private fun getCurrenciesStatusUpdates() {
         getSingleCryptoCurrencyStatusUseCase.invokeMultiWallet(
             userWalletId = params.userWalletId,
@@ -199,13 +244,8 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
                     )
                 },
                 ifLeft = {
-                    // todo yield supply error
-                    // sendConfirmAlertFactory.getGenericErrorState(
-                    //     onFailedTxEmailClick = {
-                    //         onFailedTxEmailClick(it.toString())
-                    //     },
-                    //     popBack = router::pop,
-                    // )
+                    Timber.w(it.toString())
+                    showAlertError()
                 },
             )
         }.launchIn(modelScope)
@@ -219,4 +259,23 @@ internal class YieldSupplyStartEarningModel @Inject constructor(
             onLoadFee()
         }
     }
+
+    private fun showAlertError() {
+        yieldSupplyAlertFactory.getGenericErrorState(
+            onFailedTxEmailClick = {
+                modelScope.launch(dispatchers.default) {
+                    yieldSupplyAlertFactory.onFailedTxEmailClick(
+                        userWallet,
+                        cryptoCurrency,
+                        null,
+                    )
+                }
+            },
+            popBack = params.callback::onBackClick,
+        )
+    }
+
+    private companion object {
+        val MAX_NETWORK_FEE: BigDecimal = BigDecimal.TEN // TODO replace with value from api
+    }
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
new file mode 100644
index 0000000000..0e792d8529
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/startearning/model/transformers/YieldSupplyStartEarningFeeContentTransformer.kt
@@ -0,0 +1,74 @@
+package com.tangem.features.yield.supply.impl.subcomponents.startearning.model.transformers
+
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.utils.StringsSigns.DOT
+import com.tangem.utils.transformer.Transformer
+import kotlinx.collections.immutable.toPersistentList
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+internal class YieldSupplyStartEarningFeeContentTransformer(
+    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val appCurrency: AppCurrency,
+    private val updatedTransactionList: List<TransactionData.Uncompiled>,
+    private val feeValue: BigDecimal,
+    private val maxNetworkFee: BigDecimal,
+) : Transformer<YieldSupplyActionUM> {
+    override fun transform(prevState: YieldSupplyActionUM): YieldSupplyActionUM {
+        val cryptoCurrency = cryptoCurrencyStatus.currency
+        val fiatRate = cryptoCurrencyStatus.value.fiatRate
+        val feeFiatRate = feeCryptoCurrencyStatus.value.fiatRate
+
+        val crypto = feeValue.format { crypto(feeCryptoCurrencyStatus.currency) }
+        val fiatFeeValue = feeFiatRate?.let(feeValue::multiply)
+
+        val fiat = fiatFeeValue.format { fiat(appCurrency.code, appCurrency.symbol) }
+
+        val tokenCryptoFeeValue = fiatRate?.let { rate ->
+            fiatFeeValue?.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
+        }
+
+        val tokenCryptoFee = tokenCryptoFeeValue.format { crypto(cryptoCurrency) }
+
+        val maxCryptoFee = maxNetworkFee.format { crypto(cryptoCurrency) }
+        val maxFiatFeeValue = fiatRate?.let { rate ->
+            maxNetworkFee.divide(rate, cryptoCurrency.decimals, RoundingMode.HALF_UP)
+        }
+        val maxFiatFee = maxFiatFeeValue.format { fiat(appCurrency.code, appCurrency.symbol) }
+
+        return if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
+            prevState.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
+        } else {
+            prevState.copy(
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
+                    transactionDataList = updatedTransactionList.toPersistentList(),
+                    feeValue = combinedReference(
+                        stringReference(crypto),
+                        stringReference(" $DOT "),
+                        stringReference(fiat),
+                    ),
+                    currentNetworkFeeValue = combinedReference(
+                        stringReference(tokenCryptoFee),
+                        stringReference(" $DOT "),
+                        stringReference(fiat),
+                    ),
+                    maxNetworkFeeValue = combinedReference(
+                        stringReference(maxCryptoFee),
+                        stringReference(" $DOT "),
+                        stringReference(maxFiatFee),
+                    ),
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/YieldSupplyStopEarningComponent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/YieldSupplyStopEarningComponent.kt
index 86ae2929ca..0db25f5017 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/YieldSupplyStopEarningComponent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/YieldSupplyStopEarningComponent.kt
@@ -14,7 +14,9 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.context.child
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.ui.components.PrimaryButtonIconEnd
 import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetTitle
@@ -25,6 +27,7 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.features.yield.supply.impl.R
 import com.tangem.features.yield.supply.impl.common.ui.YieldSupplyActionContent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
 import com.tangem.features.yield.supply.impl.subcomponents.stopearning.model.YieldSupplyStopEarningModel
 import kotlinx.coroutines.flow.StateFlow
 
@@ -35,6 +38,16 @@ internal class YieldSupplyStopEarningComponent(
 
     private val model: YieldSupplyStopEarningModel = getOrCreateModel(params = params)
 
+    private val yieldSupplyNotificationsComponent = YieldSupplyNotificationsComponent(
+        appComponentContext = child("yieldSupplyExitNotifications"),
+        params = YieldSupplyNotificationsComponent.Params(
+            userWalletId = params.userWallet.walletId,
+            cryptoCurrencyStatusFlow = params.cryptoCurrencyStatusFlow,
+            feeCryptoCurrencyStatusFlow = model.feeCryptoCurrencyStatusFlow,
+            callback = model,
+        ),
+    )
+
     @Composable
     override fun Title() {
         TangemModalBottomSheetTitle(
@@ -49,6 +62,8 @@ internal class YieldSupplyStopEarningComponent(
         val state by model.uiState.collectAsStateWithLifecycle()
         YieldSupplyActionContent(
             yieldSupplyActionUM = state,
+            onFooterClick = model::onReadMoreClick,
+            yieldSupplyNotificationsComponent = yieldSupplyNotificationsComponent,
             modifier = modifier,
         ) {
             Box(
@@ -75,7 +90,7 @@ internal class YieldSupplyStopEarningComponent(
         PrimaryButtonIconEnd(
             text = stringResourceSafe(R.string.common_confirm),
             onClick = model::onClick,
-            iconResId = R.drawable.ic_tangem_24,
+            iconResId = walletInterationIcon(params.userWallet),
             enabled = state.isPrimaryButtonEnabled,
             modifier = Modifier
                 .fillMaxWidth()
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/YieldSupplyStopEarningModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/YieldSupplyStopEarningModel.kt
index 8aa0b80853..b1bba83d10 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/YieldSupplyStopEarningModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/YieldSupplyStopEarningModel.kt
@@ -4,31 +4,34 @@ import arrow.core.getOrElse
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.model.ParamsContainer
+import com.tangem.core.navigation.url.UrlOpener
 import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
-import com.tangem.core.ui.extensions.combinedReference
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.wrappedList
-import com.tangem.core.ui.format.bigdecimal.crypto
-import com.tangem.core.ui.format.bigdecimal.fiat
-import com.tangem.core.ui.format.bigdecimal.format
 import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase
 import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.domain.models.currency.CryptoCurrencyStatus
 import com.tangem.domain.tokens.GetFeePaidCryptoCurrencyStatusSyncUseCase
 import com.tangem.domain.transaction.usecase.GetFeeUseCase
 import com.tangem.domain.transaction.usecase.SendTransactionUseCase
 import com.tangem.domain.yield.supply.usecase.YieldSupplyStopEarningUseCase
 import com.tangem.features.yield.supply.impl.R
+import com.tangem.features.yield.supply.impl.common.YieldSupplyAlertFactory
 import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
 import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionInProgressTransformer
+import com.tangem.features.yield.supply.impl.common.entity.transformer.YieldSupplyTransactionReadyTransformer
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsComponent
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.YieldSupplyNotificationsUpdateTrigger
+import com.tangem.features.yield.supply.impl.subcomponents.notifications.entity.YieldSupplyNotificationData
 import com.tangem.features.yield.supply.impl.subcomponents.stopearning.YieldSupplyStopEarningComponent
-import com.tangem.utils.StringsSigns.DOT
+import com.tangem.features.yield.supply.impl.subcomponents.stopearning.model.transformer.YieldSupplyStopEarningFeeContentTransformer
+import com.tangem.utils.TangemBlogUrlBuilder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
+import com.tangem.utils.extensions.orZero
+import com.tangem.utils.transformer.update
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -43,7 +46,10 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
     private val getFeePaidCryptoCurrencyStatusSyncUseCase: GetFeePaidCryptoCurrencyStatusSyncUseCase,
     private val sendTransactionUseCase: SendTransactionUseCase,
     private val yieldSupplyStopEarningUseCase: YieldSupplyStopEarningUseCase,
-) : Model() {
+    private val urlOpener: UrlOpener,
+    private val yieldSupplyNotificationsUpdateTrigger: YieldSupplyNotificationsUpdateTrigger,
+    private val yieldSupplyAlertFactory: YieldSupplyAlertFactory,
+) : Model(), YieldSupplyNotificationsComponent.ModelCallback {
 
     private val params: YieldSupplyStopEarningComponent.Params = paramsContainer.require()
 
@@ -52,44 +58,57 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
     private val cryptoCurrency = cryptoCurrencyStatus.currency
     private var userWallet = params.userWallet
 
-    private val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
-    field = MutableStateFlow(
-        CryptoCurrencyStatus(
-            cryptoCurrencyStatus.currency,
-            value = CryptoCurrencyStatus.Loading,
-        ),
-    )
+    val feeCryptoCurrencyStatusFlow: StateFlow<CryptoCurrencyStatus>
+        field = MutableStateFlow(
+            CryptoCurrencyStatus(
+                currency = cryptoCurrencyStatus.currency,
+                value = CryptoCurrencyStatus.Loading,
+            ),
+        )
+
+    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus
+        get() = feeCryptoCurrencyStatusFlow.value
 
     private var appCurrency = AppCurrency.Default
 
     val uiState: StateFlow<YieldSupplyActionUM>
-    field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
-        YieldSupplyActionUM(
-            title = resourceReference(R.string.yield_module_stop_earning),
-            subtitle = resourceReference(
-                id = R.string.yield_module_stop_earning_sheet_description,
-                formatArgs = wrappedList(cryptoCurrency.symbol),
+        field: MutableStateFlow<YieldSupplyActionUM> = MutableStateFlow(
+            YieldSupplyActionUM(
+                title = resourceReference(R.string.yield_module_stop_earning),
+                subtitle = resourceReference(
+                    id = R.string.yield_module_stop_earning_sheet_description,
+                    formatArgs = wrappedList(cryptoCurrency.symbol),
+                ),
+                footer = resourceReference(R.string.yield_module_stop_earning_sheet_fee_note),
+                footerLink = resourceReference(R.string.common_read_more),
+                currencyIconState = CryptoCurrencyToIconStateConverter().convert(cryptoCurrency),
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
+                isPrimaryButtonEnabled = false,
+                isTransactionSending = false,
             ),
-            footer = combinedReference(
-                resourceReference(R.string.yield_module_stop_earning_sheet_fee_note),
-                resourceReference(R.string.common_read_more),
-            ),
-            currencyIconState = CryptoCurrencyToIconStateConverter().convert(cryptoCurrency),
-            yieldSupplyFeeUM = YieldSupplyFeeUM.Loading,
-            isPrimaryButtonEnabled = false,
-        ),
-    )
+        )
 
     init {
         modelScope.launch {
             appCurrency = getSelectedAppCurrencyUseCase.invokeSync().getOrElse { AppCurrency.Default }
             subscribeOnCurrencyStatusUpdates()
+            subscribeOnNotificationsErrors()
         }
     }
 
+    override fun onFeeReload() {
+        modelScope.launch {
+            onLoadFee()
+        }
+    }
+
+    fun onReadMoreClick() {
+        urlOpener.openUrl(TangemBlogUrlBuilder.FEE_BLOG_LINK)
+    }
+
     fun onClick() {
         val yieldSupplyFeeUM = uiState.value.yieldSupplyFeeUM as? YieldSupplyFeeUM.Content ?: return
-        uiState.update { it.copy(isPrimaryButtonEnabled = false) }
+        uiState.update(YieldSupplyTransactionInProgressTransformer)
 
         modelScope.launch(dispatchers.default) {
             sendTransactionUseCase(
@@ -97,8 +116,22 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
                 userWallet = userWallet,
                 network = cryptoCurrency.network,
             ).fold(
-                ifLeft = {
-                    Timber.e(it.toString())
+                ifLeft = { error ->
+                    Timber.e(error.toString())
+                    uiState.update(YieldSupplyTransactionReadyTransformer)
+                    yieldSupplyAlertFactory.getSendTransactionErrorState(
+                        error = error,
+                        popBack = params.callback::onBackClick,
+                        onFailedTxEmailClick = { errorMessage ->
+                            modelScope.launch(dispatchers.default) {
+                                yieldSupplyAlertFactory.onFailedTxEmailClick(
+                                    userWallet = params.userWallet,
+                                    cryptoCurrency = cryptoCurrency,
+                                    errorMessage = error.toString(),
+                                )
+                            }
+                        },
+                    )
                 },
                 ifRight = {
                     params.callback.onTransactionSent()
@@ -120,41 +153,64 @@ internal class YieldSupplyStopEarningModel @Inject constructor(
     }
 
     private suspend fun onLoadFee() {
+        if (cryptoCurrency !is CryptoCurrency.Token || uiState.value.isTransactionSending) return
+
         val exitTransitionData = yieldSupplyStopEarningUseCase(
             userWalletId = userWallet.walletId,
             cryptoCurrencyStatus = cryptoCurrencyStatus,
             fee = null,
         ).getOrNull() ?: return
 
-        val fee = getFeeUseCase(
+        uiState.update {
+            it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
+        }
+
+        getFeeUseCase(
             transactionData = exitTransitionData,
             userWallet = userWallet,
             network = cryptoCurrency.network,
-        ).getOrNull() ?: return
-
-        val crypto = fee.normal.amount.value.format { crypto(feeCryptoCurrencyStatusFlow.value.currency) }
-        val fiatFeeValue = cryptoCurrencyStatus.value.fiatRate?.let { rate ->
-            fee.normal.amount.value?.multiply(rate)
-        }
-
-        val fiat = fiatFeeValue.format { fiat(appCurrency.code, appCurrency.symbol) }
-
-        uiState.update {
-            if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
-                it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
-            } else {
-                it.copy(
-                    isPrimaryButtonEnabled = true,
-                    yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
-                        transactionDataList = persistentListOf(exitTransitionData.copy(fee = fee.normal)),
-                        feeValue = combinedReference(
-                            stringReference(crypto),
-                            stringReference(" $DOT "),
-                            stringReference(fiat),
-                        ),
+        ).fold(
+            ifLeft = { feeError ->
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = null,
+                        feeError = feeError,
                     ),
                 )
-            }
-        }
+                uiState.update {
+                    it.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Error)
+                }
+            },
+            ifRight = { fee ->
+                val fee = fee.normal
+                val feeCryptoValue = fee.amount.value.orZero()
+
+                uiState.update(
+                    YieldSupplyStopEarningFeeContentTransformer(
+                        cryptoCurrencyStatus = cryptoCurrencyStatus,
+                        feeCryptoCurrencyStatus = feeCryptoCurrencyStatus,
+                        appCurrency = appCurrency,
+                        transactions = listOf(exitTransitionData.copy(fee = fee)),
+                        feeValue = feeCryptoValue,
+                    ),
+                )
+
+                yieldSupplyNotificationsUpdateTrigger.triggerUpdate(
+                    data = YieldSupplyNotificationData(
+                        feeValue = feeCryptoValue,
+                        feeError = null,
+                    ),
+                )
+            },
+        )
+    }
+
+    private fun subscribeOnNotificationsErrors() {
+        yieldSupplyNotificationsUpdateTrigger.hasErrorFlow
+            .onEach { hasError ->
+                uiState.update {
+                    it.copy(isPrimaryButtonEnabled = !hasError)
+                }
+            }.launchIn(modelScope)
     }
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
new file mode 100644
index 0000000000..0e3dbcac3d
--- /dev/null
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/stopearning/model/transformer/YieldSupplyStopEarningFeeContentTransformer.kt
@@ -0,0 +1,51 @@
+package com.tangem.features.yield.supply.impl.subcomponents.stopearning.model.transformer
+
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.combinedReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.format.bigdecimal.crypto
+import com.tangem.core.ui.format.bigdecimal.fiat
+import com.tangem.core.ui.format.bigdecimal.format
+import com.tangem.domain.appcurrency.model.AppCurrency
+import com.tangem.domain.models.currency.CryptoCurrencyStatus
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyActionUM
+import com.tangem.features.yield.supply.impl.common.entity.YieldSupplyFeeUM
+import com.tangem.utils.StringsSigns.DOT
+import com.tangem.utils.transformer.Transformer
+import kotlinx.collections.immutable.toPersistentList
+import java.math.BigDecimal
+
+internal class YieldSupplyStopEarningFeeContentTransformer(
+    private val cryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val feeCryptoCurrencyStatus: CryptoCurrencyStatus,
+    private val appCurrency: AppCurrency,
+    private val transactions: List<TransactionData.Uncompiled>,
+    private val feeValue: BigDecimal,
+) : Transformer<YieldSupplyActionUM> {
+    override fun transform(prevState: YieldSupplyActionUM): YieldSupplyActionUM {
+        val feeFiatValue = feeCryptoCurrencyStatus.value.fiatRate?.let { rate ->
+            feeValue.multiply(rate)
+        }
+        val cryptoFee = feeValue.format { crypto(feeCryptoCurrencyStatus.currency) }
+        val fiatFee = feeFiatValue.format { fiat(appCurrency.code, appCurrency.symbol) }
+
+        return if (cryptoCurrencyStatus.value is CryptoCurrencyStatus.Loading) {
+            prevState.copy(yieldSupplyFeeUM = YieldSupplyFeeUM.Loading)
+        } else {
+            prevState.copy(
+                isPrimaryButtonEnabled = true,
+                yieldSupplyFeeUM = YieldSupplyFeeUM.Content(
+                    transactionDataList = transactions.toPersistentList(),
+                    feeValue = combinedReference(
+                        stringReference(cryptoFee),
+                        stringReference(" $DOT "),
+                        stringReference(fiatFee),
+                    ),
+                    currentNetworkFeeValue = TextReference.EMPTY,
+                    maxNetworkFeeValue = TextReference.EMPTY,
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/model/YieldSupplyDepositedWarningModel.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/model/YieldSupplyDepositedWarningModel.kt
index 038224d072..aa994f08e2 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/model/YieldSupplyDepositedWarningModel.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/model/YieldSupplyDepositedWarningModel.kt
@@ -25,11 +25,13 @@ internal class YieldSupplyDepositedWarningModel @Inject constructor(
     private val iconStateConverter by lazy(::CryptoCurrencyToIconStateConverter)
 
     internal val state: StateFlow<YieldSupplyDepositedWarningUM>
-    field = MutableStateFlow(
-        YieldSupplyDepositedWarningUM(
-            iconState = iconStateConverter.convert(params.cryptoCurrency),
-            onWarningAcknowledged = params.modelCallback::onYieldSupplyWarningAcknowledged,
-            network = params.cryptoCurrency.name,
-        ),
-    )
+        field = MutableStateFlow(
+            YieldSupplyDepositedWarningUM(
+                iconState = iconStateConverter.convert(params.cryptoCurrency),
+                onWarningAcknowledged = {
+                    params.modelCallback.onYieldSupplyWarningAcknowledged(params.tokenAction)
+                },
+                network = params.cryptoCurrency.name,
+            ),
+        )
 }
\ No newline at end of file
diff --git a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/ui/YieldSupplyDepositedWarningContent.kt b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/ui/YieldSupplyDepositedWarningContent.kt
index 9f4529e86f..dee6512106 100644
--- a/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/ui/YieldSupplyDepositedWarningContent.kt
+++ b/features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/warning/ui/YieldSupplyDepositedWarningContent.kt
@@ -40,7 +40,7 @@ internal fun YieldSupplyDepositedWarningContent(warningUM: YieldSupplyDepositedW
             onDismissRequest = onDismiss,
             content = TangemBottomSheetConfigContent.Empty,
         ),
-        containerColor = TangemTheme.colors.background.primary,
+        containerColor = TangemTheme.colors.background.tertiary,
         onBack = null,
         title = {
             TangemModalBottomSheetTitle(
@@ -57,7 +57,7 @@ internal fun YieldSupplyDepositedWarningContent(warningUM: YieldSupplyDepositedW
                     .padding(horizontal = 16.dp)
                     .fillMaxWidth(),
                 text = stringResourceSafe(CoreUiR.string.balance_hidden_got_it_button),
-                onClick = onDismiss,
+                onClick = warningUM.onWarningAcknowledged,
             )
         },
     )
@@ -68,7 +68,6 @@ private fun Content(warningUM: YieldSupplyDepositedWarningUM) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .background(color = TangemTheme.colors.background.primary)
             .padding(
                 start = 16.dp,
                 end = 16.dp,
@@ -109,7 +108,7 @@ private fun Content(warningUM: YieldSupplyDepositedWarningUM) {
 
         Text(
             textAlign = TextAlign.Center,
-            text = stringResourceSafe(R.string.yield_module_explore_sheet_title, warningUM.network),
+            text = stringResourceSafe(R.string.yield_module_balance_info_sheet_title, warningUM.network),
             style = TangemTheme.typography.h3,
             color = TangemTheme.colors.text.primary1,
         )
@@ -145,7 +144,7 @@ private class YieldSupplyWarningContentProvider : PreviewParameterProvider<Yield
         fallbackTint = TangemColorPalette.Black,
         fallbackBackground = TangemColorPalette.Meadow,
         isGrayscale = false,
-        showCustomBadge = false,
+        shouldShowCustomBadge = false,
     )
 
     override val values: Sequence<YieldSupplyDepositedWarningUM>
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 5d0d2ea17d..34e16dd458 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -51,7 +51,7 @@ amplitude = "2.36.1"
 armadillo = "0.9.0"
 coil = "2.1.0"
 compose-shimmer = "1.0.3"
-coroutine = "1.7.2" # 1.8+ is not compatible with tangem-sdk
+coroutine = "1.8.1" # 1.9+ is not compatible with tangem-sdk
 desugarJdkLibs = "1.1.5"
 firebase = "33.10.0"
 googleMaterialComponent = "1.6.1"
@@ -80,8 +80,8 @@ zxingQrCode = "3.5.1"
 kotlinSerialization = "1.8.0"
 kotlinDatetime = "0.6.2"
 arrow = "1.2.4" # 2.0.1 breaks the build
-reownCore = "1.4.9"
-reownWeb3 = "1.4.9"
+reownCore = "1.4.11"
+reownWeb3 = "1.4.11"
 prettyLogger = "2.2.0"
 okHttp-prettyLogging = "3.1.0"
 chucker = "4.0.0"
@@ -96,12 +96,12 @@ room = "2.6.1"
 markdown = "0.7.2"
 markdownComposeView = "0.5.4"
 usedesk = "4.4.0"
-sumsub = "1.35.1"
+sumsub = "1.37.1"
 # endregion Other libraries
 
 # region Tools
-detektComposeRules = "1.3.0"
-detekt = "1.22.0"
+detektComposeRules = "1.4.0"
+detekt = "1.23.8"
 # endregion Tools
 
 # region Testing
@@ -241,6 +241,7 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
 coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" }
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutine" }
+kotlin-coroutines-jvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "coroutine" }
 kotlin-coroutines-rx2 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2", version.ref = "coroutine" }
 kotlin-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutine" }
 kotlin-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlin-immutable-collections" }
diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml
index f0a03b8ea8..6c17617aca 100644
--- a/gradle/tangem_dependencies.toml
+++ b/gradle/tangem_dependencies.toml
@@ -5,9 +5,9 @@
 # https://github.com/tangem/tangem-sdk-android/
 # https://github.com/tangem/vico
 
-tangemBlockchainSdk = "releases-5.29-1261"
+tangemBlockchainSdk = "releases-5.30-1262"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "releases-5.29-565"
+tangemCardSdk = "releases-5.30-567"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
 tangemVico = "2.0.0-alpha.25-tangem12"
 #tangemVico = "0.0.1" # Keep it! - used for local builds ^
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt
index 6c395cd076..782e3e88ff 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/compatibility/L2Networks.kt
@@ -23,9 +23,9 @@ fun getL2CompatibilityTokenComparison(token: UserTokensResponse.Token, currencyI
 
 fun List<CoinsResponse.Coin.Network>.applyL2Compatibility(coinId: String): List<CoinsResponse.Coin.Network> {
     return if (coinId == ETHEREUM_COIN_ID) {
-        val l2Networks = l2BlockchainsList.map {
+        val l2Networks = l2BlockchainsList.map { blockchain ->
             CoinsResponse.Coin.Network(
-                networkId = it.toNetworkId(),
+                networkId = blockchain.toNetworkId(),
             )
         }
         this + l2Networks
@@ -37,9 +37,9 @@ fun List<CoinsResponse.Coin.Network>.applyL2Compatibility(coinId: String): List<
 fun TokenMarketInfoResponse.applyL2Compatibility(coinId: String): TokenMarketInfoResponse {
     val networks = this.networks ?: return this
     return if (coinId == ETHEREUM_COIN_ID) {
-        val l2Networks = l2BlockchainsList.map {
+        val l2Networks = l2BlockchainsList.map { blockchain ->
             TokenMarketInfoResponse.Network(
-                networkId = it.toNetworkId(),
+                networkId = blockchain.toNetworkId(),
                 contractAddress = null,
                 decimalCount = null,
             )
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseLoader.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseLoader.kt
index 60c5024818..a6765c196a 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseLoader.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseLoader.kt
@@ -37,8 +37,8 @@ internal class BlockchainProvidersResponseLoader @Inject constructor(
                     remote = remoteResponse,
                 )
             },
-            onFailure = {
-                Timber.e(it, "Failed to load blockchain provider types from backend")
+            onFailure = { throwable ->
+                Timber.e(throwable, "Failed to load blockchain provider types from backend")
                 localResponse
             },
         )
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseMerger.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseMerger.kt
index e64cc2f00e..6e1a918463 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseMerger.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/BlockchainProvidersResponseMerger.kt
@@ -30,8 +30,8 @@ internal class BlockchainProvidersResponseMerger @Inject internal constructor(
      */
     fun merge(local: BlockchainProvidersResponse, remote: BlockchainProvidersResponse): BlockchainProvidersResponse {
         val remoteWithoutInvalidProviders = remote
-            .mapValues {
-                it.value
+            .mapValues { entry ->
+                entry.value
                     .filterUnsupportedProviders()
                     .filterInvalidProviders()
             }
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/DevBlockchainProvidersTypesManager.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/DevBlockchainProvidersTypesManager.kt
index 8af47fd124..44587e8923 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/DevBlockchainProvidersTypesManager.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/DevBlockchainProvidersTypesManager.kt
@@ -52,10 +52,10 @@ internal class DevBlockchainProvidersTypesManager(
     }
 
     override suspend fun update(blockchain: Blockchain, providers: List<ProviderType>) {
-        changedBlockchainProvidersStore.updateData {
+        changedBlockchainProvidersStore.updateData { blockchainProviders ->
             val providerModels = BlockchainProviderTypesConverter.convertBack(value = mapOf(blockchain to providers))
 
-            it + providerModels
+            blockchainProviders + providerModels
         }
     }
 
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/ProviderTypeIdMapping.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/ProviderTypeIdMapping.kt
index 831222402b..35b1248da3 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/ProviderTypeIdMapping.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/providers/ProviderTypeIdMapping.kt
@@ -11,6 +11,7 @@ internal enum class ProviderTypeIdMapping(val id: String, val providerType: Prov
     BitcoinBlockcypher(id = "blockcypher", providerType = ProviderType.BitcoinLike.Blockcypher),
     CardanoAdalite(id = "adalite", providerType = ProviderType.Cardano.Adalite),
     CardanoRosetta(id = "tangemRosetta", providerType = ProviderType.Cardano.Rosetta),
+    CardanoMock(id = "mock", providerType = ProviderType.Mock),
     ChiaFireAcademy(id = "fireAcademy", providerType = ProviderType.Chia.FireAcademy),
     ChiaTangem(id = "tangemChia", providerType = ProviderType.Chia.Tangem),
     ChiaTangemNew(id = "tangemChia3", providerType = ProviderType.Chia.TangemNew),
@@ -26,5 +27,4 @@ internal enum class ProviderTypeIdMapping(val id: String, val providerType: Prov
     AlephiumTangem(id = "tangemAlephium", providerType = ProviderType.Alephium.Tangem),
     Blink(id = "blink", providerType = ProviderType.Blink),
     Tatum(id = "tatum", providerType = ProviderType.Kusama.Tatum),
-    ;
 }
\ No newline at end of file
diff --git a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
index 0449da0454..d1d5a501c6 100644
--- a/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
+++ b/libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/utils/Blockchain.kt
@@ -167,6 +167,8 @@ fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? {
         "pepecoin/test" -> Blockchain.PepecoinTestnet
         "hyperevm" -> Blockchain.Hyperliquid
         "hyperevm/test" -> Blockchain.HyperliquidTestnet
+        "quai-network" -> Blockchain.Quai
+        "quai-network/test" -> Blockchain.QuaiTestnet
         else -> null
     }
 }
@@ -331,6 +333,8 @@ fun Blockchain.toNetworkId(): String {
         Blockchain.PepecoinTestnet -> "pepecoin/test"
         Blockchain.Hyperliquid -> "hyperevm"
         Blockchain.HyperliquidTestnet -> "hyperevm/test"
+        Blockchain.Quai -> "quai-network"
+        Blockchain.QuaiTestnet -> "quai-network/test"
     }
 }
 
@@ -435,6 +439,7 @@ fun Blockchain.toCoinId(): String {
         Blockchain.ZkLinkNova, Blockchain.ZkLinkNovaTestnet -> "zklink-ethereum"
         Blockchain.Pepecoin, Blockchain.PepecoinTestnet -> "pepecoin-network"
         Blockchain.Hyperliquid, Blockchain.HyperliquidTestnet -> "hyperliquid"
+        Blockchain.Quai, Blockchain.QuaiTestnet -> "quai-network"
     }
 }
 
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
index aec26f5567..17fd386e25 100644
--- a/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/BlockchainUtils.kt
@@ -21,6 +21,7 @@ import java.math.BigDecimal
 object BlockchainUtils {
 
     private const val XRP_X_ADDRESS = 'X'
+    const val SOLANA_TRANSACTION_SIZE_THRESHOLD_BYTES = 930
 
     /** Decodes XRP Blockchain address */
     fun decodeRippleXAddress(xAddress: String, blockchainId: String): XrpTaggedAddress? {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 365023aad8..ac0557883f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -272,6 +272,7 @@ include(":features:tangempay:main:impl")
 include(":features:tangempay:details:api")
 include(":features:tangempay:details:impl")
 
+include(":features:tangempay:onboarding")
 include(":features:tangempay:onboarding:api")
 include(":features:tangempay:onboarding:impl")
 
@@ -297,7 +298,9 @@ include(":domain:models")
 include(":domain:legacy")
 
 include(":domain:account")
+include(":domain:account:status")
 include(":domain:card")
+include(":domain:common")
 include(":domain:core")
 include(":domain:demo")
 include(":domain:demo:models")
@@ -351,6 +354,7 @@ include(":domain:swap:models")
 include(":domain:wallet-manager")
 include(":domain:wallet-manager:models")
 include(":domain:yield-supply")
+include(":domain:yield-supply:models")
 // endregion Domain modules
 
 // region Data modules
@@ -385,5 +389,4 @@ include(":data:swap")
 include(":data:express")
 include(":data:wallet-manager")
 include(":data:yield-supply")
-// endregion Data modules
-include(":features:tangempay:onboarding")
\ No newline at end of file
+// endregion Data modules
\ No newline at end of file
diff --git a/tangem-android-tools b/tangem-android-tools
index 6ef084d2b8..888c626fc5 160000
--- a/tangem-android-tools
+++ b/tangem-android-tools
@@ -1 +1 @@
-Subproject commit 6ef084d2b8bcc4f94d40f38dcdab096c2f0a082b
+Subproject commit 888c626fc514542c3d7568b83d8afe92777b1e0c