diff --git a/.gitignore b/.gitignore
index dd64e70b22..dd33a7dab3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ local.properties
 **/fastlane/Preview.html
 **/fastlane/screenshots
 **/fastlane/test_output
+/buildSrc/build/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 76a59bafa3..6527894333 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -12,6 +12,7 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
+      <option name="BLANK_LINES_BEFORE_DECLARATION_WITH_COMMENT_OR_ANNOTATION_ON_SEPARATE_LINE" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <Properties>
@@ -199,4 +200,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123c2b..0f7bc519db 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -2,4 +2,4 @@
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </state>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index c914631447..ce1b62532a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -61,8 +61,8 @@
     <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="RedundantSetter" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="RedundantSuspendModifier" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="RedundantUnitExpression" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="RedundantUnitReturnType" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="RedundantUnitExpression" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="RedundantUnitReturnType" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="RedundantVisibilityModifier" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="RedundantWith" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="RemoveCurlyBracesFromTemplate" enabled="true" level="ERROR" enabled_by_default="true" />
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 70b6edcebd..0000000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,187 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
-apply from: '../dependencies.gradle'
-
-android {
-    compileSdkVersion 33
-    defaultConfig {
-        applicationId "com.tangem.wallet"
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 1
-        versionName project.hasProperty('versionName') ? project.property('versionName') : "1.0.0.-SNAPSHOT"
-        minSdkVersion 21
-        targetSdkVersion 33
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
-        buildConfigField 'Boolean', environmentConfig.logEnabled, 'false'
-    }
-    buildFeatures {
-        compose true
-        viewBinding true
-    }
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.debug
-            buildConfigField 'String', environmentConfig.environment, '\"prod\"'
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'false'
-        }
-        debug {
-            debuggable true
-            minifyEnabled false
-            applicationIdSuffix ".dev"
-            signingConfig signingConfigs.debug
-            firebaseCrashlytics {
-                mappingFileUploadEnabled false
-            }
-            buildConfigField 'String', environmentConfig.environment, '\"dev\"'
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'true'
-        }
-        debug_beta {
-            initWith release
-            debuggable false
-            versionNameSuffix "-beta"
-            applicationIdSuffix ".debug"
-            buildConfigField 'String', environmentConfig.environment, '\"prod\"'
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'false'
-        }
-
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        coreLibraryDesugaringEnabled false
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.1.0'
-    }
-    packagingOptions {
-        exclude 'lib/x86_64/darwin/libscrypt.dylib'
-        exclude 'lib/x86_64/freebsd/libscrypt.so'
-        exclude 'lib/x86_64/linux/libscrypt.so'
-    }
-}
-
-repositories {
-    maven { url "https://jitpack.io" }
-}
-
-dependencies {
-    implementation fileTree(include: ['*.aar'], dir: 'libs')
-    implementation implementation(project(path: ':domain'))
-    implementation implementation(project(path: ':network'))
-    implementation implementation(project(path: ':common'))
-
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.3'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'com.google.android.play:core:1.10.3'
-    implementation 'com.google.android.play:core-ktx:1.8.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
-    implementation "com.tangem:blockchain:${versions.tangem_blockchain_sdk}"
-    implementation "com.tangem.tangem-sdk-kotlin:core:${versions.tangem_card_sdk}"
-    implementation "com.tangem.tangem-sdk-kotlin:android:${versions.tangem_card_sdk}"
-
-    // WebView
-    implementation "androidx.browser:browser:1.4.0"
-
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-
-    //lifecycle
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-
-    implementation "org.rekotlin:rekotlin:1.0.4"
-
-    // QR
-    implementation 'com.google.zxing:core:3.3.3'
-    implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-
-    // Camera
-    implementation 'com.otaliastudios:cameraview:2.6.3'
-
-    // Image Loading
-    implementation 'io.coil-kt:coil:2.1.0'
-    implementation 'io.coil-kt:coil-compose:2.1.0'
-
-    // Firebase
-    implementation platform('com.google.firebase:firebase-bom:26.0.0')
-    implementation 'com.google.firebase:firebase-analytics-ktx'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-
-    // Analytics
-    implementation 'com.appsflyer:af-android-sdk:6.5.1'
-    implementation 'com.amplitude:android-sdk:2.36.1'
-
-    // WalletConnect
-    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
-
-    // Network and Json
-    //TODO: refactoring: remove it when all network services moved to the network module
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
-    implementation 'com.squareup.moshi:moshi:1.12.0'
-    implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
-
-    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
-    implementation("com.squareup.okhttp3:okhttp")
-    implementation("com.squareup.okhttp3:logging-interceptor")
-
-    // Support
-    implementation("com.zendesk:chat:3.3.5")
-    implementation("com.zendesk:messaging:5.2.4")
-
-    //Crypto
-    implementation "com.madgag.spongycastle:core:1.58.0.0"
-
-    // animation
-    implementation "com.airbnb.android:lottie:3.4.0"
-
-    // Shopify
-    implementation('com.shopify.mobilebuysdk:buy3:12.0.0') {
-        exclude group: "com.shopify.graphql.support"
-        exclude module: 'joda-time'
-    }
-
-    // Google Pay
-    implementation 'com.google.android.gms:play-services-wallet:19.1.0'
-
-    //Compose
-    implementation 'androidx.activity:activity-compose:1.5.0'
-    implementation 'androidx.compose.material:material:1.1.1'
-    implementation 'androidx.compose.animation:animation:1.1.1'
-    implementation 'androidx.compose.foundation:foundation:1.2.0-rc03'
-    implementation 'androidx.compose.ui:ui:1.1.1'
-    implementation 'androidx.compose.ui:ui-tooling:1.1.1'
-    implementation "com.google.accompanist:accompanist-appcompat-theme:0.23.0"
-    implementation "com.google.accompanist:accompanist-systemuicontroller:0.23.0"
-
-    implementation "com.github.skydoves:androidveil:1.1.2"
-
-    implementation 'com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.6'
-
-    // Shared preferences (encrypted)
-    implementation 'at.favre.lib:armadillo:0.9.0'
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "com.google.truth:truth:1.1.3"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000000..1876b0038c
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,208 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+    compileSdk = AppConfig.compileSdkVersion
+
+    defaultConfig {
+        applicationId = AppConfig.packageName
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+
+        versionCode = if (project.hasProperty("versionCode")) {
+            (project.property("versionCode") as String).toInt()
+        } else {
+            AppConfig.versionCode
+        }
+
+        versionName = if (project.hasProperty("versionName")) {
+            project.property("versionName") as String
+        } else {
+            AppConfig.versionName
+        }
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildFeatures {
+        compose = true
+        viewBinding = true
+    }
+
+    buildTypes {
+        release {
+            isDebuggable = false
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("prod"),
+                    Field.TestActionEnabled(false),
+                    Field.LogEnabled(false),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+
+        debug {
+            isDebuggable = true
+            isMinifyEnabled = false
+            applicationIdSuffix = ".dev"
+
+            configure<com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension> {
+                // disable mapping file uploads (default=true if minifying)
+                mappingFileUploadEnabled = false
+            }
+
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("dev"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+
+        create("debug_beta") {
+            initWith(getByName("release"))
+            versionNameSuffix = "-beta"
+            applicationIdSuffix = ".debug"
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose
+    }
+
+    packagingOptions {
+        resources.excludes += "lib/x86_64/darwin/libscrypt.dylib"
+        resources.excludes += "lib/x86_64/freebsd/libscrypt.so"
+        resources.excludes += "lib/x86_64/linux/libscrypt.so"
+        resources.excludes += "META-INF/gradle/incremental.annotation.processors"
+    }
+}
+
+repositories {
+    maven(url = "https://jitpack.io")
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
+    implementation(project(":domain"))
+    implementation(project(":common"))
+    implementation(project(":core:res"))
+    implementation(project(":core:ui"))
+    implementation(project(":core:datasource"))
+    implementation(project(":core:utils"))
+    implementation(project(":libs:crypto"))
+    implementation(project(":libs:auth"))
+
+    /** Features */
+    implementation(project(":features:referral:presentation"))
+    implementation(project(":features:referral:domain"))
+    implementation(project(":features:referral:data"))
+    implementation(project(":features:swap:presentation"))
+    implementation(project(":features:swap:domain"))
+    implementation(project(":features:swap:data"))
+
+    /** AndroidX libraries */
+    implementation(AndroidX.coreKtx)
+    implementation(AndroidX.appCompat)
+    implementation(AndroidX.fragmentKtx)
+    implementation(AndroidX.constraintLayout)
+    implementation(AndroidX.browser)
+    implementation(AndroidX.lifecycleRuntimeKtx)
+    implementation(AndroidX.lifecycleCommonJava8)
+    implementation(AndroidX.lifecycleViewModelKtx)
+    implementation(AndroidX.lifecycleLiveDataKtx)
+    implementation(AndroidX.activityCompose)
+
+    /** Compose libraries */
+    implementation(Compose.material)
+    implementation(Compose.animation)
+    implementation(Compose.foundation)
+    implementation(Compose.ui)
+    implementation(Compose.uiTooling)
+    implementation(Compose.coil)
+
+    /** Firebase libraries */
+    implementation(platform(Firebase.bom))
+    implementation(Firebase.firebaseAnalytics)
+    implementation(Firebase.firebaseCrashlytics)
+
+    /** Tangem libraries */
+    implementation(Tangem.blockchain) {
+        exclude(module = "joda-time")
+    }
+    implementation(Tangem.cardCore)
+    implementation(Tangem.cardAndroid) {
+        exclude(module = "joda-time")
+    }
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+
+    /** Other libraries */
+    implementation(Library.materialComponent)
+    implementation(Library.googlePlayCore)
+    implementation(Library.googlePlayCoreKtx)
+    coreLibraryDesugaring(Library.desugarJdkLibs)
+    implementation(Library.timber)
+    implementation(Library.reKotlin)
+    implementation(Library.zxingQrCore)
+    implementation(Library.zxingQrBarcodeScanner)
+    implementation(Library.otaliastudiosCameraView)
+    implementation(Library.coil)
+    implementation(Library.appsflyer)
+    implementation(Library.amplitude)
+    implementation(Library.kotsonGsonExt)
+    //TODO: refactoring: remove it when all network services moved to the datasource module
+    implementation(Library.retrofit)
+    implementation(Library.retrofitMoshiConverter)
+    implementation(Library.moshi)
+    implementation(Library.moshiKotlin)
+    implementation(Library.okHttp)
+    implementation(Library.okHttpLogging)
+    implementation(Library.zendeskChat)
+    implementation(Library.zendeskMessaging)
+    implementation(Library.spongecastleCryptoCore)
+    implementation(Library.lottie)
+    implementation(Library.shopifyBuySdk) {
+        exclude(group = "com.shopify.graphql.support")
+        exclude(module = "joda-time")
+    }
+    implementation(Library.accompanistAppCompatTheme)
+    implementation(Library.accompanistSystemUiController)
+    implementation(Library.xmlShimmer)
+    implementation(Library.viewBindingDelegate)
+    implementation(Library.armadillo)
+    implementation(Library.googlePlayServicesWallet)
+    implementation(Library.composeShimmer)
+    implementation(Library.mviCoreWatcher)
+
+    /** Testing libraries */
+    testImplementation(Test.junit)
+    testImplementation(Test.truth)
+    androidTestImplementation(Test.junitAndroidExt)
+    androidTestImplementation(Test.espresso)
+}
\ No newline at end of file
diff --git a/app/libs/walletconnect-1.5.5.aar b/app/libs/walletconnect-1.5.5.aar
deleted file mode 100644
index 4e2f1b4fb7..0000000000
Binary files a/app/libs/walletconnect-1.5.5.aar and /dev/null differ
diff --git a/app/libs/walletconnect-1.5.6.aar b/app/libs/walletconnect-1.5.6.aar
new file mode 100644
index 0000000000..30c576fb89
Binary files /dev/null and b/app/libs/walletconnect-1.5.6.aar differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b424510d..2f9dc5a47e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 874783a15d..e7d11764b4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,11 +34,10 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:allowBackup="true"
-        android:fullBackupContent="true"
+        android:allowBackup="false"
         android:networkSecurityConfig="@xml/network_security_config"
         tools:ignore="GoogleAppIndexingWarning"
-        tools:replace="android:fullBackupContent">
+        tools:replace="android:allowBackup">
 
         <meta-data
             android:name="com.google.android.gms.wallet.api.enabled"
@@ -102,6 +101,17 @@
                 <data android:scheme="wc" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:host="wc" />
+                <data android:scheme="tangem" />
+
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -142,5 +152,4 @@
         </provider>
 
     </application>
-
 </manifest>
diff --git a/app/src/main/java/com/tangem/tap/ActivityResultCaller.kt b/app/src/main/java/com/tangem/tap/ActivityResultCaller.kt
new file mode 100644
index 0000000000..16a05117ac
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/ActivityResultCaller.kt
@@ -0,0 +1,8 @@
+package com.tangem.tap
+
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+
+interface ActivityResultCaller {
+    val activityResultLauncher: ActivityResultLauncher<Intent>?
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
index 806769df5f..9664f38966 100644
--- a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
+++ b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt
@@ -2,11 +2,18 @@ package com.tangem.tap
 
 import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks
+import android.content.Intent
 import android.os.Bundle
-import java.util.WeakHashMap
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import java.util.*
 import kotlin.reflect.KClass
 
-class ForegroundActivityObserver {
+class ForegroundActivityObserver : ActivityResultCaller {
+    override var activityResultLauncher: ActivityResultLauncher<Intent>? = null
+        private set
+
     private val activities = WeakHashMap<KClass<out Activity>, Activity>()
 
     val foregroundActivity: Activity?
@@ -15,25 +22,38 @@ class ForegroundActivityObserver {
             .firstOrNull()
             ?.value
 
-    val callbacks get() = Callbacks()
+    internal val callbacks: ActivityLifecycleCallbacks
+        get() = Callbacks()
+
+    internal inner class Callbacks : ActivityLifecycleCallbacks {
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+            activityResultLauncher = (activity as? AppCompatActivity)?.registerForActivityResult(
+                ActivityResultContracts.StartActivityForResult(),
+            ) {
+                /* no-op */
+            }
+        }
 
-    inner class Callbacks : ActivityLifecycleCallbacks {
         override fun onActivityResumed(activity: Activity) {
             activities[activity::class] = activity
         }
 
         override fun onActivityDestroyed(activity: Activity) {
             activities.remove(activity::class)
+            if (activities.isEmpty()) {
+                activityResultLauncher = null
+            }
         }
 
-        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        }
         override fun onActivityStarted(activity: Activity) {
         }
+
         override fun onActivityPaused(activity: Activity) {
         }
+
         override fun onActivityStopped(activity: Activity) {
         }
+
         override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
new file mode 100644
index 0000000000..426f49ca25
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/LockUserWalletsTimer.kt
@@ -0,0 +1,117 @@
+package com.tangem.tap
+
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import kotlin.time.Duration
+
+internal class LockUserWalletsTimer(
+    owner: LifecycleOwner,
+    private val duration: Duration = with(Duration) { 10.minutes },
+) : LifecycleOwner by owner,
+    DefaultLifecycleObserver {
+
+    private var delayJob: Job? = null
+        set(value) {
+            field?.cancel()
+            field = value
+        }
+
+    init {
+        lifecycle.addObserver(this)
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        Timber.d(
+            """
+                Owner resumed
+                |- Was stopped: ${preferencesStorage.wasApplicationStopped}
+                |- Need to open welcome screen: ${preferencesStorage.shouldOpenWelcomeScreenOnResume}
+            """.trimIndent(),
+        )
+        preferencesStorage.wasApplicationStopped = false
+        start()
+        if (preferencesStorage.shouldOpenWelcomeScreenOnResume) {
+            store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
+            preferencesStorage.shouldOpenWelcomeScreenOnResume = false
+        }
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        Timber.d("Owner stopped")
+        preferencesStorage.wasApplicationStopped = true
+    }
+
+    override fun onDestroy(owner: LifecycleOwner) {
+        Timber.d("Owner destroyed")
+        stop()
+    }
+
+    fun restart() {
+        if (delayJob == null) return
+        Timber.d(
+            """
+                Timer restart
+                |- Duration millis: ${duration.inWholeMilliseconds}
+            """.trimIndent(),
+        )
+        start(log = false)
+    }
+
+    private fun start(log: Boolean = true) {
+        if (log) {
+            Timber.d(
+                """
+                    Timer start
+                    |- Duration millis: ${duration.inWholeMilliseconds}
+                """.trimIndent(),
+            )
+        }
+        delayJob = createDelayJob()
+    }
+
+    private fun stop(log: Boolean = true) {
+        if (log) {
+            Timber.d(
+                """
+                    Timer stop
+                    |- Was started: ${delayJob?.isActive ?: false}
+                """.trimIndent(),
+            )
+        }
+        delayJob = null
+    }
+
+    private fun createDelayJob(): Job = lifecycleScope.launch(Dispatchers.Default) {
+        val startTime = System.currentTimeMillis()
+        delay(duration)
+        if (isActive) {
+            val userWalletsListManager = userWalletsListManagerSafe ?: return@launch
+            if (userWalletsListManager.hasSavedUserWallets) {
+                val currentTime = System.currentTimeMillis()
+                Timber.d(
+                    """
+                        Finished
+                        |- App is stopped: ${preferencesStorage.wasApplicationStopped}
+                        |- Millis passed: ${currentTime - startTime}
+                    """.trimIndent(),
+                )
+                userWalletsListManager.lock()
+                if (preferencesStorage.wasApplicationStopped) {
+                    preferencesStorage.shouldOpenWelcomeScreenOnResume = true
+                } else {
+                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index e557e59247..5ef7c985a6 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -15,30 +15,39 @@ import com.tangem.operations.backup.BackupService
 import com.tangem.tangem_sdk_new.extensions.init
 import com.tangem.tap.common.ActivityResultCallbackHolder
 import com.tangem.tap.common.DialogManager
-import com.tangem.tap.common.IntentHandler
 import com.tangem.tap.common.OnActivityResultCallback
 import com.tangem.tap.common.SnackbarHandler
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.NotificationsHandler
-import com.tangem.tap.common.redux.global.AndroidResources
-import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.shop.GooglePayService
 import com.tangem.tap.common.shop.GooglePayService.Companion.LOAD_PAYMENT_DATA_REQUEST_CODE
 import com.tangem.tap.common.shop.googlepay.GooglePayUtil.createPaymentsClient
 import com.tangem.tap.domain.TangemSdkManager
+import com.tangem.tap.domain.userWalletList.UserWalletsListManager
+import com.tangem.tap.domain.userWalletList.di.provideBiometricImplementation
 import com.tangem.tap.features.shop.redux.ShopAction
+import com.tangem.tap.features.welcome.redux.WelcomeAction
+import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ActivityMainBinding
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import java.lang.ref.WeakReference
+import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
 lateinit var tangemSdk: TangemSdk
 lateinit var tangemSdkManager: TangemSdkManager
 lateinit var backupService: BackupService
+lateinit var userWalletsListManager: UserWalletsListManager
+internal var lockUserWalletsTimer: LockUserWalletsTimer? = null
+    private set
+var userWalletsListManagerSafe: UserWalletsListManager? = null
+    private set
 var notificationsHandler: NotificationsHandler? = null
 
 private val coroutineContext: CoroutineContext
@@ -49,11 +58,14 @@ private val mainCoroutineContext: CoroutineContext
     get() = Job() + Dispatchers.Main + FeatureCoroutineExceptionHandler.create("mainScope")
 val mainScope = CoroutineScope(mainCoroutineContext)
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbackHolder {
 
+    @Inject
+    lateinit var appStateHolder: AppStateHolder
+
     private var snackbar: Snackbar? = null
     private val dialogManager = DialogManager()
-    private val intentHandler = IntentHandler()
     private val binding: ActivityMainBinding by viewBinding(ActivityMainBinding::bind)
 
     private val onActivityResultCallbacks = mutableListOf<OnActivityResultCallback>()
@@ -66,9 +78,15 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
 
         tangemSdk = TangemSdk.init(this, TangemSdkManager.config)
         tangemSdkManager = TangemSdkManager(tangemSdk, this)
+        appStateHolder.tangemSdkManager = tangemSdkManager
         backupService = BackupService.init(tangemSdk, this)
+        userWalletsListManager = UserWalletsListManager.provideBiometricImplementation(
+            context = applicationContext,
+            tangemSdkManager = tangemSdkManager,
+        )
+        userWalletsListManagerSafe = userWalletsListManager
+        lockUserWalletsTimer = LockUserWalletsTimer(owner = this)
 
-        store.dispatch(GlobalAction.SetResources(getAndroidResources()))
         store.dispatch(
             ShopAction.CheckIfGooglePayAvailable(
                 GooglePayService(createPaymentsClient(this), this),
@@ -76,17 +94,7 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         )
     }
 
-    private fun getAndroidResources(): AndroidResources {
-        return AndroidResources(
-            AndroidResources.RString(
-                R.string.copy_toast_msg,
-                R.string.details_notification_erase_wallet_not_possible,
-            ),
-        )
-    }
-
     private fun systemActions() {
-
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         val windowInsetsController = WindowInsetsControllerCompat(window, binding.root)
@@ -110,14 +118,23 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
         val isOnboardingServiceActive = store.state.globalState.onboardingState.onboardingStarted
         val shopOpened = store.state.shopState.total != null
         if (backStackIsEmpty || (!isOnboardingServiceActive && !isScannedBefore && !shopOpened)) {
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.Home))
+            if (userWalletsListManager.hasSavedUserWallets) {
+                store.dispatchOnMain(WelcomeAction.HandleDeepLink(intent))
+                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Welcome))
+            } else {
+                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Home))
+                intentHandler.handleWalletConnectLink(intent)
+            }
         }
-        intentHandler.handleIntent(intent)
+        intentHandler.handleBackgroundScan(intent)
+        intentHandler.handleSellCurrencyCallback(intent)
     }
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-        intentHandler.handleIntent(intent)
+        intentHandler.handleBackgroundScan(intent)
+        intentHandler.handleSellCurrencyCallback(intent)
+        intentHandler.handleWalletConnectLink(intent)
     }
 
     override fun onStart() {
@@ -174,4 +191,10 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     override fun removeOnActivityResultCallback(callback: OnActivityResultCallback) {
         onActivityResultCallbacks.remove(callback)
     }
+
+    override fun onUserInteraction() {
+        super.onUserInteraction()
+
+        lockUserWalletsTimer?.restart()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index c0d6e566b4..0d483b43ee 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -7,18 +7,30 @@ import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.tangem.Log
 import com.tangem.LogFormat
+import com.tangem.blockchain.common.BlockchainSdkConfig
+import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
 import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.domain.DomainLayer
 import com.tangem.domain.common.LogConfig
-import com.tangem.network.common.MoshiConverter
 import com.tangem.tap.common.AndroidAssetReader
 import com.tangem.tap.common.AssetReader
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandlerBuilder
+import com.tangem.tap.common.IntentHandler
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.AnalyticsFactory
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
+import com.tangem.tap.common.analytics.filters.BasicSignInFilter
+import com.tangem.tap.common.analytics.filters.BasicTopUpFilter
+import com.tangem.tap.common.analytics.filters.ShopPurchasedEventFilter
+import com.tangem.tap.common.analytics.handlers.amplitude.AmplitudeAnalyticsHandler
+import com.tangem.tap.common.analytics.handlers.appsFlyer.AppsFlyerAnalyticsHandler
+import com.tangem.tap.common.analytics.handlers.firebase.FirebaseAnalyticsHandler
 import com.tangem.tap.common.feedback.AdditionalFeedbackInfo
 import com.tangem.tap.common.feedback.FeedbackManager
 import com.tangem.tap.common.images.createCoilImageLoader
 import com.tangem.tap.common.log.TangemLogCollector
+import com.tangem.tap.common.moshi.BigDecimalAdapter
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.appReducer
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -28,47 +40,112 @@ import com.tangem.tap.domain.configurable.config.ConfigManager
 import com.tangem.tap.domain.configurable.config.FeaturesLocalLoader
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
 import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.totalBalance.TotalFiatBalanceCalculator
+import com.tangem.tap.domain.totalBalance.di.provideDefaultImplementation
+import com.tangem.tap.domain.walletCurrencies.WalletCurrenciesManager
+import com.tangem.tap.domain.walletCurrencies.di.provideDefaultImplementation
+import com.tangem.tap.domain.walletStores.WalletStoresManager
+import com.tangem.tap.domain.walletStores.di.provideDefaultImplementation
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+import com.tangem.tap.domain.walletStores.repository.di.provideDefaultImplementation
 import com.tangem.tap.domain.walletconnect.WalletConnectRepository
 import com.tangem.tap.network.NetworkConnectivity
+import com.tangem.tap.persistence.CardBalanceStateAdapter
 import com.tangem.tap.persistence.PreferencesStorage
+import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.wallet.BuildConfig
 import com.zendesk.logger.Logger
+import dagger.hilt.android.HiltAndroidApp
 import org.rekotlin.Store
 import timber.log.Timber
 import zendesk.chat.Chat
+import javax.inject.Inject
 
-val store = Store(
-    reducer = ::appReducer,
-    middleware = AppState.getMiddleware(),
-    state = AppState(),
-)
+lateinit var store: Store<AppState>
 
 lateinit var foregroundActivityObserver: ForegroundActivityObserver
+lateinit var activityResultCaller: ActivityResultCaller
 lateinit var preferencesStorage: PreferencesStorage
 lateinit var walletConnectRepository: WalletConnectRepository
 lateinit var shopService: TangemShopService
 lateinit var assetReader: AssetReader
 lateinit var userTokensRepository: UserTokensRepository
 
+private val walletStoresRepository by lazy { WalletStoresRepository.provideDefaultImplementation() }
+private val walletManagersRepository by lazy {
+    WalletManagersRepository.provideDefaultImplementation(
+        walletManagerFactory = WalletManagerFactory(
+            blockchainSdkConfig = store.state.globalState.configManager
+                ?.config
+                ?.blockchainSdkConfig
+                ?: BlockchainSdkConfig(),
+        ),
+    )
+}
+private val walletAmountsRepository by lazy {
+    WalletAmountsRepository.provideDefaultImplementation(
+        tangemTechService = store.state.domainNetworks.tangemTechService,
+    )
+}
+val walletStoresManager by lazy {
+    WalletStoresManager.provideDefaultImplementation(
+        userTokensRepository = userTokensRepository,
+        walletStoresRepository = walletStoresRepository,
+        walletManagersRepository = walletManagersRepository,
+        walletAmountsRepository = walletAmountsRepository,
+        appCurrencyProvider = { store.state.globalState.appCurrency },
+    )
+}
+val walletCurrenciesManager by lazy {
+    WalletCurrenciesManager.provideDefaultImplementation(
+        userTokensRepository = userTokensRepository,
+        walletStoresRepository = walletStoresRepository,
+        walletManagersRepository = walletManagersRepository,
+        walletAmountsRepository = walletAmountsRepository,
+        appCurrencyProvider = { store.state.globalState.appCurrency },
+    )
+}
+val totalFiatBalanceCalculator by lazy {
+    TotalFiatBalanceCalculator.provideDefaultImplementation()
+}
+val intentHandler by lazy { IntentHandler() }
+
+@HiltAndroidApp
 class TapApplication : Application(), ImageLoaderFactory {
 
+    @Inject
+    lateinit var appStateHolder: AppStateHolder
+
     override fun onCreate() {
         super.onCreate()
 
+        store = Store(
+            reducer = { action, state ->
+                appReducer(action, state, appStateHolder)
+            },
+            middleware = AppState.getMiddleware(),
+            state = AppState(),
+        )
+        appStateHolder.mainStore = store
+
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
 
         foregroundActivityObserver = ForegroundActivityObserver()
+        activityResultCaller = foregroundActivityObserver
         registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)
 
+        initMoshiConverter()
         DomainLayer.init()
         NetworkConnectivity.createInstance(store, this)
         preferencesStorage = PreferencesStorage(this)
         walletConnectRepository = WalletConnectRepository(this)
 
         assetReader = AndroidAssetReader(this)
-        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.defaultMoshi())
+        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.INSTANCE.moshi)
         initConfigManager(configLoader, ::initWithConfigDependency)
         initWarningMessagesManager()
 
@@ -78,6 +155,19 @@ class TapApplication : Application(), ImageLoaderFactory {
             context = this,
             tangemTechService = store.state.domainNetworks.tangemTechService,
         )
+        appStateHolder.userTokensRepository = userTokensRepository
+    }
+
+    //todo refactor: move to datasource and provide via DI
+    private fun initMoshiConverter() {
+        fun appAdapters(): List<Any> = listOf(
+            BigDecimalAdapter(),
+            CardBalanceStateAdapter(),
+        )
+        MoshiConverter.reInitInstance(
+            adapters = appAdapters() + MoshiJsonConverter.getTangemSdkAdapters(),
+            typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
+        )
     }
 
     override fun newImageLoader(): ImageLoader {
@@ -102,14 +192,23 @@ class TapApplication : Application(), ImageLoaderFactory {
     }
 
     private fun initAnalytics(application: Application, config: Config) {
-        val globalAnalyticsHandler = GlobalAnalyticsEventHandlerBuilder(
+        val factory = AnalyticsFactory()
+        factory.addHandlerBuilder(AmplitudeAnalyticsHandler.Builder())
+        factory.addHandlerBuilder(AppsFlyerAnalyticsHandler.Builder())
+        factory.addHandlerBuilder(FirebaseAnalyticsHandler.Builder())
+
+        factory.addFilter(ShopPurchasedEventFilter())
+        factory.addFilter(BasicSignInFilter())
+        factory.addFilter(BasicTopUpFilter(preferencesStorage.toppedUpWalletStorage))
+
+        val buildData = AnalyticsHandlerBuilder.Data(
             application = application,
             config = config,
             isDebug = BuildConfig.DEBUG,
             logConfig = LogConfig.analyticsHandlers,
-            jsonConverter = MoshiJsonConverter.INSTANCE,
-        ).default()
-        store.dispatch(GlobalAction.SetGlobalAnalyticsHandler(globalAnalyticsHandler))
+            jsonConverter = MoshiConverter.INSTANCE,
+        )
+        factory.build(Analytics, buildData)
     }
 
     private fun initFeedbackManager(context: Context, preferencesStorage: PreferencesStorage, config: Config) {
diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
index a1739329b5..f25d1ddf4c 100644
--- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
@@ -76,13 +76,13 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 CreateWalletInterruptDialog.create(state.dialog, context)
             is WalletConnectDialog.UnsupportedCard ->
                 SimpleAlertDialog.create(
-                    titleRes = R.string.wallet_connect,
-                    messageRes = R.string.wallet_connect_scanner_error_no_ethereum_wallet,
+                    titleRes = R.string.wallet_connect_title,
+                    messageRes = R.string.wallet_connect_scanner_error_not_valid_card,
                     context = context,
                 )
             is WalletConnectDialog.AddNetwork ->
                 SimpleAlertDialog.create(
-                    titleRes = R.string.wallet_connect,
+                    titleRes = R.string.wallet_connect_title,
                     message = context.getString(
                         R.string.wallet_connect_network_not_found_format,
                         state.dialog.network,
@@ -91,14 +91,14 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 )
             is WalletConnectDialog.OpeningSessionRejected -> {
                 SimpleAlertDialog.create(
-                    titleRes = R.string.wallet_connect,
+                    titleRes = R.string.wallet_connect_title,
                     messageRes = R.string.wallet_connect_same_wcuri,
                     context = context,
                 )
             }
             is WalletConnectDialog.SessionTimeout -> {
                 SimpleAlertDialog.create(
-                    titleRes = R.string.wallet_connect,
+                    titleRes = R.string.wallet_connect_title,
                     messageRes = R.string.wallet_connect_error_timeout,
                     context = context,
                 )
@@ -123,7 +123,7 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 )
             is WalletConnectDialog.UnsupportedNetwork ->
                 SimpleAlertDialog.create(
-                    titleRes = R.string.wallet_connect,
+                    titleRes = R.string.wallet_connect_title,
                     messageRes = R.string.wallet_connect_scanner_error_unsupported_network,
                     context = context,
                 )
@@ -153,7 +153,7 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 primaryButtonAction = state.dialog.onOk,
             )
             is WalletDialog.RussianCardholdersWarningDialog ->
-                RussianCardholdersWarningBottomSheetDialog(context, state.dialog.topUpUrl)
+                RussianCardholdersWarningBottomSheetDialog(context, state.dialog.data)
             else -> null
         }
         dialog?.show()
diff --git a/app/src/main/java/com/tangem/tap/common/IntentHandler.kt b/app/src/main/java/com/tangem/tap/common/IntentHandler.kt
index 1e41053369..4ac3547aa0 100644
--- a/app/src/main/java/com/tangem/tap/common/IntentHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/IntentHandler.kt
@@ -3,6 +3,7 @@ package com.tangem.tap.common
 import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
+import com.tangem.tap.common.extensions.removePrefixOrNull
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.walletconnect.WalletConnectManager
@@ -14,18 +15,24 @@ import timber.log.Timber
 
 class IntentHandler {
 
-    private val TRANSACTION_ID_PARAM = "transactionId"
-    private val CURRENCY_CODE_PARAM = "baseCurrencyCode"
-    private val CURRENCY_AMOUNT_PARAM = "baseCurrencyAmount"
-    private val DEPOSIT_WALLET_ADDRESS_PARAM = "depositWalletAddress"
-
-    fun handleIntent(intent: Intent?) {
-        handleBackgroundScan(intent)
-        handleWalletConnectLink(intent)
-        handleSellCurrencyCallback(intent)
+    fun handleWalletConnectLink(intent: Intent?) {
+        val wcUri = when (intent?.scheme) {
+            WalletConnectManager.WC_SCHEME -> {
+                intent.data?.toString()
+            }
+            TANGEM_SCHEME -> {
+                intent.data?.toString()?.removePrefixOrNull(TANGEM_WC_PREFIX)
+            }
+            else -> {
+                null
+            }
+        }
+        if (wcUri != null) {
+            store.dispatch(WalletConnectAction.HandleDeepLink(wcUri))
+        }
     }
 
-    private fun handleBackgroundScan(intent: Intent?) {
+    fun handleBackgroundScan(intent: Intent?) {
         if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action ||
                 NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action
                 )
@@ -40,13 +47,7 @@ class IntentHandler {
         }
     }
 
-    private fun handleWalletConnectLink(intent: Intent?) {
-        if (intent?.scheme == WalletConnectManager.WC_SCHEME) {
-            store.dispatch(WalletConnectAction.HandleDeepLink(intent.data?.toString()))
-        }
-    }
-
-    private fun handleSellCurrencyCallback(intent: Intent?) {
+    fun handleSellCurrencyCallback(intent: Intent?) {
         try {
             val transactionID =
                 intent?.data?.getQueryParameter(TRANSACTION_ID_PARAM) ?: return
@@ -60,16 +61,25 @@ class IntentHandler {
 
             Timber.d("MoonPay Sell: $amount $currency to $destinationAddress")
 
-            store.dispatch(WalletAction.TradeCryptoAction.SendCrypto(
-                currencyId = currency,
-                amount = amount,
-                destinationAddress = destinationAddress,
-                transactionId = transactionID
-            ))
+            store.dispatch(
+                WalletAction.TradeCryptoAction.SendCrypto(
+                    currencyId = currency,
+                    amount = amount,
+                    destinationAddress = destinationAddress,
+                    transactionId = transactionID,
+                ),
+            )
         } catch (exception: Exception) {
             Timber.d("Not MoonPay URL")
         }
     }
 
-
+    companion object {
+        private const val TRANSACTION_ID_PARAM = "transactionId"
+        private const val CURRENCY_CODE_PARAM = "baseCurrencyCode"
+        private const val CURRENCY_AMOUNT_PARAM = "baseCurrencyAmount"
+        private const val DEPOSIT_WALLET_ADDRESS_PARAM = "depositWalletAddress"
+        private const val TANGEM_SCHEME = "tangem"
+        private const val TANGEM_WC_PREFIX = "tangem://wc?uri="
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/Analytics.kt b/app/src/main/java/com/tangem/tap/common/analytics/Analytics.kt
new file mode 100644
index 0000000000..8a6ee52f27
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/Analytics.kt
@@ -0,0 +1,93 @@
+package com.tangem.tap.common.analytics
+
+import com.tangem.domain.common.FeatureCoroutineExceptionHandler
+import com.tangem.tap.common.analytics.api.AnalyticsEventFilter
+import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
+import com.tangem.tap.common.analytics.api.AnalyticsFilterHolder
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerHolder
+import com.tangem.tap.common.analytics.api.ParamsInterceptor
+import com.tangem.tap.common.analytics.api.ParamsInterceptorHolder
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.launch
+import java.util.concurrent.Executors
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface GlobalAnalyticsEventHandler : AnalyticsEventHandler,
+    AnalyticsHandlerHolder,
+    AnalyticsFilterHolder,
+    ParamsInterceptorHolder
+
+object Analytics : GlobalAnalyticsEventHandler {
+
+    private val analyticsScope: CoroutineScope by lazy { createScope() }
+
+    private val handlers = mutableMapOf<String, AnalyticsHandler>()
+    private val paramsInterceptors = mutableMapOf<String, ParamsInterceptor>()
+    private val analyticsFilters = mutableSetOf<AnalyticsEventFilter>()
+
+    private val analyticsHandlers: List<AnalyticsHandler>
+        get() = handlers.values.toList()
+
+    override fun addHandler(name: String, handler: AnalyticsHandler) {
+        handlers[name] = handler
+    }
+
+    override fun removeHandler(name: String): AnalyticsHandler? {
+        return handlers.remove(name)
+    }
+
+    override fun addFilter(filter: AnalyticsEventFilter) {
+        analyticsFilters.add(filter)
+    }
+
+    override fun removeFilter(filter: AnalyticsEventFilter): Boolean {
+        return analyticsFilters.remove(filter)
+    }
+
+    override fun addParamsInterceptor(interceptor: ParamsInterceptor) {
+        paramsInterceptors[interceptor.id()] = interceptor
+    }
+
+    override fun removeParamsInterceptor(interceptor: ParamsInterceptor): ParamsInterceptor? {
+        return paramsInterceptors.remove(interceptor.id())
+    }
+
+    override fun send(event: AnalyticsEvent) {
+        analyticsScope.launch {
+            event.params = applyParamsInterceptors(event)
+            val eventFilter = analyticsFilters.firstOrNull { it.canBeAppliedTo(event) }
+
+            when {
+                eventFilter == null -> analyticsHandlers.forEach { handler -> handler.send(event) }
+                eventFilter.canBeSent(event) -> {
+                    analyticsHandlers
+                        .filter { handler -> eventFilter.canBeConsumedByHandler(handler, event) }
+                        .forEach { handler -> handler.send(event) }
+                }
+            }
+        }
+    }
+
+    private fun applyParamsInterceptors(event: AnalyticsEvent): MutableMap<String, String> {
+        val interceptedParams = event.params.toMutableMap()
+        paramsInterceptors.values
+            .filter { it.canBeAppliedTo(event) }
+            .forEach { it.intercept(interceptedParams) }
+
+        return interceptedParams
+    }
+
+    private fun createScope(): CoroutineScope {
+        val name = "Analytics"
+        val dispatcher = Executors.newFixedThreadPool(1).asCoroutineDispatcher()
+        val exHandler = FeatureCoroutineExceptionHandler.create(name)
+        return CoroutineScope(SupervisorJob() + dispatcher + CoroutineName(name) + exHandler)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventAnOld.kt b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventAnOld.kt
deleted file mode 100644
index 41cc0d9b96..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsEventAnOld.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.tangem.tap.common.analytics
-
-enum class AnalyticsEventAnOld(val event: String) {
-    CARD_IS_SCANNED("card_is_scanned"),
-    TRANSACTION_IS_SENT("transaction_is_sent"),
-    READY_TO_SCAN("ready_to_scan"),
-    DEMO_MODE_ACTIVATED("demo_mode_activated"),
-
-    APP_RATING_DISPLAYED("rate_app_warning_displayed"),
-    APP_RATING_DISMISS("dismiss_rate_app_warning"),
-    APP_RATING_NEGATIVE("negative_rate_app_feedback"),
-    APP_RATING_POSITIVE("positive_rate_app_feedback"),
-
-    WC_SUCCESS_RESPONSE("wallet_connect_success_response"),
-    WC_INVALID_REQUEST("wallet_connect_invalid_request"),
-    WC_NEW_SESSION("wallet_connect_new_session"),
-    WC_SESSION_DISCONNECTED("wallet_connect_session_disconnected"),
-
-    GET_CARD("get_card"),
-}
-
-enum class AnalyticsParamAnOld(val param: String) {
-    BLOCKCHAIN("blockchain"),
-    CARD_ID("cardId"),
-    BATCH_ID("batch_id"),
-    FIRMWARE("firmware"),
-    ACTION("action"),
-    ERROR_DESCRIPTION("error_description"),
-    ERROR_CODE("error_code"),
-    NEW_SECURITY_OPTION("new_security_option"),
-    ERROR_KEY("Tangem SDK error key"),
-
-    WALLET_CONNECT_ACTION("wallet_connect_action"),
-    WALLET_CONNECT_REQUEST("wallet_connect_request"),
-    WALLET_CONNECT_DAPP_URL("wallet_connect_dapp_url"),
-
-    SOURCE("source"),
-}
-
-enum class GetCardSourceParamsAnOld(val param: String) {
-    WELCOME("welcome"),
-    ONBOARDING_BUY_MORE("wallet_onboaring_buy_more_cards"),
-    ONBOARDING("wallet_onboarding")
-}
-
-object AnalyticsAnOld {
-    enum class ActionToLog(val key: String) {
-        Scan("tap_scan_task"),
-        SendTransaction("send_transaction"),
-        WalletConnectSign("wallet_connect_personal_sign"),
-        WalletConnectTransaction("wallet_connect_tx_sign"),
-        ReadPinSettings("read_pin_settings"),
-        ChangeSecOptions("change_sec_options"),
-        CreateWallet("create_wallet"),
-        PurgeWallet("purge_wallet"),
-        WriteIssuerData("write_issuer_data"),
-    }
-
-    enum class WcSessionEvent { Disconnect, Connect }
-
-    enum class WcAction { PersonalSign, SignTransaction, SendTransaction }
-
-    sealed class WcAnalyticsEvent {
-        data class Error(val error: Throwable, val action: WcAction?) :
-            WcAnalyticsEvent()
-
-        data class Session(val event: WcSessionEvent, val url: String?) : WcAnalyticsEvent()
-        data class Action(val action: WcAction) : WcAnalyticsEvent()
-        data class InvalidRequest(val json: String?) : WcAnalyticsEvent()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsFactory.kt b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsFactory.kt
new file mode 100644
index 0000000000..8936adfc3c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsFactory.kt
@@ -0,0 +1,37 @@
+package com.tangem.tap.common.analytics
+
+import com.tangem.tap.common.analytics.api.AnalyticsEventFilter
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
+import com.tangem.tap.common.analytics.api.ParamsInterceptor
+
+/**
+[REDACTED_AUTHOR]
+ */
+class AnalyticsFactory {
+
+    private val builders = mutableListOf<AnalyticsHandlerBuilder>()
+    private val filters = mutableListOf<AnalyticsEventFilter>()
+    private val interceptors = mutableListOf<ParamsInterceptor>()
+
+    fun addHandlerBuilder(builder: AnalyticsHandlerBuilder) {
+        builders.add(builder)
+    }
+
+    fun addFilter(filter: AnalyticsEventFilter) {
+        filters.add(filter)
+    }
+
+    fun addParamsInterceptor(interceptor: ParamsInterceptor) {
+        interceptors.add(interceptor)
+    }
+
+    fun build(analytics: Analytics, data: AnalyticsHandlerBuilder.Data) {
+        builders.mapNotNull { it.build(data) }.forEach { analytics.addHandler(it.id(), it) }
+        filters.forEach { analytics.addFilter(it) }
+        interceptors.forEach { analytics.addParamsInterceptor(it) }
+
+        builders.clear()
+        filters.clear()
+        interceptors.clear()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsInterfaces.kt b/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsInterfaces.kt
deleted file mode 100644
index 6fd6fc7dc8..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/AnalyticsInterfaces.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.tangem.tap.common.analytics
-
-
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsEventHandlerBuilder.kt b/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsEventHandlerBuilder.kt
deleted file mode 100644
index 8e2b439e08..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsEventHandlerBuilder.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.tangem.tap.common.analytics
-
-import android.app.Application
-import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.domain.common.AnalyticsHandlersLogConfig
-import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
-import com.tangem.tap.common.analytics.handlers.amplitude.AmplitudeAnalyticsHandler
-import com.tangem.tap.common.analytics.handlers.amplitude.AmplitudeClient
-import com.tangem.tap.common.analytics.handlers.amplitude.AmplitudeLogClient
-import com.tangem.tap.common.analytics.handlers.appsFlyer.AppsFlyerAnalyticsHandler
-import com.tangem.tap.common.analytics.handlers.appsFlyer.AppsFlyerClient
-import com.tangem.tap.common.analytics.handlers.appsFlyer.AppsFlyerLogClient
-import com.tangem.tap.common.analytics.handlers.firebase.FirebaseAnalyticsHandler
-import com.tangem.tap.common.analytics.handlers.firebase.FirebaseClient
-import com.tangem.tap.common.analytics.handlers.firebase.FirebaseLogClient
-import com.tangem.tap.domain.configurable.config.Config
-
-/**
-[REDACTED_AUTHOR]
- */
-class GlobalAnalyticsEventHandlerBuilder(
-    val application: Application,
-    val config: Config,
-    val isDebug: Boolean,
-    val logConfig: AnalyticsHandlersLogConfig,
-    val jsonConverter: MoshiJsonConverter,
-) {
-
-    private val analyticHandlers = mutableListOf<AnalyticsEventHandler>()
-
-    fun build(): GlobalAnalyticsEventHandler {
-        return GlobalAnalyticsHandler(analyticHandlers.toList())
-    }
-
-    fun default(): GlobalAnalyticsEventHandler {
-        addFirebaseAnalytics()
-        addAppsFlyer()
-        addAmplitude()
-
-        return GlobalAnalyticsHandler(analyticHandlers.toList())
-    }
-
-    fun addFirebaseAnalytics(): GlobalAnalyticsEventHandlerBuilder {
-        if (isDebug) {
-            if (logConfig.firebase) FirebaseLogClient(createLogger("FirebaseAnalyticsHandler")) else null
-        } else {
-            FirebaseClient()
-        }?.let {
-            analyticHandlers.add(FirebaseAnalyticsHandler(it))
-        }
-        return this
-    }
-
-    fun addAppsFlyer(): GlobalAnalyticsEventHandlerBuilder {
-        if (isDebug) {
-            if (logConfig.appsFlyer) AppsFlyerLogClient(createLogger("AppsFlyerAnalyticsHandler")) else null
-        } else {
-            AppsFlyerClient(application, config.appsFlyerDevKey)
-        }?.let {
-            analyticHandlers.add(AppsFlyerAnalyticsHandler(it))
-        }
-        return this
-    }
-
-    fun addAmplitude(): GlobalAnalyticsEventHandlerBuilder {
-        if (isDebug) {
-            if (logConfig.firebase) AmplitudeLogClient(createLogger("AmplitudeAnalyticsHandler")) else null
-        } else {
-            AmplitudeClient(application, config.amplitudeApiKey)
-        }?.let {
-            analyticHandlers.add(AmplitudeAnalyticsHandler(it))
-        }
-        return this
-    }
-
-    private fun createLogger(name: String): AnalyticsEventsLogger {
-        return AnalyticsEventsLogger(name, jsonConverter)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsHandler.kt
deleted file mode 100644
index d1bef7d01b..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/GlobalAnalyticsHandler.kt
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.tangem.tap.common.analytics
-
-import com.shopify.buy3.Storefront
-import com.tangem.blockchain.common.BlockchainError
-import com.tangem.common.card.Card
-import com.tangem.common.core.TangemSdkError
-import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
-import com.tangem.tap.common.analytics.api.BlockchainSdkErrorEventHandler
-import com.tangem.tap.common.analytics.api.CardSdkErrorEventHandler
-import com.tangem.tap.common.analytics.api.ErrorEventHandler
-import com.tangem.tap.common.analytics.api.ErrorEventLogger
-import com.tangem.tap.common.analytics.api.SdkErrorEventHandler
-import com.tangem.tap.common.analytics.api.ShopifyOrderEventHandler
-import com.tangem.tap.common.analytics.events.AnalyticsEvent
-import com.tangem.tap.common.extensions.filterNotNull
-
-interface GlobalAnalyticsEventHandler : AnalyticsEventHandler,
-    ErrorEventHandler,
-    SdkErrorEventHandler,
-    ShopifyOrderEventHandler {
-
-    fun attachToAllEvents(key: String, value: String)
-
-    companion object {
-        fun stub(): GlobalAnalyticsEventHandler {
-            return object : GlobalAnalyticsEventHandler {
-                override fun attachToAllEvents(key: String, value: String) {}
-                override fun handleEvent(event: String, params: Map<String, String>) {}
-                override fun handleErrorEvent(error: Throwable, params: Map<String, String>) {}
-                override fun handleCardSdkErrorEvent(
-                    error: TangemSdkError,
-                    action: AnalyticsAnOld.ActionToLog,
-                    params: Map<AnalyticsParamAnOld, String>,
-                    card: Card?,
-                ) {
-                }
-
-                override fun handleBlockchainSdkErrorEvent(
-                    error: BlockchainError,
-                    action: AnalyticsAnOld.ActionToLog,
-                    params: Map<AnalyticsParamAnOld, String>,
-                    card: Card?,
-                ) {
-                }
-
-                override fun handleShopifyOrderEvent(order: Storefront.Order) {}
-            }
-        }
-    }
-}
-
-class GlobalAnalyticsHandler(
-    private val analyticsHandlers: List<AnalyticsEventHandler>,
-) : GlobalAnalyticsEventHandler {
-
-    private val attachToAllEventsParams: MutableMap<String, String> = mutableMapOf()
-
-    override fun attachToAllEvents(key: String, value: String) {
-        attachToAllEventsParams[key] = value
-    }
-
-    override fun handleEvent(event: String, params: Map<String, String>) {
-        analyticsHandlers.forEach { it.handleEvent(event, params) }
-    }
-
-    override fun handleAnalyticsEvent(
-        event: AnalyticsEvent,
-        card: Card?,
-        blockchain: String?,
-    ) {
-        analyticsHandlers.forEach { it.handleAnalyticsEvent(event, card, blockchain) }
-    }
-
-    override fun handleAnalyticsEvent(
-        event: AnalyticsEventAnOld,
-        params: Map<String, String>,
-        card: Card?,
-        blockchain: String?,
-    ) {
-        analyticsHandlers.forEach { it.handleAnalyticsEvent(event, params, card, blockchain) }
-    }
-
-    override fun handleErrorEvent(error: Throwable, params: Map<String, String>) {
-        analyticsHandlers.filterIsInstance<ErrorEventLogger>().forEach {
-            it.logErrorEvent(error, params)
-        }
-    }
-
-    override fun handleCardSdkErrorEvent(
-        error: TangemSdkError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String>,
-        card: Card?,
-    ) {
-        analyticsHandlers.filterIsInstance<CardSdkErrorEventHandler>().forEach {
-            it.handleCardSdkErrorEvent(error, action, params, card)
-        }
-    }
-
-    override fun handleBlockchainSdkErrorEvent(
-        error: BlockchainError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String>,
-        card: Card?,
-    ) {
-        analyticsHandlers.filterIsInstance<BlockchainSdkErrorEventHandler>().forEach {
-            it.handleBlockchainSdkErrorEvent(error, action, params, card)
-        }
-    }
-
-    override fun handleShopifyOrderEvent(order: Storefront.Order) {
-        analyticsHandlers.filterIsInstance<ShopifyOrderEventHandler>().forEach {
-            it.handleShopifyOrderEvent(order)
-        }
-    }
-
-    override fun prepareParams(card: Card?, blockchain: String?, params: Map<String, String>): Map<String, String> {
-        return super.prepareParams(card, blockchain, params).toMutableMap().apply {
-            putAll(attachToAllEventsParams)
-        }
-    }
-}
-
-fun GlobalAnalyticsEventHandler.logWcEvent(event: AnalyticsAnOld.WcAnalyticsEvent) {
-    when (event) {
-        is AnalyticsAnOld.WcAnalyticsEvent.Action -> {
-            handleAnalyticsEvent(
-                event = AnalyticsEventAnOld.WC_SUCCESS_RESPONSE,
-                params = mapOf(
-                    AnalyticsParamAnOld.WALLET_CONNECT_ACTION.param to event.action.name,
-                ),
-            )
-        }
-        is AnalyticsAnOld.WcAnalyticsEvent.Error -> {
-            val params = mapOf(
-                AnalyticsParamAnOld.WALLET_CONNECT_ACTION.param to event.action?.name,
-                AnalyticsParamAnOld.ERROR_DESCRIPTION.param to event.error.message,
-            ).filterNotNull()
-            handleErrorEvent(event.error, params)
-        }
-        is AnalyticsAnOld.WcAnalyticsEvent.InvalidRequest ->
-            handleAnalyticsEvent(
-                event = AnalyticsEventAnOld.WC_INVALID_REQUEST,
-                params = mapOf(
-                    AnalyticsParamAnOld.WALLET_CONNECT_REQUEST.param to event.json,
-                ).filterNotNull(),
-            )
-        is AnalyticsAnOld.WcAnalyticsEvent.Session -> {
-            val analyticsEvent = when (event.event) {
-                AnalyticsAnOld.WcSessionEvent.Disconnect -> AnalyticsEventAnOld.WC_SESSION_DISCONNECTED
-                AnalyticsAnOld.WcSessionEvent.Connect -> AnalyticsEventAnOld.WC_NEW_SESSION
-            }
-            handleAnalyticsEvent(
-                event = analyticsEvent,
-                params = mapOf(
-                    AnalyticsParamAnOld.WALLET_CONNECT_DAPP_URL.param to event.url,
-                ).filterNotNull(),
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt
index 17e31d88c4..491ef8f683 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/TangemSdkError.kt
@@ -74,7 +74,7 @@ object TangemSdk {
             is TangemSdkError.UnsupportedWalletConfig -> TangemSdkError.UnsupportedWalletConfig()
             is TangemSdkError.CryptoUtilsError -> TangemSdkError.CryptoUtilsError(error.customMessage)
             is TangemSdkError.NetworkError -> TangemSdkError.NetworkError(error.customMessage)
-            is TangemSdkError.ExceptionError -> TangemSdkError.ExceptionError(error.throwable)
+            is TangemSdkError.ExceptionError -> TangemSdkError.ExceptionError(error.cause)
             is TangemSdkError.TooMuchBackupCards -> TangemSdkError.TooMuchBackupCards()
             is TangemSdkError.BackupCardRequired -> TangemSdkError.BackupCardRequired()
             is TangemSdkError.CertificateSignatureRequired -> TangemSdkError.CertificateSignatureRequired()
@@ -107,6 +107,8 @@ object TangemSdk {
             is TangemSdkError.BackupFailedFirmware -> TangemSdkError.BackupFailedFirmware()
             is TangemSdkError.UserForgotTheCode -> TangemSdkError.UserForgotTheCode()
             is TangemSdkError.BackupFailedIncompatibleBatch -> TangemSdkError.BackupFailedIncompatibleBatch()
+            is TangemSdkError.BiometricsUnavailable -> error
+            is TangemSdkError.BiometricsAuthenticationFailed -> error
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/api/EventFilterApi.kt b/app/src/main/java/com/tangem/tap/common/analytics/api/EventFilterApi.kt
new file mode 100644
index 0000000000..04d6dbbb01
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/api/EventFilterApi.kt
@@ -0,0 +1,30 @@
+package com.tangem.tap.common.analytics.api
+
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+
+/**
+[REDACTED_AUTHOR]
+ * The filter is used to separate events to send and determine which handler it can be processed with.
+ */
+interface AnalyticsEventFilter {
+    /**
+     * Recognizes the event and checks if the given filter can be applied to the event.
+     */
+    fun canBeAppliedTo(event: AnalyticsEvent): Boolean
+
+    /**
+     * An internal filter check that, on external or internal conditions, recognizes the possibility of
+     * sending an event.
+     */
+    fun canBeSent(event: AnalyticsEvent): Boolean
+
+    /**
+     * Performs a check to see if the event can be dispatched by a specific handler
+     */
+    fun canBeConsumedByHandler(handler: AnalyticsHandler, event: AnalyticsEvent): Boolean
+}
+
+interface AnalyticsFilterHolder {
+    fun addFilter(filter: AnalyticsEventFilter)
+    fun removeFilter(filter: AnalyticsEventFilter): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt b/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt
index 08e1609e3c..344402f7f1 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt
@@ -1,88 +1,50 @@
 package com.tangem.tap.common.analytics.api
 
-import com.shopify.buy3.Storefront
-import com.tangem.blockchain.common.BlockchainError
-import com.tangem.common.card.Card
-import com.tangem.common.core.TangemSdkError
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
+import android.app.Application
+import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.domain.common.AnalyticsHandlersLogConfig
 import com.tangem.tap.common.analytics.events.AnalyticsEvent
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.extensions.filterNotNull
+import com.tangem.tap.domain.configurable.config.Config
 
 /**
 [REDACTED_AUTHOR]
  */
 interface AnalyticsEventHandler {
-    fun handleEvent(
-        event: String,
-        params: Map<String, String> = emptyMap(),
-    )
+    fun send(event: AnalyticsEvent)
+}
 
-    fun handleAnalyticsEvent(
-        event: AnalyticsEvent,
-        card: Card? = null,
-        blockchain: String? = null,
-    ) {
-        handleEvent(
-            event = prepareEventString(event.category, event.event),
-            params = prepareParams(card, blockchain, event.params),
-        )
+interface AnalyticsHandler : AnalyticsEventHandler {
+    fun id(): String
+
+    fun send(event: String, params: Map<String, String> = emptyMap())
+
+    override fun send(event: AnalyticsEvent) {
+        send(prepareEventString(event), event.params)
     }
 
-    @Deprecated("Migrate to AnalyticsEvent")
-    fun handleAnalyticsEvent(
-        event: AnalyticsEventAnOld,
-        params: Map<String, String> = emptyMap(),
-        card: Card? = null,
-        blockchain: String? = null,
-    ) {
-        handleEvent(event.event, prepareParams(card, blockchain, params))
-    }
-
-    fun prepareParams(
-        card: Card? = null,
-        blockchain: String? = null,
-        params: Map<String, String> = emptyMap(),
-    ): Map<String, String> = mapOf(
-        AnalyticsParam.Firmware to card?.firmwareVersion?.stringValue,
-        AnalyticsParam.BatchId to card?.batchId,
-        AnalyticsParam.Blockchain to blockchain,
-    ).filterNotNull() + params
-
-    fun prepareEventString(category: String, event: String): String {
-        return "[$category] $event"
-    }
+    fun prepareEventString(event: AnalyticsEvent): String = "[${event.category}] ${event.event}"
 }
 
 interface ErrorEventHandler {
-    fun handleErrorEvent(
+    fun send(
         error: Throwable,
         params: Map<String, String> = emptyMap(),
     )
 }
 
-interface SdkErrorEventHandler : CardSdkErrorEventHandler, BlockchainSdkErrorEventHandler
+interface AnalyticsHandlerHolder {
+    fun addHandler(name: String, handler: AnalyticsHandler)
+    fun removeHandler(name: String): AnalyticsHandler?
+}
 
-interface CardSdkErrorEventHandler {
-    fun handleCardSdkErrorEvent(
-        error: TangemSdkError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String> = emptyMap(),
-        card: Card? = null,
+interface AnalyticsHandlerBuilder {
+    fun build(data: Data): AnalyticsHandler?
+
+    data class Data(
+        val application: Application,
+        val config: Config,
+        val isDebug: Boolean,
+        val logConfig: AnalyticsHandlersLogConfig,
+        val jsonConverter: MoshiJsonConverter,
     )
-}
-
-interface BlockchainSdkErrorEventHandler {
-    fun handleBlockchainSdkErrorEvent(
-        error: BlockchainError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String> = mapOf(),
-        card: Card? = null,
-    )
-}
-
-interface ShopifyOrderEventHandler {
-    fun handleShopifyOrderEvent(order: Storefront.Order)
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/api/ParamsInterceptorApi.kt b/app/src/main/java/com/tangem/tap/common/analytics/api/ParamsInterceptorApi.kt
new file mode 100644
index 0000000000..245ef32da5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/api/ParamsInterceptorApi.kt
@@ -0,0 +1,17 @@
+package com.tangem.tap.common.analytics.api
+
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+
+/**
+[REDACTED_AUTHOR]
+ */
+interface ParamsInterceptor {
+    fun id(): String
+    fun canBeAppliedTo(event: AnalyticsEvent): Boolean
+    fun intercept(params: MutableMap<String, String>)
+}
+
+interface ParamsInterceptorHolder {
+    fun addParamsInterceptor(interceptor: ParamsInterceptor)
+    fun removeParamsInterceptor(interceptor: ParamsInterceptor): ParamsInterceptor?
+}
\ 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
new file mode 100644
index 0000000000..b6fab47d07
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/AnalyticsErrorConverter.kt
@@ -0,0 +1,70 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.tangem.blockchain.common.BlockchainSdkError
+import com.tangem.common.Converter
+import com.tangem.common.core.TangemSdkError
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.features.demo.DemoTransactionSender
+
+/**
+[REDACTED_AUTHOR]
+ */
+class AnalyticsErrorConverter : Converter<Throwable, Map<String, String>> {
+    fun canBeHandled(error: Throwable): Boolean {
+        return when (error) {
+            is TangemSdkError.UserCancelled -> false
+            is BlockchainSdkError -> !error.customMessage.contains(DemoTransactionSender.ID)
+            else -> true
+        }
+    }
+
+    override fun convert(value: Throwable): Map<String, String> {
+        return when (value) {
+            is BlockchainSdkError -> BlockchainSdkErrorConverter(CardSdkErrorConverter()).convert(value)
+            is TangemSdkError -> CardSdkErrorConverter().convert(value)
+            else -> ThrowableErrorConverter().convert(value)
+        }
+    }
+}
+
+private class ThrowableErrorConverter : Converter<Throwable, Map<String, String>> {
+    override fun convert(value: Throwable): Map<String, String> {
+        val unknown = "unknown"
+        return mapOf(
+            AnalyticsParam.ErrorKey to AnalyticsParam.Error.App.value,
+            AnalyticsParam.ErrorDescription to (value.message ?: value.cause?.message ?: unknown),
+        )
+    }
+}
+
+class CardSdkErrorConverter : Converter<TangemSdkError, Map<String, String>> {
+
+    override fun convert(value: TangemSdkError): Map<String, String> {
+        if (value is TangemSdkError.UserCancelled) return emptyMap()
+
+        return mapOf(
+            AnalyticsParam.ErrorKey to AnalyticsParam.Error.CardSdk.value,
+            AnalyticsParam.ErrorCode to value.code.toString(),
+            AnalyticsParam.ErrorDescription to value.toString(),
+        )
+    }
+}
+
+private class BlockchainSdkErrorConverter(
+    private val cardSdkErrorConverter: CardSdkErrorConverter,
+) : Converter<BlockchainSdkError, Map<String, String>> {
+
+    override fun convert(value: BlockchainSdkError): Map<String, String> {
+        if (value.customMessage.contains(DemoTransactionSender.ID)) return emptyMap()
+
+        if (value is BlockchainSdkError.WrappedTangemError) {
+            return (value.tangemError as? TangemSdkError)?.let { cardSdkErrorConverter.convert(it) } ?: emptyMap()
+        }
+
+        return mapOf(
+            AnalyticsParam.ErrorKey to AnalyticsParam.Error.BlockchainSdk.value,
+            AnalyticsParam.ErrorCode to value.code.toString(),
+            AnalyticsParam.ErrorDescription to "${value.javaClass.simpleName}: ${value.customMessage}",
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/converters/BasicEventConverter.kt b/app/src/main/java/com/tangem/tap/common/analytics/converters/BasicEventConverter.kt
new file mode 100644
index 0000000000..52fa450434
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/BasicEventConverter.kt
@@ -0,0 +1,78 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.tangem.common.Converter
+import com.tangem.common.extensions.isZero
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.tap.common.analytics.filters.BasicTopUpFilter
+import com.tangem.tap.domain.extensions.isMultiwalletAllowed
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
+import com.tangem.tap.features.wallet.redux.ProgressState
+import com.tangem.tap.features.wallet.redux.WalletData
+import com.tangem.tap.features.wallet.redux.WalletState
+import com.tangem.tap.features.wallet.redux.reducers.calculateTotalCryptoAmount
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BasicSignInEventConverter(
+    private val scanResponse: ScanResponse,
+) : Converter<WalletState, Basic.SignedIn?> {
+
+    override fun convert(value: WalletState): Basic.SignedIn? {
+        if (!statesIsReadyToCreateEvent(scanResponse, value)) return null
+        val cardCurrency = ParamCardCurrencyConverter().convert(scanResponse) ?: return null
+
+        return Basic.SignedIn(
+            state = AnalyticsParam.CardBalanceState.from(value.walletsDataFromStores),
+            currency = cardCurrency,
+            batch = scanResponse.card.batchId,
+        ).apply {
+            filterData = UserWalletIdBuilder.scanResponse(scanResponse)
+                .build()
+                ?.stringValue
+        }
+    }
+}
+
+class BasicTopUpEventConverter(
+    private val scanResponse: ScanResponse,
+) : Converter<WalletState, Basic.ToppedUp?> {
+
+    override fun convert(value: WalletState): Basic.ToppedUp? {
+        if (!statesIsReadyToCreateEvent(scanResponse, value)) return null
+        val cardCurrency = ParamCardCurrencyConverter().convert(scanResponse) ?: return null
+
+        val data = BasicTopUpFilter.Data(
+            walletId = UserWalletIdBuilder.scanResponse(scanResponse).build()?.stringValue ?: "",
+            cardBalanceState = AnalyticsParam.CardBalanceState.from(value.walletsDataFromStores),
+        )
+
+        return Basic.ToppedUp(cardCurrency).apply { filterData = data }
+    }
+}
+
+private fun AnalyticsParam.CardBalanceState.Companion.from(walletsData: List<WalletData>): AnalyticsParam.CardBalanceState {
+    val totalCryptoAmount = walletsData.calculateTotalCryptoAmount()
+    return when {
+        totalCryptoAmount.isZero() -> AnalyticsParam.CardBalanceState.Empty
+        else -> AnalyticsParam.CardBalanceState.Full
+    }
+}
+
+private fun statesIsReadyToCreateEvent(scanResponse: ScanResponse, state: WalletState): Boolean {
+    if (scanResponse.card.isMultiwalletAllowed && state.missingDerivations.isNotEmpty()) return false
+    if (state.walletsDataFromStores.isEmpty()) return false
+
+    val totalBalanceState = state.totalBalance?.state ?: return false
+    if (totalBalanceState == ProgressState.Loading || totalBalanceState == ProgressState.Refreshing) return false
+
+    val balancesCount = state.walletsDataFromStores.map {
+        if (it.currencyData.amount == null) 0 else 1
+    }.reduce { acc, i -> acc + i }
+
+    if (balancesCount != state.walletsStores.size) return false
+
+    return true
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt b/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt
new file mode 100644
index 0000000000..e64b751f4f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt
@@ -0,0 +1,31 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.Converter
+import com.tangem.domain.common.SaltPayWorkaround
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.getTangemNoteBlockchain
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.domain.extensions.isMultiwalletAllowed
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ParamCardCurrencyConverter : Converter<ScanResponse, AnalyticsParam.CardCurrency?> {
+
+    override fun convert(value: ScanResponse): AnalyticsParam.CardCurrency? {
+        if (value.card.isMultiwalletAllowed) return AnalyticsParam.CardCurrency.MultiCurrency
+
+        val type = when {
+            value.isTangemNote() -> {
+                value.card.getTangemNoteBlockchain()?.let { AnalyticsParam.CurrencyType.Blockchain(it) }
+            }
+            value.isTangemTwins() -> AnalyticsParam.CurrencyType.Blockchain(Blockchain.Bitcoin)
+            value.isSaltPay() -> AnalyticsParam.CurrencyType.Token(SaltPayWorkaround.tokenFrom(Blockchain.SaltPay))
+            value.getPrimaryToken() != null -> AnalyticsParam.CurrencyType.Token(value.getPrimaryToken()!!)
+            else -> null
+        } ?: return null
+
+        return AnalyticsParam.CardCurrency.SingleCurrency(type)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/converters/SdkErrorConverters.kt b/app/src/main/java/com/tangem/tap/common/analytics/converters/SdkErrorConverters.kt
deleted file mode 100644
index 5229df8174..0000000000
--- a/app/src/main/java/com/tangem/tap/common/analytics/converters/SdkErrorConverters.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.tangem.tap.common.analytics.converters
-
-import com.tangem.blockchain.common.BlockchainError
-import com.tangem.blockchain.common.BlockchainSdkError
-import com.tangem.common.Converter
-import com.tangem.common.core.TangemSdkError
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
-import com.tangem.tap.common.analytics.TangemSdk
-import com.tangem.tap.features.demo.DemoTransactionSender
-
-/**
-[REDACTED_AUTHOR]
- */
-internal data class ErrorEvent(
-    val throwable: Throwable,
-    val params: Map<String, String>,
-)
-
-internal class CardSdkErrorConverter : Converter<CardSdkErrorConverter.Model, ErrorEvent?> {
-
-    override fun convert(value: Model): ErrorEvent? {
-        if (value.error is TangemSdkError.UserCancelled) return null
-
-        val mutableParams = value.params.convertToParamValue().toMutableMap().apply {
-            putAll(value.cardParams)
-        }
-        mutableParams[AnalyticsParamAnOld.ACTION.param] = value.action.key
-        mutableParams[AnalyticsParamAnOld.ERROR_CODE.param] = value.error.code.toString()
-        mutableParams[AnalyticsParamAnOld.ERROR_DESCRIPTION.param] = value.error.javaClass.simpleName
-        mutableParams[AnalyticsParamAnOld.ERROR_KEY.param] = "TangemSdkError"
-
-        return ErrorEvent(TangemSdk.map(value.error), mutableParams)
-    }
-
-    internal data class Model(
-        val error: TangemSdkError,
-        val action: AnalyticsAnOld.ActionToLog,
-        val params: Map<AnalyticsParamAnOld, String>,
-        val cardParams: Map<String, String>,
-    )
-}
-
-internal class BlockchainSdkErrorConverter(
-    private val cardSdkErrorConverter: CardSdkErrorConverter,
-) : Converter<BlockchainSdkErrorConverter.Model, ErrorEvent?> {
-
-    override fun convert(value: Model): ErrorEvent? {
-        val error = (value.error as? BlockchainSdkError) ?: return null
-
-        if (error is BlockchainSdkError.WrappedTangemError) {
-            val tangemSdkError = (error.tangemError as? TangemSdkError) ?: return null
-
-            val cardSdkModel = CardSdkErrorConverter.Model(
-                error = tangemSdkError,
-                action = value.action,
-                params = value.params,
-                cardParams = value.cardParams,
-            )
-            return cardSdkErrorConverter.convert(cardSdkModel)
-        }
-
-        if (error.customMessage.contains(DemoTransactionSender.ID)) return null
-
-        val mutableParams = value.params.convertToParamValue().toMutableMap()
-        mutableParams[AnalyticsParamAnOld.ACTION.param] = value.action.key
-        mutableParams[AnalyticsParamAnOld.ERROR_CODE.param] = error.code.toString()
-        mutableParams[AnalyticsParamAnOld.ERROR_DESCRIPTION.param] = "${error.javaClass.simpleName}: ${error.customMessage}"
-        mutableParams[AnalyticsParamAnOld.ERROR_KEY.param] = "BlockchainSdkError"
-
-        return ErrorEvent(value.error, mutableParams)
-    }
-
-    data class Model(
-        val error: BlockchainError,
-        val action: AnalyticsAnOld.ActionToLog,
-        val params: Map<AnalyticsParamAnOld, String>,
-        val cardParams: Map<String, String>,
-    )
-}
-
-internal fun Map<AnalyticsParamAnOld, String>.convertToParamValue(): Map<String, String> {
-    return mutableMapOf<String, String>().also { newMap ->
-        this.forEach {
-            newMap[it.key.param] = it.value
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/converters/ShopOrderToEventConverter.kt b/app/src/main/java/com/tangem/tap/common/analytics/converters/ShopOrderToEventConverter.kt
new file mode 100644
index 0000000000..ddbd1683bd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/ShopOrderToEventConverter.kt
@@ -0,0 +1,27 @@
+package com.tangem.tap.common.analytics.converters
+
+import com.shopify.buy3.Storefront
+import com.tangem.common.Converter
+import com.tangem.tap.common.analytics.events.Shop
+import com.tangem.tap.common.shop.data.ProductType
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ShopOrderToEventConverter : Converter<Pair<Storefront.Order, ProductType>, Shop.Purchased> {
+
+    override fun convert(value: Pair<Storefront.Order, ProductType>): Shop.Purchased {
+        val order = value.first
+        val productType = value.second
+
+        val sku = order.lineItems.edges.firstOrNull()?.node?.variant?.sku ?: productType.sku
+        val count = when (productType) {
+            ProductType.WALLET_2_CARDS -> "2"
+            ProductType.WALLET_3_CARDS -> "3"
+        }
+        val amount = "${order.totalPriceV2.amount} ${order.totalPriceV2.currencyCode.name}"
+        val code = (order.discountApplications.edges.firstOrNull()?.node as? Storefront.DiscountCodeApplication)?.code
+
+        return Shop.Purchased(sku, count, amount, code)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsEvent.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsEvent.kt
index 0451fdd68c..b2db44fe52 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsEvent.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsEvent.kt
@@ -6,5 +6,7 @@ package com.tangem.tap.common.analytics.events
 sealed class AnalyticsEvent(
     val category: String,
     val event: String,
-    val params: Map<String, String> = mapOf(),
+    var params: Map<String, String> = mapOf(),
+    val error: Throwable? = null,
+    var filterData: Any? = null,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
index 8c69239429..bad36d3f0d 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
@@ -1,22 +1,27 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.tap.features.details.redux.SecurityOption
+
 sealed class AnalyticsParam {
 
     sealed class CurrencyType(val value: String) {
         class Currency(currency: com.tangem.tap.features.wallet.models.Currency) : CurrencyType(currency.currencySymbol)
         class Blockchain(blockchain: com.tangem.blockchain.common.Blockchain) : CurrencyType(blockchain.currency)
         class Token(token: com.tangem.blockchain.common.Token) : CurrencyType(token.symbol)
+        class FiatCurrency(fiatCurrency: com.tangem.tap.common.entities.FiatCurrency) : CurrencyType(fiatCurrency.symbol)
+        class Amount(amount: com.tangem.blockchain.common.Amount) : CurrencyType(amount.currencySymbol)
     }
 
-    // Multicurrency or CurrencyType
+    // MultiCurrency or CurrencyType
     sealed class CardCurrency(val value: String) {
         object MultiCurrency : CardCurrency("Multicurrency")
         class SingleCurrency(type: CurrencyType) : CardCurrency(type.value)
     }
 
-    sealed class CardState(val value: String) {
-        object Empty : CardState("Empty")
-        object Full : CardState("Full")
+    sealed class CardBalanceState(val value: String) {
+        object Empty : CardBalanceState("Empty")
+        object Full : CardBalanceState("Full")
+        companion object
     }
 
     sealed class RateApp(val value: String) {
@@ -39,20 +44,26 @@ sealed class AnalyticsParam {
         object AccessCode : SecurityMode("Access Code")
         object Passcode : SecurityMode("Passcode")
         object LongTap : SecurityMode("Long Tap")
+
+        companion object {
+            fun from(option: SecurityOption): SecurityMode = when (option) {
+                SecurityOption.AccessCode -> AccessCode
+                SecurityOption.PassCode -> Passcode
+                SecurityOption.LongTap -> LongTap
+            }
+        }
     }
 
-    sealed class SocialNetwork(val value: String) {
-        object Facebook : SocialNetwork("Facebook")
-        object Instagram : SocialNetwork("Instagram")
-        object Youtube : SocialNetwork("Youtube")
-        object Twitter : SocialNetwork("Twitter")
-        object LinkedIn : SocialNetwork("LinkedIn")
-        object GitHub : SocialNetwork("GitHub")
+    sealed class Error(val value: String) {
+        object App : Error("App Error")
+        object CardSdk : Error("Card Sdk Error")
+        object BlockchainSdk : Error("Blockchain Sdk Error")
     }
 
     companion object Key {
-        const val Blockchain = "blockchain"
-        const val BatchId = "batch_id"
-        const val Firmware = "firmware"
+        const val BatchId = "Batch"
+        const val ErrorDescription = "Error Description"
+        const val ErrorCode = "Error Code"
+        const val ErrorKey = "Error Key"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
index bb37145672..80afe6d3f8 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
@@ -6,10 +6,11 @@ package com.tangem.tap.common.analytics.events
 sealed class Basic(
     event: String,
     params: Map<String, String> = mapOf(),
-) : AnalyticsEvent("Basic", event, params) {
+    error: Throwable? = null,
+) : AnalyticsEvent("Basic", event, params, error) {
 
-    sealed class SignedIn(
-        state: AnalyticsParam.CardState,
+    class SignedIn(
+        state: AnalyticsParam.CardBalanceState,
         currency: AnalyticsParam.CardCurrency,
         batch: String,
     ) : Basic(
@@ -17,7 +18,7 @@ sealed class Basic(
         params = mapOf(
             "State" to state.value,
             "Currency" to currency.value,
-            "Batch" to batch,
+            AnalyticsParam.BatchId to batch,
         ),
     )
 
@@ -25,4 +26,9 @@ sealed class Basic(
         event = "Topped up",
         params = mapOf("Currency" to currency.value),
     )
+
+    class ScanError(error: Throwable) : Basic(
+        event = "Scan",
+        error = error,
+    )
 }
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
index c6825718b7..a42cc3568e 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
@@ -14,12 +14,17 @@ sealed class MainScreen(
     class CardWasScanned : MainScreen("Card Was Scanned")
     class ButtonMyWallets : MainScreen("Button - My Wallets")
 
+    class EnableBiometrics(state: AnalyticsParam.OnOffState) : MainScreen(
+        event = "Enable Biometric",
+        params = mapOf("State" to state.value),
+    )
+
     class MainCurrencyChanged(currencyType: AnalyticsParam.CurrencyType) : MainScreen(
         event = "Main Currency Changed",
         params = mapOf("Currency Type" to currencyType.value),
     )
 
-    sealed class NoticeRateAppButton(result: AnalyticsParam.RateApp) : MainScreen(
+    class NoticeRateAppButton(result: AnalyticsParam.RateApp) : MainScreen(
         event = "Notice - Rate The App Button Tapped",
         params = mapOf("Result" to result.value),
     )
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt
index e5e3fdb96a..f944f58d24 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/ManageTokens.kt
@@ -1,5 +1,9 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.domain.features.addCustomToken.CustomCurrency
+import com.tangem.tap.common.extensions.filterNotNull
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -10,7 +14,18 @@ sealed class ManageTokens(
 
     class ScreenOpened : ManageTokens("Manage Tokens Screen Opened")
     class TokenSearched : ManageTokens("Token Searched")
-    class TokenSwitcherChanged : ManageTokens("Token Switcher Changed")
+
+    class TokenSwitcherChanged(
+        type: AnalyticsParam.CurrencyType,
+        state: AnalyticsParam.OnOffState,
+    ) : ManageTokens(
+        "Token Switcher Changed",
+        params = mapOf(
+            "Token" to type.value,
+            "State" to state.value,
+        ),
+    )
+
     class ButtonSaveChanges : ManageTokens("Button - Save Changes")
     class ButtonCustomToken : ManageTokens("Button - Custom Token")
 
@@ -21,13 +36,26 @@ sealed class ManageTokens(
 
         class ScreenOpened : ManageTokens("Custom Token Screen Opened")
 
-        class TokenWasAdded(symbol: String, network: String, address: String) : ManageTokens(
+        class TokenWasAdded(customCurrency: CustomCurrency) : ManageTokens(
             event = "Custom Token Was Added",
-            params = mapOf(
-                "Symbol" to symbol,
-                "Network" to network,
-                "Address" to address,
-            ),
-        )
+            params = convertToParam(customCurrency),
+        ) {
+            companion object {
+                private fun convertToParam(customCurrency: CustomCurrency): Map<String, String> = with(customCurrency) {
+                    return when (this) {
+                        is CustomCurrency.CustomBlockchain -> mapOf(
+                            "Token" to network.currency,
+                            "Derivation Path" to derivationPath?.rawPath,
+                        ).filterNotNull()
+                        is CustomCurrency.CustomToken -> mapOf(
+                            "Token" to token.symbol,
+                            "Derivation Path" to derivationPath?.rawPath,
+                            "Network Id" to network.toNetworkId(),
+                            "Contract Address" to token.contractAddress,
+                        ).filterNotNull()
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt
new file mode 100644
index 0000000000..0fd08ddd88
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MyWallets.kt
@@ -0,0 +1,18 @@
+package com.tangem.tap.common.analytics.events
+
+sealed class MyWallets(
+    event: String,
+    params: Map<String, String> = mapOf(),
+) : AnalyticsEvent("My Wallets", event, params) {
+
+    object MyWalletsScreenOpened : MyWallets(event = "My Wallets Screen Opened")
+    object CardWasScanned : MyWallets(event = "Card Was Scanned")
+    object WalletUnlockTapped : MyWallets(event = "Wallet Unlock Tapped")
+
+    object Button {
+        object ScanNewCard : MyWallets(event = "Button - Scan New Card")
+        object UnlockWithBiometrics : MyWallets(event = "Button - Unlock all with Face ID")
+        object EditWalletTapped : MyWallets(event = "Button - Edit Wallet Tapped")
+        object DeleteWalletTapped : MyWallets(event = "Button - Delete Wallet Tapped")
+    }
+}
\ No newline at end of file
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 b65408b7d5..92f55074e9 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
@@ -34,9 +34,9 @@ sealed class Onboarding(
         class AccessCodeEntered : Backup("Access Code Entered")
         class AccessCodeReEntered : Backup("Access Code Re-entered")
 
-        class Finished(cardsCount: String) : Backup(
+        class Finished(cardsCount: Int) : Backup(
             event = "Backup Finished",
-            params = mapOf("Cards count" to cardsCount),
+            params = mapOf("Cards count" to "$cardsCount"),
         )
     }
 
@@ -65,12 +65,17 @@ sealed class Onboarding(
         class SetupFinished : Twins("Twin Setup Finished")
     }
 
-    class PinCodeSet: Onboarding("Onboarding", "PIN code set")
-    class ButtonConnect: Onboarding("Onboarding", "Button - Connect")
-    class KYCStarted: Onboarding("Onboarding", "KYC started")
-    class KYCInProgress: Onboarding("Onboarding", "KYC in progress")
-    class KYCRejected: Onboarding("Onboarding", "KYC rejected")
-    class ClaimScreenOpened: Onboarding("Onboarding", "Claim screen opened")
-    class ButtonClaim: Onboarding("Onboarding", "Button - Claim")
-    class ClaimWasSuccessfully: Onboarding("Onboarding", "Claim was successfully")
+    class PinCodeSet : Onboarding("Onboarding", "PIN code set")
+    class ButtonConnect : Onboarding("Onboarding", "Button - Connect")
+    class KYCStarted : Onboarding("Onboarding", "KYC started")
+    class KYCInProgress : Onboarding("Onboarding", "KYC in progress")
+    class KYCRejected : Onboarding("Onboarding", "KYC rejected")
+    class ClaimScreenOpened : Onboarding("Onboarding", "Claim screen opened")
+    class ButtonClaim : Onboarding("Onboarding", "Button - Claim")
+    class ClaimWasSuccessfully : Onboarding("Onboarding", "Claim was successfully")
+    class EnableBiometrics(state: AnalyticsParam.OnOffState) : Onboarding(
+        category = "Onboarding / Biometric",
+        event = "Enable Biometric",
+        params = mapOf("State" to state.value),
+    )
 }
\ No newline at end of file
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 56893d2f31..728662bdb9 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
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.tap.features.details.ui.details.SocialNetwork
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -7,7 +9,8 @@ sealed class Settings(
     category: String = "Settings",
     event: String,
     params: Map<String, String> = mapOf(),
-) : AnalyticsEvent(category, event, params) {
+    error: Throwable? = null,
+) : AnalyticsEvent(category, event, params, error) {
 
     class ScreenOpened : Settings(event = "Settings Screen Opened")
     class ButtonChat : Settings(event = "Button - Chat")
@@ -18,29 +21,35 @@ sealed class Settings(
     class ButtonAppSettings : Settings(event = "Button - App Settings")
     class ButtonCreateBackup : Settings(event = "Button - Create Backup")
 
-    sealed class ButtonSocialNetwork(network: AnalyticsParam.SocialNetwork) : Settings(
+    class ButtonSocialNetwork(network: SocialNetwork) : Settings(
         event = "Button - Social Network",
-        params = mapOf("Network" to network.value),
+        params = mapOf("Network" to network.id),
     )
 
     sealed class CardSettings(
         event: String,
         params: Map<String, String> = mapOf(),
-    ) : Settings("Settings / Card Settings", event, params) {
+        error: Throwable? = null,
+    ) : Settings("Settings / Card Settings", event, params, error) {
 
         class ButtonFactoryReset : CardSettings("Button - Factory Reset")
-        class FactoryResetFinished : CardSettings("Factory Reset Finished")
+        class FactoryResetFinished(error: Throwable? = null) : CardSettings(
+            event = "Factory Reset Finished",
+            error = error,
+        )
+
         class UserCodeChanged : CardSettings("User Code Changed")
         class ButtonChangeSecurityMode : CardSettings("Button - Change Security Mode")
 
-        sealed class ButtonChangeUserCode(type: AnalyticsParam.UserCode) : CardSettings(
+        class ButtonChangeUserCode(type: AnalyticsParam.UserCode) : CardSettings(
             event = "Button - Change User Code",
             params = mapOf("Type" to type.value),
         )
 
-        sealed class SecurityModeChanged(mode: AnalyticsParam.SecurityMode) : CardSettings(
+        class SecurityModeChanged(mode: AnalyticsParam.SecurityMode, error: Throwable? = null) : CardSettings(
             event = "Security Mode Changed",
             params = mapOf("Mode" to mode.value),
+            error = error,
         )
     }
 
@@ -49,16 +58,16 @@ sealed class Settings(
         params: Map<String, String> = mapOf(),
     ) : Settings("Settings / App Settings", event, params) {
 
-        sealed class FaceIDSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
-            event = "Face ID Switcher Changed",
+        class SaveWalletSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
+            event = "Save Wallet Switcher Changed",
             params = mapOf("State" to state.value),
         )
 
-        sealed class SaveAccessCodeSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
+        class SaveAccessCodeSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
             event = "Save Access Code Switcher Changed",
             params = mapOf("State" to state.value),
         )
 
-        class ButtonEnableBiometricAuthentication : AppSettings("Button - Enable Biometric Authentication")
+        object ButtonEnableBiometricAuthentication : AppSettings("Button - Enable Biometric Authentication")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt
index c09bf89ab3..9634f2929b 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Shop.kt
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.tap.common.extensions.filterNotNull
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -10,9 +12,14 @@ sealed class Shop(
 
     class ScreenOpened : IntroductionProcess("Shop Screen Opened")
 
-    class Purchased(productSku: String) : Shop(
+    class Purchased(sku: String, count: String, amount: String, couponCode: String?) : Shop(
         event = "Purchased",
-        params = mapOf("SKU" to productSku),
+        params = mapOf(
+            "SKU" to sku,
+            "Count" to count,
+            "Amount" to amount,
+            "Coupon Code" to couponCode,
+        ).filterNotNull(),
     )
 
     class Redirected(partnerName: String) : Shop(
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 afe5da529a..7445e31f33 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
@@ -1,5 +1,7 @@
 package com.tangem.tap.common.analytics.events
 
+import com.tangem.tap.common.analytics.events.AnalyticsParam.CurrencyType
+
 /**
 [REDACTED_AUTHOR]
  */
@@ -7,15 +9,41 @@ sealed class Token(
     category: String,
     event: String,
     params: Map<String, String> = mapOf(),
-) : AnalyticsEvent(category, event, params) {
+    error: Throwable? = null,
+) : AnalyticsEvent(category, event, params, error) {
 
     class Refreshed : Token("Token", "Refreshed")
-    class ButtonRemoveToken : Token("Token", "Button - Remove Token")
     class ButtonExplore : Token("Token", "Button - Explore")
-    class ButtonBuy(token: String) : Token("Token", "Button - Buy", mapOf("Token" to token))
-    class ButtonSell(token: String) : Token("Token", "Button - Sell", mapOf("Token" to token))
-    class ButtonExchange(token: String) : Token("Token", "Button - Exchange", mapOf("Token" to token))
-    class ButtonSend(token: String) : Token("Token", "Button - Send", mapOf("Token" to token))
+
+    class ButtonRemoveToken(type: CurrencyType) : Token(
+        "Token",
+        "Button - Remove Token",
+        params = mapOf("Token" to type.value),
+    )
+
+    class ButtonBuy(type: CurrencyType) : Token(
+        category = "Token",
+        event = "Button - Buy",
+        params = mapOf("Token" to type.value),
+    )
+
+    class ButtonSell(type: CurrencyType) : Token(
+        category = "Token",
+        event = "Button - Sell",
+        params = mapOf("Token" to type.value),
+    )
+
+    class ButtonExchange(type: CurrencyType) : Token(
+        category = "Token",
+        event = "Button - Exchange",
+        params = mapOf("Token" to type.value),
+    )
+
+    class ButtonSend(type: CurrencyType) : Token(
+        category = "Token",
+        event = "Button - Send",
+        params = mapOf("Token" to type.value),
+    )
 
     sealed class Recieve(
         event: String,
@@ -30,16 +58,18 @@ sealed class Token(
     sealed class Send(
         event: String,
         params: Map<String, String> = mapOf(),
-    ) : Token("Token / Send", event, params) {
+        error: Throwable? = null,
+    ) : Token("Token / Send", event, params, error) {
 
         class ScreenOpened : Send("Send Screen Opened")
         class ButtonPaste : Send("Button - Paste")
         class ButtonQRCode : Send("Button - QR Code")
         class ButtonSwapCurrency : Send("Button - Swap Currency")
 
-        class TransactionSent(token: AnalyticsParam.CurrencyType) : Send(
+        class TransactionSent(type: CurrencyType, error: Throwable? = null) : Send(
             event = "Transaction Sent",
-            params = mapOf("Token" to token.value),
+            params = mapOf("Token" to type.value),
+            error = error,
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
index 624145c63d..1ff587b2aa 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt
@@ -6,9 +6,13 @@ package com.tangem.tap.common.analytics.events
 sealed class WalletConnect(
     event: String,
     params: Map<String, String> = mapOf(),
-) : AnalyticsEvent("Wallet Connect", event, params) {
+    error: Throwable? = null,
+) : AnalyticsEvent("Wallet Connect", event, params, error) {
 
     class NewSessionEstablished : WalletConnect("New Session Established")
     class SessionDisconnected : WalletConnect("Session Disconnected")
     class RequestSigned : WalletConnect("Request Signed")
+
+    class SignError(error: Throwable) : WalletConnect("Sign", error = error)
+    class TransactionError(error: Throwable) : WalletConnect("Transaction", error = error)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicSignInFilter.kt b/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicSignInFilter.kt
new file mode 100644
index 0000000000..a582ea34f1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicSignInFilter.kt
@@ -0,0 +1,27 @@
+package com.tangem.tap.common.analytics.filters
+
+import com.tangem.tap.common.analytics.api.AnalyticsEventFilter
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.Basic
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BasicSignInFilter : AnalyticsEventFilter {
+
+    private val alreadySignedIn = mutableSetOf<String>()
+
+    override fun canBeAppliedTo(event: AnalyticsEvent): Boolean = event is Basic.SignedIn
+
+    override fun canBeSent(event: AnalyticsEvent): Boolean {
+        val userWalletId = event.filterData as? String ?: return false
+
+        val canBeSent = !alreadySignedIn.contains(userWalletId)
+        alreadySignedIn.add(userWalletId)
+
+        return canBeSent
+    }
+
+    override fun canBeConsumedByHandler(handler: AnalyticsHandler, event: AnalyticsEvent): Boolean = true
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicTopUpFilter.kt b/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicTopUpFilter.kt
new file mode 100644
index 0000000000..be780ccd2d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/filters/BasicTopUpFilter.kt
@@ -0,0 +1,50 @@
+package com.tangem.tap.common.analytics.filters
+
+import com.tangem.common.extensions.guard
+import com.tangem.tap.common.analytics.api.AnalyticsEventFilter
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.tap.persistence.ToppedUpWalletStorage
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BasicTopUpFilter(
+    private val topupWalletStorage: ToppedUpWalletStorage,
+) : AnalyticsEventFilter {
+
+    override fun canBeAppliedTo(event: AnalyticsEvent): Boolean = event is Basic.ToppedUp
+
+    override fun canBeSent(event: AnalyticsEvent): Boolean {
+        val data = event.filterData as? Data ?: return false
+
+        val walletInfo = topupWalletStorage.restore(data.walletId).guard {
+            val newWalletInfo = Data(
+                walletId = data.walletId,
+                cardBalanceState = data.cardBalanceState,
+            )
+            topupWalletStorage.save(newWalletInfo)
+            return false
+        }
+
+        if (walletInfo.isToppedUp) return false
+
+        return if (!walletInfo.isToppedUp && data.isToppedUp) {
+            topupWalletStorage.save(walletInfo.copy(cardBalanceState = AnalyticsParam.CardBalanceState.Full))
+            true
+        } else {
+            false
+        }
+    }
+
+    override fun canBeConsumedByHandler(handler: AnalyticsHandler, event: AnalyticsEvent): Boolean = true
+
+    data class Data(
+        val walletId: String,
+        val cardBalanceState: AnalyticsParam.CardBalanceState,
+    ) {
+        val isToppedUp: Boolean = cardBalanceState == AnalyticsParam.CardBalanceState.Full
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/filters/ShopPurchasedEventFilter.kt b/app/src/main/java/com/tangem/tap/common/analytics/filters/ShopPurchasedEventFilter.kt
new file mode 100644
index 0000000000..dffa123240
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/filters/ShopPurchasedEventFilter.kt
@@ -0,0 +1,25 @@
+package com.tangem.tap.common.analytics.filters
+
+import com.tangem.tap.common.analytics.api.AnalyticsEventFilter
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.Shop
+import com.tangem.tap.common.analytics.handlers.appsFlyer.AppsFlyerAnalyticsHandler
+import com.tangem.tap.common.analytics.handlers.firebase.FirebaseAnalyticsHandler
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ShopPurchasedEventFilter : AnalyticsEventFilter {
+
+    override fun canBeAppliedTo(event: AnalyticsEvent): Boolean = event is Shop.Purchased
+
+    override fun canBeSent(event: AnalyticsEvent): Boolean = true
+
+    override fun canBeConsumedByHandler(handler: AnalyticsHandler, event: AnalyticsEvent): Boolean {
+        return when (handler) {
+            is AppsFlyerAnalyticsHandler, is FirebaseAnalyticsHandler -> true
+            else -> false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
index 27132a1f61..c76fe21d38 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
@@ -1,12 +1,27 @@
 package com.tangem.tap.common.analytics.handlers.amplitude
 
-import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 
 class AmplitudeAnalyticsHandler(
     private val client: AmplitudeAnalyticsClient,
-) : AnalyticsEventHandler {
+) : AnalyticsHandler {
 
-    override fun handleEvent(event: String, params: Map<String, String>) {
+    override fun id(): String = ID
+
+    override fun send(event: String, params: Map<String, String>) {
         client.logEvent(event, params)
     }
+
+    companion object {
+        const val ID = "Amplitude"
+    }
+
+    class Builder : AnalyticsHandlerBuilder {
+        override fun build(data: AnalyticsHandlerBuilder.Data): AnalyticsHandler? = when {
+            !data.isDebug -> AmplitudeClient(data.application, data.config.amplitudeApiKey)
+            data.isDebug && data.logConfig.amplitude -> AmplitudeLogClient(data.jsonConverter)
+            else -> null
+        }?.let { AmplitudeAnalyticsHandler(it) }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeLogClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeLogClient.kt
index b800259b5f..f60d2edfcf 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeLogClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeLogClient.kt
@@ -1,14 +1,17 @@
 package com.tangem.tap.common.analytics.handlers.amplitude
 
+import com.tangem.common.json.MoshiJsonConverter
 import com.tangem.tap.common.analytics.AnalyticsEventsLogger
 
 /**
 [REDACTED_AUTHOR]
  */
 internal class AmplitudeLogClient(
-    private val logger: AnalyticsEventsLogger,
+    jsonConverter: MoshiJsonConverter,
 ) : AmplitudeAnalyticsClient {
 
+    private val logger: AnalyticsEventsLogger = AnalyticsEventsLogger(AmplitudeAnalyticsHandler.ID, jsonConverter)
+
     override fun logEvent(event: String, params: Map<String, String>) {
         logger.logEvent(event, params)
     }
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
index 0acfb1dc2f..c3968d9d72 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
@@ -1,47 +1,27 @@
 package com.tangem.tap.common.analytics.handlers.appsFlyer
 
-import com.appsflyer.AFInAppEventParameterName
-import com.appsflyer.AFInAppEventType
-import com.shopify.buy3.Storefront
-import com.tangem.common.Converter
-import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
-import com.tangem.tap.common.analytics.api.ShopifyOrderEventHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 
 class AppsFlyerAnalyticsHandler(
     private val client: AppsFlyerAnalyticsClient,
-) : AnalyticsEventHandler, ShopifyOrderEventHandler {
+) : AnalyticsHandler {
 
-    override fun handleEvent(event: String, params: Map<String, String>) {
+    override fun id(): String = ID
+
+    override fun send(event: String, params: Map<String, String>) {
         client.logEvent(event, params)
     }
 
-    override fun handleShopifyOrderEvent(order: Storefront.Order) {
-        handleEvent(ORDER_EVENT, OrderToParamsConverter().convert(order))
-    }
-
     companion object {
-        const val ORDER_EVENT = AFInAppEventType.PURCHASE
+        const val ID = "AppsFlyer"
     }
-}
 
-private class OrderToParamsConverter : Converter<Storefront.Order, Map<String, String>> {
-
-    override fun convert(value: Storefront.Order): Map<String, String> {
-        val sku = value.lineItems.edges.firstOrNull()?.node?.variant?.sku ?: "unknown"
-
-        val discountCode =
-            (value.discountApplications.edges.firstOrNull()?.node as? Storefront.DiscountCodeApplication)?.code
-
-        val discountParams = if (discountCode != null) {
-            mapOf(AFInAppEventParameterName.COUPON_CODE to discountCode)
-        } else {
-            mapOf()
-        }
-
-        return mapOf(
-            AFInAppEventParameterName.CONTENT_ID to sku,
-            AFInAppEventParameterName.REVENUE to value.totalPriceV2.amount,
-            AFInAppEventParameterName.CURRENCY to value.currencyCode.name,
-        ) + discountParams
+    class Builder : AnalyticsHandlerBuilder {
+        override fun build(data: AnalyticsHandlerBuilder.Data): AnalyticsHandler? = when {
+            !data.isDebug -> AppsFlyerClient(data.application, data.config.appsFlyerDevKey)
+            data.isDebug && data.logConfig.appsFlyer -> AppsFlyerLogClient(data.jsonConverter)
+            else -> null
+        }?.let { AppsFlyerAnalyticsHandler(it) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerLogClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerLogClient.kt
index 0d3737a161..8e87061b2c 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerLogClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerLogClient.kt
@@ -1,14 +1,17 @@
 package com.tangem.tap.common.analytics.handlers.appsFlyer
 
+import com.tangem.common.json.MoshiJsonConverter
 import com.tangem.tap.common.analytics.AnalyticsEventsLogger
 
 /**
 [REDACTED_AUTHOR]
  */
 internal class AppsFlyerLogClient(
-    private val logger: AnalyticsEventsLogger,
+    jsonConverter: MoshiJsonConverter,
 ) : AppsFlyerAnalyticsClient {
 
+    private val logger = AnalyticsEventsLogger(AppsFlyerAnalyticsHandler.ID, jsonConverter)
+
     override fun logEvent(event: String, params: Map<String, String>) {
         logger.logEvent(event, params)
     }
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt
index 3ab6326670..109e61d0a5 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt
@@ -1,81 +1,50 @@
 package com.tangem.tap.common.analytics.handlers.firebase
 
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.shopify.buy3.Storefront
-import com.tangem.blockchain.common.BlockchainError
-import com.tangem.common.Converter
-import com.tangem.common.card.Card
-import com.tangem.common.core.TangemSdkError
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
-import com.tangem.tap.common.analytics.api.AnalyticsEventHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandler
+import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 import com.tangem.tap.common.analytics.api.ErrorEventHandler
-import com.tangem.tap.common.analytics.api.SdkErrorEventHandler
-import com.tangem.tap.common.analytics.api.ShopifyOrderEventHandler
-import com.tangem.tap.common.analytics.converters.BlockchainSdkErrorConverter
-import com.tangem.tap.common.analytics.converters.CardSdkErrorConverter
+import com.tangem.tap.common.analytics.converters.AnalyticsErrorConverter
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
 
 class FirebaseAnalyticsHandler(
     private val client: FirebaseAnalyticsClient,
-) : AnalyticsEventHandler, ErrorEventHandler, SdkErrorEventHandler, ShopifyOrderEventHandler {
+) : AnalyticsHandler, ErrorEventHandler {
 
-    override fun handleEvent(event: String, params: Map<String, String>) {
+    override fun id(): String = ID
+
+    override fun send(event: String, params: Map<String, String>) {
         client.logEvent(event, params)
     }
 
-    override fun handleErrorEvent(error: Throwable, params: Map<String, String>) {
+    override fun send(event: AnalyticsEvent) {
+        when (event.error) {
+            null -> super.send(event)
+            else -> {
+                val errorConverter = AnalyticsErrorConverter()
+                if (!errorConverter.canBeHandled(event.error)) return
+
+                val errorParams = errorConverter.convert(event.error).toMutableMap()
+                errorParams["Category"] = event.category
+                errorParams["Event"] = event.event
+                errorParams.putAll(event.params)
+                send(event.error, errorParams)
+            }
+        }
+    }
+
+    override fun send(error: Throwable, params: Map<String, String>) {
         client.logErrorEvent(error, params)
     }
 
-    override fun handleCardSdkErrorEvent(
-        error: TangemSdkError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String>,
-        card: Card?,
-    ) {
-        val model = CardSdkErrorConverter.Model(error, action, params, prepareParams(card))
-        val converter = CardSdkErrorConverter()
-        converter.convert(model)?.let {
-            handleErrorEvent(it.throwable, it.params)
-        }
+    companion object {
+        const val ID = "Firebase"
     }
 
-    override fun handleBlockchainSdkErrorEvent(
-        error: BlockchainError,
-        action: AnalyticsAnOld.ActionToLog,
-        params: Map<AnalyticsParamAnOld, String>,
-        card: Card?,
-    ) {
-
-        val model = BlockchainSdkErrorConverter.Model(error, action, params, prepareParams(card))
-        val converter = BlockchainSdkErrorConverter(CardSdkErrorConverter())
-        converter.convert(model)?.let {
-            handleErrorEvent(it.throwable, it.params)
-        }
-    }
-
-    override fun handleShopifyOrderEvent(order: Storefront.Order) {
-        handleEvent(FirebaseClient.ORDER_EVENT, OrderToParamsConverter().convert(order))
-    }
-}
-
-private class OrderToParamsConverter : Converter<Storefront.Order, Map<String, String>> {
-    override fun convert(value: Storefront.Order): Map<String, String> {
-        val sku = value.lineItems.edges.firstOrNull()?.node?.variant?.sku ?: "unknown"
-
-        val discountCode =
-            (value.discountApplications.edges.firstOrNull()?.node as? Storefront.DiscountCodeApplication)?.code
-
-        val discountParams = if (discountCode != null) {
-            mapOf(FirebaseAnalytics.Param.DISCOUNT to discountCode)
-        } else {
-            mapOf()
-        }
-
-        return mapOf(
-            FirebaseAnalytics.Param.ITEM_ID to sku,
-            FirebaseAnalytics.Param.VALUE to value.totalPriceV2.amount,
-            FirebaseAnalytics.Param.CURRENCY to value.currencyCode.name,
-        ) + discountParams
+    class Builder : AnalyticsHandlerBuilder {
+        override fun build(data: AnalyticsHandlerBuilder.Data): AnalyticsHandler? = when {
+            !data.isDebug -> FirebaseClient()
+            data.isDebug && data.logConfig.firebase -> FirebaseLogClient(data.jsonConverter)
+            else -> null
+        }?.let { FirebaseAnalyticsHandler(it) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseLogClient.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseLogClient.kt
index ccacc09f9e..e460f9dbf9 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseLogClient.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseLogClient.kt
@@ -1,14 +1,17 @@
 package com.tangem.tap.common.analytics.handlers.firebase
 
+import com.tangem.common.json.MoshiJsonConverter
 import com.tangem.tap.common.analytics.AnalyticsEventsLogger
 
 /**
 [REDACTED_AUTHOR]
  */
 internal class FirebaseLogClient(
-    private val logger: AnalyticsEventsLogger,
+    jsonConverter: MoshiJsonConverter,
 ) : FirebaseAnalyticsClient {
 
+    private val logger: AnalyticsEventsLogger = AnalyticsEventsLogger(FirebaseAnalyticsHandler.ID, jsonConverter)
+
     override fun logEvent(event: String, params: Map<String, String>) {
         logger.logEvent(event, params)
     }
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/BatchIdParamsInterceptor.kt b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/BatchIdParamsInterceptor.kt
new file mode 100644
index 0000000000..ffe48cf198
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/BatchIdParamsInterceptor.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.common.analytics.paramsInterceptor
+
+import com.tangem.tap.common.analytics.api.ParamsInterceptor
+import com.tangem.tap.common.analytics.events.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BatchIdParamsInterceptor(
+    val batchId: String,
+) : ParamsInterceptor {
+
+    override fun id(): String = this::class.java.simpleName
+
+    override fun canBeAppliedTo(event: AnalyticsEvent): Boolean = true
+
+    override fun intercept(params: MutableMap<String, String>) {
+        params[AnalyticsParam.BatchId] = batchId
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/Button.kt b/app/src/main/java/com/tangem/tap/common/compose/Button.kt
index 690f35f388..b20f7470b8 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/Button.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/Button.kt
@@ -1,7 +1,17 @@
 package com.tangem.tap.common.compose
 
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.material.ripple.LocalRippleTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -16,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.components.SpacerH8
 import com.tangem.tap.common.compose.extensions.stringResourceDefault
 import com.tangem.wallet.R
 
@@ -137,8 +148,7 @@ fun ToggledRippleTheme(
 @Preview
 @Composable
 fun ButtonTest() {
-    Scaffold(
-    ) {
+    Scaffold {
         Column(modifier = Modifier.padding(16.dp)) {
             PreviewItem("Button") {
                 RectangleButton(text = "Some button") {}
diff --git a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt
index fc496f1d9b..99042c3391 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/ComposeDialogManager.kt
@@ -30,6 +30,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import com.tangem.core.ui.components.SpacerH16
 import com.tangem.domain.DomainDialog
 import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.global.DomainGlobalAction
@@ -105,7 +106,7 @@ fun <T> SimpleDialog(
                 modifier = Modifier.padding(22.dp)
             ) {
                 DialogTitle(title = title)
-                LazyColumn() {
+                LazyColumn {
                     items(items) { item ->
                         Row(
                             modifier = Modifier
@@ -154,4 +155,4 @@ fun ErrorDialog(
             }
         }
     )
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/TangemTypography.kt b/app/src/main/java/com/tangem/tap/common/compose/TangemTypography.kt
index 88b088fa6a..2013295f25 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/TangemTypography.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/TangemTypography.kt
@@ -9,13 +9,13 @@ import com.tangem.wallet.R
 object TangemTypography {
 
     val body1 = TextStyle(
-        fontFamily = FontFamily(Font(R.font.roboto)),
+        fontFamily = FontFamily(Font(R.font.roboto_regular)),
         fontSize = 16.0.sp,
         letterSpacing = 0.5.sp,
         lineHeight = 24.0.sp,
     )
     val body2 = TextStyle(
-        fontFamily = FontFamily(Font(R.font.roboto)),
+        fontFamily = FontFamily(Font(R.font.roboto_regular)),
         fontSize = 14.0.sp,
         letterSpacing = 0.25.sp,
         lineHeight = 20.0.sp,
@@ -27,13 +27,13 @@ object TangemTypography {
         lineHeight = 20.0.sp,
     )
     val caption = TextStyle(
-        fontFamily = FontFamily(Font(R.font.roboto)),
+        fontFamily = FontFamily(Font(R.font.roboto_regular)),
         fontSize = 12.0.sp,
         letterSpacing = 0.4000000059604645.sp,
         lineHeight = 16.0.sp,
     )
     val headline1 = TextStyle(
-        fontFamily = FontFamily(Font(R.font.roboto)),
+        fontFamily = FontFamily(Font(R.font.roboto_regular)),
         fontSize = 34.0.sp,
         letterSpacing = 0.0.sp,
         lineHeight = 44.0.sp,
diff --git a/app/src/main/java/com/tangem/tap/common/compose/Warning.kt b/app/src/main/java/com/tangem/tap/common/compose/Warning.kt
index 07c82d1384..0d19a8e2ea 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/Warning.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/Warning.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.tangem.common.module.ModuleMessage
+import com.tangem.core.ui.components.SpacerH8
 import com.tangem.tap.domain.moduleMessage.ModuleMessageConverter
 import com.tangem.wallet.R
 
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
index a9504e668a..711e7ed172 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt
@@ -1,10 +1,12 @@
 package com.tangem.tap.common.extensions
 
 import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import com.tangem.common.extensions.VoidCallback
+import com.tangem.feature.referral.ReferralFragment
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.FragmentShareTransition
 import com.tangem.tap.features.details.ui.appsettings.AppSettingsFragment
@@ -20,21 +22,22 @@ import com.tangem.tap.features.onboarding.products.note.OnboardingNoteFragment
 import com.tangem.tap.features.onboarding.products.otherCards.OnboardingOtherCardsFragment
 import com.tangem.tap.features.onboarding.products.twins.ui.TwinsCardsFragment
 import com.tangem.tap.features.onboarding.products.wallet.ui.OnboardingWalletFragment
+import com.tangem.tap.features.saveWallet.ui.SaveWalletBottomSheetFragment
 import com.tangem.tap.features.send.ui.SendFragment
 import com.tangem.tap.features.shop.ui.ShopFragment
 import com.tangem.tap.features.tokens.addCustomToken.AddCustomTokenFragment
 import com.tangem.tap.features.tokens.ui.AddTokensFragment
 import com.tangem.tap.features.wallet.ui.WalletDetailsFragment
 import com.tangem.tap.features.wallet.ui.WalletFragment
+import com.tangem.tap.features.walletSelector.ui.WalletSelectorBottomSheetFragment
+import com.tangem.tap.features.welcome.ui.WelcomeFragment
 import com.tangem.wallet.R
 import timber.log.Timber
 
-private class Navigation
-
 fun FragmentActivity.openFragment(
     screen: AppScreen,
     addToBackstack: Boolean,
-    fgShareTransition: FragmentShareTransition? = null
+    fgShareTransition: FragmentShareTransition? = null,
 ) {
     val transaction = this.supportFragmentManager.beginTransaction()
     val fragment = fragmentFactory(screen)
@@ -48,9 +51,18 @@ fun FragmentActivity.openFragment(
             }
         }
     }
-    transaction.replace(R.id.fragment_container, fragment, screen.name)
-    if (addToBackstack && screen != AppScreen.Home) transaction.addToBackStack(null)
-    transaction.commitAllowingStateLoss()
+    if (screen.isDialogFragment) {
+        (fragment as DialogFragment).show(transaction, screen.name)
+        if (addToBackstack) {
+            transaction.addToBackStack(screen.name)
+        }
+    } else {
+        transaction.replace(R.id.fragment_container, fragment, screen.name)
+        if (addToBackstack) {
+            transaction.addToBackStack(screen.name)
+        }
+        transaction.commitAllowingStateLoss()
+    }
 }
 
 fun FragmentActivity.popBackTo(screen: AppScreen?, inclusive: Boolean = false) {
@@ -104,5 +116,9 @@ private fun fragmentFactory(screen: AppScreen): Fragment {
         AppScreen.WalletDetails -> WalletDetailsFragment()
         AppScreen.WalletConnectSessions -> WalletConnectFragment()
         AppScreen.QrScan -> QrScanFragment()
+        AppScreen.ReferralProgram -> ReferralFragment()
+        AppScreen.Welcome -> WelcomeFragment()
+        AppScreen.SaveWallet -> SaveWalletBottomSheetFragment()
+        AppScreen.WalletSelector -> WalletSelectorBottomSheetFragment()
     }
 }
\ No newline at end of file
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 d88560669e..69c5f1c085 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
@@ -6,6 +6,7 @@ import com.tangem.tap.common.redux.StateDialog
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
+import com.tangem.tap.domain.model.UserWallet
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
@@ -26,6 +27,11 @@ fun Store<*>.dispatchNotification(resId: Int) {
     dispatchOnMain(GlobalAction.ShowNotification(resId))
 }
 
+@Suppress("UnusedReceiverParameter")
+suspend fun Store<*>.onUserWalletSelected(userWallet: UserWallet, refresh: Boolean = false) {
+    store.state.globalState.tapWalletManager.onWalletSelected(userWallet, refresh)
+}
+
 fun Store<*>.dispatchToastNotification(resId: Int) {
     dispatchOnMain(GlobalAction.ShowToastNotification(resId))
 }
@@ -71,7 +77,6 @@ suspend fun Store<*>.onCardScanned(scanResponse: ScanResponse) {
 fun Store<*>.dispatchOpenUrl(url: String) {
     store.dispatch(NavigationAction.OpenUrl(url))
 }
-
 fun Store<*>.dispatchShare(url: String) {
     store.dispatch(NavigationAction.Share(url))
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/String.kt b/app/src/main/java/com/tangem/tap/common/extensions/String.kt
index 7d54a7bf92..021cc3a7f2 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/String.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/String.kt
@@ -62,4 +62,9 @@ fun String.toQrCode(): Bitmap {
     return bmp
 }
 
-fun String.urlEncode(): String = Uri.encode(this)
\ No newline at end of file
+fun String.urlEncode(): String = Uri.encode(this)
+
+fun String.removePrefixOrNull(prefix: String): String? = when {
+    startsWith(prefix) -> substring(prefix.length)
+    else -> null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/extensions/UI.kt b/app/src/main/java/com/tangem/tap/common/extensions/UI.kt
index 4be902ebf7..9e58542ecb 100644
--- a/app/src/main/java/com/tangem/tap/common/extensions/UI.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/UI.kt
@@ -19,6 +19,7 @@ import android.view.inputmethod.InputMethodManager
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -57,7 +58,7 @@ fun View.getString(@StringRes id: Int, vararg formatArgs: String): String {
     return context.getString(id, *formatArgs)
 }
 
-fun View.getQuantityString(@StringRes id: Int, quantity: Int): String {
+fun View.getQuantityString(@PluralsRes id: Int, quantity: Int): String {
     return context.resources.getQuantityString(id, quantity, quantity)
 }
 
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 15d02907bf..cda489f536 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
@@ -55,11 +55,10 @@ suspend fun WalletManager.safeUpdate(): Result<Wallet> = try {
     }
 }
 
-fun WalletManager?.getToUpUrl(): String? {
+fun WalletManager.getTopUpUrl(): String? {
     val globalState = store.state.globalState
-    val wallet = this?.wallet ?: return null
-
     val defaultAddress = wallet.address
+
     return globalState.exchangeManager.getUrl(
         action = CurrencyExchangeManager.Action.Buy,
         blockchain = wallet.blockchain,
diff --git a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
index 97c8a9e41f..589597238f 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/AdditionalFeedbackInfo.kt
@@ -8,9 +8,10 @@ import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.address.Address
-import com.tangem.common.card.CardWallet
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.extensions.stripZeroPlainString
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 
 class AdditionalFeedbackInfo {
     class EmailWalletInfo(
@@ -29,6 +30,7 @@ class AdditionalFeedbackInfo {
     var cardFirmwareVersion: String = ""
     var cardIssuer: String = ""
     var cardBlockchain: String = ""
+    var userWalletId: String = ""
 
     // wallets
     internal val walletsInfo = mutableListOf<EmailWalletInfo>()
@@ -52,6 +54,7 @@ class AdditionalFeedbackInfo {
         cardFirmwareVersion = data.card.firmwareVersion.stringValue
         cardIssuer = data.card.issuer.name
         signedHashesCount = formatSignedHashes(data.card.wallets)
+        userWalletId = UserWalletIdBuilder.scanResponse(data).build()?.stringValue ?: ""
     }
 
     fun setWalletsInfo(walletManagers: List<WalletManager>) {
@@ -89,7 +92,7 @@ class AdditionalFeedbackInfo {
         )
     }
 
-    private fun formatSignedHashes(wallets: List<CardWallet>): String {
+    private fun formatSignedHashes(wallets: List<CardDTO.Wallet>): String {
         return wallets.joinToString("\n") { "Signed hashes: ${it.curve.curve} - ${it.totalSignedHashes}" }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt
index 6578b97356..8a426cccfc 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt
@@ -96,8 +96,8 @@ class FeedbackEmail : FeedbackData {
 }
 
 class SupportInfo : FeedbackData {
-    override val subjectResId: Int = R.string.details_ask_a_question
-    override val mainMessageResId: Int = R.string.details_ask_a_question
+    override val subjectResId: Int = R.string.details_chat
+    override val mainMessageResId: Int = R.string.details_chat
 
     override fun createOptionalMessage(infoHolder: AdditionalFeedbackInfo): String {
         return FeedbackDataBuilder(infoHolder)
diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackDataBuilder.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackDataBuilder.kt
index 46cf302fee..4baf39c3e2 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackDataBuilder.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackDataBuilder.kt
@@ -22,6 +22,7 @@ class FeedbackDataBuilder(
         builder.appendKeyValue("Firmware version", infoHolder.cardFirmwareVersion)
         builder.appendKeyValue("Card Blockchain", infoHolder.cardBlockchain)
         builder.appendKeyValue("", infoHolder.signedHashesCount)
+        builder.appendKeyValue("User Wallet ID", infoHolder.userWalletId)
         return this
     }
 
diff --git a/app/src/main/java/com/tangem/tap/common/moshi/Adapters.kt b/app/src/main/java/com/tangem/tap/common/moshi/Adapters.kt
new file mode 100644
index 0000000000..c0ec09ea9c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/moshi/Adapters.kt
@@ -0,0 +1,16 @@
+package com.tangem.tap.common.moshi
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.math.BigDecimal
+
+/**
+[REDACTED_AUTHOR]
+ */
+class BigDecimalAdapter {
+    @FromJson
+    fun fromJson(value: String) = BigDecimal(value)
+
+    @ToJson
+    fun toJson(value: BigDecimal) = value.toString()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/AccessCodeRequestPolicyMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/AccessCodeRequestPolicyMiddleware.kt
new file mode 100644
index 0000000000..e9aaabfd70
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/redux/AccessCodeRequestPolicyMiddleware.kt
@@ -0,0 +1,27 @@
+package com.tangem.tap.common.redux
+
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.tangemSdkManager
+import org.rekotlin.Middleware
+
+class AccessCodeRequestPolicyMiddleware {
+    val middleware: Middleware<AppState> = { _, _ ->
+        { next ->
+            { action ->
+                if (action is GlobalAction.SaveScanResponse) {
+                    updateAccessCodeRequestPolicy(action.scanResponse)
+                }
+                next(action)
+            }
+        }
+    }
+
+    private fun updateAccessCodeRequestPolicy(scanResponse: ScanResponse) {
+        tangemSdkManager.setAccessCodeRequestPolicy(
+            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes &&
+                scanResponse.card.isAccessCodeSet,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
index cbfa2565fb..f03dfc70ca 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
@@ -10,24 +10,28 @@ import com.tangem.tap.features.onboarding.products.note.redux.OnboardingNoteRedu
 import com.tangem.tap.features.onboarding.products.otherCards.redux.OnboardingOtherCardsReducer
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsReducer
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletReducer
+import com.tangem.tap.features.saveWallet.redux.SaveWalletReducer
 import com.tangem.tap.features.send.redux.reducers.SendScreenReducer
 import com.tangem.tap.features.shop.redux.ShopReducer
 import com.tangem.tap.features.tokens.redux.TokensReducer
 import com.tangem.tap.features.wallet.redux.reducers.WalletReducer
+import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorReducer
+import com.tangem.tap.features.welcome.redux.WelcomeReducer
 import org.rekotlin.Action
 
-fun appReducer(action: Action, state: AppState?): AppState {
+fun appReducer(action: Action, state: AppState?, appStateHolder: AppStateHolder): AppState {
     requireNotNull(state)
     if (action is AppAction.RestoreState) return action.state
 
     return AppState(
         navigationState = NavigationReducer.reduce(action, state),
-        globalState = globalReducer(action, state),
+        globalState = globalReducer(action, state, appStateHolder),
         homeState = HomeReducer.reduce(action, state),
         onboardingNoteState = OnboardingNoteReducer.reduce(action, state),
         onboardingWalletState = OnboardingWalletReducer.reduce(action, state),
         onboardingOtherCardsState = OnboardingOtherCardsReducer.reduce(action, state),
-        walletState = WalletReducer.reduce(action, state),
+        walletState = WalletReducer.reduce(action, state, appStateHolder),
         twinCardsState = TwinCardsReducer.reduce(action, state),
         sendState = SendScreenReducer.reduce(action, state.sendState),
         detailsState = DetailsReducer.reduce(action, state),
@@ -35,6 +39,9 @@ fun appReducer(action: Action, state: AppState?): AppState {
         tokensState = TokensReducer.reduce(action, state),
         walletConnectState = WalletConnectReducer.reduce(action, state.walletConnectState),
         shopState = ShopReducer.reduce(action, state.shopState),
+        welcomeState = WelcomeReducer.reduce(action, state),
+        saveWalletState = SaveWalletReducer.reduce(action, state),
+        walletSelectorState = WalletSelectorReducer.reduce(action, state),
     )
 }
 
diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
index af79cb81e1..9f7c34b90f 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
@@ -25,6 +25,8 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.BackupMiddleware
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletMiddleware
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletState
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayMiddleware
+import com.tangem.tap.features.saveWallet.redux.SaveWalletMiddleware
+import com.tangem.tap.features.saveWallet.redux.SaveWalletState
 import com.tangem.tap.features.send.redux.middlewares.SendMiddleware
 import com.tangem.tap.features.send.redux.states.SendState
 import com.tangem.tap.features.shop.redux.ShopMiddleware
@@ -33,6 +35,10 @@ import com.tangem.tap.features.tokens.redux.TokensMiddleware
 import com.tangem.tap.features.tokens.redux.TokensState
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.redux.middlewares.WalletMiddleware
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorMiddleware
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorState
+import com.tangem.tap.features.welcome.redux.WelcomeMiddleware
+import com.tangem.tap.features.welcome.redux.WelcomeState
 import org.rekotlin.Middleware
 import org.rekotlin.StateType
 
@@ -51,6 +57,9 @@ data class AppState(
     val tokensState: TokensState = TokensState(),
     val walletConnectState: WalletConnectState = WalletConnectState(),
     val shopState: ShopState = ShopState(),
+    val welcomeState: WelcomeState = WelcomeState(),
+    val saveWalletState: SaveWalletState = SaveWalletState(),
+    val walletSelectorState: WalletSelectorState = WalletSelectorState(),
 ) : StateType {
 
     val domainState: DomainState
@@ -62,7 +71,9 @@ data class AppState(
     companion object {
         fun getMiddleware(): List<Middleware<AppState>> {
             return listOf(
-                logMiddleware, navigationMiddleware, notificationsMiddleware,
+                logMiddleware,
+                navigationMiddleware,
+                notificationsMiddleware,
                 GlobalMiddleware.handler,
                 HomeMiddleware.handler,
                 OnboardingNoteMiddleware.handler,
@@ -78,8 +89,12 @@ data class AppState(
                 WalletConnectMiddleware().walletConnectMiddleware,
                 BackupMiddleware().backupMiddleware,
                 ShopMiddleware().shopMiddleware,
+                WelcomeMiddleware().middleware,
+                SaveWalletMiddleware().middleware,
+                WalletSelectorMiddleware().middleware,
+                LockUserWalletsTimerMiddleware().middleware,
+                AccessCodeRequestPolicyMiddleware().middleware,
             )
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/LockUserWalletsTimerMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/LockUserWalletsTimerMiddleware.kt
new file mode 100644
index 0000000000..67bb53a5b5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/common/redux/LockUserWalletsTimerMiddleware.kt
@@ -0,0 +1,15 @@
+package com.tangem.tap.common.redux
+
+import com.tangem.tap.lockUserWalletsTimer
+import org.rekotlin.Middleware
+
+class LockUserWalletsTimerMiddleware {
+    val middleware: Middleware<AppState> = { _, _ ->
+        { nextDispatch ->
+            { action ->
+                lockUserWalletsTimer?.restart()
+                nextDispatch(action)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
index b226be3401..1f51374cae 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt
@@ -5,7 +5,6 @@ import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemError
 import com.tangem.domain.common.ScanResponse
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.feedback.FeedbackData
 import com.tangem.tap.common.feedback.FeedbackManager
@@ -30,9 +29,6 @@ sealed class GlobalAction : Action {
     data class ShowErrorNotification(override val error: TapError) : GlobalAction(), ErrorAction
     data class DebugShowErrorNotification(override val error: TapError) : GlobalAction(), DebugErrorAction
 
-    // android resources
-    data class SetResources(val resources: AndroidResources) : GlobalAction()
-
     // dialogs
     data class ShowDialog(val stateDialog: StateDialog) : GlobalAction()
     object HideDialog : GlobalAction()
@@ -68,7 +64,7 @@ sealed class GlobalAction : Action {
         object Increment : GlobalAction()
     }
 
-    data class SaveScanNoteResponse(val scanResponse: ScanResponse) : GlobalAction()
+    data class SaveScanResponse(val scanResponse: ScanResponse) : GlobalAction()
 
     data class SetIfCardVerifiedOnline(val verified: Boolean) : GlobalAction()
 
@@ -89,7 +85,6 @@ sealed class GlobalAction : Action {
     data class SetConfigManager(val configManager: ConfigManager) : GlobalAction()
     data class SetWarningManager(val warningManager: WarningMessagesManager) : GlobalAction()
     data class SetFeedbackManager(val feedbackManager: FeedbackManager) : GlobalAction()
-    data class SetGlobalAnalyticsHandler(val analyticsHandler: GlobalAnalyticsEventHandler) : GlobalAction()
 
     data class SendEmail(val feedbackData: FeedbackData) : GlobalAction()
     data class OpenChat(val feedbackData: FeedbackData, val zendeskConfig: ZendeskConfig? = null) : GlobalAction()
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt
index 6f5af6bb92..dfcdf942bf 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt
@@ -167,10 +167,9 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di
             scope.launch {
                 tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
                 val result = tangemSdkManager.scanProduct(
-                    store.state.globalState.analyticsHandler,
-                    userTokensRepository,
-                    action.additionalBlockchainsToDerive,
-                    action.messageResId,
+                    userTokensRepository = userTokensRepository,
+                    additionalBlockchainsToDerive = action.additionalBlockchainsToDerive,
+                    messageRes = action.messageResId,
                 )
                 withMainContext {
                     store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result))
diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
index b0cefc6d9e..543e734f8f 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalReducer.kt
@@ -2,21 +2,20 @@ package com.tangem.tap.common.redux.global
 
 import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.global.DomainGlobalAction
+import com.tangem.tap.common.extensions.replaceBy
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.onboarding.OnboardingManager
 import com.tangem.tap.preferencesStorage
+import com.tangem.tap.proxy.AppStateHolder
 import org.rekotlin.Action
 
-fun globalReducer(action: Action, state: AppState): GlobalState {
+fun globalReducer(action: Action, state: AppState, appStateHolder: AppStateHolder): GlobalState {
 
     if (action !is GlobalAction) return state.globalState
 
     val globalState = state.globalState
 
     return when (action) {
-        is GlobalAction.SetResources -> {
-            globalState.copy(resources = action.resources)
-        }
         is GlobalAction.Onboarding.Start -> {
             val usedCardsPrefStorage = preferencesStorage.usedCardsPrefStorage
             val onboardingManager = OnboardingManager(action.scanResponse, usedCardsPrefStorage)
@@ -34,7 +33,8 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
         is GlobalAction.ScanFailsCounter.Reset -> {
             globalState.copy(scanCardFailsCounter = 0)
         }
-        is GlobalAction.SaveScanNoteResponse ->{
+        is GlobalAction.SaveScanResponse -> {
+            appStateHolder.scanResponse = action.scanResponse
             domainStore.dispatch(DomainGlobalAction.SaveScanNoteResponse(action.scanResponse))
             globalState.copy(scanResponse = action.scanResponse)
         }
@@ -48,15 +48,22 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
             globalState.copy(configManager = action.configManager)
         }
         is GlobalAction.SetWarningManager -> globalState.copy(warningManager = action.warningManager)
-        is GlobalAction.SetGlobalAnalyticsHandler -> globalState.copy(analyticsHandler = action.analyticsHandler)
         is GlobalAction.UpdateWalletSignedHashes -> {
             val card = globalState.scanResponse?.card ?: return globalState
-            val wallet = card.wallet(action.walletPublicKey) ?: return globalState
+            val wallet = card.wallets
+                .firstOrNull { it.publicKey.contentEquals(action.walletPublicKey) }
+                ?: return globalState
 
-            val newCardInstance = card.updateWallet(wallet.copy(
-                totalSignedHashes = action.walletSignedHashes,
-                remainingSignatures = action.remainingSignatures
-            ))
+            val newCardInstance = card.copy(
+                wallets = card.wallets.toMutableList().also { walletsMutable ->
+                    walletsMutable.replaceBy(
+                        item = wallet.copy(
+                            totalSignedHashes = action.walletSignedHashes,
+                            remainingSignatures = action.remainingSignatures,
+                        ),
+                    ) { it.index == wallet.index }
+                },
+            )
             globalState.copy(scanResponse = globalState.scanResponse.copy(card = newCardInstance))
         }
         is GlobalAction.SetFeedbackManager -> {
@@ -74,7 +81,7 @@ fun globalReducer(action: Action, state: AppState): GlobalState {
         is GlobalAction.SetIfCardVerifiedOnline ->
             globalState.copy(cardVerifiedOnline = action.verified)
         is GlobalAction.FetchUserCountry.Success -> globalState.copy(
-            userCountryCode = action.countryCode
+            userCountryCode = action.countryCode,
         )
         else -> globalState
     }
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 a02172db23..b897f1b5dc 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
@@ -1,7 +1,6 @@
 package com.tangem.tap.common.redux.global
 
 import com.tangem.domain.common.ScanResponse
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.feedback.FeedbackManager
 import com.tangem.tap.common.redux.StateDialog
@@ -26,20 +25,9 @@ data class GlobalState(
     val scanCardFailsCounter: Int = 0,
     val dialog: StateDialog? = null,
     val exchangeManager: CurrencyExchangeManager = CurrencyExchangeManager.dummy(),
-    val resources: AndroidResources = AndroidResources(),
-    val analyticsHandler: GlobalAnalyticsEventHandler = GlobalAnalyticsEventHandler.stub(),
     val userCountryCode: String? = null,
 ) : StateType
 
-
-data class AndroidResources(
-    val strings: RString = RString(),
-) {
-    data class RString(
-        val addressWasCopied: Int = -1,
-        val walletIsNotEmpty: Int = -1,
-    )
-}
 typealias CryptoCurrencyName = String
 
 data class OnboardingState(
diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationAction.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationAction.kt
index e397d78d8a..3e4f3a9702 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationAction.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationAction.kt
@@ -12,12 +12,17 @@ sealed class NavigationAction : Action {
         val addToBackstack: Boolean = true,
     ) : NavigationAction()
 
-    data class PopBackTo(val screen: AppScreen? = null) : NavigationAction()
+    data class PopBackTo(
+        val screen: AppScreen? = null,
+        val inclusive: Boolean = false,
+    ) : NavigationAction()
 
     data class OpenUrl(val url: String) : NavigationAction()
 
     data class OpenDocument(val url: Uri) : NavigationAction()
 
+    object OpenBiometricsSettings : NavigationAction()
+
     data class Share(val data: String) : NavigationAction()
 
     data class ActivityCreated(val activity: WeakReference<AppCompatActivity>) : NavigationAction()
diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
index 8a2f5c5ac1..28357c1efd 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationMiddleware.kt
@@ -1,14 +1,20 @@
 package com.tangem.tap.common.redux.navigation
 
 import android.content.Intent
+import android.hardware.biometrics.BiometricManager
+import android.os.Build
+import android.provider.Settings
+import com.tangem.tap.activityResultCaller
 import com.tangem.tap.common.CustomTabsManager
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.openFragment
 import com.tangem.tap.common.extensions.popBackTo
 import com.tangem.tap.common.extensions.shareText
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.store
 import org.rekotlin.Middleware
 
-val navigationMiddleware: Middleware<AppState> = { dispatch, state ->
+val navigationMiddleware: Middleware<AppState> = { _, state ->
     { next ->
         { action ->
             if (action is NavigationAction) {
@@ -16,16 +22,24 @@ val navigationMiddleware: Middleware<AppState> = { dispatch, state ->
                 when (action) {
                     is NavigationAction.NavigateTo -> {
                         navState?.activity?.get()?.openFragment(
-                                action.screen,
-                                action.addToBackstack,
-                                action.fragmentShareTransition
+                            screen = action.screen,
+                            addToBackstack = action.addToBackstack,
+                            fgShareTransition = action.fragmentShareTransition,
                         )
                     }
                     is NavigationAction.PopBackTo -> {
-                        if (action.screen == AppScreen.Home) {
-                            navState?.activity?.get()?.popBackTo(null, true)
-                        } else {
-                            navState?.activity?.get()?.popBackTo(action.screen)
+                        if (navState?.backStack?.lastOrNull() != action.screen) {
+                            when (val screen = action.screen) {
+                                AppScreen.Home,
+                                AppScreen.Welcome,
+                                -> {
+                                    navState?.activity?.get()?.popBackTo(screen, inclusive = true)
+                                    store.dispatchOnMain(NavigationAction.NavigateTo(screen))
+                                }
+                                else -> {
+                                    navState?.activity?.get()?.popBackTo(screen, action.inclusive)
+                                }
+                            }
                         }
                     }
                     is NavigationAction.OpenUrl -> {
@@ -38,11 +52,31 @@ val navigationMiddleware: Middleware<AppState> = { dispatch, state ->
                         intent.data = action.url
                         navState?.activity?.get()?.startActivity(intent)
                     }
-                    is NavigationAction.Share -> {
-                        navState?.activity?.get()?.let {
-                            it.shareText(action.data)
+                    is NavigationAction.OpenBiometricsSettings -> {
+                        val settingsAction = when {
+                            Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
+                                Settings.ACTION_BIOMETRIC_ENROLL
+                            }
+                            else -> {
+                                Settings.ACTION_SECURITY_SETTINGS
+                            }
                         }
+                        val intent = Intent(settingsAction).apply {
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                                putExtra(
+                                    Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
+                                    BiometricManager.Authenticators.BIOMETRIC_STRONG,
+                                )
+                            }
+                        }
+                        activityResultCaller.activityResultLauncher?.launch(intent)
                     }
+                    is NavigationAction.Share -> {
+                        navState?.activity?.get()?.shareText(action.data)
+                    }
+                    is NavigationAction.ActivityCreated,
+                    is NavigationAction.ActivityDestroyed,
+                    -> Unit
                 }
             }
             next(action)
diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationReducer.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationReducer.kt
index 7d63cb95ee..b6f7522586 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationReducer.kt
@@ -20,6 +20,8 @@ private fun internalReduce(action: Action, state: AppState): NavigationState {
             navState.copy(backStack = navState.backStack + navigationAction.screen)
         }
         is NavigationAction.PopBackTo -> {
+            if (navState.backStack.lastOrNull() == navigationAction.screen) return navState
+
             val screen = navigationAction.screen ?: navState.activity?.get()?.getPreviousScreen()
             val index = navState.backStack.lastIndexOf(screen) + 1
             state.navigationState.copy(backStack = navState.backStack.subList(0, index))
diff --git a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationState.kt b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationState.kt
index 224e12755b..cf60dc79f6 100644
--- a/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/navigation/NavigationState.kt
@@ -5,11 +5,13 @@ import org.rekotlin.StateType
 import java.lang.ref.WeakReference
 
 data class NavigationState(
-    val backStack: List<AppScreen> = listOf(AppScreen.Home),
+    val backStack: List<AppScreen> = emptyList(),
     val activity: WeakReference<AppCompatActivity>? = null,
 ) : StateType
 
-enum class AppScreen {
+enum class AppScreen(
+    val isDialogFragment: Boolean = false,
+) {
     Home,
     Shop,
     Disclaimer,
@@ -19,5 +21,9 @@ enum class AppScreen {
     Details, DetailsSecurity, CardSettings, AppSettings, ResetToFactory,
     AddTokens, AddCustomToken,
     WalletConnectSessions,
-    QrScan
+    QrScan,
+    ReferralProgram,
+    Welcome,
+    SaveWallet(isDialogFragment = true),
+    WalletSelector(isDialogFragment = true),
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/shop/TangemShopService.kt b/app/src/main/java/com/tangem/tap/common/shop/TangemShopService.kt
index 94c37e96d9..808cb5bbbc 100644
--- a/app/src/main/java/com/tangem/tap/common/shop/TangemShopService.kt
+++ b/app/src/main/java/com/tangem/tap/common/shop/TangemShopService.kt
@@ -4,8 +4,8 @@ import android.app.Application
 import android.content.Intent
 import com.google.android.gms.wallet.PaymentData
 import com.shopify.buy3.Storefront
-import com.tangem.common.extensions.ifNotNull
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.converters.ShopOrderToEventConverter
 import com.tangem.tap.common.extensions.filterNotNull
 import com.tangem.tap.common.shop.data.ProductType
 import com.tangem.tap.common.shop.data.TangemProduct
@@ -23,7 +23,6 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
 
     private val shopifyService = ShopifyService(application, shopifyShop)
 
-
     private val checkouts = mutableMapOf<ProductType, Storefront.Checkout>()
     private val variants = mutableMapOf<ProductType, Storefront.ProductVariant>()
 
@@ -41,24 +40,27 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
             variants.putAll(availableVariants)
 
             if (variants.size < SKUS_TO_DISPLAY.size) {
-                return Result.failure(Exception(
-                    "Shopify: products are missing, " +
-                            "\nproducts available: ${variants.keys.map { it.sku }}"))
+                return Result.failure(
+                    Exception(
+                        "Shopify: products are missing, " +
+                            "\nproducts available: ${variants.keys.map { it.sku }}",
+                    ),
+                )
             }
 
             val twoCardsProduct = TangemProduct(
                 type = ProductType.WALLET_2_CARDS,
                 totalSum = TotalSum(
                     finalValue = variants[ProductType.WALLET_2_CARDS]?.priceV2?.format(),
-                    beforeDiscount = variants[ProductType.WALLET_2_CARDS]?.compareAtPriceV2?.format()
-                )
+                    beforeDiscount = variants[ProductType.WALLET_2_CARDS]?.compareAtPriceV2?.format(),
+                ),
             )
             val threeCardsProduct = TangemProduct(
                 type = ProductType.WALLET_3_CARDS,
                 totalSum = TotalSum(
                     finalValue = variants[ProductType.WALLET_3_CARDS]?.priceV2?.format(),
-                    beforeDiscount = variants[ProductType.WALLET_3_CARDS]?.compareAtPriceV2?.format()
-                )
+                    beforeDiscount = variants[ProductType.WALLET_3_CARDS]?.compareAtPriceV2?.format(),
+                ),
             )
             createCheckouts()
             return Result.success(listOf(twoCardsProduct, threeCardsProduct))
@@ -86,7 +88,7 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
         val totalPrice = checkouts[productType]!!.totalPriceV2.amount
         googlePayService.payWithGooglePay(
             totalPriceCents = totalPrice, currencyCode = checkouts[productType]!!.currencyCode.name,
-            merchantID = shopifyService.shop.merchantID
+            merchantID = shopifyService.shop.merchantID,
         )
     }
 
@@ -105,7 +107,7 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
     suspend fun handleGooglePayResult(
         resultCode: Int,
         data: Intent?,
-        productType: ProductType
+        productType: ProductType,
     ): Result<Unit> {
         val result = googlePayService.handleResponseFromGooglePay(resultCode, data)
         result.onSuccess {
@@ -120,7 +122,7 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
 
     private suspend fun completeTokenizedPayment(
         paymentData: PaymentData,
-        productType: ProductType
+        productType: ProductType,
     ): Result<Storefront.Checkout> {
         val checkout = checkouts[productType]!!
         val googlePayResponse =
@@ -141,19 +143,18 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
             phone = addressGPay.phoneNumber
         }
 
-
         val payment = Storefront.TokenizedPaymentInputV3(
             amount,
             idempotencyKey,
             address,
             paymentData.toJson(),
-            Storefront.PaymentTokenType.GOOGLE_PAY
+            Storefront.PaymentTokenType.GOOGLE_PAY,
         )
             .setTest(true)
 
         return shopifyService.completeWithTokenizedPayment(
             payment = payment,
-            checkoutID = checkout.id
+            checkoutID = checkout.id,
         )
     }
 
@@ -182,12 +183,12 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
                     productType,
                     TotalSum(
                         finalValue = it.totalPriceV2.format(),
-                        beforeDiscount = variants[productType]!!.compareAtPriceV2.format()
+                        beforeDiscount = variants[productType]!!.compareAtPriceV2.format(),
                     ),
-                    appliedDiscount = it.getAppliedDiscount()
-                )
+                    appliedDiscount = it.getAppliedDiscount(),
+                ),
 
-            )
+                )
         }
         return Result.failure(result.exceptionOrNull()!!)
     }
@@ -196,10 +197,13 @@ class TangemShopService(application: Application, shopifyShop: ShopifyShop) {
         return checkouts[productType]!!.webUrl
     }
 
-    suspend fun waitForCheckout(productType: ProductType, analyticsHandler: GlobalAnalyticsEventHandler?) {
+    suspend fun waitForCheckout(productType: ProductType) {
         val result = shopifyService.checkout(true, checkouts[productType]!!.id)
-        result.onSuccess {
-            ifNotNull(analyticsHandler, it.order) { handler, order -> handler.handleShopifyOrderEvent(order) }
+        result.onSuccess { checkout ->
+            checkout.order?.let {
+                val event = ShopOrderToEventConverter().convert(it to productType)
+                Analytics.send(event)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt b/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
index 8b4136e90f..7cee3bcfd9 100644
--- a/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/RatesRepository.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.domain
 
 import com.tangem.common.services.Result
 import com.tangem.domain.common.ThrottlerWithValues
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.TangemTechService
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.store
 import java.math.BigDecimal
diff --git a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
index 70576a26b9..be8e4f65b2 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@@ -1,7 +1,5 @@
 package com.tangem.tap.domain
 
-import CreateProductWalletTask
-import CreateProductWalletTaskResponse
 import android.content.Context
 import androidx.annotation.StringRes
 import com.tangem.Message
@@ -10,14 +8,20 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CardFilter
 import com.tangem.common.CompletionResult
 import com.tangem.common.SuccessResponse
-import com.tangem.common.card.Card
+import com.tangem.common.UserCode
+import com.tangem.common.UserCodeType
+import com.tangem.common.biometric.BiometricManager
 import com.tangem.common.card.FirmwareVersion
 import com.tangem.common.core.CardIdDisplayFormat
 import com.tangem.common.core.CardSessionRunnable
 import com.tangem.common.core.Config
 import com.tangem.common.core.TangemSdkError
+import com.tangem.common.core.UserCodeRequestPolicy
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.map
+import com.tangem.common.usersCode.UserCodeRepository
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.operations.CommandResponse
 import com.tangem.operations.ScanTask
@@ -26,15 +30,14 @@ import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.pins.CheckUserCodesCommand
 import com.tangem.operations.pins.CheckUserCodesResponse
 import com.tangem.operations.pins.SetUserCodeCommand
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Basic
 import com.tangem.tap.domain.tasks.CreateWalletAndRescanTask
+import com.tangem.tap.domain.tasks.product.CreateProductWalletTask
+import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
 import com.tangem.tap.domain.tasks.product.ResetToFactorySettingsTask
 import com.tangem.tap.domain.tasks.product.ScanProductTask
 import com.tangem.tap.domain.tokens.UserTokensRepository
-import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
@@ -44,19 +47,38 @@ import kotlin.coroutines.suspendCoroutine
 
 class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Context) {
 
+    private val userCodeRepository by lazy {
+        UserCodeRepository(
+            biometricManager = tangemSdk.biometricManager,
+            secureStorage = tangemSdk.secureStorage,
+        )
+    }
+
+    val canUseBiometry: Boolean
+        get() = tangemSdk.biometricManager.canAuthenticate || needEnrollBiometrics
+
+    val needEnrollBiometrics: Boolean
+        get() = tangemSdk.biometricManager.canEnrollBiometrics
+
+    val biometricManager: BiometricManager
+        get() = tangemSdk.biometricManager
+
     suspend fun scanProduct(
-        analyticsHandler: GlobalAnalyticsEventHandler?,
         userTokensRepository: UserTokensRepository,
+        cardId: String? = null,
         additionalBlockchainsToDerive: Collection<Blockchain>? = null,
         messageRes: Int? = null,
     ): CompletionResult<ScanResponse> {
-        analyticsHandler?.handleAnalyticsEvent(AnalyticsEventAnOld.READY_TO_SCAN, card = null)
-
         val message = Message(context.getString(messageRes ?: R.string.initial_message_scan_header))
         return runTaskAsyncReturnOnMain(
-            runnable = ScanProductTask(null, userTokensRepository, additionalBlockchainsToDerive),
-            cardId = null, initialMessage = message,
-        ).also { sendScanResultsToAnalytics(analyticsHandler, it) }
+            runnable = ScanProductTask(
+                card = null,
+                userTokensRepository = userTokensRepository,
+                additionalBlockchainsToDerive = additionalBlockchainsToDerive,
+            ),
+            cardId = cardId,
+            initialMessage = message,
+        ).also { sendScanResultsToAnalytics(it) }
     }
 
     suspend fun createProductWallet(
@@ -70,41 +92,22 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
     }
 
     private fun sendScanResultsToAnalytics(
-        analyticsHandler: GlobalAnalyticsEventHandler?,
         result: CompletionResult<ScanResponse>,
     ) {
-        when (result) {
-            is CompletionResult.Success -> {
-                analyticsHandler?.handleAnalyticsEvent(
-                    event = AnalyticsEventAnOld.CARD_IS_SCANNED,
-                    card = result.data.card,
-                    blockchain = result.data.walletData?.blockchain,
-                )
-                if (DemoHelper.isDemoCard(result.data)) {
-                    analyticsHandler?.handleAnalyticsEvent(
-                        event = AnalyticsEventAnOld.DEMO_MODE_ACTIVATED,
-                        params = mapOf(AnalyticsParamAnOld.CARD_ID.param to result.data.card.cardId),
-                        card = result.data.card,
-                        blockchain = result.data.walletData?.blockchain,
-                    )
-                }
+        if (result is CompletionResult.Failure) {
+            (result.error as? TangemSdkError)?.let { error ->
+                Analytics.send(Basic.ScanError(error))
             }
-            is CompletionResult.Failure ->
-                (result.error as? TangemSdkError)?.let { error ->
-                    analyticsHandler?.handleCardSdkErrorEvent(
-                        error = error,
-                        action = AnalyticsAnOld.ActionToLog.Scan,
-                    )
-                }
         }
     }
 
-    suspend fun createWallet(cardId: String?): CompletionResult<Card> {
+    suspend fun createWallet(cardId: String?): CompletionResult<CardDTO> {
         return runTaskAsyncReturnOnMain(
             CreateWalletAndRescanTask(),
             cardId,
             initialMessage = Message(context.getString(R.string.initial_message_create_wallet_body)),
         )
+            .map { CardDTO(it) }
     }
 
     suspend fun derivePublicKeys(
@@ -114,12 +117,31 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
         return runTaskAsyncReturnOnMain(DeriveMultipleWalletPublicKeysTask(derivations), cardId)
     }
 
-    suspend fun resetToFactorySettings(card: Card): CompletionResult<Card> {
+    suspend fun resetToFactorySettings(cardId: String): CompletionResult<CardDTO> {
         return runTaskAsyncReturnOnMain(
-            ResetToFactorySettingsTask(),
-            card.cardId,
-            initialMessage = Message(context.getString(R.string.details_row_title_reset_factory_settings)),
+            runnable = ResetToFactorySettingsTask(),
+            cardId = cardId,
+            initialMessage = Message(context.getString(R.string.card_settings_reset_card_to_factory)),
         )
+            .map { CardDTO(it) }
+    }
+
+    suspend fun saveAccessCode(accessCode: String, cardsIds: Set<String>): CompletionResult<Unit> {
+        return userCodeRepository.save(
+            cardsIds = cardsIds,
+            userCode = UserCode(
+                type = UserCodeType.AccessCode,
+                stringValue = accessCode,
+            ),
+        )
+    }
+
+    suspend fun deleteSavedUserCodes(cardsIds: Set<String>): CompletionResult<Unit> {
+        return userCodeRepository.delete(cardsIds.toSet())
+    }
+
+    suspend fun clearSavedUserCodes(): CompletionResult<Unit> {
+        return userCodeRepository.clear()
     }
 
     suspend fun setPasscode(cardId: String?): CompletionResult<SuccessResponse> {
@@ -154,11 +176,16 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
         )
     }
 
-    suspend fun scanCard(): CompletionResult<Card> {
+    suspend fun scanCard(
+        cardId: String? = null,
+        allowRequestAccessCodeFromRepository: Boolean = false,
+    ): CompletionResult<CardDTO> {
         return runTaskAsyncReturnOnMain(
-            ScanTask(),
+            runnable = ScanTask(allowRequestAccessCodeFromRepository),
+            cardId = cardId,
             initialMessage = Message(context.getString(R.string.initial_message_tap_header)),
         )
+            .map { CardDTO(it) }
     }
 
     suspend fun <T : CommandResponse> runTaskAsync(
@@ -176,7 +203,9 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
         }
 
     private suspend fun <T : CommandResponse> runTaskAsyncReturnOnMain(
-        runnable: CardSessionRunnable<T>, cardId: String? = null, initialMessage: Message? = null,
+        runnable: CardSessionRunnable<T>,
+        cardId: String? = null,
+        initialMessage: Message? = null,
     ): CompletionResult<T> {
         val result = runTaskAsync(runnable, cardId, initialMessage)
         return withContext(Dispatchers.Main) { result }
@@ -192,7 +221,22 @@ class TangemSdkManager(private val tangemSdk: TangemSdk, private val context: Co
     }
 
     fun getString(@StringRes stringResId: Int, vararg formatArgs: Any?): String {
-        return context.getString(stringResId, formatArgs)
+        return context.getString(stringResId, *formatArgs)
+    }
+
+    fun setAccessCodeRequestPolicy(
+        useBiometricsForAccessCode: Boolean,
+    ) {
+        tangemSdk.config.userCodeRequestPolicy = if (useBiometricsForAccessCode) {
+            UserCodeRequestPolicy.AlwaysWithBiometrics(codeType = UserCodeType.AccessCode)
+        } else {
+            UserCodeRequestPolicy.Default
+        }
+    }
+
+    fun useBiometricsForAccessCode(): Boolean {
+        val policy = tangemSdk.config.userCodeRequestPolicy
+        return policy is UserCodeRequestPolicy.AlwaysWithBiometrics && policy.codeType == UserCodeType.AccessCode
     }
 
     companion object {
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 af5cdb6a5c..1979b1df8a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSigner.kt
@@ -5,13 +5,13 @@ import com.tangem.TangemSdk
 import com.tangem.blockchain.common.TransactionSigner
 import com.tangem.blockchain.common.Wallet
 import com.tangem.common.CompletionResult
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.tap.domain.tasks.SignHashesTask
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 class TangemSigner(
-    private val card: Card,
+    private val card: CardDTO,
     private val tangemSdk: TangemSdk,
     private val initialMessage: Message,
     private val accessCode: String? = null,
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 5a0cf85668..aae3cf8e9a 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.domain
 
 import androidx.annotation.StringRes
 import com.tangem.common.core.TangemError
-import com.tangem.network.api.tangemTech.TangemTechError
+import com.tangem.datasource.api.tangemTech.TangemTechError
 import com.tangem.wallet.R
 
 interface TapErrors
@@ -64,8 +64,7 @@ sealed class TapError(
     ) : TapError(-1), MultiMessageError
 }
 
-sealed class TapSdkError(override val messageResId: Int?) : Throwable(), TangemError {
-    final override val code: Int = 50100
+sealed class TapSdkError(override val messageResId: Int?) : TangemError(code = 50100) {
     override var customMessage: String = code.toString()
 
     object CardForDifferentApp : TapSdkError(R.string.alert_unsupported_card)
@@ -88,4 +87,4 @@ fun TangemTechError.toTapError(): TapError {
     }
 }
 
-class NoDataError(message: String) : TapError.CustomError(customMessage = message)
+class NoDataError(message: String) : TapError.CustomError(customMessage = message)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
index b15f2a7431..ea26d15848 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@@ -6,13 +6,16 @@ import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
-import com.tangem.common.card.Card
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
 import com.tangem.common.services.Result
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.domain.common.ThrottlerWithValues
 import com.tangem.domain.common.extensions.withMainContext
+import com.tangem.operations.attestation.Attestation
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -20,16 +23,22 @@ import com.tangem.tap.domain.configurable.config.ConfigManager
 import com.tangem.tap.domain.extensions.isMultiwalletAllowed
 import com.tangem.tap.domain.extensions.makePrimaryWalletManager
 import com.tangem.tap.domain.extensions.makeWalletManagersForApp
+import com.tangem.tap.domain.model.UserWallet
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.domain.walletStores.WalletStoresError
 import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
+import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
 import com.tangem.tap.features.wallet.models.toBlockchainNetworks
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.network.NetworkConnectivity
 import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
 import com.tangem.tap.userTokensRepository
+import com.tangem.tap.walletStoresManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 class TapWalletManager {
     val walletManagerFactory: WalletManagerFactory
@@ -81,22 +90,75 @@ class TapWalletManager {
         }
     }
 
+    suspend fun onWalletSelected(userWallet: UserWallet, refresh: Boolean) {
+        val scanResponse = userWallet.scanResponse
+        val card = scanResponse.card
+        val attestationFailed = card.attestation.status == Attestation.Status.Failed
+
+        tangemSdkManager.changeDisplayedCardIdNumbersCount(scanResponse)
+        store.state.globalState.feedbackManager?.infoHolder?.setCardInfo(scanResponse)
+        updateConfigManager(scanResponse)
+
+        withMainContext {
+            store.dispatch(WalletAction.UserWalletChanged(userWallet))
+            store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
+            store.dispatch(WalletConnectAction.ResetState)
+            store.dispatch(GlobalAction.SaveScanResponse(scanResponse))
+            store.dispatch(WalletConnectAction.RestoreSessions(scanResponse))
+            store.dispatch(GlobalAction.SetIfCardVerifiedOnline(!attestationFailed))
+            store.dispatch(WalletAction.Warnings.CheckIfNeeded)
+        }
+
+        loadData(userWallet, refresh)
+    }
+
+    suspend fun loadData(userWallet: UserWallet, refresh: Boolean = false) {
+        walletStoresManager.fetch(userWallet, refresh)
+            .doOnSuccess {
+                Timber.d("Wallet stores fetched for ${userWallet.walletId}")
+                store.dispatchOnMain(WalletAction.LoadData.Success)
+            }
+            .doOnFailure { error ->
+                val errorAction = when (error) {
+                    is WalletStoresError -> when (error) {
+                        is WalletStoresError.FetchFiatRatesError,
+                        is WalletStoresError.UpdateWalletManagerError,
+                        -> WalletAction.LoadData.Failure(error = null)
+                        is WalletStoresError.WalletManagerNotCreated -> WalletAction.LoadData.Failure(
+                            error = TapError.WalletManager.CreationError,
+                        )
+                        is WalletStoresError.UnknownBlockchain -> WalletAction.LoadData.Failure(
+                            error = TapError.UnknownBlockchain,
+                        )
+                        is WalletStoresError.NoInternetConnection -> WalletAction.LoadData.Failure(
+                            error = TapError.NoInternetConnection,
+                        )
+                    }
+                    else -> WalletAction.LoadData.Failure(error = null)
+                }
+
+                Timber.e(error, "Wallet stores fetching failed for ${userWallet.walletId}")
+
+                store.dispatchOnMain(errorAction)
+            }
+    }
+
     suspend fun onCardScanned(data: ScanResponse) {
         walletManagersThrottler.clear()
         store.state.globalState.feedbackManager?.infoHolder?.setCardInfo(data)
         updateConfigManager(data)
 
         withMainContext {
-            store.dispatch(WalletAction.ResetState(data.card.cardId))
+            store.dispatch(WalletAction.ResetState(data.card))
             store.dispatch(WalletConnectAction.ResetState)
-            store.dispatch(GlobalAction.SaveScanNoteResponse(data))
+            store.dispatch(GlobalAction.SaveScanResponse(data))
             store.dispatch(WalletAction.SetIfTestnetCard(data.card.isTestCard))
             store.dispatch(WalletAction.MultiWallet.SetIsMultiwalletAllowed(data.card.isMultiwalletAllowed))
             store.dispatch(WalletConnectAction.RestoreSessions(data))
             store.dispatch(
                 WalletAction.MultiWallet.ShowWalletBackupWarning(
                     show = data.card.settings.isBackupAllowed
-                        && data.card.backupStatus == Card.BackupStatus.NoBackup,
+                        && data.card.backupStatus == CardDTO.BackupStatus.NoBackup,
                 ),
             )
             loadData(data)
@@ -143,7 +205,7 @@ class TapWalletManager {
     private fun checkIfDerivationsAreMissing(blockchainNetworks: List<BlockchainNetwork>, scanResponse: ScanResponse) {
         blockchainNetworks.map {
             if (it.tokens.isNotEmpty()) {
-                WalletAction.MultiWallet.AddTokens(it.tokens, it, false)
+                WalletAction.MultiWallet.AddTokens(it.tokens, it)
             }
         }
         val missingDerivations = blockchainNetworks
@@ -171,7 +233,6 @@ class TapWalletManager {
                 WalletAction.MultiWallet.AddBlockchains(
                     blockchains = listOf(BlockchainNetwork.fromWalletManager(primaryWalletManager)),
                     walletManagers = listOf(primaryWalletManager),
-                    save = false,
                 ),
                 WalletAction.LoadFiatRate(),
             )
@@ -187,7 +248,6 @@ class TapWalletManager {
                 WalletAction.MultiWallet.AddBlockchains(
                     blockchains = blockchainNetworks,
                     walletManagers = walletManagers,
-                    save = false,
                 ),
             )
 
@@ -197,7 +257,6 @@ class TapWalletManager {
                         WalletAction.MultiWallet.AddTokens(
                             tokens = it.tokens,
                             blockchain = it,
-                            save = false,
                         ),
                     )
                 }
diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
index 683302ba73..f75a4922ce 100644
--- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt
@@ -77,7 +77,7 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Critical,
             listOf(WarningMessage.Location.MainScreen),
             null,
-            R.string.alert_title,
+            R.string.common_warning,
             R.string.alert_developer_card,
             WarningMessage.Origin.Local,
         )
@@ -89,7 +89,7 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Info,
             listOf(WarningMessage.Location.MainScreen),
             null,
-            R.string.alert_title,
+            R.string.common_warning,
             R.string.alert_card_signed_transactions,
             WarningMessage.Origin.Local,
         )
@@ -142,7 +142,7 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Critical,
             listOf(WarningMessage.Location.MainScreen),
             blockchains = null,
-            titleResId = R.string.alert_title,
+            titleResId = R.string.common_warning,
             messageResId = R.string.warning_low_signatures_format,
             origin = WarningMessage.Origin.Local,
             messageFormatArg = remainingSignatures.toString(),
@@ -155,7 +155,7 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Critical,
             listOf(WarningMessage.Location.MainScreen, WarningMessage.Location.SendScreen),
             null,
-            R.string.alert_title,
+            R.string.common_warning,
             R.string.warning_testnet_card_message,
             WarningMessage.Origin.Local,
         )
@@ -167,7 +167,7 @@ class WarningMessagesManager {
             priority = WarningMessage.Priority.Critical,
             listOf(WarningMessage.Location.MainScreen),
             null,
-            R.string.alert_title,
+            R.string.common_warning,
             R.string.alert_demo_message,
             WarningMessage.Origin.Local,
         )
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt b/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
index ab2ba5610b..fd46ad2fde 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/Card.kt
@@ -1,58 +1,45 @@
 package com.tangem.tap.domain.extensions
 
-import com.tangem.common.card.Card
-import com.tangem.common.card.CardWallet
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.FirmwareVersion
-import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.services.Result
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.TapWorkarounds.isTangemNote
 import com.tangem.domain.common.TwinCardNumber
-import com.tangem.domain.common.extensions.calculateHmacSha256
 import com.tangem.domain.common.getTwinCardNumber
 import com.tangem.domain.common.isTangemTwin
 import com.tangem.operations.attestation.CardVerifyAndGetInfo
 import com.tangem.operations.attestation.OnlineCardVerifier
 import com.tangem.tap.features.wallet.redux.Artwork
 
-val Card.remainingSignatures: Int?
-    get() = this.getSingleWallet()?.remainingSignatures
+val CardDTO.remainingSignatures: Int?
+    get() = this.wallets.firstOrNull()?.remainingSignatures
 
-val Card.isWalletDataSupported: Boolean
+val CardDTO.isWalletDataSupported: Boolean
     get() = this.firmwareVersion.major >= 4
 
-val Card.isMultiwalletAllowed: Boolean
+val CardDTO.isMultiwalletAllowed: Boolean
     get() {
-        return !isTangemTwin() && !isStart2Coin && !isTangemNote && !isSaltPay
-            && (firmwareVersion >= FirmwareVersion.MultiWalletAvailable ||
-            getSingleWallet()?.curve == EllipticCurve.Secp256k1)
+        return !isTangemTwin() && !isStart2Coin && !isTangemNote && !isSaltPay &&
+            (firmwareVersion >= FirmwareVersion.MultiWalletAvailable ||
+                wallets.firstOrNull()?.curve == EllipticCurve.Secp256k1)
     }
 
-val Card.isHdWalletAllowedByApp: Boolean
+val CardDTO.isHdWalletAllowedByApp: Boolean
     get() = settings.isHDWalletAllowed && !isSaltPay
 
-fun Card.getSingleWallet(): CardWallet? {
-    return wallets.firstOrNull()
+fun CardDTO.hasSignedHashes(): Boolean {
+    return wallets.any { (it.totalSignedHashes ?: 0) > 0 }
 }
 
-fun Card.hasWallets(): Boolean = wallets.isNotEmpty()
-
-fun Card.hasNoWallets(): Boolean = wallets.isEmpty()
-
-fun Card.hasSingleWallet(): Boolean = wallets.size == 1
-
-fun Card.hasSignedHashes(): Boolean {
-    return wallets.any { it.totalSignedHashes ?: 0 > 0 }
+fun CardDTO.signedHashesCount(): Int {
+    return wallets.sumOf { it.totalSignedHashes ?: 0 }
 }
 
-fun Card.signedHashesCount(): Int {
-    return wallets.map { it.totalSignedHashes ?: 0 }.sum()
-}
-
-suspend fun Card.getOrLoadCardArtworkUrl(cardInfo: Result<CardVerifyAndGetInfo.Response.Item>? = null): String {
+suspend fun CardDTO.getOrLoadCardArtworkUrl(cardInfo: Result<CardVerifyAndGetInfo.Response.Item>? = null): String {
     fun ifAnyError(): String {
         return when {
             cardId.startsWith(Artwork.SERGIO_CARD_ID) -> Artwork.SERGIO_CARD_URL
@@ -67,42 +54,28 @@ suspend fun Card.getOrLoadCardArtworkUrl(cardInfo: Result<CardVerifyAndGetInfo.R
         }
     }
 
-    val cardInfoResult = cardInfo ?: OnlineCardVerifier().getCardInfo(cardId, cardPublicKey)
-    return when (cardInfoResult) {
+    return when (val cardInfoResult = cardInfo ?: OnlineCardVerifier().getCardInfo(cardId, cardPublicKey)) {
         is Result.Success -> {
             val artworkId = cardInfoResult.data.artwork?.id
-            if (artworkId == null || artworkId.isEmpty()) {
+            if (artworkId.isNullOrEmpty()) {
                 ifAnyError()
             } else {
                 OnlineCardVerifier.getUrlForArtwork(cardId, cardPublicKey.toHexString(), artworkId)
             }
         }
+
         is Result.Failure -> ifAnyError()
     }
 }
 
-fun Card.getArtworkUrl(artworkId: String?): String? {
+fun CardDTO.getArtworkUrl(artworkId: String?): String? {
     return when {
         artworkId != null -> {
             OnlineCardVerifier.getUrlForArtwork(cardId, cardPublicKey.toHexString(), artworkId)
         }
+
         cardId.startsWith(Artwork.SERGIO_CARD_ID) -> Artwork.SERGIO_CARD_URL
         cardId.startsWith(Artwork.MARTA_CARD_ID) -> Artwork.MARTA_CARD_URL
         else -> null
     }
-}
-
-fun Card.getUserWalletId(): String {
-    val walletPublicKey = this.wallets.firstOrNull()?.publicKey ?: return ""
-    return UserWalletId(walletPublicKey).stringValue
-}
-
-class UserWalletId(val walletPublicKey: ByteArray) {
-    val stringValue: String = calculateUserId(walletPublicKey)
-
-    private fun calculateUserId(walletPublicKey: ByteArray): String {
-        val message = "UserWalletID".toByteArray()
-        val keyHash = walletPublicKey.calculateSha256()
-        return message.calculateHmacSha256(keyHash).toHexString()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt b/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
index ec95e13dc6..874e562a2a 100644
--- a/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
+++ b/app/src/main/java/com/tangem/tap/domain/extensions/WalletManagerFactory.kt
@@ -7,13 +7,12 @@ import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.WalletManagerFactory
-import com.tangem.common.card.Card
-import com.tangem.common.card.CardWallet
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.SaltPayWorkaround
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isTestCard
@@ -82,7 +81,7 @@ fun WalletManagerFactory.makeWalletManagerForApp(
     )
 }
 
-private fun getDerivationParams(derivationPath: String?, card: Card): DerivationParams? {
+private fun getDerivationParams(derivationPath: String?, card: CardDTO): DerivationParams? {
     return derivationPath?.let {
         DerivationParams.Custom(
             DerivationPath(it),
@@ -132,7 +131,7 @@ fun WalletManagerFactory.makePrimaryWalletManager(
     )
 }
 
-private fun selectWallet(wallets: List<CardWallet>): CardWallet? {
+private fun selectWallet(wallets: List<CardDTO.Wallet>): CardDTO.Wallet? {
     return when (wallets.size) {
         0 -> null
         1 -> wallets[0]
diff --git a/app/src/main/java/com/tangem/tap/domain/model/TotalFiatBalance.kt b/app/src/main/java/com/tangem/tap/domain/model/TotalFiatBalance.kt
new file mode 100644
index 0000000000..dd9a0b27a1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/TotalFiatBalance.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.domain.model
+
+import java.math.BigDecimal
+
+/**
+ * Represents fiat balance of [WalletStoreModel] list
+ * @property amount Amount of the total balance
+ * */
+sealed class TotalFiatBalance {
+    open val amount: BigDecimal = BigDecimal.ZERO
+
+    object Loading : TotalFiatBalance()
+
+    data class Error(
+        override val amount: BigDecimal,
+    ) : TotalFiatBalance()
+
+    data class Loaded(
+        override val amount: BigDecimal,
+    ) : TotalFiatBalance()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt b/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt
new file mode 100644
index 0000000000..a76fbb9d1a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/UserWallet.kt
@@ -0,0 +1,35 @@
+package com.tangem.tap.domain.model
+
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.util.UserWalletId
+
+/**
+ * Represents user's wallet which stored in app persistence
+ * @param name User wallet name
+ * @param walletId User wallet [UserWalletId]
+ * @param artworkUrl User wallet card artwork URL
+ * @param cardsInWallet List of cards IDs assigned with this user's wallet
+ * @param isMultiCurrency Indicates whether this user wallet can work with more than one currency
+ * @param scanResponse [ScanResponse] of primary user's wallet card.
+ * TODO: Replace with [com.tangem.domain.common.CardDTO]
+ * @property cardId ID of user's wallet primary card
+ * @property hasAccessCode Indicates if the user's wallet primary card has access code
+ * @property isLocked Indicates if this primary card has no currency wallets
+ * */
+data class UserWallet(
+    val name: String,
+    val walletId: UserWalletId,
+    val artworkUrl: String,
+    val cardsInWallet: Set<String>,
+    val isMultiCurrency: Boolean,
+    val scanResponse: ScanResponse,
+) {
+    val cardId: String
+        get() = scanResponse.card.cardId
+
+    val hasAccessCode: Boolean
+        get() = scanResponse.card.isAccessCodeSet
+
+    val isLocked: Boolean
+        get() = scanResponse.card.wallets.isEmpty()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/WalletDataModel.kt b/app/src/main/java/com/tangem/tap/domain/model/WalletDataModel.kt
new file mode 100644
index 0000000000..4462f4d8ec
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/WalletDataModel.kt
@@ -0,0 +1,71 @@
+package com.tangem.tap.domain.model
+
+import com.tangem.tap.domain.model.WalletDataModel.Status
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.PendingTransaction
+import com.tangem.tap.features.wallet.redux.AddressData
+import java.math.BigDecimal
+
+/**
+ * Contains info about wallet store currency
+ * @param currency Wallet's [Currency]
+ * @param status Wallet's [Status], represents current status of that currency
+ * @param walletAddresses List of wallet data [AddressData]
+ * @param existentialDeposit Amount that must be held on currency's balance, if balance is below that amount all
+ * founds will be destroyed. Null if currency don't have existential deposit
+ * @param fiatRate Wallet's fiat rate, used to calculate fiat balance. Null if not provided
+ * */
+data class WalletDataModel(
+    val currency: Currency,
+    val status: Status,
+    val walletAddresses: List<AddressData>,
+    val existentialDeposit: BigDecimal?,
+    val fiatRate: BigDecimal?,
+) {
+
+    /**
+     * Represent current status of currency
+     * @property amount Currency amount
+     * @property pendingTransactions List of currency [PendingTransaction] sent in currency's blockchain
+     * @property errorMessage Status error message, null if not provided
+     * @property isErrorStatus true if current status is error status, false otherwise
+     * */
+    sealed class Status {
+        open val amount: BigDecimal = BigDecimal.ZERO
+        open val pendingTransactions: List<PendingTransaction> = emptyList()
+        open val errorMessage: String? = null
+        open val isErrorStatus: Boolean = false
+    }
+
+    object Loading : Status()
+
+    data class VerifiedOnline(
+        override val amount: BigDecimal,
+    ) : Status()
+
+    data class TransactionInProgress(
+        override val amount: BigDecimal,
+        override val pendingTransactions: List<PendingTransaction>,
+    ) : Status()
+
+    data class SameCurrencyTransactionInProgress(
+        override val amount: BigDecimal,
+        override val pendingTransactions: List<PendingTransaction>,
+    ) : Status()
+
+    data class NoAccount(
+        val amountToCreateAccount: BigDecimal?,
+    ) : Status() {
+        override val isErrorStatus: Boolean = true
+    }
+
+    data class Unreachable(
+        override val errorMessage: String?,
+    ) : Status() {
+        override val isErrorStatus: Boolean = true
+    }
+
+    object MissedDerivation : Status() {
+        override val isErrorStatus: Boolean = true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt b/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
new file mode 100644
index 0000000000..a0511784e2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/WalletStoreModel.kt
@@ -0,0 +1,77 @@
+package com.tangem.tap.domain.model
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletStoreModel.WalletRent
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import java.math.BigDecimal
+
+/**
+ * Contains info about the blockchain and its currencies
+ * @param userWalletId ID of the associated [UserWallet]
+ * @param blockchain [Blockchain] of this WalletStore
+ * @param derivationPath [DerivationPath] of this store, null if the card does not support the
+ * [HD Wallet](https://coinsutra.com/hd-wallets-deterministic-wallet/)
+ * @param walletsData List of [WalletDataModel] which represents store's blockchain currency and tokens currencies
+ * @param walletRent [WalletRent], null if store has no rent or currency balance is greater then
+ * [WalletRent.exemptionAmount]
+ * @param blockchainNetwork [BlockchainNetwork].
+ * TODO: Remove after WalletMiddleware refactoring
+ * @param walletManager [WalletManager], may be null if it fails to create this manager.
+ * TODO: Remove after WalletMiddleware refactoring
+ * */
+data class WalletStoreModel(
+    val userWalletId: UserWalletId,
+    val blockchain: Blockchain,
+    val derivationPath: DerivationPath?,
+    val walletsData: List<WalletDataModel>,
+    val walletRent: WalletRent?,
+    @Deprecated("Don't use it, will be removed")
+    val blockchainNetwork: BlockchainNetwork,
+    @Deprecated("Don't use it, will be removed")
+    val walletManager: WalletManager?,
+) {
+
+    /**
+     * Represents wallet blockchain rent
+     * @param rent Amount that will be charged in overtime if the blockchain does not have an amount greater than
+     * the [WalletRent.exemptionAmount]
+     * @param exemptionAmount Amount that should be on the blockchain balance not to pay rent
+     * */
+    data class WalletRent(
+        val rent: BigDecimal,
+        val exemptionAmount: BigDecimal,
+    )
+
+    // TODO: Remove the generated methods after blockchainNetwork and walletManager are removed from the model
+    // region Generated
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is WalletStoreModel) return false
+
+        if (userWalletId != other.userWalletId) return false
+        if (blockchain != other.blockchain) return false
+        if (derivationPath != other.derivationPath) return false
+        if (walletsData != other.walletsData) return false
+        if (walletRent != other.walletRent) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = userWalletId.hashCode()
+        result = 31 * result + blockchain.hashCode()
+        result = 31 * result + (derivationPath?.hashCode() ?: 0)
+        result = 31 * result + walletsData.hashCode()
+        result = 31 * result + (walletRent?.hashCode() ?: 0)
+        return result
+    }
+
+    override fun toString(): String {
+        return "WalletStoreModel(userWalletId=$userWalletId, blockchain=$blockchain, derivationPath=$derivationPath, " +
+            "walletsData=$walletsData, walletRent=$walletRent)"
+    }
+    // endregion Generated
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletBuilder.kt b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletBuilder.kt
new file mode 100644
index 0000000000..9148486bc6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletBuilder.kt
@@ -0,0 +1,110 @@
+package com.tangem.tap.domain.model.builders
+
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.FirmwareVersion
+import com.tangem.common.extensions.toHexString
+import com.tangem.common.services.Result
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ProductType
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.isStart2Coin
+import com.tangem.domain.common.TwinCardNumber
+import com.tangem.domain.common.TwinsHelper
+import com.tangem.operations.attestation.OnlineCardVerifier
+import com.tangem.operations.attestation.TangemApi
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.features.wallet.redux.Artwork
+
+class UserWalletBuilder(
+    private val scanResponse: ScanResponse,
+    private val onlineCardVerifier: OnlineCardVerifier = OnlineCardVerifier(),
+) {
+    private var backupCardsIds: Set<String> = emptySet()
+
+    private val CardDTO.isBackupNotAllowed: Boolean
+        get() = !this.settings.isBackupAllowed
+
+    private val ScanResponse.userWalletName: String
+        get() = when (productType) {
+            ProductType.Note -> "Note"
+            ProductType.Twins -> "Twin"
+            ProductType.SaltPay -> "SaltPay"
+            ProductType.Wallet -> when {
+                card.isBackupNotAllowed -> "Tangem card"
+                card.isStart2Coin -> "Start2Coin"
+                else -> "Wallet"
+            }
+        }
+
+    private val ScanResponse.isMultiCurrency: Boolean
+        get() = when (productType) {
+            ProductType.Note -> false
+            ProductType.Twins -> false
+            ProductType.SaltPay -> false
+            ProductType.Wallet -> when {
+                card.isStart2Coin -> false
+                card.firmwareVersion >= FirmwareVersion.MultiWalletAvailable -> true
+                else -> {
+                    val cardWallets = card.wallets
+                    require(cardWallets.isNotEmpty()) { "Card wallets must not be empty" }
+
+                    cardWallets.first().curve == EllipticCurve.Secp256k1
+                }
+            }
+        }
+
+    fun backupCardsIds(backupCardsIds: Set<String>?) = this.apply {
+        if (backupCardsIds != null) {
+            this.backupCardsIds = backupCardsIds
+        }
+    }
+
+    suspend fun build(): UserWallet? {
+        return with(scanResponse) {
+            UserWalletIdBuilder.scanResponse(scanResponse)
+                .build()
+                ?.let {
+                    UserWallet(
+                        walletId = it,
+                        name = userWalletName,
+                        artworkUrl = loadArtworkUrl(card.cardId, card.cardPublicKey),
+                        cardsInWallet = backupCardsIds.plus(card.cardId),
+                        scanResponse = this,
+                        isMultiCurrency = isMultiCurrency,
+                    )
+                }
+        }
+    }
+
+    private suspend fun loadArtworkUrl(cardId: String, cardPublicKey: ByteArray): String {
+        return when (val result = onlineCardVerifier.getCardInfo(cardId, cardPublicKey)) {
+            is Result.Success -> {
+                val artworkId = result.data.artwork?.id
+                if (artworkId.isNullOrEmpty()) {
+                    getFallbackArtworkUrl(cardId)
+                } else {
+                    getUrlForArtwork(cardId, cardPublicKey.toHexString(), artworkId)
+                }
+            }
+
+            is Result.Failure -> getFallbackArtworkUrl(cardId)
+        }
+    }
+
+    private fun getFallbackArtworkUrl(cardId: String): String {
+        return when {
+            cardId.startsWith(Artwork.SERGIO_CARD_ID) -> Artwork.SERGIO_CARD_URL
+            cardId.startsWith(Artwork.MARTA_CARD_ID) -> Artwork.MARTA_CARD_URL
+            else -> when (TwinsHelper.getTwinCardNumber(cardId)) {
+                TwinCardNumber.First -> Artwork.TWIN_CARD_1
+                TwinCardNumber.Second -> Artwork.TWIN_CARD_2
+                else -> Artwork.DEFAULT_IMG_URL
+            }
+        }
+    }
+
+    private fun getUrlForArtwork(cardId: String, cardPublicKeyHex: String, artworkId: String): String {
+        return TangemApi.Companion.BaseUrl.VERIFY.url + TangemApi.ARTWORK +
+            "?artworkId=${artworkId}&CID=${cardId}&publicKey=$cardPublicKeyHex"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletIdBuilder.kt b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletIdBuilder.kt
new file mode 100644
index 0000000000..1fdef7c37c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/UserWalletIdBuilder.kt
@@ -0,0 +1,70 @@
+package com.tangem.tap.domain.model.builders
+
+import com.tangem.common.extensions.calculateSha256
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.crypto.Secp256k1
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ProductType
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.isTangemTwins
+import com.tangem.domain.common.extensions.calculateHmacSha256
+import com.tangem.domain.common.util.UserWalletId
+
+class UserWalletIdBuilder private constructor(
+    private val publicKey: ByteArray?,
+    private val pairTwinPublicKey: ByteArray? = null,
+) {
+    fun build(): UserWalletId? {
+        val seed = if (publicKey != null) {
+            if (pairTwinPublicKey != null) {
+                Secp256k1.sum(publicKey, pairTwinPublicKey)
+            } else {
+                publicKey
+            }
+        } else null
+
+        return seed?.let {
+            UserWalletId(value = calculateUserWalletId(it))
+        }
+    }
+
+    private fun calculateUserWalletId(seed: ByteArray?): ByteArray? {
+        val message = MESSAGE_FOR_WALLET_ID.toByteArray()
+        val keyHash = seed?.calculateSha256()
+
+        return if (keyHash != null) {
+            message.calculateHmacSha256(keyHash)
+        } else null
+    }
+
+    companion object {
+        private const val MESSAGE_FOR_WALLET_ID = "UserWalletID"
+
+        @Throws(IllegalArgumentException::class)
+        fun card(card: CardDTO): UserWalletIdBuilder {
+            require(!card.isTangemTwins) {
+                "For twin cards use scanResponse to ID calculation"
+            }
+
+            return UserWalletIdBuilder(findPublicKey(card.wallets))
+        }
+
+        fun scanResponse(scanResponse: ScanResponse): UserWalletIdBuilder {
+            return UserWalletIdBuilder(
+                publicKey = findPublicKey(scanResponse.card.wallets),
+                pairTwinPublicKey = when (scanResponse.productType) {
+                    ProductType.Twins -> scanResponse.secondTwinPublicKey?.hexToBytes()
+                    ProductType.Note,
+                    ProductType.Wallet,
+                    ProductType.SaltPay,
+                    -> null
+                },
+            )
+        }
+
+        private fun findPublicKey(wallets: List<CardDTO.Wallet>): ByteArray? {
+            return wallets.firstOrNull()
+                ?.publicKey
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt b/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
new file mode 100644
index 0000000000..e76a291668
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/model/builders/WalletStoreBuilder.kt
@@ -0,0 +1,151 @@
+package com.tangem.tap.domain.model.builders
+
+import com.tangem.blockchain.blockchains.polkadot.ExistentialDepositProvider
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.redux.reducers.createAddressesData
+import java.math.BigDecimal
+
+interface WalletStoreBuilder {
+    fun build(): WalletStoreModel
+
+    interface BlockchainNetworkWalletStoreBuilder : WalletStoreBuilder {
+        fun walletManager(walletManager: WalletManager?): WalletStoreBuilder
+    }
+
+    interface WalletMangerWalletStoreBuilder : WalletStoreBuilder
+
+    companion object {
+        operator fun invoke(
+            userWalletId: UserWalletId,
+            blockchainNetwork: BlockchainNetwork,
+        ): BlockchainNetworkWalletStoreBuilder {
+            return BlockchainNetworkWalletStoreBuilderImpl(userWalletId, blockchainNetwork)
+        }
+
+        operator fun invoke(
+            userWalletId: UserWalletId,
+            walletManager: WalletManager,
+        ): WalletMangerWalletStoreBuilder {
+            return WalletMangerWalletStoreBuilderImpl(userWalletId, walletManager)
+        }
+    }
+}
+
+private class BlockchainNetworkWalletStoreBuilderImpl(
+    private val userWalletId: UserWalletId,
+    private val blockchainNetwork: BlockchainNetwork,
+) : WalletStoreBuilder.BlockchainNetworkWalletStoreBuilder {
+    private var walletManager: WalletManager? = null
+
+    override fun walletManager(walletManager: WalletManager?) = this.apply {
+        this.walletManager = walletManager
+    }
+
+    override fun build(): WalletStoreModel {
+        val blockchainWalletData = blockchainNetwork.getBlockchainWalletData(walletManager)
+        val tokensWalletsData = blockchainNetwork.getTokensWalletsData(walletManager)
+
+        return WalletStoreModel(
+            userWalletId = userWalletId,
+            blockchain = blockchainNetwork.blockchain,
+            derivationPath = blockchainNetwork.derivationPath?.let { DerivationPath(it) },
+            walletsData = (listOf(blockchainWalletData) + tokensWalletsData),
+            walletRent = null,
+            walletManager = walletManager,
+            blockchainNetwork = blockchainNetwork,
+        )
+    }
+}
+
+private class WalletMangerWalletStoreBuilderImpl(
+    private val userWalletId: UserWalletId,
+    private val walletManager: WalletManager,
+) : WalletStoreBuilder.WalletMangerWalletStoreBuilder {
+
+    override fun build(): WalletStoreModel {
+        val wallet = walletManager.wallet
+        val blockchainWalletData = wallet.blockchain.toBlockchainWalletData(walletManager)
+        val tokenWalletsData = wallet.getTokens().firstOrNull()?.toTokenWalletData(walletManager)
+
+        return WalletStoreModel(
+            userWalletId = userWalletId,
+            blockchain = wallet.blockchain,
+            derivationPath = wallet.publicKey.derivationPath,
+            walletsData = (listOf(blockchainWalletData) + listOfNotNull(tokenWalletsData)),
+            walletRent = null,
+            walletManager = walletManager,
+            blockchainNetwork = BlockchainNetwork.fromWalletManager(walletManager),
+        )
+    }
+}
+
+private fun BlockchainNetwork.getBlockchainWalletData(walletManager: WalletManager?): WalletDataModel {
+    return WalletDataModel(
+        currency = Currency.Blockchain(
+            blockchain = blockchain,
+            derivationPath = derivationPath,
+        ),
+        status = WalletDataModel.Loading,
+        walletAddresses = walletManager?.wallet?.createAddressesData().orEmpty(),
+        existentialDeposit = getExistentialDeposit(walletManager),
+        fiatRate = null,
+    )
+}
+
+private fun BlockchainNetwork.getTokensWalletsData(walletManager: WalletManager?): List<WalletDataModel> {
+    return this.tokens
+        .map { token ->
+            WalletDataModel(
+                currency = Currency.Token(
+                    token = token,
+                    blockchain = blockchain,
+                    derivationPath = derivationPath,
+                ),
+                status = WalletDataModel.Loading,
+                walletAddresses = walletManager?.wallet?.createAddressesData().orEmpty(),
+                existentialDeposit = getExistentialDeposit(walletManager),
+                fiatRate = null,
+            )
+        }
+}
+
+private fun Blockchain.toBlockchainWalletData(walletManager: WalletManager): WalletDataModel {
+    val wallet = walletManager.wallet
+    return WalletDataModel(
+        currency = Currency.Blockchain(
+            blockchain = this,
+            derivationPath = wallet.publicKey.derivationPath?.rawPath,
+        ),
+        status = WalletDataModel.Loading,
+        walletAddresses = wallet.createAddressesData(),
+        existentialDeposit = getExistentialDeposit(walletManager),
+        fiatRate = null,
+    )
+}
+
+private fun Token.toTokenWalletData(walletManager: WalletManager): WalletDataModel {
+    val wallet = walletManager.wallet
+    return WalletDataModel(
+        currency = Currency.Token(
+            token = this,
+            blockchain = wallet.blockchain,
+            derivationPath = wallet.publicKey.derivationPath?.rawPath,
+        ),
+        status = WalletDataModel.Loading,
+        walletAddresses = wallet.createAddressesData(),
+        existentialDeposit = getExistentialDeposit(walletManager),
+        fiatRate = null,
+    )
+}
+
+private fun getExistentialDeposit(walletManager: WalletManager?): BigDecimal? {
+    return (walletManager as? ExistentialDepositProvider)?.getExistentialDeposit()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/scanCard/ScanCardProcessor.kt b/app/src/main/java/com/tangem/tap/domain/scanCard/ScanCardProcessor.kt
new file mode 100644
index 0000000000..d940a338ad
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/ScanCardProcessor.kt
@@ -0,0 +1,250 @@
+package com.tangem.tap.domain.scanCard
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.core.TangemError
+import com.tangem.common.core.TangemSdkError
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.common.services.Result
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.extensions.withMainContext
+import com.tangem.operations.backup.BackupService
+import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
+import com.tangem.tap.backupService
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.IntroductionProcess
+import com.tangem.tap.common.analytics.paramsInterceptor.BatchIdParamsInterceptor
+import com.tangem.tap.common.extensions.dispatchDialogShow
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.primaryCardIsSaltPayVisa
+import com.tangem.tap.common.redux.AppDialog
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
+import com.tangem.tap.features.disclaimer.redux.DisclaimerType
+import com.tangem.tap.features.disclaimer.redux.isAccepted
+import com.tangem.tap.features.onboarding.OnboardingHelper
+import com.tangem.tap.features.onboarding.OnboardingSaltPayHelper
+import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
+import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayExceptionHandler
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayAction
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayState
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userTokensRepository
+import com.tangem.wallet.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+// TODO: Create repository for that
+object ScanCardProcessor {
+    suspend fun scan(
+        additionalBlockchainsToDerive: Collection<Blockchain>? = null,
+        cardId: String? = null,
+        onProgressStateChange: suspend (showProgress: Boolean) -> Unit = {},
+        onScanStateChange: suspend (scanInProgress: Boolean) -> Unit = {},
+        onWalletNotCreated: suspend (() -> Unit) = {},
+        onFailure: suspend (error: TangemError) -> Unit = {},
+        onSuccess: suspend (scanResponse: ScanResponse) -> Unit = {},
+    ) = withMainContext {
+        onProgressStateChange(true)
+        onScanStateChange(true)
+
+        tangemSdkManager.changeDisplayedCardIdNumbersCount(null)
+
+        val result = tangemSdkManager.scanProduct(
+            userTokensRepository = userTokensRepository,
+            cardId = cardId,
+            additionalBlockchainsToDerive = additionalBlockchainsToDerive,
+        )
+
+        store.dispatchOnMain(GlobalAction.ScanFailsCounter.ChooseBehavior(result))
+
+        result
+            .doOnFailure { error ->
+                onProgressStateChange(false)
+                onScanStateChange(false)
+                onFailure(error)
+            }
+            .doOnSuccess { scanResponse ->
+                tangemSdkManager.changeDisplayedCardIdNumbersCount(scanResponse)
+
+                onScanStateChange(false)
+                checkForUnfinishedBackupForSaltPay(
+                    backupService = backupService,
+                    scanResponse = scanResponse,
+                    onProgressStateChange = { onProgressStateChange(it) },
+                    nextHandler = { scanResponse1 ->
+                        showDisclaimerIfNeed(
+                            scanResponse = scanResponse1,
+                            onProgressStateChange = onProgressStateChange,
+                            nextHandler = { scanResponse2 ->
+                                onScanSuccess(
+                                    scanResponse = scanResponse2,
+                                    onProgressStateChange = onProgressStateChange,
+                                    onSuccess = onSuccess,
+                                    onWalletNotCreated = onWalletNotCreated,
+                                    onFailure = onFailure,
+                                )
+                            },
+                        )
+                    },
+                )
+            }
+    }
+
+    /**
+     * It checks only the SaltPay cards. To check for unfinished backups for the standard Wallet cards
+     * see BackupAction.CheckForUnfinishedBackup
+     * If user touches card other than Visa SaltPay - show dialog and block next processing
+     */
+    private inline fun checkForUnfinishedBackupForSaltPay(
+        backupService: BackupService,
+        scanResponse: ScanResponse,
+        onProgressStateChange: (showProgress: Boolean) -> Unit,
+        nextHandler: (ScanResponse) -> Unit,
+    ) {
+        if (!backupService.hasIncompletedBackup || !backupService.primaryCardIsSaltPayVisa()) {
+            nextHandler(scanResponse)
+            return
+        }
+
+        val isTheSamePrimaryCard = backupService.primaryCardId
+            ?.let { it == scanResponse.card.cardId }
+            ?: false
+
+        if (scanResponse.isSaltPayWallet() || !isTheSamePrimaryCard) {
+            onProgressStateChange(false)
+            showSaltPayTapVisaLogoCardDialog()
+        } else {
+            nextHandler(scanResponse)
+        }
+    }
+
+    private suspend inline fun showDisclaimerIfNeed(
+        scanResponse: ScanResponse,
+        crossinline onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
+        crossinline nextHandler: suspend (ScanResponse) -> Unit,
+    ) {
+        val disclaimerType = DisclaimerType.get(scanResponse)
+        store.dispatchOnMain(DisclaimerAction.SetDisclaimerType(disclaimerType))
+
+        if (disclaimerType.isAccepted()) {
+            nextHandler((scanResponse))
+        } else scope.launch(Dispatchers.Main) {
+            delay(DELAY_SDK_DIALOG_CLOSE)
+            store.dispatchOnMain(
+                DisclaimerAction.Show(
+                    onAcceptCallback = {
+                        scope.launch(Dispatchers.Main) {
+                            nextHandler(scanResponse)
+                        }
+                    },
+                    onDismissCallback = {
+                        scope.launch(Dispatchers.Main) {
+                            onProgressStateChange(false)
+                        }
+                    },
+                ),
+            )
+        }
+    }
+
+    private suspend inline fun onScanSuccess(
+        scanResponse: ScanResponse,
+        crossinline onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
+        crossinline onWalletNotCreated: suspend () -> Unit,
+        crossinline onSuccess: suspend (ScanResponse) -> Unit,
+        crossinline onFailure: suspend (error: TangemError) -> Unit,
+    ) {
+        Analytics.send(IntroductionProcess.CardWasScanned())
+
+        val globalState = store.state.globalState
+        val tapWalletManager = globalState.tapWalletManager
+        tapWalletManager.updateConfigManager(scanResponse)
+
+        Analytics.addParamsInterceptor(BatchIdParamsInterceptor(scanResponse.card.batchId))
+
+        store.dispatchOnMain(TwinCardsAction.IfTwinsPrepareState(scanResponse))
+
+        if (scanResponse.isSaltPay()) {
+            if (scanResponse.isSaltPayVisa()) {
+                val (manager, config) = OnboardingSaltPayState.initDependency(scanResponse)
+                val result = OnboardingSaltPayHelper.isOnboardingCase(scanResponse, manager)
+                delay(500)
+                withMainContext {
+                    when (result) {
+                        is Result.Success -> {
+                            val isOnboardingCase = result.data
+                            if (isOnboardingCase) {
+                                onWalletNotCreated()
+                                store.dispatchOnMain(GlobalAction.Onboarding.Start(scanResponse, canSkipBackup = false))
+                                store.dispatchOnMain(OnboardingSaltPayAction.SetDependencies(manager, config))
+                                store.dispatchOnMain(OnboardingSaltPayAction.Update)
+                                navigateTo(AppScreen.OnboardingWallet) { onProgressStateChange(it) }
+                            } else {
+                                delay(DELAY_SDK_DIALOG_CLOSE)
+                                onSuccess(scanResponse)
+                                onProgressStateChange(false)
+                            }
+                        }
+                        is Result.Failure -> {
+                            SaltPayExceptionHandler.handle(result.error)
+                            delay(DELAY_SDK_DIALOG_CLOSE)
+                            onFailure(TangemSdkError.ExceptionError(result.error))
+                            onProgressStateChange(false)
+                        }
+                    }
+                }
+            } else {
+                delay(DELAY_SDK_DIALOG_CLOSE)
+                if (scanResponse.card.backupStatus?.isActive == false) {
+                    showSaltPayTapVisaLogoCardDialog()
+                } else {
+                    onSuccess(scanResponse)
+                }
+                onProgressStateChange(false)
+            }
+        } else {
+            if (OnboardingHelper.isOnboardingCase(scanResponse)) {
+                onWalletNotCreated()
+                store.dispatchOnMain(GlobalAction.Onboarding.Start(scanResponse, canSkipBackup = true))
+                val appScreen = OnboardingHelper.whereToNavigate(scanResponse)
+                navigateTo(appScreen) { onProgressStateChange(it) }
+            } else {
+                if (scanResponse.twinsIsTwinned() && !preferencesStorage.wasTwinsOnboardingShown()) {
+                    onWalletNotCreated()
+                    store.dispatchOnMain(TwinCardsAction.SetStepOfScreen(TwinCardsStep.WelcomeOnly(scanResponse)))
+                    navigateTo(AppScreen.OnboardingTwins) { onProgressStateChange(it) }
+                } else {
+                    delay(DELAY_SDK_DIALOG_CLOSE)
+                    onSuccess(scanResponse)
+                    onProgressStateChange(false)
+                }
+            }
+        }
+    }
+
+    private fun showSaltPayTapVisaLogoCardDialog() {
+        store.dispatchDialogShow(
+            AppDialog.SimpleOkDialogRes(
+                headerId = R.string.saltpay_error_empty_backup_title,
+                messageId = R.string.saltpay_error_empty_backup_message,
+            ),
+        )
+    }
+
+    private suspend inline fun navigateTo(
+        screen: AppScreen,
+        onProgressStateChange: (showProgress: Boolean) -> Unit,
+    ) {
+        delay(DELAY_SDK_DIALOG_CLOSE)
+        store.dispatchOnMain(NavigationAction.NavigateTo(screen))
+        onProgressStateChange(false)
+    }
+}
\ No newline at end of file
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 982ed86857..98ce39259e 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
@@ -1,3 +1,5 @@
+package com.tangem.tap.domain.tasks.product
+
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
 import com.tangem.common.card.Card
@@ -9,6 +11,8 @@ import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.map
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.KeyWalletPublicKey
 import com.tangem.domain.common.ProductType
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
@@ -19,49 +23,72 @@ import com.tangem.operations.backup.PrimaryCard
 import com.tangem.operations.backup.StartPrimaryCardLinkingTask
 import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
-import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.operations.wallet.CreateWalletTask
-import com.tangem.tap.domain.tasks.product.CreateWalletsTask
-import com.tangem.tap.domain.tasks.product.ProductCommandProcessor
-import com.tangem.tap.domain.tasks.product.getCurvesForNonCreatedWallets
 import com.tangem.tap.features.demo.DemoHelper
-
+import com.tangem.operations.wallet.CreateWalletResponse as SdkCreateWalletResponse
 
 data class CreateProductWalletTaskResponse(
-    val card: Card,
+    val card: CardDTO,
     val derivedKeys: Map<KeyWalletPublicKey, ExtendedPublicKeysMap> = mapOf(),
-    val primaryCard: PrimaryCard? = null
-) : CommandResponse
+    val primaryCard: PrimaryCard? = null,
+) : CommandResponse {
+    constructor(
+        card: Card,
+        derivedKeys: Map<KeyWalletPublicKey, ExtendedPublicKeysMap> = mapOf(),
+        primaryCard: PrimaryCard? = null,
+    ) : this(
+        card = CardDTO(card),
+        derivedKeys = derivedKeys,
+        primaryCard = primaryCard,
+    )
+}
+
+private data class CreateWalletResponse(
+    val cardId: String,
+    val wallet: CardDTO.Wallet,
+) {
+    constructor(
+        sdkResponse: SdkCreateWalletResponse,
+    ) : this(
+        cardId = sdkResponse.cardId,
+        wallet = CardDTO.Wallet(sdkResponse.wallet),
+    )
+}
 
 class CreateProductWalletTask(
     private val type: ProductType,
 ) : CardSessionRunnable<CreateProductWalletTaskResponse> {
 
+    override val allowsRequestAccessCodeFromRepository: Boolean = false
+
     override fun run(
         session: CardSession,
-        callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit
+        callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
         val card = session.environment.card.guard {
             callback(CompletionResult.Failure(TangemSdkError.CardError()))
             return
         }
+        val cardDto = CardDTO(card)
 
         val commandProcessor = when (type) {
             ProductType.Note -> CreateWalletTangemNote()
             ProductType.Twins -> throw UnsupportedOperationException("Use the TwinCardsManager to create a wallet")
             else -> CreateWalletTangemWallet()
         }
-        commandProcessor.proceed(card, session) {
+        commandProcessor.proceed(cardDto, session) {
             when (it) {
                 is CompletionResult.Success -> {
                     val result = when (commandProcessor) {
                         is CreateWalletTangemWallet -> {
                             it.data as CreateProductWalletTaskResponse
                         }
+
                         else -> CreateProductWalletTaskResponse(card = session.environment.card!!)
                     }
                     callback(CompletionResult.Success(result))
                 }
+
                 is CompletionResult.Failure -> callback(CompletionResult.Failure(it.error))
             }
         }
@@ -70,7 +97,7 @@ class CreateProductWalletTask(
 
 private class CreateWalletTangemNote : ProductCommandProcessor<CreateWalletResponse> {
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<CreateWalletResponse>) -> Unit,
     ) {
@@ -94,52 +121,65 @@ private class CreateWalletTangemNote : ProductCommandProcessor<CreateWalletRespo
             } else {
                 intersectCurves[0]
             }
-            CreateWalletTask(curve).run(session, callback)
+            CreateWalletTask(curve).run(session) { result ->
+                callback(result.map { CreateWalletResponse(it) })
+            }
         }
     }
 }
 
 private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWalletTaskResponse> {
 
-    private lateinit var card: Card
     private var primaryCard: PrimaryCard? = null
 
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
-        this.card = card
         val curves = card.getCurvesForNonCreatedWallets()
 
         if (curves.isEmpty()) {
-            val createWalletResponses = card.wallets.map { CreateWalletResponse(card.cardId, it) }
-            proceedWithCreatedWallets(createWalletResponses, session, callback)
+            val createWalletResponses = card.wallets.map { wallet ->
+                CreateWalletResponse(card.cardId, wallet)
+            }
+            proceedWithCreatedWallets(card, createWalletResponses, session, callback)
             return
         }
 
         CreateWalletsTask(curves).run(session) { result ->
             when (result) {
                 is CompletionResult.Success -> {
-                    proceedWithCreatedWallets(result.data.createWalletResponses, session, callback)
+                    proceedWithCreatedWallets(
+                        card = card,
+                        createWalletResponses = result.data.createWalletResponses.map { CreateWalletResponse(it) },
+                        session = session,
+                        callback = callback,
+                    )
+                }
+
+                is CompletionResult.Failure -> {
+                    callback(CompletionResult.Failure(result.error))
                 }
-                is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
             }
         }
     }
 
     private fun proceedWithCreatedWallets(
+        card: CardDTO,
         createWalletResponses: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
         when {
             card.settings.isBackupAllowed -> {
-                linkPrimaryCard(createWalletResponses, session, callback)
+                linkPrimaryCard(card, createWalletResponses, session, callback)
             }
+
             card.settings.isHDWalletAllowed -> {
-                deriveKeys(createWalletResponses, session, callback)
+                deriveKeys(card, createWalletResponses, session, callback)
             }
+
             else -> {
                 callback(
                     CompletionResult.Success(
@@ -151,6 +191,7 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
     }
 
     private fun linkPrimaryCard(
+        card: CardDTO,
         createWalletResponse: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
@@ -161,8 +202,9 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
                     primaryCard = result.data
                     when {
                         card.settings.isHDWalletAllowed -> {
-                            deriveKeys(createWalletResponse, session, callback)
+                            deriveKeys(card, createWalletResponse, session, callback)
                         }
+
                         else -> {
                             callback(
                                 CompletionResult.Success(
@@ -174,6 +216,7 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
                         }
                     }
                 }
+
                 is CompletionResult.Failure -> {
                     callback(CompletionResult.Failure(result.error))
                 }
@@ -182,13 +225,14 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
     }
 
     private fun deriveKeys(
+        card: CardDTO,
         createWalletResponse: List<CreateWalletResponse>,
         session: CardSession,
         callback: (result: CompletionResult<CreateProductWalletTaskResponse>) -> Unit,
     ) {
         val map = mutableMapOf<ByteArrayKey, List<DerivationPath>>()
         createWalletResponse.forEach { response ->
-            val blockchainsForCurve = getBlockchains(response.cardId).filter {
+            val blockchainsForCurve = getBlockchains(response.cardId, card).filter {
                 it.getSupportedCurves().contains(response.wallet.curve)
             }
             val derivationPaths = blockchainsForCurve.mapNotNull { it.derivationPath(card.derivationStyle) }
@@ -210,17 +254,21 @@ private class CreateWalletTangemWallet : ProductCommandProcessor<CreateProductWa
                                 CreateProductWalletTaskResponse(
                                     card = session.environment.card!!,
                                     derivedKeys = result.data.entries,
-                                    primaryCard = primaryCard
-                                )
-                            )
+                                    primaryCard = primaryCard,
+                                ),
+                            ),
                         )
                     }
+
                     is CompletionResult.Failure -> callback(CompletionResult.Failure(result.error))
                 }
             }
     }
 
-    private fun getBlockchains(cardId: String): List<Blockchain> {
+    private fun getBlockchains(
+        cardId: String,
+        card: CardDTO,
+    ): List<Blockchain> {
         return when {
             DemoHelper.isDemoCardId(cardId) -> DemoHelper.config.demoBlockchains
             card.isTestCard -> listOf(Blockchain.BitcoinTestnet, Blockchain.EthereumTestnet)
diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ProductCommandProcessor.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ProductCommandProcessor.kt
index c0810ff887..8b9d8d9d2f 100644
--- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ProductCommandProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ProductCommandProcessor.kt
@@ -1,15 +1,15 @@
 package com.tangem.tap.domain.tasks.product
 
 import com.tangem.common.CompletionResult
-import com.tangem.common.card.Card
 import com.tangem.common.core.CardSession
+import com.tangem.domain.common.CardDTO
 
 /**
 [REDACTED_AUTHOR]
  */
 interface ProductCommandProcessor<T> {
     fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<T>) -> Unit,
     )
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 d028eb9a9e..b04226d1d6 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
@@ -13,6 +13,7 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.extensions.toMapKey
 import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ProductType
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isExcluded
@@ -32,7 +33,6 @@ import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.issuerAndUserData.ReadIssuerDataCommand
 import com.tangem.tap.domain.TapSdkError
 import com.tangem.tap.domain.extensions.getPrimaryCurve
-import com.tangem.tap.domain.extensions.getSingleWallet
 import com.tangem.tap.domain.extensions.isMultiwalletAllowed
 import com.tangem.tap.domain.tokens.UserTokensRepository
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
@@ -46,6 +46,9 @@ class ScanProductTask(
     private val additionalBlockchainsToDerive: Collection<Blockchain>? = null,
 ) : CardSessionRunnable<ScanResponse> {
 
+    override val allowsRequestAccessCodeFromRepository: Boolean
+        get() = !additionalBlockchainsToDerive.isNullOrEmpty()
+
     override fun run(
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
@@ -54,19 +57,20 @@ class ScanProductTask(
             callback(CompletionResult.Failure(TangemSdkError.MissingPreflightRead()))
             return
         }
+        val cardDto = CardDTO(card)
 
-        val error = getErrorIfExcludedCard(card)
+        val error = getErrorIfExcludedCard(cardDto)
         if (error != null) {
             callback(CompletionResult.Failure(error))
             return
         }
 
         val commandProcessor = when {
-            card.isTangemNote -> ScanNoteProcessor()
-            card.isTangemTwins -> ScanTwinProcessor()
+            cardDto.isTangemNote -> ScanNoteProcessor()
+            cardDto.isTangemTwins -> ScanTwinProcessor()
             else -> ScanWalletProcessor(userTokensRepository, additionalBlockchainsToDerive)
         }
-        commandProcessor.proceed(card, session) { processorResult ->
+        commandProcessor.proceed(cardDto, session) { processorResult ->
             when (processorResult) {
                 is CompletionResult.Success -> ScanTask().run(session) { scanTaskResult ->
                     when (scanTaskResult) {
@@ -74,7 +78,7 @@ class ScanProductTask(
                             // it need because processorResult.data.card doesn't contains attestation result
                             // and CardWallet.derivedKeys
                             val processorScanResponseWithNewCard = processorResult.data.copy(
-                                card = scanTaskResult.data,
+                                card = CardDTO(scanTaskResult.data),
                             )
                             callback(CompletionResult.Success(processorScanResponseWithNewCard))
                         }
@@ -86,7 +90,7 @@ class ScanProductTask(
         }
     }
 
-    private fun getErrorIfExcludedCard(card: Card): TangemError? {
+    private fun getErrorIfExcludedCard(card: CardDTO): TangemError? {
         if (card.isExcluded) return TapSdkError.CardForDifferentApp
         if (card.isNotSupportedInThatRelease) return TapSdkError.CardNotSupportedByRelease
         return null
@@ -95,7 +99,7 @@ class ScanProductTask(
 
 private class ScanNoteProcessor : ProductCommandProcessor<ScanResponse> {
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
@@ -118,7 +122,7 @@ private class ScanWalletProcessor(
 
     var primaryCard: PrimaryCard? = null
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
@@ -126,7 +130,7 @@ private class ScanWalletProcessor(
     }
 
     private fun createMissingWalletsIfNeeded(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
@@ -160,13 +164,15 @@ private class ScanWalletProcessor(
     }
 
     private fun startLinkingForBackupIfNeeded(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
-        val activationIsFinished = preferencesStorage.usedCardsPrefStorage.isActivationFinished(card.cardId)
+        val activationInProgress = preferencesStorage.usedCardsPrefStorage.isActivationInProgress(card.cardId)
 
-        if (card.backupStatus == Card.BackupStatus.NoBackup && !activationIsFinished && card.wallets.isNotEmpty()) {
+        if ((card.backupStatus == CardDTO.BackupStatus.NoBackup && card.wallets.isNotEmpty())
+            && (activationInProgress || card.isSaltPay)
+        ) {
             StartPrimaryCardLinkingTask().run(session) { linkingResult ->
                 when (linkingResult) {
                     is CompletionResult.Success -> {
@@ -184,7 +190,7 @@ private class ScanWalletProcessor(
     }
 
     private fun deriveKeysIfNeeded(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
@@ -227,25 +233,41 @@ private class ScanWalletProcessor(
         }
     }
 
-    private suspend fun getBlockchainsToDerive(card: Card): List<BlockchainNetwork> {
+    private suspend fun getBlockchainsToDerive(card: CardDTO): List<BlockchainNetwork> {
         val userTokensRepository = userTokensRepository ?: return emptyList()
-        val blockchainsToDerive = userTokensRepository.loadBlockchainsToDerive(card).toMutableList().ifEmpty {
-            mutableListOf(
-                BlockchainNetwork(Blockchain.Bitcoin, card),
-                BlockchainNetwork(Blockchain.Ethereum, card),
-            )
-        }
+        val blockchainsToDerive = userTokensRepository.loadBlockchainsToDerive(card)
+            .toMutableList()
+            .ifEmpty {
+                mutableListOf(
+                    BlockchainNetwork(
+                        blockchain = Blockchain.Bitcoin,
+                        card = card,
+                    ),
+                    BlockchainNetwork(
+                        blockchain = Blockchain.Ethereum,
+                        card = card,
+                    ),
+                )
+            }
 
         if (card.settings.isHDWalletAllowed) {
             blockchainsToDerive.addAll(
                 listOf(
-                    BlockchainNetwork(Blockchain.Ethereum, card),
-                    BlockchainNetwork(Blockchain.EthereumTestnet, card),
+                    BlockchainNetwork(
+                        blockchain = Blockchain.Ethereum,
+                        card = card,
+                    ),
+                    BlockchainNetwork(
+                        blockchain = Blockchain.EthereumTestnet,
+                        card = card,
+                    ),
                 ),
             )
         }
         if (additionalBlockchainsToDerive != null) {
-            blockchainsToDerive.addAll(additionalBlockchainsToDerive.map { BlockchainNetwork(it, card) })
+            blockchainsToDerive.addAll(
+                additionalBlockchainsToDerive.map { BlockchainNetwork(it, card) }
+            )
         }
         if (!card.useOldStyleDerivation) {
             blockchainsToDerive.removeAll(
@@ -261,7 +283,7 @@ private class ScanWalletProcessor(
         return blockchainsToDerive.distinct()
     }
 
-    private suspend fun collectDerivations(card: Card): Map<ByteArrayKey, List<DerivationPath>> {
+    private suspend fun collectDerivations(card: CardDTO): Map<ByteArrayKey, List<DerivationPath>> {
         val blockchains = getBlockchainsToDerive(card)
         val derivations = mutableMapOf<ByteArrayKey, List<DerivationPath>>()
 
@@ -287,14 +309,14 @@ private class ScanWalletProcessor(
 
 private class ScanTwinProcessor : ProductCommandProcessor<ScanResponse> {
     override fun proceed(
-        card: Card,
+        card: CardDTO,
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
     ) {
         ReadIssuerDataCommand().run(session) { readDataResult ->
             when (readDataResult) {
                 is CompletionResult.Success -> {
-                    val publicKey = card.getSingleWallet()?.publicKey
+                    val publicKey = card.wallets.firstOrNull()?.publicKey
                     if (publicKey == null) {
                         val response = ScanResponse(
                             card = card,
@@ -332,7 +354,7 @@ private class ScanTwinProcessor : ProductCommandProcessor<ScanResponse> {
     }
 }
 
-fun Card.getCurvesForNonCreatedWallets(): List<EllipticCurve> {
+fun CardDTO.getCurvesForNonCreatedWallets(): List<EllipticCurve> {
     val curvesPresent = wallets.map { it.curve }.toSet()
     val curvesForNonCreatedWallets = supportedCurves.subtract(curvesPresent + EllipticCurve.Secp256r1)
     return curvesForNonCreatedWallets.toList()
diff --git a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
index f05065bc8d..6644362bf5 100644
--- a/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
+++ b/app/src/main/java/com/tangem/tap/domain/termsOfUse/CardTou.kt
@@ -3,8 +3,8 @@ package com.tangem.tap.domain.termsOfUse
 import android.content.res.Resources
 import android.net.Uri
 import androidx.core.os.ConfigurationCompat
-import com.tangem.common.card.Card
-import java.util.Locale
+import com.tangem.domain.common.CardDTO
+import java.util.*
 
 /**
 [REDACTED_AUTHOR]
@@ -13,7 +13,7 @@ class CardTou {
     private val locale: Locale =
         ConfigurationCompat.getLocales(Resources.getSystem().configuration).get(0)!!
 
-    fun getUrl(card: Card): Uri? {
+    fun getUrl(card: CardDTO): Uri? {
         val issuerName = card.issuer.name
         if (issuerName.lowercase(Locale.getDefault()) != "start2coin") return null
 
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt b/app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt
index d3d5836701..28bcdc9c35 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt
@@ -2,10 +2,11 @@ package com.tangem.tap.domain.tokens
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.card.FirmwareVersion
+import com.tangem.domain.common.CardDTO
 
 object CurrenciesRepository {
     fun getBlockchains(
-        cardFirmware: FirmwareVersion,
+        cardFirmware: CardDTO.FirmwareVersion,
         isTestNet: Boolean = false,
     ): List<Blockchain> {
         val blockchains = if (cardFirmware < FirmwareVersion.MultiWalletAvailable) {
@@ -26,6 +27,4 @@ object CurrenciesRepository {
             )
         }
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/Currency.kt b/app/src/main/java/com/tangem/tap/domain/tokens/Currency.kt
index 6e94b5a88a..0e18c4018d 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/Currency.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/Currency.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.domain.tokens
 import com.squareup.moshi.JsonClass
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.extensions.fromNetworkId
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 
 @JsonClass(generateAdapter = true)
 data class CurrencyFromJson(
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
index 7df68e80c3..fbbaad9022 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
@@ -6,9 +6,9 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.getListOfCoins
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.network.api.tangemTech.CoinsResponse
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.common.AssetReader
 
 class LoadAvailableCoinsService(
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt b/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt
index 7418891662..2aa1dce1a7 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt
@@ -7,8 +7,8 @@ import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.getTokens
 import com.tangem.domain.common.extensions.toNetworkId
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.common.FileReader
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.domain.tokens.models.TokenDao
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt
index c0b7e18155..821a8046ac 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensNetworkService.kt
@@ -2,8 +2,8 @@ package com.tangem.tap.domain.tokens
 
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.api.tangemTech.UserTokensResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
 import com.tangem.tap.domain.NoDataError
 
 class UserTokensNetworkService(private val tangemTechService: TangemTechService) {
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
index 40b8389049..b3efb6ce5b 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensRepository.kt
@@ -2,13 +2,13 @@ package com.tangem.tap.domain.tokens
 
 import android.content.Context
 import com.tangem.blockchain.common.DerivationStyle
-import com.tangem.common.card.Card
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.TangemTechService
-import com.tangem.network.api.tangemTech.UserTokensResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
+import com.tangem.domain.common.CardDTO
 import com.tangem.tap.common.AndroidFileReader
 import com.tangem.tap.domain.NoDataError
-import com.tangem.tap.domain.extensions.getUserWalletId
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.wallet.models.Currency
@@ -23,8 +23,8 @@ class UserTokensRepository(
     private val storageService: UserTokensStorageService,
     private val networkService: UserTokensNetworkService,
 ) {
-    suspend fun getUserTokens(card: Card): List<Currency> {
-        val userId = card.getUserWalletId()
+    suspend fun getUserTokens(card: CardDTO): List<Currency> {
+        val userId = getUserWalletId(card) ?: return emptyList()
         if (DemoHelper.isDemoCardId(card.cardId)) {
             return loadTokensOffline(card, userId).ifEmpty { loadDemoCurrencies() }
         }
@@ -36,25 +36,28 @@ class UserTokensRepository(
         return when (val networkResult = networkService.getUserTokens(userId)) {
             is Result.Success -> {
                 val tokens = networkResult.data.tokens.mapNotNull { Currency.fromTokenResponse(it) }
-                storageService.saveUserTokens(card.getUserWalletId(), tokens.toUserTokensResponse())
+                storageService.saveUserTokens(userId, tokens.toUserTokensResponse())
                 tokens.distinct()
             }
+
             is Result.Failure -> {
                 handleGetUserTokensFailure(card = card, userId = userId, error = networkResult.error)
             }
         }
     }
 
-    suspend fun saveUserTokens(card: Card, tokens: List<Currency>) {
+    suspend fun saveUserTokens(card: CardDTO, tokens: List<Currency>) {
+        val userId = getUserWalletId(card) ?: return
         val userTokens = tokens.toUserTokensResponse()
-        networkService.saveUserTokens(card.getUserWalletId(), userTokens)
-        storageService.saveUserTokens(card.getUserWalletId(), userTokens)
+        networkService.saveUserTokens(userId, userTokens)
+        storageService.saveUserTokens(userId, userTokens)
     }
 
-    suspend fun removeUserTokens(card: Card) {
+    suspend fun removeUserTokens(card: CardDTO) {
+        val userId = getUserWalletId(card) ?: return
         val userTokens = emptyList<Currency>().toUserTokensResponse()
-        networkService.saveUserTokens(card.getUserWalletId(), userTokens)
-        storageService.saveUserTokens(card.getUserWalletId(), userTokens)
+        networkService.saveUserTokens(userId, userTokens)
+        storageService.saveUserTokens(userId, userTokens)
     }
 
     private fun List<Currency>.toUserTokensResponse(): UserTokensResponse {
@@ -66,8 +69,8 @@ class UserTokensRepository(
         )
     }
 
-    suspend fun loadBlockchainsToDerive(card: Card): List<BlockchainNetwork> {
-        val userId = card.getUserWalletId()
+    suspend fun loadBlockchainsToDerive(card: CardDTO): List<BlockchainNetwork> {
+        val userId = getUserWalletId(card) ?: return emptyList()
         val blockchainNetworks = loadTokensOffline(card, userId).toBlockchainNetworks()
 
         if (DemoHelper.isDemoCardId(card.cardId)) {
@@ -89,7 +92,7 @@ class UserTokensRepository(
     }
 
     private suspend fun handleGetUserTokensFailure(
-        card: Card,
+        card: CardDTO,
         userId: String,
         error: Throwable,
     ): List<Currency> {
@@ -100,6 +103,7 @@ class UserTokensRepository(
                 coroutineScope { launch { networkService.saveUserTokens(userId = userId, tokens = userTokens) } }
                 tokens
             }
+
             else -> {
                 val tokens = storageService.getUserTokens(userId) ?: storageService.getUserTokens(card)
                 tokens.distinct()
@@ -107,10 +111,15 @@ class UserTokensRepository(
         }
     }
 
-    private suspend fun loadTokensOffline(card: Card, userId: String): List<Currency> {
+    private suspend fun loadTokensOffline(card: CardDTO, userId: String): List<Currency> {
         return storageService.getUserTokens(userId) ?: storageService.getUserTokens(card)
     }
 
+    private fun getUserWalletId(card: CardDTO): String? {
+        return UserWalletIdBuilder.card(card).build()
+            ?.stringValue
+    }
+
     companion object {
         const val SORT_DEFAULT_VALUE = "manual"
         const val GROUP_DEFAULT_VALUE = "none"
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
index c71e5afa53..9e5dac0b68 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
@@ -2,9 +2,9 @@ package com.tangem.tap.domain.tokens
 
 import com.squareup.moshi.JsonAdapter
 import com.tangem.Log
-import com.tangem.common.card.Card
-import com.tangem.network.api.tangemTech.UserTokensResponse
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.tangemTech.UserTokensResponse
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.domain.common.CardDTO
 import com.tangem.tap.common.FileReader
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.toCurrencies
@@ -28,7 +28,7 @@ class UserTokensStorageService(
     }
 
     @Deprecated("")
-    suspend fun getUserTokens(card: Card): List<Currency> {
+    suspend fun getUserTokens(card: CardDTO): List<Currency> {
         val blockchainNetworks =
             oldUserTokensRepository.loadSavedCurrencies(card.cardId, card.settings.isHDWalletAllowed)
         return blockchainNetworks.flatMap { it.toCurrencies() }
diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainNetwork.kt b/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainNetwork.kt
index 36e376a08b..3b9558c303 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainNetwork.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainNetwork.kt
@@ -4,8 +4,8 @@ import com.squareup.moshi.JsonClass
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.card.Card
 import com.tangem.common.extensions.calculateHashCode
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 
 @JsonClass(generateAdapter = true)
@@ -15,16 +15,18 @@ data class BlockchainNetwork(
     val tokens: List<Token>
 ) {
 
-    constructor(blockchain: Blockchain, card: Card) : this(
+    constructor(
+        blockchain: Blockchain,
+        card: CardDTO,
+    ) : this(
         blockchain = blockchain,
         derivationPath = if (card.settings.isHDWalletAllowed) blockchain.derivationPath(card.derivationStyle)?.rawPath else null,
-        tokens = emptyList()
+        tokens = emptyList(),
     )
 
-
     fun updateTokens(tokens: List<Token>): BlockchainNetwork {
         return copy(
-            tokens = (this.tokens + tokens).distinct()
+            tokens = (this.tokens + tokens).distinct(),
         )
     }
 
diff --git a/app/src/main/java/com/tangem/tap/domain/totalBalance/TotalFiatBalanceCalculator.kt b/app/src/main/java/com/tangem/tap/domain/totalBalance/TotalFiatBalanceCalculator.kt
new file mode 100644
index 0000000000..9790310eb0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/totalBalance/TotalFiatBalanceCalculator.kt
@@ -0,0 +1,34 @@
+package com.tangem.tap.domain.totalBalance
+
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.WalletStoreModel
+import java.math.BigDecimal
+
+interface TotalFiatBalanceCalculator {
+
+    /**
+     * Calculate total fiat balance for list of [WalletStoreModel]
+     * @param prevAmount Previous amount, used in [TotalFiatBalance.Refreshing]
+     * @param walletStores List of [WalletStoreModel] to calculate fiat amount
+     * @param initial Initial [TotalFiatBalance] state, used when list of [WalletStoreModel] is empty
+     * @return [TotalFiatBalance] with state found with the [WalletStoreModel] list
+     * */
+    suspend fun calculate(
+        prevAmount: BigDecimal?,
+        walletStores: List<WalletStoreModel>,
+        initial: TotalFiatBalance,
+    ): TotalFiatBalance
+
+    /**
+     * Same as [TotalFiatBalanceCalculator.calculate] but returns null if list of [WalletStoreModel] is empty
+     * @param prevAmount Previous amount, used in [TotalFiatBalance.Refreshing]
+     * @param walletStores List of [WalletStoreModel] to calculate fiat amount
+     * @return [TotalFiatBalance] with state found with the [WalletStoreModel] list
+     * */
+    suspend fun calculateOrNull(
+        prevAmount: BigDecimal?,
+        walletStores: List<WalletStoreModel>,
+    ): TotalFiatBalance?
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/totalBalance/di/TotalFiatBalanceCalculatorProvider.kt b/app/src/main/java/com/tangem/tap/domain/totalBalance/di/TotalFiatBalanceCalculatorProvider.kt
new file mode 100644
index 0000000000..ea285cc404
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/totalBalance/di/TotalFiatBalanceCalculatorProvider.kt
@@ -0,0 +1,8 @@
+package com.tangem.tap.domain.totalBalance.di
+
+import com.tangem.tap.domain.totalBalance.TotalFiatBalanceCalculator
+import com.tangem.tap.domain.totalBalance.implementation.DefaultTotalFiatBalanceCalculator
+
+fun TotalFiatBalanceCalculator.Companion.provideDefaultImplementation(): TotalFiatBalanceCalculator {
+    return DefaultTotalFiatBalanceCalculator()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/totalBalance/implementation/DefaultTotalFiatBalanceCalculator.kt b/app/src/main/java/com/tangem/tap/domain/totalBalance/implementation/DefaultTotalFiatBalanceCalculator.kt
new file mode 100644
index 0000000000..0c0f909c80
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/totalBalance/implementation/DefaultTotalFiatBalanceCalculator.kt
@@ -0,0 +1,99 @@
+package com.tangem.tap.domain.totalBalance.implementation
+
+import com.tangem.tap.common.extensions.toFiatValue
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.totalBalance.TotalFiatBalanceCalculator
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.math.BigDecimal
+
+internal class DefaultTotalFiatBalanceCalculator : TotalFiatBalanceCalculator {
+    override suspend fun calculate(
+        prevAmount: BigDecimal?,
+        walletStores: List<WalletStoreModel>,
+        initial: TotalFiatBalance,
+    ): TotalFiatBalance {
+        return calculateOrNull(prevAmount, walletStores) ?: initial
+    }
+
+    override suspend fun calculateOrNull(
+        prevAmount: BigDecimal?,
+        walletStores: List<WalletStoreModel>,
+    ): TotalFiatBalance? {
+        return if (walletStores.isEmpty()) {
+            null
+        } else {
+            withContext(Dispatchers.Default) {
+                val walletsData = walletStores
+                    .asSequence()
+                    .flatMap { it.walletsData }
+                val calculateAmount = { walletsData.calculateTotalFiatAmount() }
+
+                when (walletsData.findStatus()) {
+                    TotalFiatBalanceStatus.Loading -> TotalFiatBalance.Loading
+                    TotalFiatBalanceStatus.Error -> TotalFiatBalance.Error(calculateAmount())
+                    TotalFiatBalanceStatus.Loaded -> TotalFiatBalance.Loaded(calculateAmount())
+                }
+            }
+        }
+    }
+
+    private fun Sequence<WalletDataModel>.findStatus(): TotalFiatBalanceStatus {
+        return this
+            .mapToStatus()
+            .reduce { prevStatus, newStatus ->
+                getCurrentStatus(prevStatus, newStatus)
+            }
+    }
+
+    private fun Sequence<WalletDataModel>.mapToStatus(): Sequence<TotalFiatBalanceStatus> {
+        return this.map { walletData ->
+            when (walletData.status) {
+                is WalletDataModel.VerifiedOnline,
+                is WalletDataModel.SameCurrencyTransactionInProgress,
+                is WalletDataModel.TransactionInProgress,
+                is WalletDataModel.NoAccount,
+                -> TotalFiatBalanceStatus.Loaded
+                is WalletDataModel.Unreachable,
+                is WalletDataModel.MissedDerivation,
+                -> TotalFiatBalanceStatus.Error
+                is WalletDataModel.Loading -> TotalFiatBalanceStatus.Loading
+            }
+        }
+    }
+
+    private fun Sequence<WalletDataModel>.calculateTotalFiatAmount(): BigDecimal {
+        return this
+            .map { walletData ->
+                walletData.fiatRate
+                    ?.let { walletData.status.amount.toFiatValue(it) }
+                    ?: BigDecimal.ZERO
+            }
+            .reduce(BigDecimal::plus)
+    }
+
+    private fun getCurrentStatus(
+        prevStatus: TotalFiatBalanceStatus,
+        newStatus: TotalFiatBalanceStatus,
+    ): TotalFiatBalanceStatus {
+        return when (prevStatus) {
+            TotalFiatBalanceStatus.Loading -> prevStatus
+            TotalFiatBalanceStatus.Loaded,
+            TotalFiatBalanceStatus.Error,
+            -> when (newStatus) {
+                TotalFiatBalanceStatus.Loading,
+                TotalFiatBalanceStatus.Error,
+                -> newStatus
+                TotalFiatBalanceStatus.Loaded -> prevStatus
+            }
+        }
+    }
+
+    private enum class TotalFiatBalanceStatus {
+        Loading,
+        Error,
+        Loaded,
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
index 872c130c30..28016d704f 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/CreateFirstTwinWalletTask.kt
@@ -4,18 +4,30 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.core.CardSession
 import com.tangem.common.core.CardSessionRunnable
+import com.tangem.domain.common.TwinsHelper
 import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.operations.wallet.CreateWalletTask
 import com.tangem.operations.wallet.PurgeWalletCommand
-import com.tangem.tap.domain.extensions.getSingleWallet
 
-class CreateFirstTwinWalletTask : CardSessionRunnable<CreateWalletResponse> {
+class CreateFirstTwinWalletTask(private val firstCardId: String) : CardSessionRunnable<CreateWalletResponse> {
+
+    override val allowsRequestAccessCodeFromRepository: Boolean = false
+
     override fun run(
         session: CardSession,
         callback: (result: CompletionResult<CreateWalletResponse>) -> Unit,
     ) {
-        val publicKey = session.environment.card?.getSingleWallet()?.publicKey
+        val card = session.environment.card
+        val publicKey = card?.wallets?.firstOrNull()?.publicKey
         if (publicKey != null) {
+            val requiredTwinCardNumber = TwinsHelper.getTwinCardNumber(firstCardId)
+            if (requiredTwinCardNumber != TwinsHelper.getTwinCardNumber(card.cardId)) {
+                requiredTwinCardNumber?.let {
+                    callback(CompletionResult.Failure(WrongTwinCard(it)))
+                }
+                return
+            }
+
             PurgeWalletCommand(publicKey).run(session) { response ->
                 when (response) {
                     is CompletionResult.Success -> {
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 85c03925ff..628c041112 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
@@ -6,28 +6,31 @@ import com.tangem.common.KeyPair
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.core.CardSession
 import com.tangem.common.core.CardSessionRunnable
-import com.tangem.common.core.TangemError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.domain.common.TwinsHelper
 import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.operations.wallet.CreateWalletTask
 import com.tangem.operations.wallet.PurgeWalletCommand
-import com.tangem.tap.domain.extensions.getSingleWallet
-import com.tangem.wallet.R
 
 class CreateSecondTwinWalletTask(
     private val firstPublicKey: String,
     private val firstCardId: String,
     private val issuerKeys: KeyPair,
     private val preparingMessage: Message,
-    private val creatingWalletMessage: Message
+    private val creatingWalletMessage: Message,
 ) : CardSessionRunnable<CreateWalletResponse> {
+
+    override val allowsRequestAccessCodeFromRepository: Boolean = false
+
     override fun run(session: CardSession, callback: (result: CompletionResult<CreateWalletResponse>) -> Unit) {
         val card = session.environment.card
-        val publicKey = card?.getSingleWallet()?.publicKey
+        val publicKey = card?.wallets?.firstOrNull()?.publicKey
         if (publicKey != null) {
-            if (!card.cardId.startsWith(TwinsHelper.getPairCardSeries(firstCardId) ?: "")) {
-                callback(CompletionResult.Failure(WrongTwinCard()))
+            val currentTwinCardNumber = TwinsHelper.getTwinCardNumber(card.cardId)
+            if (TwinsHelper.getTwinCardNumber(firstCardId) == currentTwinCardNumber) {
+                currentTwinCardNumber?.pairNumber()?.let {
+                    callback(CompletionResult.Failure(WrongTwinCard(it)))
+                }
                 return
             }
 
@@ -53,13 +56,10 @@ class CreateSecondTwinWalletTask(
                 is CompletionResult.Success -> {
                     session.environment.card = session.environment.card?.updateWallet(result.data.wallet)
 
-                    WriteProtectedIssuerDataTask(
-                            firstPublicKey.hexToBytes(), issuerKeys
-                    ).run(session) { writeResult ->
+                    WriteProtectedIssuerDataTask(firstPublicKey.hexToBytes(), issuerKeys).run(session) { writeResult ->
                         when (writeResult) {
                             is CompletionResult.Success -> callback(result)
-                            is CompletionResult.Failure ->
-                                callback(CompletionResult.Failure(writeResult.error))
+                            is CompletionResult.Failure -> callback(CompletionResult.Failure(writeResult.error))
                         }
                     }
                 }
@@ -67,10 +67,4 @@ class CreateSecondTwinWalletTask(
             }
         }
     }
-
-    private class WrongTwinCard : TangemError {
-        override val code: Int = 50005
-        override var customMessage: String = code.toString()
-        override val messageResId = R.string.twins_wrong_card_error
-    }
-}
+}
\ No newline at end of file
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 73b9e2f40a..d4e00cb3fe 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
@@ -13,6 +13,8 @@ class FinalizeTwinTask(
     private val twinPublicKey: ByteArray, private val issuerKeys: KeyPair,
 ) : CardSessionRunnable<ScanResponse> {
 
+    override val allowsRequestAccessCodeFromRepository: Boolean = false
+
     override fun run(
         session: CardSession,
         callback: (result: CompletionResult<ScanResponse>) -> Unit,
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 feb58ca6f0..b910fcb589 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
@@ -6,25 +6,20 @@ import com.tangem.Message
 import com.tangem.blockchain.extensions.Result
 import com.tangem.common.CompletionResult
 import com.tangem.common.KeyPair
-import com.tangem.common.card.Card
-import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.common.MoshiConverter
 import com.tangem.operations.wallet.CreateWalletResponse
 import com.tangem.tap.common.AssetReader
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
 import com.tangem.tap.tangemSdkManager
 
 class TwinCardsManager(
-    private val card: Card,
+    card: CardDTO,
     assetReader: AssetReader,
-    val analyticsHandler: GlobalAnalyticsEventHandler?
 ) {
-
-    private val currentCardId: String = card.cardId
+    private val firstCardId: String = card.cardId
 
     private var currentCardPublicKey: String? = null
     private var secondCardPublicKey: String? = null
@@ -32,18 +27,14 @@ class TwinCardsManager(
     private val issuerKeyPair: KeyPair = getIssuerKeys(assetReader, card.issuer.publicKey.toHexString())
 
     suspend fun createFirstWallet(message: Message): CompletionResult<CreateWalletResponse> {
-        val response = tangemSdkManager.runTaskAsync(CreateFirstTwinWalletTask(), currentCardId, message)
+        val response = tangemSdkManager.runTaskAsync(
+            runnable = CreateFirstTwinWalletTask(firstCardId),
+            cardId = firstCardId,
+            initialMessage = message,
+        )
         when (response) {
             is CompletionResult.Success -> currentCardPublicKey = response.data.wallet.publicKey.toHexString()
-            is CompletionResult.Failure -> {
-                (response.error as? TangemSdkError)?.let { error ->
-                   analyticsHandler?.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.CreateWallet,
-                        card = card
-                    )
-                }
-            }
+            is CompletionResult.Failure -> {}
         }
         return response
     }
@@ -55,46 +46,30 @@ class TwinCardsManager(
     ): CompletionResult<CreateWalletResponse> {
         val task = CreateSecondTwinWalletTask(
             firstPublicKey = currentCardPublicKey!!,
-            firstCardId = currentCardId,
+            firstCardId = firstCardId,
             issuerKeys = issuerKeyPair,
             preparingMessage = preparingMessage,
-            creatingWalletMessage = creatingWalletMessage
+            creatingWalletMessage = creatingWalletMessage,
         )
         val response = tangemSdkManager.runTaskAsync(task, null, initialMessage)
         when (response) {
             is CompletionResult.Success -> {
                 secondCardPublicKey = response.data.wallet.publicKey.toHexString()
             }
-            is CompletionResult.Failure -> {
-                (response.error as? TangemSdkError)?.let { error ->
-                    analyticsHandler?.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.CreateWallet,
-                        card = card
-                    )
-                }
-            }
+            is CompletionResult.Failure -> {}
         }
         return response
     }
 
     suspend fun complete(message: Message): Result<ScanResponse> {
         val response = tangemSdkManager.runTaskAsync(
-            FinalizeTwinTask(secondCardPublicKey!!.hexToBytes(), issuerKeyPair),
-            currentCardId, message
+            runnable = FinalizeTwinTask(secondCardPublicKey!!.hexToBytes(), issuerKeyPair),
+            cardId = firstCardId,
+            initialMessage = message,
         )
         return when (response) {
             is CompletionResult.Success -> Result.Success(response.data)
-            is CompletionResult.Failure -> {
-                (response.error as? TangemSdkError)?.let { error ->
-                    analyticsHandler?.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.WriteIssuerData,
-                        card = card
-                    )
-                }
-                Result.fromTangemSdkError(response.error)
-            }
+            is CompletionResult.Failure -> Result.fromTangemSdkError(response.error)
         }
     }
 
@@ -103,13 +78,13 @@ class TwinCardsManager(
             val issuer = getIssuers(reader).first { it.publicKey == publicKey }
             return KeyPair(
                 publicKey = issuer.publicKey.hexToBytes(),
-                privateKey = issuer.privateKey.hexToBytes()
+                privateKey = issuer.privateKey.hexToBytes(),
             )
         }
 
         private fun getAdapter(): JsonAdapter<List<Issuer>> {
             return MoshiConverter.defaultMoshi().adapter(
-                Types.newParameterizedType(List::class.java, Issuer::class.java)
+                Types.newParameterizedType(List::class.java, Issuer::class.java),
             )
         }
 
@@ -121,7 +96,6 @@ class TwinCardsManager(
 }
 
 private class Issuer(
-    val id: String,
     val privateKey: String,
     val publicKey: String,
 )
\ No newline at end of file
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 e4ae0109bd..31d35c4a06 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
@@ -13,7 +13,6 @@ import com.tangem.operations.issuerAndUserData.ReadIssuerDataCommand
 import com.tangem.operations.issuerAndUserData.ReadIssuerDataResponse
 import com.tangem.operations.issuerAndUserData.WriteIssuerDataCommand
 import com.tangem.operations.sign.SignHashCommand
-import com.tangem.tap.domain.extensions.getSingleWallet
 
 class WriteProtectedIssuerDataTask(
     private val twinPublicKey: ByteArray, private val issuerKeys: KeyPair,
@@ -25,7 +24,7 @@ class WriteProtectedIssuerDataTask(
     ) {
         SignHashCommand(
             twinPublicKey.calculateSha256(),
-            session.environment.card!!.getSingleWallet()!!.publicKey
+            session.environment.card!!.wallets.first().publicKey,
         )
             .run(session) { signResult ->
                 when (signResult) {
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt b/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt
new file mode 100644
index 0000000000..d05d28217e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/twins/WrongTwinCard.kt
@@ -0,0 +1,14 @@
+package com.tangem.tap.domain.twins
+
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.TwinCardNumber
+import com.tangem.tap.tangemSdkManager
+import com.tangem.wallet.R
+
+data class WrongTwinCard(private val twinCardNumber: TwinCardNumber) : TangemError(code = 50005) {
+    override var customMessage: String = tangemSdkManager.getString(
+        R.string.twin_error_same_card,
+        twinCardNumber.number,
+    )
+    override val messageResId: Int? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletListError.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletListError.kt
new file mode 100644
index 0000000000..6291f7ae4d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletListError.kt
@@ -0,0 +1,40 @@
+package com.tangem.tap.domain.userWalletList
+
+import com.tangem.common.core.TangemError
+import com.tangem.wallet.R
+
+sealed class UserWalletListError(code: Int) : TangemError(code) {
+    override val silent: Boolean
+        get() = (cause as? TangemError)?.silent == true
+
+    override val messageResId: Int? = null
+
+    object WalletAlreadySaved : UserWalletListError(code = 60001) {
+        override var customMessage: String = "This wallet has already been saved, you can add another one"
+        override val messageResId: Int = R.string.user_wallet_list_error_wallet_already_saved
+    }
+
+    class SaveEncryptionKeysError(
+        override val cause: Throwable,
+    ) : UserWalletListError(code = 60001) {
+        override var customMessage: String = "Encryption keys could not be saved: ${cause.localizedMessage}"
+    }
+
+    class ReceiveEncryptionKeysError(
+        override val cause: Throwable,
+    ) : UserWalletListError(code = 60002) {
+        override var customMessage: String = "Encryption keys could not be received: ${cause.localizedMessage}"
+    }
+
+    class SaveSensitiveInformationError(
+        override val cause: Throwable,
+    ) : UserWalletListError(code = 60003) {
+        override var customMessage: String = "Sensitive information could not be saved: ${cause.localizedMessage}"
+    }
+
+    class ReceiveSensitiveInformationError(
+        override val cause: Throwable,
+    ) : UserWalletListError(code = 60004) {
+        override var customMessage: String = "Sensitive information could not be received: ${cause.localizedMessage}"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletsListManager.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletsListManager.kt
new file mode 100644
index 0000000000..9e7619e7c5
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/UserWalletsListManager.kt
@@ -0,0 +1,47 @@
+package com.tangem.tap.domain.userWalletList
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import kotlinx.coroutines.flow.Flow
+
+interface UserWalletsListManager {
+    val userWallets: Flow<List<UserWallet>>
+    val selectedUserWallet: Flow<UserWallet>
+    val selectedUserWalletSync: UserWallet?
+    val isLocked: Flow<Boolean>
+    val isLockedSync: Boolean
+    val hasSavedUserWallets: Boolean
+
+    suspend fun unlockWithBiometry(): CompletionResult<UserWallet?>
+    fun lock()
+
+    suspend fun selectWallet(userWalletId: UserWalletId): CompletionResult<UserWallet>
+
+    /**
+     * Save provided user wallet and set it as selected
+     * @param userWallet [UserWallet] to save
+     * @param canOverride If false, then terminate with [UserWalletListError.WalletAlreadySaved] when user tries to save an
+     * already saved card
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun save(userWallet: UserWallet, canOverride: Boolean = false): CompletionResult<Unit>
+
+    /**
+     * Same as [save] but not change selected user wallet ID
+     * and not terminate with [UserWalletListError.WalletAlreadySaved] if [UserWallet] already saved
+     *
+     * Can terminate with [NoSuchElementException] if unable to find [UserWallet] with provided [UserWalletId]
+     * @param userWalletId update [UserWallet] with that [UserWalletId]
+     * @param update lambda that receives stored [UserWallet] and returns updated [UserWallet]
+     * @return [CompletionResult] of operation with updated [UserWallet]
+     * */
+    suspend fun update(userWalletId: UserWalletId, update: (UserWallet) -> UserWallet): CompletionResult<UserWallet>
+
+    suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit>
+    suspend fun clear(): CompletionResult<Unit>
+
+    suspend fun get(userWalletId: UserWalletId): CompletionResult<UserWallet>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt
new file mode 100644
index 0000000000..3773da7127
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerProvider.kt
@@ -0,0 +1,71 @@
+package com.tangem.tap.domain.userWalletList.di
+
+import android.content.Context
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.tangem.common.json.TangemSdkAdapter
+import com.tangem.common.services.secure.SecureStorage
+import com.tangem.tangem_sdk_new.storage.AndroidSecureStorage
+import com.tangem.tangem_sdk_new.storage.createEncryptedSharedPreferences
+import com.tangem.tap.domain.TangemSdkManager
+import com.tangem.tap.domain.userWalletList.UserWalletsListManager
+import com.tangem.tap.domain.userWalletList.implementation.BiometricUserWalletsListManager
+import com.tangem.tap.domain.userWalletList.repository.implementation.BiometricUserWalletsKeysRepository
+import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultSelectedUserWalletRepository
+import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsPublicInformationRepository
+import com.tangem.tap.domain.userWalletList.repository.implementation.DefaultUserWalletsSensitiveInformationRepository
+import com.tangem.tap.domain.userWalletList.utils.json.ByteArrayKeyAdapter
+import com.tangem.tap.domain.userWalletList.utils.json.CardBackupStatusAdapter
+import com.tangem.tap.domain.userWalletList.utils.json.ExtendedPublicKeysMapAdapter
+import com.tangem.tap.domain.userWalletList.utils.json.ScanResponseDerivedKeysMapAdapter
+import com.tangem.tap.domain.userWalletList.utils.json.WalletDerivedKeysMapAdapter
+
+private const val USER_WALLETS_STORAGE_NAME = "user_wallets_storage"
+
+fun UserWalletsListManager.Companion.provideBiometricImplementation(
+    context: Context,
+    tangemSdkManager: TangemSdkManager,
+): UserWalletsListManager {
+    val moshi = Moshi.Builder()
+        .add(WalletDerivedKeysMapAdapter())
+        .add(ScanResponseDerivedKeysMapAdapter())
+        .add(ByteArrayKeyAdapter())
+        .add(ExtendedPublicKeysMapAdapter())
+        .add(CardBackupStatusAdapter())
+        .add(TangemSdkAdapter.DateAdapter())
+        .add(TangemSdkAdapter.DerivationPathAdapter())
+        .add(TangemSdkAdapter.DerivationNodeAdapter())
+        .add(KotlinJsonAdapterFactory())
+        .build()
+
+    val secureStorage = AndroidSecureStorage(
+        preferences = SecureStorage.createEncryptedSharedPreferences(
+            context = context,
+            storageName = USER_WALLETS_STORAGE_NAME,
+        ),
+    )
+
+    val keysRepository = BiometricUserWalletsKeysRepository(
+        moshi = moshi,
+        secureStorage = secureStorage,
+        biometricManager = tangemSdkManager.biometricManager,
+    )
+    val publicInformationRepository = DefaultUserWalletsPublicInformationRepository(
+        moshi = moshi,
+        secureStorage = secureStorage,
+    )
+    val sensitiveInformationRepository = DefaultUserWalletsSensitiveInformationRepository(
+        moshi = moshi,
+        secureStorage = secureStorage,
+    )
+    val selectedUserWalletRepository = DefaultSelectedUserWalletRepository(
+        secureStorage = secureStorage,
+    )
+
+    return BiometricUserWalletsListManager(
+        keysRepository = keysRepository,
+        publicInformationRepository = publicInformationRepository,
+        sensitiveInformationRepository = sensitiveInformationRepository,
+        selectedUserWalletRepository = selectedUserWalletRepository,
+    )
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..db1db2ebbd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt
@@ -0,0 +1,298 @@
+package com.tangem.tap.domain.userWalletList.implementation
+
+import com.tangem.common.*
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.UserWalletListError
+import com.tangem.tap.domain.userWalletList.UserWalletsListManager
+import com.tangem.tap.domain.userWalletList.model.UserWalletEncryptionKey
+import com.tangem.tap.domain.userWalletList.repository.SelectedUserWalletRepository
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsKeysRepository
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsPublicInformationRepository
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsSensitiveInformationRepository
+import com.tangem.tap.domain.userWalletList.utils.encryptionKey
+import com.tangem.tap.domain.userWalletList.utils.toUserWallets
+import com.tangem.tap.domain.userWalletList.utils.updateWith
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+import timber.log.Timber
+
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class BiometricUserWalletsListManager(
+    private val keysRepository: UserWalletsKeysRepository,
+    private val publicInformationRepository: UserWalletsPublicInformationRepository,
+    private val sensitiveInformationRepository: UserWalletsSensitiveInformationRepository,
+    private val selectedUserWalletRepository: SelectedUserWalletRepository,
+) : UserWalletsListManager {
+    private val state = MutableStateFlow(State())
+
+    override val userWallets: Flow<List<UserWallet>>
+        get() = state
+            .mapLatest { it.userWallets }
+            .distinctUntilChanged()
+
+    override val selectedUserWallet: Flow<UserWallet>
+        get() = state
+            .mapLatest { state ->
+                findSelectedUserWallet(state.userWallets)
+            }
+            .filterNotNull()
+            .distinctUntilChanged()
+
+    override val selectedUserWalletSync: UserWallet?
+        get() = findSelectedUserWallet()
+
+    override val isLocked: Flow<Boolean>
+        get() = state
+            .mapLatest { it.isLocked }
+            .distinctUntilChanged()
+
+    override val isLockedSync: Boolean
+        get() = state.value.isLocked
+
+    override val hasSavedUserWallets: Boolean
+        get() = keysRepository.hasSavedEncryptionKeys()
+
+    override suspend fun unlockWithBiometry(): CompletionResult<UserWallet?> {
+        return unlockWithBiometryInternal()
+            .map { selectedUserWalletSync }
+    }
+
+    override fun lock() {
+        state.update { prevState ->
+            prevState.copy(
+                encryptionKeys = emptyList(),
+                isLocked = true,
+            )
+        }
+    }
+
+    override suspend fun selectWallet(userWalletId: UserWalletId): CompletionResult<UserWallet> = catching {
+        if (state.value.selectedUserWalletId == userWalletId) {
+            return@catching findSelectedUserWallet()!!
+        }
+
+        selectedUserWalletRepository.set(userWalletId)
+
+        state.update { prevState ->
+            prevState.copy(
+                selectedUserWalletId = userWalletId,
+            )
+        }
+
+        findSelectedUserWallet()!!
+    }
+
+    override suspend fun save(userWallet: UserWallet, canOverride: Boolean): CompletionResult<Unit> {
+        return if (canOverride) {
+            saveInternal(userWallet, changeSelectedUserWallet = true)
+        } else {
+            val isWalletSaved = state.value.userWallets
+                .any {
+                    it.walletId == userWallet.walletId || it.cardsInWallet.contains(userWallet.cardId)
+                }
+
+            if (isWalletSaved) {
+                CompletionResult.Failure(UserWalletListError.WalletAlreadySaved)
+            } else {
+                saveInternal(userWallet, changeSelectedUserWallet = true)
+            }
+        }
+    }
+
+    override suspend fun update(
+        userWalletId: UserWalletId,
+        update: (UserWallet) -> UserWallet,
+    ): CompletionResult<UserWallet> {
+        return get(userWalletId)
+            .map { storedUserWallet ->
+                update(storedUserWallet)
+            }
+            .flatMap { updatedUserWallet ->
+                saveInternal(updatedUserWallet, changeSelectedUserWallet = false)
+                    .map { updatedUserWallet }
+            }
+    }
+
+    override suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit> {
+        if (userWalletIds.isEmpty()) {
+            return CompletionResult.Success(Unit)
+        }
+
+        changeSelectedUserWalletIdIfNeeded(userWalletIds)
+
+        return sensitiveInformationRepository.delete(userWalletIds)
+            .flatMap { publicInformationRepository.delete(userWalletIds) }
+            .flatMap { keysRepository.delete(userWalletIds) }
+            .map {
+                state.update { prevState ->
+                    val newUserWallets = prevState.userWallets.filter { it.walletId !in userWalletIds }
+
+                    prevState.copy(
+                        encryptionKeys = prevState.encryptionKeys.filter { it.walletId !in userWalletIds },
+                        userWallets = newUserWallets,
+                        isLocked = newUserWallets.any { it.isLocked },
+                    )
+                }
+            }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> {
+        return sensitiveInformationRepository.clear()
+            .flatMap { publicInformationRepository.clear() }
+            .flatMap { keysRepository.clear() }
+            .map {
+                selectedUserWalletRepository.set(null)
+                state.update { State() }
+            }
+    }
+
+    override suspend fun get(userWalletId: UserWalletId): CompletionResult<UserWallet> {
+        return catching {
+            state.value.userWallets.first { it.walletId == userWalletId }
+        }
+    }
+
+    private suspend fun saveInternal(
+        userWallet: UserWallet,
+        changeSelectedUserWallet: Boolean,
+    ): CompletionResult<Unit> {
+        return saveEncryptionKeyIfNotNull(userWallet)
+            .flatMap { sensitiveInformationRepository.save(userWallet, encryptionKey = it) }
+            .flatMap { publicInformationRepository.save(userWallet) }
+            .map { selectedUserWalletRepository.set(userWallet.walletId) }
+            .flatMap { loadModels() }
+            .doOnSuccess {
+                state.update { prevState ->
+                    prevState.copy(
+                        selectedUserWalletId = if (changeSelectedUserWallet) {
+                            userWallet.walletId
+                        } else {
+                            prevState.selectedUserWalletId
+                        },
+                        isLocked = prevState.userWallets.any { it.isLocked },
+                    )
+                }
+            }
+    }
+
+    private suspend fun unlockWithBiometryInternal(): CompletionResult<Unit> {
+        return keysRepository.getAll()
+            .map { keys ->
+                state.update { prevState ->
+                    prevState.copy(
+                        encryptionKeys = (keys + prevState.encryptionKeys).distinctBy { it.walletId },
+                    )
+                }
+            }
+            .flatMap { loadModels() }
+            .map {
+                state.update { prevState ->
+                    prevState.copy(
+                        isLocked = false,
+                    )
+                }
+            }
+    }
+
+    private suspend fun saveEncryptionKeyIfNotNull(userWallet: UserWallet): CompletionResult<ByteArray?> {
+        val encryptionKey = userWallet.scanResponse.card.encryptionKey
+            ?.let { UserWalletEncryptionKey(userWallet.walletId, it) }
+
+        return if (encryptionKey != null) {
+            keysRepository.save(encryptionKey)
+                .doOnSuccess {
+                    state.update { prevState ->
+                        prevState.copy(
+                            encryptionKeys = prevState.encryptionKeys
+                                .plus(encryptionKey)
+                                .distinctBy { it.walletId },
+                        )
+                    }
+                }
+                .map { encryptionKey.encryptionKey }
+        } else {
+            CompletionResult.Success(data = null)
+        }
+    }
+
+    private suspend fun loadModels(): CompletionResult<Unit> {
+        return getSavedUserWallets()
+            .map { userWallets ->
+                if (userWallets.isNotEmpty()) state.update { prevState ->
+                    val wallets = (userWallets + prevState.userWallets).distinctBy { it.walletId }
+
+                    prevState.copy(
+                        userWallets = wallets,
+                        selectedUserWalletId = findOrSetSelectedUserWalletId(prevState.selectedUserWalletId, wallets),
+                    )
+                }
+            }
+            .doOnFailure { error ->
+                Timber.e(error, "Unable to load user wallets")
+            }
+    }
+
+    private suspend fun getSavedUserWallets(): CompletionResult<List<UserWallet>> {
+        return publicInformationRepository.getAll()
+            .map { it.toUserWallets() }
+            .flatMap { userWallets ->
+                sensitiveInformationRepository.getAll(state.value.encryptionKeys)
+                    .map { walletIdToSensitiveInformation ->
+                        userWallets.updateWith(walletIdToSensitiveInformation)
+                    }
+            }
+    }
+
+    private fun findOrSetSelectedUserWalletId(
+        prevSelectedWalletId: UserWalletId?,
+        userWallets: List<UserWallet>,
+    ): UserWalletId? {
+        val findUnlockedAndSet = {
+            userWallets.firstOrNull { !it.isLocked }
+                ?.walletId
+                ?.also { selectedUserWalletRepository.set(it) }
+        }
+
+        return prevSelectedWalletId ?: (selectedUserWalletRepository.get() ?: findUnlockedAndSet())
+    }
+
+    private fun changeSelectedUserWalletIdIfNeeded(walletsIdsToRemove: List<UserWalletId>) {
+        val remainingWallets = state.value.userWallets.filter {
+            it.walletId !in walletsIdsToRemove
+        }
+        val selectedWallet = findSelectedUserWallet()
+        when {
+            remainingWallets.isEmpty() -> {
+                state.update { prevState ->
+                    prevState.copy(
+                        selectedUserWalletId = null,
+                    )
+                }
+                selectedUserWalletRepository.set(null)
+            }
+            !remainingWallets.contains(selectedWallet) -> {
+                val newSelectedWallet = remainingWallets.firstOrNull { !it.isLocked }
+                state.update { prevState ->
+                    prevState.copy(
+                        selectedUserWalletId = newSelectedWallet?.walletId,
+                    )
+                }
+                selectedUserWalletRepository.set(newSelectedWallet?.walletId)
+            }
+        }
+    }
+
+    private fun findSelectedUserWallet(userWallets: List<UserWallet> = state.value.userWallets): UserWallet? {
+        return userWallets.find {
+            it.walletId == state.value.selectedUserWalletId
+        }
+    }
+
+    private data class State(
+        val encryptionKeys: List<UserWalletEncryptionKey> = emptyList(),
+        val userWallets: List<UserWallet> = emptyList(),
+        val selectedUserWalletId: UserWalletId? = null,
+        val isLocked: Boolean = true,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletEncryptionKey.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletEncryptionKey.kt
new file mode 100644
index 0000000000..df0f473bae
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletEncryptionKey.kt
@@ -0,0 +1,26 @@
+package com.tangem.tap.domain.userWalletList.model
+
+import com.squareup.moshi.JsonClass
+import com.tangem.domain.common.util.UserWalletId
+
+@JsonClass(generateAdapter = true)
+internal data class UserWalletEncryptionKey(
+    val walletId: UserWalletId,
+    val encryptionKey: ByteArray,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is UserWalletEncryptionKey) return false
+
+        if (walletId != other.walletId) return false
+        if (!encryptionKey.contentEquals(other.encryptionKey)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = walletId.hashCode()
+        result = 31 * result + encryptionKey.contentHashCode()
+        return result
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..d383e11e3f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/model/UserWalletInformation.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.domain.userWalletList.model
+
+import com.squareup.moshi.JsonClass
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.util.UserWalletId
+
+@JsonClass(generateAdapter = true)
+internal data class UserWalletSensitiveInformation(
+    val wallets: List<CardDTO.Wallet>,
+)
+
+@JsonClass(generateAdapter = true)
+internal data class UserWalletPublicInformation(
+    val name: String,
+    val walletId: UserWalletId,
+    val artworkUrl: String,
+    val cardsInWallet: Set<String>,
+    val scanResponse: ScanResponse,
+    val isMultiCurrency: Boolean,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/SelectedUserWalletRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/SelectedUserWalletRepository.kt
new file mode 100644
index 0000000000..aee7766d49
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/SelectedUserWalletRepository.kt
@@ -0,0 +1,8 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.domain.common.util.UserWalletId
+
+internal interface SelectedUserWalletRepository {
+    fun get(): UserWalletId?
+    fun set(walletId: UserWalletId?)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt
new file mode 100644
index 0000000000..99b62dc99d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsKeysRepository.kt
@@ -0,0 +1,41 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.userWalletList.model.UserWalletEncryptionKey
+
+internal interface UserWalletsKeysRepository {
+    /**
+     * Obtaining the encryption keys of all user wallets from the biometric vault. Biometric authentication required
+     * If that operation runs more than biometric cipher key expiration time then the user will not receive all
+     * encryption keys
+     * @return [CompletionResult] of operation with stored [UserWalletEncryptionKey] list
+     * */
+    suspend fun getAll(): CompletionResult<List<UserWalletEncryptionKey>>
+
+    /**
+     * Save the encryption key for user wallet. Biometric authentication not required
+     * @param encryptionKey [UserWalletEncryptionKey] to save
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun save(encryptionKey: UserWalletEncryptionKey): CompletionResult<Unit>
+
+    /**
+     * Delete encryption keys for user wallets. Biometric authentication not required
+     * @param userWalletsIds List of [UserWalletId] whose encryption keys will be deleted
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+
+    /**
+     * Clear all encryption keys for user wallets. Biometric authentication not required
+     * @return [CompletionResult] of operation
+     * */
+    suspend fun clear(): CompletionResult<Unit>
+
+    /**
+     * Determine if the user has saved user wallets
+     * @return [Boolean] true if user has saved wallets
+     * */
+    fun hasSavedEncryptionKeys(): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsPublicInformationRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsPublicInformationRepository.kt
new file mode 100644
index 0000000000..8765a6b804
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsPublicInformationRepository.kt
@@ -0,0 +1,15 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.model.UserWalletPublicInformation
+
+internal interface UserWalletsPublicInformationRepository {
+    suspend fun save(userWallet: UserWallet): CompletionResult<Unit>
+
+    suspend fun getAll(): CompletionResult<List<UserWalletPublicInformation>>
+
+    suspend fun delete(walletIds: List<UserWalletId>): CompletionResult<Unit>
+    suspend fun clear(): CompletionResult<Unit>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsSensitiveInformationRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsSensitiveInformationRepository.kt
new file mode 100644
index 0000000000..fdae3e64a0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletsSensitiveInformationRepository.kt
@@ -0,0 +1,17 @@
+package com.tangem.tap.domain.userWalletList.repository
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.model.UserWalletEncryptionKey
+import com.tangem.tap.domain.userWalletList.model.UserWalletSensitiveInformation
+
+internal interface UserWalletsSensitiveInformationRepository {
+    suspend fun save(userWallet: UserWallet, encryptionKey: ByteArray?): CompletionResult<Unit>
+    suspend fun getAll(
+        encryptionKeys: List<UserWalletEncryptionKey>,
+    ): CompletionResult<Map<UserWalletId, UserWalletSensitiveInformation>>
+
+    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+    suspend fun clear(): CompletionResult<Unit>
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..11e558535d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/BiometricUserWalletsKeysRepository.kt
@@ -0,0 +1,194 @@
+package com.tangem.tap.domain.userWalletList.repository.implementation
+
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.tangem.common.CompletionResult
+import com.tangem.common.biometric.BiometricManager
+import com.tangem.common.biometric.BiometricStorage
+import com.tangem.common.core.TangemSdkError
+import com.tangem.common.doOnFailure
+import com.tangem.common.fold
+import com.tangem.common.map
+import com.tangem.common.mapFailure
+import com.tangem.common.services.secure.SecureStorage
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.userWalletList.UserWalletListError
+import com.tangem.tap.domain.userWalletList.model.UserWalletEncryptionKey
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsKeysRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+
+internal class BiometricUserWalletsKeysRepository(
+    moshi: Moshi,
+    biometricManager: BiometricManager,
+    private val secureStorage: SecureStorage,
+) : UserWalletsKeysRepository {
+    private val biometricStorage = BiometricStorage(
+        biometricManager = biometricManager,
+        secureStorage = secureStorage,
+    )
+    private val encryptionKeyAdapter: JsonAdapter<UserWalletEncryptionKey> = moshi.adapter(
+        UserWalletEncryptionKey::class.java,
+    )
+    private val userWalletsIdsListAdapter: JsonAdapter<List<UserWalletId>> = moshi.adapter(
+        Types.newParameterizedType(List::class.java, UserWalletId::class.java),
+    )
+
+    override suspend fun getAll(): CompletionResult<List<UserWalletEncryptionKey>> {
+        return withContext(Dispatchers.IO) {
+            getAllInternal()
+                .mapFailure { error ->
+                    UserWalletListError.ReceiveEncryptionKeysError(error.cause ?: error)
+                }
+        }
+    }
+
+    override suspend fun save(encryptionKey: UserWalletEncryptionKey): CompletionResult<Unit> {
+        return withContext(Dispatchers.IO) {
+            storeEncryptionKey(encryptionKey)
+                .mapFailure { error ->
+                    UserWalletListError.SaveEncryptionKeysError(error.cause ?: error)
+                }
+        }
+    }
+
+    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+        return withContext(Dispatchers.IO) {
+            userWalletsIds.map { userWalletId ->
+                deleteEncryptionKey(userWalletId)
+            }
+                .fold()
+                .map { deleteUserWalletsIds(userWalletsIds) }
+        }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> {
+        return withContext(Dispatchers.IO) {
+            getUserWalletsIds()
+                .map { userWalletId ->
+                    deleteEncryptionKey(userWalletId)
+                }
+                .fold()
+                .map {
+                    clearUserWalletsIds()
+                }
+        }
+    }
+
+    override fun hasSavedEncryptionKeys(): Boolean {
+        return runBlocking {
+            getUserWalletsIds().isNotEmpty()
+        }
+    }
+
+    private suspend fun getAllInternal(): CompletionResult<List<UserWalletEncryptionKey>> {
+        return getUserWalletsIds()
+            .map { userWalletId ->
+                // This is possible because the Card SDK cipher key has an expiration time
+                // If this operation runs more than that expiration time, the user will not receive all encryption keys
+                getEncryptionKey(userWalletId)
+                    .doOnFailure { error ->
+                        // If the user cancels biometric authentication, cancel the request for all keys
+                        if (error is TangemSdkError.BiometricsAuthenticationFailed) {
+                            return CompletionResult.Failure(error)
+                        }
+                    }
+            }
+            .fold(listOf()) { acc, data ->
+                if (data != null) acc + data else acc
+            }
+    }
+
+    private suspend fun getEncryptionKey(userWalletId: UserWalletId): CompletionResult<UserWalletEncryptionKey?> {
+        return biometricStorage.get(StorageKey.WalletEncryptionKey(userWalletId).name)
+            .map { it.decodeToKey() }
+    }
+
+    private suspend fun storeEncryptionKey(encryptionKey: UserWalletEncryptionKey): CompletionResult<Unit> {
+        return biometricStorage.store(
+            key = StorageKey.WalletEncryptionKey(encryptionKey.walletId).name,
+            data = encryptionKey.encode(),
+        )
+            .map { storeUserWalletId(encryptionKey.walletId) }
+    }
+
+    private suspend fun deleteEncryptionKey(userWalletId: UserWalletId): CompletionResult<Unit> {
+        return biometricStorage.delete(StorageKey.WalletEncryptionKey(userWalletId).name)
+    }
+
+    private suspend fun getUserWalletsIds(): List<UserWalletId> {
+        return withContext(Dispatchers.IO) {
+            secureStorage.get(StorageKey.UserWalletIds.name)
+                .decodeToUserWalletsIds()
+        }
+    }
+
+    private suspend fun storeUserWalletId(userWalletId: UserWalletId) {
+        val userWalletIds = (getUserWalletsIds() + userWalletId).distinct()
+
+        withContext(Dispatchers.IO) {
+            secureStorage.store(userWalletIds.encode(), StorageKey.UserWalletIds.name)
+        }
+    }
+
+    private suspend fun deleteUserWalletsIds(userWalletsIds: List<UserWalletId>) {
+        val remainingIds = (getUserWalletsIds() - userWalletsIds.toSet())
+
+        withContext(Dispatchers.IO) {
+            secureStorage.store(remainingIds.encode(), StorageKey.UserWalletIds.name)
+        }
+    }
+
+    private suspend fun clearUserWalletsIds() {
+        withContext(Dispatchers.IO) {
+            secureStorage.delete(StorageKey.UserWalletIds.name)
+        }
+    }
+
+    private suspend fun UserWalletEncryptionKey.encode(): ByteArray {
+        return withContext(Dispatchers.Default) {
+            this@encode
+                .let(encryptionKeyAdapter::toJson)
+                .encodeToByteArray(throwOnInvalidSequence = true)
+        }
+    }
+
+    private suspend fun ByteArray?.decodeToKey(): UserWalletEncryptionKey? {
+        return withContext(Dispatchers.Default) {
+            this@decodeToKey
+                ?.decodeToString(throwOnInvalidSequence = true)
+                ?.let(encryptionKeyAdapter::fromJson)
+        }
+    }
+
+    private suspend fun List<UserWalletId>.encode(): ByteArray {
+        return withContext(Dispatchers.Default) {
+            this@encode
+                .let(userWalletsIdsListAdapter::toJson)
+                .encodeToByteArray(throwOnInvalidSequence = true)
+        }
+    }
+
+    private suspend fun ByteArray?.decodeToUserWalletsIds(): List<UserWalletId> {
+        return withContext(Dispatchers.Default) {
+            this@decodeToUserWalletsIds
+                ?.decodeToString(throwOnInvalidSequence = true)
+                ?.let(userWalletsIdsListAdapter::fromJson)
+                .orEmpty()
+        }
+    }
+
+    private sealed interface StorageKey {
+        val name: String
+
+        class WalletEncryptionKey(userWalletId: UserWalletId) : StorageKey {
+            override val name: String = "user_wallet_encryption_key_${userWalletId.stringValue}"
+        }
+
+        object UserWalletIds : StorageKey {
+            override val name: String = "user_wallets_ids_with_saved_keys"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultSelectedUserWalletRepository.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultSelectedUserWalletRepository.kt
new file mode 100644
index 0000000000..ec44dbd914
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultSelectedUserWalletRepository.kt
@@ -0,0 +1,30 @@
+package com.tangem.tap.domain.userWalletList.repository.implementation
+
+import com.tangem.common.services.secure.SecureStorage
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.userWalletList.repository.SelectedUserWalletRepository
+
+internal class DefaultSelectedUserWalletRepository(
+    private val secureStorage: SecureStorage,
+) : SelectedUserWalletRepository {
+    override fun get(): UserWalletId? {
+        return secureStorage.get(StorageKey.SelectedWalletId.name)
+            ?.decodeToString(throwOnInvalidSequence = true)
+            ?.let { UserWalletId(it) }
+    }
+
+    override fun set(walletId: UserWalletId?) {
+        if (walletId == null) {
+            secureStorage.delete(StorageKey.SelectedWalletId.name)
+        } else {
+            secureStorage.store(
+                data = walletId.stringValue.encodeToByteArray(throwOnInvalidSequence = true),
+                account = StorageKey.SelectedWalletId.name,
+            )
+        }
+    }
+
+    private enum class StorageKey {
+        SelectedWalletId
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..7d1bd9333b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsPublicInformationRepository.kt
@@ -0,0 +1,90 @@
+package com.tangem.tap.domain.userWalletList.repository.implementation
+
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.tangem.common.CompletionResult
+import com.tangem.common.catching
+import com.tangem.common.flatMap
+import com.tangem.common.services.secure.SecureStorage
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.extensions.replaceByOrAdd
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.model.UserWalletPublicInformation
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsPublicInformationRepository
+import com.tangem.tap.domain.userWalletList.utils.publicInformation
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+internal class DefaultUserWalletsPublicInformationRepository(
+    moshi: Moshi,
+    private val secureStorage: SecureStorage,
+) : UserWalletsPublicInformationRepository {
+    private val publicInformationAdapter: JsonAdapter<List<UserWalletPublicInformation>> = moshi.adapter(
+        Types.newParameterizedType(List::class.java, UserWalletPublicInformation::class.java),
+    )
+
+    override suspend fun save(userWallet: UserWallet): CompletionResult<Unit> {
+        return withContext(Dispatchers.IO) {
+            getAll()
+                .flatMap { savedInformation ->
+                    val infoToSave = withContext(Dispatchers.Default) {
+                        savedInformation.toMutableList()
+                            .apply {
+                                replaceByOrAdd(userWallet.publicInformation) {
+                                    userWallet.walletId == it.walletId
+                                }
+                            }
+                    }
+
+                    save(infoToSave)
+                }
+        }
+    }
+
+    override suspend fun getAll(): CompletionResult<List<UserWalletPublicInformation>> = catching {
+        withContext(Dispatchers.IO) {
+            secureStorage.get(StorageKey.UserWalletPublicInformation.name)
+                ?.decodeToString()
+                ?.let(publicInformationAdapter::fromJson)
+                .orEmpty()
+        }
+    }
+
+    override suspend fun delete(walletIds: List<UserWalletId>): CompletionResult<Unit> {
+        return withContext(Dispatchers.IO) {
+            getAll()
+                .flatMap { publicInformation ->
+                    val infoToRemove = publicInformation
+                        .filter { it.walletId in walletIds }
+                        .toSet()
+
+                    save(
+                        publicInformation = publicInformation - infoToRemove,
+                    )
+                }
+        }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> = catching {
+        withContext(Dispatchers.IO) {
+            secureStorage.delete(StorageKey.UserWalletPublicInformation.name)
+        }
+    }
+
+    @JvmName("saveWithPublicInformation")
+    private suspend fun save(
+        publicInformation: List<UserWalletPublicInformation>,
+    ): CompletionResult<Unit> = catching {
+        withContext(Dispatchers.IO) {
+            publicInformation
+                .let(publicInformationAdapter::toJson)
+                .encodeToByteArray(throwOnInvalidSequence = true)
+                .also { secureStorage.store(it, StorageKey.UserWalletPublicInformation.name) }
+        }
+    }
+
+    private enum class StorageKey {
+        UserWalletPublicInformation
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..673ec51a10
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/implementation/DefaultUserWalletsSensitiveInformationRepository.kt
@@ -0,0 +1,192 @@
+package com.tangem.tap.domain.userWalletList.repository.implementation
+
+import android.security.keystore.KeyProperties
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.tangem.common.CompletionResult
+import com.tangem.common.catching
+import com.tangem.common.mapFailure
+import com.tangem.common.services.secure.SecureStorage
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.extensions.filterNotNull
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.UserWalletListError
+import com.tangem.tap.domain.userWalletList.model.UserWalletEncryptionKey
+import com.tangem.tap.domain.userWalletList.model.UserWalletSensitiveInformation
+import com.tangem.tap.domain.userWalletList.repository.UserWalletsSensitiveInformationRepository
+import com.tangem.tap.domain.userWalletList.utils.encryptionKey
+import com.tangem.tap.domain.userWalletList.utils.sensitiveInformation
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+internal class DefaultUserWalletsSensitiveInformationRepository(
+    moshi: Moshi,
+    private val secureStorage: SecureStorage,
+) : UserWalletsSensitiveInformationRepository {
+    private val sensitiveInformationAdapter: JsonAdapter<UserWalletSensitiveInformation> = moshi.adapter(
+        UserWalletSensitiveInformation::class.java,
+    )
+    private val encryptedSensitiveInformationMapAdapter: JsonAdapter<Map<String, ByteArray>> = moshi.adapter(
+        Types.newParameterizedType(Map::class.java, String::class.java, ByteArray::class.java),
+    )
+
+    private val cipher: Cipher by lazy {
+        Cipher.getInstance("$algorithm/$blockMode/$encryptionPadding")
+    }
+
+    override suspend fun save(userWallet: UserWallet, encryptionKey: ByteArray?): CompletionResult<Unit> {
+        if (encryptionKey == null) return CompletionResult.Success(Unit) // Encryption key is null, do nothing
+        return catching {
+            val encryptedSensitiveInformation = userWallet.sensitiveInformation
+                .encode()
+                .encryptAndStoreIv(userWallet.walletId.stringValue, encryptionKey)
+
+            getAllEncrypted().toMutableMap()
+                .apply { set(userWallet.walletId.stringValue, encryptedSensitiveInformation) }
+                .let { saveInternal(it) }
+        }
+            .mapFailure { error ->
+                UserWalletListError.SaveSensitiveInformationError(error.cause ?: error)
+            }
+    }
+
+    override suspend fun getAll(
+        encryptionKeys: List<UserWalletEncryptionKey>,
+    ): CompletionResult<Map<UserWalletId, UserWalletSensitiveInformation>> {
+        if (encryptionKeys.isEmpty()) {
+            return CompletionResult.Success(emptyMap())
+        }
+
+        return catching {
+            val encryptedSensitiveInformation = getAllEncrypted()
+
+            encryptionKeys
+                .associateBy { it.walletId }
+                .mapValues { (userWalletId, encryptionKey) ->
+                    encryptedSensitiveInformation[userWalletId.stringValue]
+                        ?.getIvAndDecrypt(userWalletId.stringValue, encryptionKey.encryptionKey)
+                        .decodeToSensitiveInformation()
+                }
+                .filterNotNull()
+        }
+            .mapFailure { error ->
+                UserWalletListError.ReceiveSensitiveInformationError(error.cause ?: error)
+            }
+    }
+
+    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+        return catching { deleteInternal(userWalletsIds) }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> {
+        return catching { clearInternal() }
+    }
+
+    private suspend fun getAllEncrypted(): Map<String, ByteArray> {
+        return withContext(Dispatchers.IO) {
+            secureStorage.get(StorageKey.UserWalletsSensitiveInformation.name)
+                .decodeToEncryptedSensitiveInformation()
+        }
+    }
+
+    private suspend fun saveInternal(sensitiveInformation: Map<String, ByteArray>) {
+        return withContext(Dispatchers.IO) {
+            secureStorage.store(
+                account = StorageKey.UserWalletsSensitiveInformation.name,
+                data = sensitiveInformation.encode(),
+            )
+        }
+    }
+
+    private suspend fun deleteInternal(userWalletsIds: List<UserWalletId>) {
+        return saveInternal(
+            sensitiveInformation = getAllEncrypted() - userWalletsIds.map { it.stringValue }.toSet(),
+        )
+    }
+
+    private suspend fun clearInternal() {
+        withContext(Dispatchers.IO) {
+            secureStorage.delete(StorageKey.UserWalletsSensitiveInformation.name)
+        }
+    }
+
+    private suspend fun ByteArray?.decodeToEncryptedSensitiveInformation(): Map<String, ByteArray> {
+        return withContext(Dispatchers.Default) {
+            this@decodeToEncryptedSensitiveInformation
+                ?.decodeToString(throwOnInvalidSequence = true)
+                ?.let(encryptedSensitiveInformationMapAdapter::fromJson)
+                .orEmpty()
+        }
+    }
+
+    private suspend fun ByteArray?.decodeToSensitiveInformation(): UserWalletSensitiveInformation? {
+        return withContext(Dispatchers.Default) {
+            this@decodeToSensitiveInformation
+                ?.decodeToString(throwOnInvalidSequence = true)
+                ?.let(sensitiveInformationAdapter::fromJson)
+        }
+    }
+
+    private suspend fun UserWalletSensitiveInformation.encode(): ByteArray {
+        return withContext(Dispatchers.Default) {
+            this@encode
+                .let(sensitiveInformationAdapter::toJson)
+                .encodeToByteArray(throwOnInvalidSequence = true)
+        }
+    }
+
+    private suspend fun Map<String, ByteArray>.encode(): ByteArray {
+        return withContext(Dispatchers.Default) {
+            this@encode
+                .let(encryptedSensitiveInformationMapAdapter::toJson)
+                .encodeToByteArray(throwOnInvalidSequence = true)
+        }
+    }
+
+    private suspend fun ByteArray.encryptAndStoreIv(userWalletId: String, encryptionKey: ByteArray): ByteArray {
+        return withContext(Dispatchers.Default) {
+            val secretKey = SecretKeySpec(encryptionKey, algorithm)
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey)
+            val encryptedData = cipher.doFinal(this@encryptAndStoreIv)
+            secureStorage.store(data = cipher.iv, account = StorageKey.SensitiveInformationIv(userWalletId).name)
+            encryptedData
+        }
+    }
+
+    private suspend fun ByteArray.getIvAndDecrypt(
+        userWalletId: String,
+        encryptionKey: ByteArray,
+    ): ByteArray? {
+        return withContext(Dispatchers.Default) {
+            val iv = secureStorage.get(StorageKey.SensitiveInformationIv(userWalletId).name)
+                ?: error("IV not found")
+            val ivParam = IvParameterSpec(iv)
+            val secretKeySpec = SecretKeySpec(encryptionKey, algorithm)
+            cipher
+                .also { it.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParam) }
+                .doFinal(this@getIvAndDecrypt)
+        }
+    }
+
+    private sealed interface StorageKey {
+        val name: String
+
+        object UserWalletsSensitiveInformation : StorageKey {
+            override val name: String = "user_wallets_sensitive_information"
+        }
+
+        class SensitiveInformationIv(userWalletId: String) : StorageKey {
+            override val name: String = "user_wallet_sensitive_information_iv_${userWalletId}"
+        }
+    }
+
+    companion object {
+        private const val algorithm = KeyProperties.KEY_ALGORITHM_AES
+        private const val blockMode = KeyProperties.BLOCK_MODE_CBC
+        private const val encryptionPadding = KeyProperties.ENCRYPTION_PADDING_PKCS7
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt
new file mode 100644
index 0000000000..8a150ac79e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/ByteArrayListExtensions.kt
@@ -0,0 +1,9 @@
+package com.tangem.tap.domain.userWalletList.utils
+
+internal fun List<ByteArray>.containsBA(element: ByteArray?): Boolean {
+    this.forEach {
+        if (it.contentEquals(element)) return true
+    }
+
+    return false
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..7d8170895c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/Mapper.kt
@@ -0,0 +1,60 @@
+package com.tangem.tap.domain.userWalletList.utils
+
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.userWalletList.model.UserWalletPublicInformation
+import com.tangem.tap.domain.userWalletList.model.UserWalletSensitiveInformation
+
+internal val UserWallet.sensitiveInformation: UserWalletSensitiveInformation
+    get() = UserWalletSensitiveInformation(scanResponse.card.wallets)
+
+internal val UserWallet.publicInformation: UserWalletPublicInformation
+    get() = UserWalletPublicInformation(
+        name = name,
+        walletId = walletId,
+        artworkUrl = artworkUrl,
+        cardsInWallet = cardsInWallet,
+        isMultiCurrency = isMultiCurrency,
+        scanResponse = scanResponse.copy(
+            card = scanResponse.card.copy(
+                wallets = emptyList(),
+            ),
+        ),
+    )
+
+internal fun UserWalletPublicInformation.toUserWallet(): UserWallet {
+    return UserWallet(
+        name = name,
+        walletId = walletId,
+        artworkUrl = artworkUrl,
+        cardsInWallet = cardsInWallet,
+        scanResponse = scanResponse,
+        isMultiCurrency = isMultiCurrency,
+    )
+}
+
+internal fun List<UserWalletPublicInformation>.toUserWallets(): List<UserWallet> {
+    return this.map { it.toUserWallet() }
+}
+
+internal fun UserWallet.updateWith(sensitiveInformation: UserWalletSensitiveInformation): UserWallet {
+    return copy(
+        scanResponse = scanResponse.copy(
+            card = scanResponse.card.copy(
+                wallets = sensitiveInformation.wallets,
+            ),
+        ),
+    )
+}
+
+internal fun List<UserWallet>.updateWith(
+    walletIdToSensitiveInformation: Map<UserWalletId, UserWalletSensitiveInformation>,
+): List<UserWallet> {
+    return if (walletIdToSensitiveInformation.isEmpty()) this else {
+        this.map { wallet ->
+            walletIdToSensitiveInformation[wallet.walletId]
+                ?.let(wallet::updateWith)
+                ?: wallet
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/UserWalletEncyptionKeyCalculator.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/UserWalletEncyptionKeyCalculator.kt
new file mode 100644
index 0000000000..d97af026cc
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/UserWalletEncyptionKeyCalculator.kt
@@ -0,0 +1,22 @@
+package com.tangem.tap.domain.userWalletList.utils
+
+import com.tangem.common.extensions.calculateSha256
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.extensions.calculateHmacSha256
+
+internal val CardDTO.encryptionKey: ByteArray?
+    get() = findPublicKey(wallets)?.let { calculateEncryptionKey(it) }
+
+private fun calculateEncryptionKey(publicKey: ByteArray): ByteArray {
+    val message = MESSAGE_FOR_ENCRYPTION_KEY.toByteArray()
+    val keyHash = publicKey.calculateSha256()
+
+    return message.calculateHmacSha256(keyHash)
+}
+
+private fun findPublicKey(wallets: List<CardDTO.Wallet>): ByteArray? {
+    return wallets.firstOrNull()
+        ?.publicKey
+}
+
+private const val MESSAGE_FOR_ENCRYPTION_KEY = "UserWalletEncryptionKey"
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ByteArrayKeyAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ByteArrayKeyAdapter.kt
new file mode 100644
index 0000000000..889438c346
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ByteArrayKeyAdapter.kt
@@ -0,0 +1,29 @@
+package com.tangem.tap.domain.userWalletList.utils.json
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import com.tangem.common.extensions.ByteArrayKey
+
+internal class ByteArrayKeyAdapter {
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        src: ByteArrayKey,
+        byteArrayAdapter: JsonAdapter<ByteArray>,
+    ) {
+        byteArrayAdapter.toJson(writer, src.bytes)
+    }
+
+    @FromJson
+    fun fromJson(
+        reader: JsonReader,
+        byteArrayAdapter: JsonAdapter<ByteArray>,
+    ): ByteArrayKey? {
+        return byteArrayAdapter.fromJson(reader)?.let {
+            ByteArrayKey(bytes = it)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/CardBackupStatusAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/CardBackupStatusAdapter.kt
new file mode 100644
index 0000000000..419fd22dbf
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/CardBackupStatusAdapter.kt
@@ -0,0 +1,57 @@
+package com.tangem.tap.domain.userWalletList.utils.json
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import com.tangem.domain.common.CardDTO
+
+internal class CardBackupStatusAdapter {
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        src: CardDTO.BackupStatus?,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+    ) {
+        val jsonMap = mutableMapOf<String, String>()
+
+        when (src) {
+            is CardDTO.BackupStatus.Active -> {
+                jsonMap["status"] = "active"
+                jsonMap["cardCount"] = src.cardCount.toString()
+            }
+            is CardDTO.BackupStatus.CardLinked -> {
+                jsonMap["status"] = "card_linked"
+                jsonMap["cardCount"] = src.cardCount.toString()
+            }
+            is CardDTO.BackupStatus.NoBackup -> {
+                jsonMap["status"] = "no_backup"
+            }
+            null -> {
+                jsonMap["status"] = "null"
+            }
+        }
+
+        mapAdapter.toJson(writer, jsonMap)
+    }
+
+    @FromJson
+    fun fromJson(
+        reader: JsonReader,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+    ): CardDTO.BackupStatus? {
+        val map = mapAdapter.fromJson(reader) ?: return null
+
+        return when (map["status"]) {
+            "active" -> CardDTO.BackupStatus.Active(
+                cardCount = map["cardCount"]?.toInt() ?: 0,
+            )
+            "card_linked" -> CardDTO.BackupStatus.CardLinked(
+                cardCount = map["cardCount"]?.toInt() ?: 0,
+            )
+            "no_backup" -> CardDTO.BackupStatus.NoBackup
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt
new file mode 100644
index 0000000000..9399f55b79
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ExtendedPublicKeysMapAdapter.kt
@@ -0,0 +1,57 @@
+package com.tangem.tap.domain.userWalletList.utils.json
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toHexString
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.hdWallet.ExtendedPublicKey
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+
+internal class ExtendedPublicKeysMapAdapter {
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        src: ExtendedPublicKeysMap,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        derivationPathAdapter: JsonAdapter<DerivationPath>,
+        extendedPublicKeyAdapter: JsonAdapter<ExtendedPublicKey>,
+    ) {
+        val jsonMap = mutableMapOf<String, String>()
+
+        src.forEach { (derivationPath, extendedPublicKey) ->
+            val derivationPathJson = derivationPathAdapter.toJson(derivationPath)
+            val derivationPathEncoded = derivationPathJson.encodeToByteArray().toHexString()
+            val extendedPublicKeyJson = extendedPublicKeyAdapter.toJson(extendedPublicKey)
+
+            jsonMap[derivationPathEncoded] = extendedPublicKeyJson
+        }
+
+        mapAdapter.toJson(writer, jsonMap)
+    }
+
+    @FromJson
+    fun fromJson(
+        reader: JsonReader,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        derivationPathAdapter: JsonAdapter<DerivationPath>,
+        extendedPublicKeyAdapter: JsonAdapter<ExtendedPublicKey>,
+    ): ExtendedPublicKeysMap {
+        val map = mutableMapOf<DerivationPath, ExtendedPublicKey>()
+
+        mapAdapter.fromJson(reader)?.forEach { (derivationPathEncoded, extendedPublicKeyJson) ->
+            val derivationPathJson = derivationPathEncoded.hexToBytes().decodeToString()
+            val derivationPath = derivationPathAdapter.fromJson(derivationPathJson)
+            val extendedPublicKey = extendedPublicKeyAdapter.fromJson(extendedPublicKeyJson)
+
+            if (derivationPath != null && extendedPublicKey != null) {
+                map[derivationPath] = extendedPublicKey
+            }
+        }
+
+        return ExtendedPublicKeysMap(map)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ScanResponseDerivedKeysMapAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ScanResponseDerivedKeysMapAdapter.kt
new file mode 100644
index 0000000000..0aada43b6a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/ScanResponseDerivedKeysMapAdapter.kt
@@ -0,0 +1,52 @@
+package com.tangem.tap.domain.userWalletList.utils.json
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+
+internal class ScanResponseDerivedKeysMapAdapter {
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        src: Map<ByteArrayKey, ExtendedPublicKeysMap>,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        byteArrayKeyAdapter: JsonAdapter<ByteArrayKey>,
+        extendedPublicKeysMapAdapter: JsonAdapter<ExtendedPublicKeysMap>,
+    ) {
+        val jsonMap = mutableMapOf<String, String>()
+
+        src.forEach { (key, extendedPublicKeysMap) ->
+            val keyJson = byteArrayKeyAdapter.toJson(key)
+            val extendedPublicKeysMapJson = extendedPublicKeysMapAdapter.toJson(extendedPublicKeysMap)
+
+            jsonMap[keyJson] = extendedPublicKeysMapJson
+        }
+
+        mapAdapter.toJson(writer, jsonMap)
+    }
+
+    @FromJson
+    fun fromJson(
+        reader: JsonReader,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        byteArrayKeyAdapter: JsonAdapter<ByteArrayKey>,
+        extendedPublicKeysMapAdapter: JsonAdapter<ExtendedPublicKeysMap>,
+    ): Map<ByteArrayKey, ExtendedPublicKeysMap> {
+        val map = mutableMapOf<ByteArrayKey, ExtendedPublicKeysMap>()
+
+        mapAdapter.fromJson(reader)?.forEach { (keyJson, extendedPublicKeysMapJson) ->
+            val key = byteArrayKeyAdapter.fromJson(keyJson)
+            val extendedPublicKeysMap = extendedPublicKeysMapAdapter.fromJson(extendedPublicKeysMapJson)
+
+            if (key != null && extendedPublicKeysMap != null) {
+                map[key] = extendedPublicKeysMap
+            }
+        }
+
+        return map
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt
new file mode 100644
index 0000000000..e4ba0dd0db
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/utils/json/WalletDerivedKeysMapAdapter.kt
@@ -0,0 +1,56 @@
+package com.tangem.tap.domain.userWalletList.utils.json
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toHexString
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.hdWallet.ExtendedPublicKey
+
+internal class WalletDerivedKeysMapAdapter {
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        src: Map<DerivationPath, ExtendedPublicKey>,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        derivationPathAdapter: JsonAdapter<DerivationPath>,
+        extendedPublicKeyAdapter: JsonAdapter<ExtendedPublicKey>,
+    ) {
+        val jsonMap = mutableMapOf<String, String>()
+
+        src.forEach { (derivationPath, extendedPublicKey) ->
+            val derivationPathJson = derivationPathAdapter.toJson(derivationPath)
+            val derivationPathEncoded = derivationPathJson.encodeToByteArray().toHexString()
+            val extendedPublicKeyJson = extendedPublicKeyAdapter.toJson(extendedPublicKey)
+
+            jsonMap[derivationPathEncoded] = extendedPublicKeyJson
+        }
+
+        mapAdapter.toJson(writer, jsonMap)
+    }
+
+    @FromJson
+    fun fromJson(
+        reader: JsonReader,
+        mapAdapter: JsonAdapter<Map<String, String>>,
+        derivationPathAdapter: JsonAdapter<DerivationPath>,
+        extendedPublicKeyAdapter: JsonAdapter<ExtendedPublicKey>,
+    ): Map<DerivationPath, ExtendedPublicKey> {
+        val map = mutableMapOf<DerivationPath, ExtendedPublicKey>()
+
+        mapAdapter.fromJson(reader)?.forEach { (derivationPathEncoded, extendedPublicKeyJson) ->
+            val derivationPathJson = derivationPathEncoded.hexToBytes().decodeToString()
+            val derivationPath = derivationPathAdapter.fromJson(derivationPathJson)
+            val extendedPublicKey = extendedPublicKeyAdapter.fromJson(extendedPublicKeyJson)
+
+            if (derivationPath != null && extendedPublicKey != null) {
+                map[derivationPath] = extendedPublicKey
+            }
+        }
+
+        return map
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletCurrencies/WalletCurrenciesManager.kt b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/WalletCurrenciesManager.kt
new file mode 100644
index 0000000000..fb77a29584
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/WalletCurrenciesManager.kt
@@ -0,0 +1,29 @@
+package com.tangem.tap.domain.walletCurrencies
+
+import com.tangem.common.CompletionResult
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.features.wallet.models.Currency
+
+interface WalletCurrenciesManager {
+    suspend fun update(
+        userWallet: UserWallet,
+        currency: Currency,
+    ): CompletionResult<Unit>
+
+    suspend fun addCurrencies(
+        userWallet: UserWallet,
+        currenciesToAdd: List<Currency>,
+    ): CompletionResult<Unit>
+
+    suspend fun removeCurrency(
+        userWallet: UserWallet,
+        currencyToRemove: Currency,
+    ): CompletionResult<Unit>
+
+    suspend fun removeCurrencies(
+        userWallet: UserWallet,
+        currenciesToRemove: List<Currency>,
+    ): CompletionResult<Unit>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletCurrencies/di/WalletCurrenciesManagerProvider.kt b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/di/WalletCurrenciesManagerProvider.kt
new file mode 100644
index 0000000000..0c6bfccf02
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/di/WalletCurrenciesManagerProvider.kt
@@ -0,0 +1,25 @@
+package com.tangem.tap.domain.walletCurrencies.di
+
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.walletCurrencies.WalletCurrenciesManager
+import com.tangem.tap.domain.walletCurrencies.implementation.DefaultWalletCurrenciesManager
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+
+fun WalletCurrenciesManager.Companion.provideDefaultImplementation(
+    userTokensRepository: UserTokensRepository,
+    walletStoresRepository: WalletStoresRepository,
+    walletAmountsRepository: WalletAmountsRepository,
+    walletManagersRepository: WalletManagersRepository,
+    appCurrencyProvider: () -> FiatCurrency,
+): WalletCurrenciesManager {
+    return DefaultWalletCurrenciesManager(
+        userTokensRepository = userTokensRepository,
+        walletStoresRepository = walletStoresRepository,
+        walletAmountsRepository = walletAmountsRepository,
+        walletManagersRepository = walletManagersRepository,
+        appCurrencyProvider = appCurrencyProvider,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletCurrencies/implementation/DefaultWalletCurrenciesManager.kt b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/implementation/DefaultWalletCurrenciesManager.kt
new file mode 100644
index 0000000000..e000fe1c6d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletCurrencies/implementation/DefaultWalletCurrenciesManager.kt
@@ -0,0 +1,205 @@
+package com.tangem.tap.domain.walletCurrencies.implementation
+
+import com.tangem.blockchain.common.DerivationStyle
+import com.tangem.common.CompletionResult
+import com.tangem.common.flatMap
+import com.tangem.common.fold
+import com.tangem.common.map
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.builders.WalletStoreBuilder
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.domain.walletCurrencies.WalletCurrenciesManager
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.toBlockchainNetworks
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.withContext
+
+internal class DefaultWalletCurrenciesManager(
+    private val userTokensRepository: UserTokensRepository,
+    private val walletStoresRepository: WalletStoresRepository,
+    private val walletAmountsRepository: WalletAmountsRepository,
+    private val walletManagersRepository: WalletManagersRepository,
+    private val appCurrencyProvider: () -> FiatCurrency,
+) : WalletCurrenciesManager {
+    override suspend fun update(
+        userWallet: UserWallet,
+        currency: Currency,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        val walletStore = walletStoresRepository.getSync(userWallet.walletId)
+            .find {
+                it.blockchain == currency.blockchain
+                    && it.derivationPath?.rawPath == currency.derivationPath
+            }
+
+        if (walletStore != null) {
+            walletAmountsRepository.updateAmountsForWalletStore(
+                walletStore = walletStore,
+                userWallet = userWallet,
+                fiatCurrency = appCurrencyProvider(),
+            )
+        } else CompletionResult.Success(Unit)
+    }
+
+    override suspend fun addCurrencies(
+        userWallet: UserWallet,
+        currenciesToAdd: List<Currency>,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        val card = userWallet.scanResponse.card
+        val updatedBlockchainNetworks = currenciesToAdd
+            .addMissingBlockchains(card)
+            .toBlockchainNetworks()
+        val newCurrencies = (getSavedCurrencies(userWallet.walletId) + currenciesToAdd)
+            .addMissingBlockchains(card)
+
+        updateWalletStores(userWallet, updatedBlockchainNetworks)
+            .map {
+                saveUserCurrencies(card, newCurrencies)
+            }
+            .flatMap {
+                val updatedBlockchains = updatedBlockchainNetworks
+                    .map { it.blockchain }
+                val updatedWalletStores = walletStoresRepository.get(userWallet.walletId)
+                    .firstOrNull()
+                    ?.filter { it.blockchain in updatedBlockchains }
+                    ?: return@flatMap CompletionResult.Success(Unit)
+
+                walletAmountsRepository.updateAmountsForWalletStores(
+                    walletStores = updatedWalletStores,
+                    userWallet = userWallet,
+                    fiatCurrency = appCurrencyProvider(),
+                )
+            }
+    }
+
+    override suspend fun removeCurrencies(
+        userWallet: UserWallet,
+        currenciesToRemove: List<Currency>,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        val card = userWallet.scanResponse.card
+        val remainingCurrencies = getSavedCurrencies(userWallet.walletId)
+            .filter { it !in currenciesToRemove }
+        val remainingBlockchains = remainingCurrencies
+            .filterIsInstance<Currency.Blockchain>()
+            .map { it.blockchain }
+
+        walletStoresRepository.deleteDifference(userWallet.walletId, remainingBlockchains)
+            .flatMap {
+                updateWalletStores(userWallet, remainingCurrencies.toBlockchainNetworks())
+            }
+            .map {
+                saveUserCurrencies(card, remainingCurrencies)
+            }
+    }
+
+    override suspend fun removeCurrency(
+        userWallet: UserWallet,
+        currencyToRemove: Currency,
+    ): CompletionResult<Unit> {
+        return removeCurrencies(userWallet, listOf(currencyToRemove))
+    }
+
+    private suspend fun getSavedCurrencies(userWalletId: UserWalletId): List<Currency> {
+        return withContext(Dispatchers.Default) {
+            walletStoresRepository.getSync(userWalletId)
+                .flatMap { walletStore ->
+                    walletStore.walletsData.map { it.currency }
+                }
+        }
+    }
+
+    private suspend fun saveUserCurrencies(card: CardDTO, currencies: List<Currency>) {
+        withContext(Dispatchers.IO) {
+            userTokensRepository.saveUserTokens(
+                card = card,
+                tokens = currencies,
+            )
+        }
+    }
+
+    private fun List<Currency>.addMissingBlockchains(card: CardDTO): List<Currency> {
+        val newCurrencies = arrayListOf<Currency>()
+
+        for (currency in this.sortedByDescending { it is Currency.Blockchain }) {
+            when (currency) {
+                is Currency.Blockchain -> {
+                    newCurrencies.add(currency.updateDerivationPath(card.derivationStyle))
+                }
+
+                is Currency.Token -> {
+                    val containsTokenBlockchain = newCurrencies.any {
+                        it.isBlockchain() && it.blockchain == currency.blockchain
+                    }
+
+                    if (containsTokenBlockchain) {
+                        newCurrencies.add(currency.updateDerivationPath(card.derivationStyle))
+                    } else {
+                        val derivationPath = findDerivationPath(currency, card.derivationStyle)
+                        newCurrencies.add(
+                            Currency.Blockchain(
+                                blockchain = currency.blockchain,
+                                derivationPath = derivationPath,
+                            ),
+                        )
+                        newCurrencies.add(
+                            currency.copy(derivationPath = derivationPath),
+                        )
+                    }
+                }
+            }
+        }
+
+        return newCurrencies
+    }
+
+    private suspend fun updateWalletStores(
+        userWallet: UserWallet,
+        blockchainNetworks: List<BlockchainNetwork>,
+    ): CompletionResult<Unit> {
+        val userWalletId = userWallet.walletId
+        return blockchainNetworks
+            .map { blockchainNetwork ->
+                walletManagersRepository.findOrMakeMultiCurrencyWalletManager(
+                    userWallet = userWallet,
+                    blockchainNetwork = blockchainNetwork,
+                )
+                    .flatMap { walletManager ->
+                        walletStoresRepository.storeOrUpdate(
+                            userWalletId = userWalletId,
+                            walletStore = WalletStoreBuilder(userWalletId, blockchainNetwork)
+                                .walletManager(walletManager)
+                                .build(),
+                        )
+                    }
+            }
+            .fold()
+    }
+
+    private fun Currency.updateDerivationPath(cardDerivationStyle: DerivationStyle?): Currency {
+        val findDerivationPath: () -> String? = {
+            findDerivationPath(this, cardDerivationStyle)
+        }
+
+        return when (this) {
+            is Currency.Blockchain -> this.copy(
+                derivationPath = findDerivationPath(),
+            )
+
+            is Currency.Token -> this.copy(
+                derivationPath = findDerivationPath(),
+            )
+        }
+    }
+
+    private fun findDerivationPath(currency: Currency, cardDerivationStyle: DerivationStyle?): String? {
+        return currency.derivationPath ?: currency.blockchain.derivationPath(cardDerivationStyle)?.rawPath
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresError.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresError.kt
new file mode 100644
index 0000000000..de8c07b6d2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresError.kt
@@ -0,0 +1,39 @@
+package com.tangem.tap.domain.walletStores
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.core.TangemError
+
+sealed class WalletStoresError(code: Int) : TangemError(code) {
+    override val silent: Boolean
+        get() = (cause as? TangemError)?.silent == true
+
+    override val messageResId: Int? = null
+    override val message: String?
+        get() = customMessage
+
+    class FetchFiatRatesError(
+        currencies: List<String>,
+        override val cause: Throwable?,
+    ) : WalletStoresError(60011) {
+        override var customMessage: String = "Failed to fetch fiat rates for currencies $currencies"
+    }
+
+    class UnknownBlockchain : WalletStoresError(60012) {
+        override var customMessage: String = "Unknown blockchain"
+    }
+
+    object NoInternetConnection : WalletStoresError(60013) {
+        override var customMessage: String = "No internet connection"
+    }
+
+    class WalletManagerNotCreated(blockchain: Blockchain) : WalletStoresError(60014) {
+        override var customMessage: String = "Wallet manager can not be created for $blockchain"
+    }
+
+    class UpdateWalletManagerError(
+        blockchain: Blockchain,
+        override val cause: Throwable,
+    ) : WalletStoresError(600015) {
+        override var customMessage: String = "Unable to update wallet manager for currency $blockchain: $cause"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresManager.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresManager.kt
new file mode 100644
index 0000000000..e834cf0541
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/WalletStoresManager.kt
@@ -0,0 +1,31 @@
+package com.tangem.tap.domain.walletStores
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import kotlinx.coroutines.flow.Flow
+
+interface WalletStoresManager {
+    fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>>
+    fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>>
+
+    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+    suspend fun clear(): CompletionResult<Unit>
+
+    suspend fun fetch(
+        userWallet: UserWallet,
+        refresh: Boolean = false,
+    ): CompletionResult<Unit>
+
+    suspend fun fetch(
+        userWallets: List<UserWallet>,
+        refresh: Boolean = false,
+    ): CompletionResult<Unit>
+
+    suspend fun updateAmounts(
+        userWallets: List<UserWallet>,
+    ): CompletionResult<Unit>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/di/WalletsStoresManagerProvider.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/di/WalletsStoresManagerProvider.kt
new file mode 100644
index 0000000000..d2a4789fb0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/di/WalletsStoresManagerProvider.kt
@@ -0,0 +1,30 @@
+package com.tangem.tap.domain.walletStores.di
+
+import com.tangem.tap.domain.walletStores.WalletStoresManager
+import com.tangem.tap.domain.walletStores.implementation.DummyWalletStoresManager
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.walletStores.implementation.DefaultWalletStoresManager
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+
+fun WalletStoresManager.Companion.provideDummyImplementation(): WalletStoresManager {
+    return DummyWalletStoresManager()
+}
+
+fun WalletStoresManager.Companion.provideDefaultImplementation(
+    userTokensRepository: UserTokensRepository,
+    walletStoresRepository: WalletStoresRepository,
+    walletAmountsRepository: WalletAmountsRepository,
+    walletManagersRepository: WalletManagersRepository,
+    appCurrencyProvider: () -> FiatCurrency,
+): WalletStoresManager {
+    return DefaultWalletStoresManager(
+        userTokensRepository = userTokensRepository,
+        walletStoresRepository = walletStoresRepository,
+        walletAmountsRepository = walletAmountsRepository,
+        walletManagersRepository = walletManagersRepository,
+        appCurrencyProvider = appCurrencyProvider,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt
new file mode 100644
index 0000000000..219d7f4af1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DefaultWalletStoresManager.kt
@@ -0,0 +1,184 @@
+package com.tangem.tap.domain.walletStores.implementation
+
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.common.CompletionResult
+import com.tangem.common.doOnSuccess
+import com.tangem.common.flatMap
+import com.tangem.common.flatMapOnFailure
+import com.tangem.common.fold
+import com.tangem.common.map
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.model.builders.WalletStoreBuilder
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.domain.walletStores.WalletStoresError
+import com.tangem.tap.domain.walletStores.WalletStoresManager
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+import com.tangem.tap.features.wallet.models.toBlockchainNetworks
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+
+internal class DefaultWalletStoresManager(
+    private val userTokensRepository: UserTokensRepository,
+    private val walletStoresRepository: WalletStoresRepository,
+    private val walletAmountsRepository: WalletAmountsRepository,
+    private val walletManagersRepository: WalletManagersRepository,
+    private val appCurrencyProvider: () -> FiatCurrency,
+) : WalletStoresManager {
+    private val state = MutableStateFlow(State())
+
+    override fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>> {
+        return walletStoresRepository.getAll()
+    }
+
+    override fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>> {
+        return walletStoresRepository.get(userWalletId)
+            .distinctUntilChanged()
+    }
+
+    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+        return walletStoresRepository.delete(userWalletsIds)
+            .flatMap { walletManagersRepository.delete(userWalletsIds) }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> {
+        return walletStoresRepository.clear()
+    }
+
+    override suspend fun fetch(
+        userWallets: List<UserWallet>,
+        refresh: Boolean,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        val fiatCurrency = appCurrencyProvider.invoke()
+        val isFiatCurrencyChanged = state.value.fiatCurrency != fiatCurrency
+
+        state.update { prevState ->
+            prevState.copy(
+                fiatCurrency = fiatCurrency,
+            )
+        }
+
+        userWallets
+            .mapNotNull { userWallet ->
+                val hasNotWalletStoresForUserWallet = !walletStoresRepository.contains(userWallet.walletId)
+                if (refresh || hasNotWalletStoresForUserWallet || isFiatCurrencyChanged) {
+                    fetchWalletsIfNeeded(userWallet)
+                } else null
+            }
+            .fold(arrayListOf<UserWallet>()) { acc, data ->
+                acc.apply { add(data) }
+            }
+            .flatMap {
+                walletAmountsRepository.updateAmountsForUserWallets(it, fiatCurrency)
+            }
+    }
+
+    override suspend fun fetch(
+        userWallet: UserWallet,
+        refresh: Boolean,
+    ): CompletionResult<Unit> {
+        return fetch(listOf(userWallet), refresh)
+    }
+
+    override suspend fun updateAmounts(userWallets: List<UserWallet>): CompletionResult<Unit> {
+        val fiatCurrency = appCurrencyProvider.invoke()
+
+        return walletAmountsRepository.updateAmountsForUserWallets(userWallets, fiatCurrency)
+            .doOnSuccess {
+                state.update { prevState ->
+                    prevState.copy(
+                        fiatCurrency = fiatCurrency,
+                    )
+                }
+            }
+    }
+
+    private suspend fun fetchWalletsIfNeeded(userWallet: UserWallet): CompletionResult<UserWallet> {
+        return if (userWallet.isMultiCurrency) {
+            fetchMultiWallets(userWallet)
+        } else {
+            fetchSingleWallet(userWallet)
+        }
+            .map { userWallet }
+    }
+
+    private suspend fun fetchMultiWallets(userWallet: UserWallet): CompletionResult<Unit> {
+        val scanResponse = userWallet.scanResponse
+        val userTokens = withContext(Dispatchers.IO) {
+            userTokensRepository.getUserTokens(scanResponse.card)
+        }
+        val userWalletId = userWallet.walletId
+
+        return withContext(Dispatchers.Default) {
+            userTokens.toBlockchainNetworks()
+                .also { blockchainNetworks ->
+                    walletStoresRepository.deleteDifference(
+                        userWalletId = userWalletId,
+                        currentBlockchains = blockchainNetworks.map { it.blockchain },
+                    )
+                }
+                .map { blockchainNetwork ->
+                    val storeWalletStore: suspend (WalletManager?) -> CompletionResult<Unit> =
+                        { walletManager ->
+                            walletStoresRepository.storeOrUpdate(
+                                userWalletId = userWalletId,
+                                walletStore = WalletStoreBuilder(userWalletId, blockchainNetwork)
+                                    .walletManager(walletManager)
+                                    .build(),
+                            )
+                        }
+
+                    walletManagersRepository.findOrMakeMultiCurrencyWalletManager(
+                        userWallet = userWallet,
+                        blockchainNetwork = blockchainNetwork,
+                    )
+                        .flatMap { walletManager ->
+                            storeWalletStore(walletManager)
+                        }
+                        .flatMapOnFailure { error ->
+                            when (error) {
+                                is WalletStoresError.WalletManagerNotCreated,
+                                is WalletStoresError.UpdateWalletManagerError,
+                                -> storeWalletStore(null)
+                                else -> CompletionResult.Failure(error)
+                            }
+                        }
+                }
+                .fold()
+        }
+    }
+
+    private suspend fun fetchSingleWallet(userWallet: UserWallet): CompletionResult<Unit> {
+        return walletManagersRepository.findOrMakeSingleCurrencyWalletManager(
+            userWallet = userWallet,
+        )
+            .flatMap { walletManager ->
+                val userWalletId = userWallet.walletId
+                walletStoresRepository.storeOrUpdate(
+                    userWalletId = userWalletId,
+                    walletStore = WalletStoreBuilder(userWalletId, walletManager)
+                        .build(),
+                )
+            }
+            .flatMapOnFailure { error ->
+                when (error) {
+                    is WalletStoresError.WalletManagerNotCreated,
+                    is WalletStoresError.UpdateWalletManagerError,
+                    -> CompletionResult.Success(Unit)
+                    else -> CompletionResult.Failure(error)
+                }
+            }
+    }
+
+    internal data class State(
+        val fiatCurrency: FiatCurrency? = null,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DummyWalletStoresManager.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DummyWalletStoresManager.kt
new file mode 100644
index 0000000000..b1729a0b11
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/implementation/DummyWalletStoresManager.kt
@@ -0,0 +1,39 @@
+package com.tangem.tap.domain.walletStores.implementation
+
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.walletStores.WalletStoresManager
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+
+internal class DummyWalletStoresManager : WalletStoresManager {
+    override fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>> {
+        return emptyFlow()
+    }
+
+    override fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>> {
+        return emptyFlow()
+    }
+
+    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+        return CompletionResult.Success(Unit)
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> {
+        return CompletionResult.Success(Unit)
+    }
+
+    override suspend fun fetch(userWallet: UserWallet, refresh: Boolean): CompletionResult<Unit> {
+        return CompletionResult.Success(Unit)
+    }
+
+    override suspend fun fetch(userWallets: List<UserWallet>, refresh: Boolean): CompletionResult<Unit> {
+        return CompletionResult.Success(Unit)
+    }
+
+    override suspend fun updateAmounts(userWallets: List<UserWallet>): CompletionResult<Unit> {
+        return CompletionResult.Success(Unit)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletAmountsRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletAmountsRepository.kt
new file mode 100644
index 0000000000..a054ed0ff2
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletAmountsRepository.kt
@@ -0,0 +1,52 @@
+package com.tangem.tap.domain.walletStores.repository
+
+import com.tangem.common.CompletionResult
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+
+interface WalletAmountsRepository {
+
+    /**
+     * Fetch wallet amounts and fiat rates then update [com.tangem.tap.domain.walletStores.storage.WalletStoresStorage]
+     * and [com.tangem.tap.domain.walletStores.storage.WalletManagerStorage] with new data
+     * @param userWallets list of [UserWallet] which will be used to get the list of associated [WalletStoreModel]
+     * @param fiatCurrency current app [FiatCurrency]
+     * */
+    suspend fun updateAmountsForUserWallets(
+        userWallets: List<UserWallet>,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit>
+
+    /**
+     * Fetch wallet amounts and fiat rates then update [com.tangem.tap.domain.walletStores.storage.WalletStoresStorage]
+     * and [com.tangem.tap.domain.walletStores.storage.WalletManagerStorage] with new data
+     * @param userWallet [UserWallet] which will be used to get the list of associated [WalletStoreModel]
+     * @param fiatCurrency current app [FiatCurrency]
+     * */
+    suspend fun updateAmountsForUserWallet(
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit>
+
+    suspend fun updateAmountsForWalletStores(
+        walletStores: List<WalletStoreModel>,
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit>
+
+    /**
+     * Fetch wallet amounts and fiat rates then update [com.tangem.tap.domain.walletStores.storage.WalletStoresStorage]
+     * and [com.tangem.tap.domain.walletStores.storage.WalletManagerStorage] with new data
+     * @param walletStore [WalletStoreModel] to update
+     * @param userWallet [UserWallet] associated with provided [walletStore]
+     * @param fiatCurrency current app [FiatCurrency]
+     * */
+    suspend fun updateAmountsForWalletStore(
+        walletStore: WalletStoreModel,
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletManagersRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletManagersRepository.kt
new file mode 100644
index 0000000000..0d8a2044be
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletManagersRepository.kt
@@ -0,0 +1,26 @@
+package com.tangem.tap.domain.walletStores.repository
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+
+interface WalletManagersRepository {
+    suspend fun findOrMakeMultiCurrencyWalletManager(
+        userWallet: UserWallet,
+        blockchainNetwork: BlockchainNetwork,
+    ): CompletionResult<WalletManager>
+
+    suspend fun findOrMakeSingleCurrencyWalletManager(userWallet: UserWallet): CompletionResult<WalletManager>
+
+    suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit>
+
+    suspend fun delete(
+        userWalletId: UserWalletId,
+        blockchain: Blockchain,
+    ): CompletionResult<Unit>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletStoresRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletStoresRepository.kt
new file mode 100644
index 0000000000..7b07a6eee0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/WalletStoresRepository.kt
@@ -0,0 +1,31 @@
+package com.tangem.tap.domain.walletStores.repository
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.CompletionResult
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletStoreModel
+import kotlinx.coroutines.flow.Flow
+
+interface WalletStoresRepository {
+    fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>>
+    fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>>
+    suspend fun getSync(userWalletId: UserWalletId): List<WalletStoreModel>
+
+    suspend fun contains(userWalletId: UserWalletId): Boolean
+
+    suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit>
+
+    suspend fun deleteDifference(
+        userWalletId: UserWalletId,
+        currentBlockchains: List<Blockchain>,
+    ): CompletionResult<Unit>
+
+    suspend fun clear(): CompletionResult<Unit>
+
+    suspend fun storeOrUpdate(
+        userWalletId: UserWalletId,
+        walletStore: WalletStoreModel,
+    ): CompletionResult<Unit>
+
+    companion object
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/di/RepositoryProvider.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/di/RepositoryProvider.kt
new file mode 100644
index 0000000000..7fc7ba38e7
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/di/RepositoryProvider.kt
@@ -0,0 +1,26 @@
+package com.tangem.tap.domain.walletStores.repository.di
+
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+import com.tangem.tap.domain.walletStores.repository.implementation.DefaultWalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.implementation.DefaultWalletManagersRepository
+import com.tangem.tap.domain.walletStores.repository.implementation.DefaultWalletStoresRepository
+
+fun WalletStoresRepository.Companion.provideDefaultImplementation(): WalletStoresRepository {
+    return DefaultWalletStoresRepository()
+}
+
+fun WalletManagersRepository.Companion.provideDefaultImplementation(
+    walletManagerFactory: WalletManagerFactory,
+): WalletManagersRepository {
+    return DefaultWalletManagersRepository(walletManagerFactory)
+}
+
+fun WalletAmountsRepository.Companion.provideDefaultImplementation(
+    tangemTechService: TangemTechService,
+): WalletAmountsRepository {
+    return DefaultWalletAmountsRepository(tangemTechService)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletAmountsRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletAmountsRepository.kt
new file mode 100644
index 0000000000..444d6fc480
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletAmountsRepository.kt
@@ -0,0 +1,451 @@
+package com.tangem.tap.domain.walletStores.repository.implementation
+
+import com.tangem.blockchain.blockchains.solana.RentProvider
+import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.BlockchainSdkError
+import com.tangem.blockchain.common.Wallet
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.extensions.Result.Failure
+import com.tangem.blockchain.extensions.Result.Success
+import com.tangem.common.CompletionResult
+import com.tangem.common.catching
+import com.tangem.common.core.TangemError
+import com.tangem.common.flatMap
+import com.tangem.common.flatMapOnFailure
+import com.tangem.common.fold
+import com.tangem.common.map
+import com.tangem.common.services.Result
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.common.extensions.replaceByOrAdd
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.walletStores.WalletStoresError
+import com.tangem.tap.domain.walletStores.repository.WalletAmountsRepository
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.replaceWalletStore
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.replaceWalletStores
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithAmounts
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithError
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithFiatRates
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithMissedDerivation
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithRent
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithUnreachable
+import com.tangem.tap.domain.walletStores.storage.WalletManagerStorage
+import com.tangem.tap.domain.walletStores.storage.WalletStoresStorage
+import com.tangem.tap.features.wallet.models.PendingTransactionType
+import com.tangem.tap.features.wallet.models.filterByCoin
+import com.tangem.tap.features.wallet.models.getPendingTransactions
+import com.tangem.tap.network.NetworkConnectivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.math.BigDecimal
+
+internal class DefaultWalletAmountsRepository(
+    private val tangemTechService: TangemTechService,
+) : WalletAmountsRepository {
+    private val walletStoresStorage = WalletStoresStorage
+    private val walletManagersStorage = WalletManagerStorage
+
+    override suspend fun updateAmountsForUserWallets(
+        userWallets: List<UserWallet>,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit> {
+        return if (userWallets.isEmpty()) CompletionResult.Success(Unit)
+        else withContext(Dispatchers.Default) {
+            awaitAll(
+                async { fetchAmountsForUserWallets(userWallets) },
+                async { fetchFiatRates(userWallets, walletStores = null, fiatCurrency) },
+            )
+                .fold()
+        }
+    }
+
+    override suspend fun updateAmountsForUserWallet(
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit> {
+        return updateAmountsForUserWallets(listOf(userWallet), fiatCurrency)
+    }
+
+    override suspend fun updateAmountsForWalletStores(
+        walletStores: List<WalletStoreModel>,
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit> {
+        return if (walletStores.isEmpty()) CompletionResult.Success(Unit)
+        else withContext(Dispatchers.Default) {
+            val userWalletId = userWallet.walletId
+            val scanResponse = userWallet.scanResponse
+
+            awaitAll(
+                async { fetchAmountForWalletStores(userWalletId, scanResponse, walletStores) },
+                async { fetchFiatRates(listOf(userWallet), walletStores, fiatCurrency) },
+            )
+                .fold()
+        }
+    }
+
+    override suspend fun updateAmountsForWalletStore(
+        walletStore: WalletStoreModel,
+        userWallet: UserWallet,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit> {
+        return updateAmountsForWalletStores(listOf(walletStore), userWallet, fiatCurrency)
+    }
+
+    private suspend fun fetchFiatRates(
+        userWallets: List<UserWallet>,
+        walletStores: List<WalletStoreModel>?,
+        fiatCurrency: FiatCurrency,
+    ): CompletionResult<Unit> {
+        val walletStoresInternal = walletStores ?: getWalletStores(userWallets)
+
+        val currencies = walletStoresInternal
+            .asSequence()
+            .flatMap { it.walletsData }
+            .map { it.currency }
+
+        val coinsIds = currencies.mapNotNull { it.coinId }.distinct().toList()
+
+        val fiatRatesResult = withContext(Dispatchers.IO) {
+            tangemTechService.rates(
+                currency = fiatCurrency.code,
+                ids = coinsIds,
+            )
+        }
+
+        return when (fiatRatesResult) {
+            is Result.Success -> {
+                updateWalletStoresWithFiatRates(
+                    walletStores = walletStoresInternal,
+                    fiatRates = fiatRatesResult.data.rates,
+                )
+
+                CompletionResult.Success(Unit)
+            }
+            is Result.Failure -> {
+                val error = WalletStoresError.FetchFiatRatesError(
+                    currencies = currencies.map { it.currencySymbol }.toList(),
+                    cause = fiatRatesResult.error,
+                )
+
+                Timber.e(
+                    error,
+                    """
+                        Unable to fetch fiat rates
+                        |- Coins ids: $coinsIds
+                    """.trimIndent(),
+                )
+
+                CompletionResult.Failure(error)
+            }
+        }
+    }
+
+    private suspend fun fetchAmountsForUserWallets(
+        userWallets: List<UserWallet>,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        userWallets.map { async { fetchAmountsForUserWallet(it) } }
+            .awaitAll()
+            .fold()
+    }
+
+    private suspend fun fetchAmountsForUserWallet(
+        userWallet: UserWallet,
+    ): CompletionResult<Unit> = withContext(Dispatchers.Default) {
+        val userWalletId = userWallet.walletId
+        val scanResponse = userWallet.scanResponse
+        val walletStores = getWalletStores(listOf(userWallet))
+
+        fetchAmountForWalletStores(userWalletId, scanResponse, walletStores)
+    }
+
+    private suspend fun fetchAmountForWalletStores(
+        userWalletId: UserWalletId,
+        scanResponse: ScanResponse,
+        walletStores: List<WalletStoreModel>,
+    ): CompletionResult<Unit> = coroutineScope {
+        walletStores.map { walletStore ->
+            async {
+                // TODO: Find wallet manager via [com.tangem.tap.domain.walletStores.repository.WalletManagersRepository]
+                val walletManager = walletStore.walletManager
+                fetchAmountsForWalletStore(userWalletId, scanResponse, walletStore, walletManager)
+            }
+        }
+            .awaitAll()
+            .fold()
+    }
+
+    private suspend fun fetchAmountsForWalletStore(
+        userWalletId: UserWalletId,
+        scanResponse: ScanResponse,
+        walletStore: WalletStoreModel,
+        walletManager: WalletManager?,
+    ): CompletionResult<Unit> {
+        val hasMissedDerivations = with(walletStore) {
+            derivationPath != null && !scanResponse.hasDerivation(blockchain, derivationPath.rawPath)
+        }
+
+        return when {
+            hasMissedDerivations -> {
+                updateWalletStoreWithMissedDerivation(walletStore)
+            }
+            walletManager == null -> {
+                updateWalletStoreWithUnreachable(walletStore)
+            }
+            else -> {
+                withInternetConnection { walletManager.update() }
+                    .map { updateWalletManagerWithAmounts(userWalletId, walletManager) }
+                    .flatMap {
+                        updateWalletStoreWithAmounts(
+                            walletStore = walletStore,
+                            updatedWallet = walletManager.wallet,
+                        )
+                    }
+                    .flatMap { fetchWalletStoreRentIfNeeded(walletStore, walletManager) }
+                    .flatMapOnFailure { error ->
+                        updateWalletStoreWithError(
+                            walletStore = walletStore,
+                            wallet = walletManager.wallet,
+                            error = error,
+                        )
+                    }
+            }
+        }
+    }
+
+    private suspend fun fetchWalletStoreRentIfNeeded(
+        walletStore: WalletStoreModel,
+        walletManager: WalletManager,
+    ): CompletionResult<Unit> {
+        val rentProvider = walletManager as? RentProvider
+            ?: return CompletionResult.Success(Unit)
+
+        when (val result = rentProvider.minimalBalanceForRentExemption()) {
+            is Success -> {
+                val balance = walletManager.wallet.fundsAvailable(AmountType.Coin)
+                val outgoingTxs = walletManager.wallet.getPendingTransactions(
+                    PendingTransactionType.Outgoing,
+                ).filterByCoin()
+
+                val rentExempt = result.data
+                val setRent = if (outgoingTxs.isEmpty()) {
+                    balance < rentExempt
+                } else {
+                    val outgoingAmount = outgoingTxs.sumOf { it.amountValue ?: BigDecimal.ZERO }
+                    val rest = balance.minus(outgoingAmount)
+                    balance < rest
+                }
+
+                updateWalletStoreWithRent(
+                    walletStore = walletStore,
+                    rent = if (setRent) {
+                        WalletStoreModel.WalletRent(
+                            rent = rentProvider.rentAmount(),
+                            exemptionAmount = rentExempt,
+                        )
+                    } else null,
+                )
+            }
+            is Failure -> Unit
+        }
+
+        return CompletionResult.Success(Unit)
+    }
+
+    private suspend fun updateWalletStoreWithError(
+        walletStore: WalletStoreModel,
+        wallet: Wallet,
+        error: TangemError,
+    ) = withContext(Dispatchers.Default) {
+        Timber.e(
+            error,
+            """
+                Unable to fetch amounts
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+            """.trimIndent(),
+        )
+
+        if (error is BlockchainSdkError) {
+            walletStoresStorage.update { prevState ->
+                prevState.replaceWalletStore(
+                    walletStoreToUpdate = walletStore,
+                    update = {
+                        it.updateWithError(
+                            wallet = wallet,
+                            error = error,
+                        )
+                    },
+                )
+            }
+
+            CompletionResult.Success(Unit)
+        } else {
+            CompletionResult.Failure(error)
+        }
+    }
+
+    private suspend fun updateWalletStoreWithAmounts(
+        walletStore: WalletStoreModel,
+        updatedWallet: Wallet,
+    ) = withContext(Dispatchers.Default) {
+        Timber.d(
+            """
+                Fetched amounts
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+            """.trimIndent(),
+        )
+
+        walletStoresStorage.update { prevState ->
+            prevState.replaceWalletStore(
+                walletStoreToUpdate = walletStore,
+                update = {
+                    it.updateWithAmounts(wallet = updatedWallet)
+                },
+            )
+        }
+
+        CompletionResult.Success(Unit)
+    }
+
+    private suspend fun updateWalletStoreWithMissedDerivation(
+        walletStore: WalletStoreModel,
+    ) = withContext(Dispatchers.Default) {
+        Timber.e(
+            """
+                Missed derivation
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+            """.trimIndent(),
+        )
+
+        walletStoresStorage.update { prevState ->
+            prevState.replaceWalletStore(
+                walletStoreToUpdate = walletStore,
+                update = {
+                    it.updateWithMissedDerivation()
+                },
+            )
+        }
+
+        CompletionResult.Success(Unit)
+    }
+
+    private suspend fun updateWalletStoreWithUnreachable(
+        walletStore: WalletStoreModel,
+    ) = withContext(Dispatchers.Default) {
+        Timber.e(
+            """
+                Wallet manager is null
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+            """.trimIndent(),
+        )
+
+        walletStoresStorage.update { prevState ->
+            prevState.replaceWalletStore(
+                walletStoreToUpdate = walletStore,
+                update = {
+                    it.updateWithUnreachable()
+                },
+            )
+        }
+
+        CompletionResult.Success(Unit)
+    }
+
+    private suspend fun updateWalletStoresWithFiatRates(
+        walletStores: List<WalletStoreModel>,
+        fiatRates: Map<String, Double>,
+    ) = withContext(Dispatchers.Default) {
+        Timber.d(
+            """
+                Fetched fiat rates
+                |- User wallets ids: ${walletStores.map { it.userWalletId }.distinct()}
+            """.trimIndent(),
+        )
+
+        walletStoresStorage.update { prevState ->
+            prevState.replaceWalletStores(
+                walletStoresToUpdate = walletStores,
+                update = {
+                    it.updateWithFiatRates(rates = fiatRates)
+                },
+            )
+        }
+    }
+
+    private suspend fun updateWalletStoreWithRent(
+        walletStore: WalletStoreModel,
+        rent: WalletStoreModel.WalletRent?,
+    ) = withContext(Dispatchers.Default) {
+        Timber.d(
+            """
+                Fetched wallet rent
+                |- User wallet id: ${walletStore.userWalletId}
+                |- Blockchain: ${walletStore.blockchain}
+                |- Rent: $rent
+            """.trimIndent(),
+        )
+
+        if (rent != walletStore.walletRent) {
+            walletStoresStorage.update { prevState ->
+                prevState.replaceWalletStore(
+                    walletStoreToUpdate = walletStore,
+                    update = {
+                        it.updateWithRent(rent)
+                    },
+                )
+            }
+        }
+    }
+
+    private suspend inline fun withInternetConnection(crossinline block: suspend () -> Unit): CompletionResult<Unit> {
+        return if (!NetworkConnectivity.getInstance().isOnlineOrConnecting()) {
+            val error = WalletStoresError.NoInternetConnection
+            Timber.e(error)
+            CompletionResult.Failure(error)
+        } else withContext(Dispatchers.IO) {
+            catching { block() }
+        }
+    }
+
+    private suspend fun updateWalletManagerWithAmounts(
+        userWalletId: UserWalletId,
+        walletManager: WalletManager,
+    ) = withContext(Dispatchers.Default) {
+        walletManagersStorage.update { prevManagers ->
+            val newManagersForUserWallet = prevManagers[userWalletId].orEmpty()
+                .toMutableList()
+                .apply {
+                    replaceByOrAdd(walletManager) {
+                        it.wallet.blockchain == it.wallet.blockchain
+                    }
+                }
+
+            prevManagers.apply {
+                set(userWalletId, newManagersForUserWallet)
+            }
+        }
+    }
+
+    private suspend fun getWalletStores(userWallets: List<UserWallet>): List<WalletStoreModel> {
+        return userWallets
+            .map { it.walletId }
+            .flatMap { userWalletId ->
+                walletStoresStorage.getAll()
+                    .firstOrNull()
+                    ?.get(userWalletId)
+                    .orEmpty()
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
new file mode 100644
index 0000000000..6355f2f6d6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletManagersRepository.kt
@@ -0,0 +1,201 @@
+package com.tangem.tap.domain.walletStores.repository.implementation
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.DerivationParams
+import com.tangem.blockchain.common.DerivationStyle
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.common.CompletionResult
+import com.tangem.common.catching
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.map
+import com.tangem.common.mapFailure
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.extensions.makeWalletManagerForApp
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.domain.walletStores.WalletStoresError
+import com.tangem.tap.domain.walletStores.repository.WalletManagersRepository
+import com.tangem.tap.domain.walletStores.storage.WalletManagerStorage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+internal class DefaultWalletManagersRepository(
+    private val walletManagerFactory: WalletManagerFactory,
+) : WalletManagersRepository {
+    private val walletManagersStorage = WalletManagerStorage
+
+    override suspend fun findOrMakeMultiCurrencyWalletManager(
+        userWallet: UserWallet,
+        blockchainNetwork: BlockchainNetwork,
+    ): CompletionResult<WalletManager> {
+        return findOrMakeInternal(userWallet, blockchainNetwork)
+    }
+
+    override suspend fun findOrMakeSingleCurrencyWalletManager(userWallet: UserWallet): CompletionResult<WalletManager> {
+        return findOrMakeInternal(userWallet, blockchainNetwork = null)
+    }
+
+    private suspend fun findOrMakeInternal(
+        userWallet: UserWallet,
+        blockchainNetwork: BlockchainNetwork?,
+    ): CompletionResult<WalletManager> = withContext(Dispatchers.Default) {
+        val foundWalletManager = findWalletManager(
+            userWalletId = userWallet.walletId,
+            blockchain = blockchainNetwork?.blockchain,
+        )
+
+        foundWalletManager?.updateTokens(
+            scanResponse = userWallet.scanResponse,
+            blockchainNetwork = blockchainNetwork,
+        )
+            ?: makeAndStore(userWallet, blockchainNetwork)
+    }
+
+    private suspend fun makeAndStore(
+        userWallet: UserWallet,
+        blockchainNetwork: BlockchainNetwork?,
+    ): CompletionResult<WalletManager> {
+        val scanResponse = userWallet.scanResponse
+        val blockchain = blockchainNetwork?.blockchain
+            ?: scanResponse.getBlockchain().let { blockchain ->
+                if (scanResponse.card.isTestCard) blockchain.getTestnetVersion() else blockchain
+            }
+        val derivationParams = getDerivationParams(
+            derivationPath = blockchainNetwork?.derivationPath,
+            card = scanResponse.card,
+        )
+
+        val walletManager = blockchain?.let {
+            walletManagerFactory.makeWalletManagerForApp(
+                scanResponse = userWallet.scanResponse,
+                blockchain = blockchain,
+                derivationParams = derivationParams,
+            )
+        }
+
+        return when {
+            blockchain == Blockchain.Unknown || blockchain == null -> {
+                val error = WalletStoresError.UnknownBlockchain()
+                Timber.e(error)
+                CompletionResult.Failure(error)
+            }
+            walletManager != null -> {
+                walletManager.updateTokens(
+                    scanResponse = scanResponse,
+                    blockchainNetwork = blockchainNetwork,
+                )
+                    .map { updatedWalletManager ->
+                        store(userWallet.walletId, updatedWalletManager)
+                        updatedWalletManager
+                    }
+            }
+            else -> {
+                val error = WalletStoresError.WalletManagerNotCreated(blockchain)
+                Timber.e(error)
+                CompletionResult.Failure(error)
+            }
+        }
+    }
+
+    override suspend fun delete(userWalletIds: List<UserWalletId>): CompletionResult<Unit> = catching {
+        walletManagersStorage.update { prevManagers ->
+            prevManagers.filterKeys { it !in userWalletIds } as HashMap<UserWalletId, List<WalletManager>>
+        }
+    }
+
+    override suspend fun delete(
+        userWalletId: UserWalletId,
+        blockchain: Blockchain,
+    ): CompletionResult<Unit> = catching {
+        deleteInternal(userWalletId, blockchain)
+    }
+
+    private suspend fun store(userWalletId: UserWalletId, walletManager: WalletManager) {
+        walletManagersStorage.update { prevManagers ->
+            prevManagers.apply {
+                set(
+                    key = userWalletId,
+                    value = this[userWalletId].orEmpty() + walletManager,
+                )
+            }
+        }
+    }
+
+    private suspend fun deleteInternal(userWalletId: UserWalletId, blockchain: Blockchain?) {
+        walletManagersStorage.update { prevManagers ->
+            prevManagers.apply {
+                if (blockchain == null) {
+                    set(
+                        key = userWalletId,
+                        value = emptyList(),
+                    )
+                } else {
+                    set(
+                        key = userWalletId,
+                        value = this[userWalletId]
+                            ?.filter { it.wallet.blockchain == blockchain }
+                            .orEmpty(),
+                    )
+                }
+            }
+        }
+    }
+
+    private fun WalletManager.updateTokens(
+        scanResponse: ScanResponse,
+        blockchainNetwork: BlockchainNetwork?,
+    ): CompletionResult<WalletManager> {
+        val walletManager = this
+        return catching {
+            val tokens = blockchainNetwork?.tokens ?: listOfNotNull(scanResponse.getPrimaryToken())
+
+            if (tokens != cardTokens) {
+                cardTokens.clear()
+                if (tokens.isNotEmpty()) {
+                    walletManager.cardTokens.addAll(tokens)
+                }
+            }
+
+            walletManager
+        }
+            .mapFailure {
+                val error = WalletStoresError.UpdateWalletManagerError(
+                    blockchain = walletManager.wallet.blockchain,
+                    cause = it,
+                )
+                Timber.e(error)
+                error
+            }
+    }
+
+    private suspend fun findWalletManager(
+        userWalletId: UserWalletId,
+        blockchain: Blockchain?,
+    ): WalletManager? {
+        return walletManagersStorage.getAll().first()[userWalletId]?.let { userWalletManagers ->
+            if (blockchain == null) userWalletManagers.firstOrNull()
+            else userWalletManagers.find { it.wallet.blockchain == blockchain }
+        }
+    }
+
+    private fun getDerivationParams(derivationPath: String?, card: CardDTO): DerivationParams? {
+        return derivationPath?.let {
+            DerivationParams.Custom(
+                path = DerivationPath(it),
+            )
+        } ?: if (!card.settings.isHDWalletAllowed) {
+            null
+        } else if (card.useOldStyleDerivation) {
+            DerivationParams.Default(DerivationStyle.LEGACY)
+        } else {
+            DerivationParams.Default(DerivationStyle.NEW)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletStoresRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletStoresRepository.kt
new file mode 100644
index 0000000000..b9087070e4
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/DefaultWalletStoresRepository.kt
@@ -0,0 +1,97 @@
+package com.tangem.tap.domain.walletStores.repository.implementation
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.common.CompletionResult
+import com.tangem.common.catching
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.isSameWalletStore
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.replaceWalletStore
+import com.tangem.tap.domain.walletStores.repository.implementation.utils.updateWithSelf
+import com.tangem.tap.domain.walletStores.storage.WalletStoresStorage
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+
+internal class DefaultWalletStoresRepository : WalletStoresRepository {
+    private val walletStoresStorage = WalletStoresStorage
+
+    override fun getAll(): Flow<Map<UserWalletId, List<WalletStoreModel>>> {
+        return walletStoresStorage.getAll()
+    }
+
+    override fun get(userWalletId: UserWalletId): Flow<List<WalletStoreModel>> {
+        return getAll().map { it[userWalletId].orEmpty() }
+    }
+
+    override suspend fun getSync(userWalletId: UserWalletId): List<WalletStoreModel> {
+        return get(userWalletId).firstOrNull() ?: emptyList()
+    }
+
+    override suspend fun contains(userWalletId: UserWalletId): Boolean {
+        return getSync(userWalletId).isNotEmpty()
+    }
+
+    override suspend fun delete(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> = catching {
+        walletStoresStorage.update { prevStores ->
+            prevStores.filterKeys { it !in userWalletsIds } as HashMap<UserWalletId, List<WalletStoreModel>>
+        }
+    }
+
+    override suspend fun deleteDifference(
+        userWalletId: UserWalletId,
+        currentBlockchains: List<Blockchain>,
+    ): CompletionResult<Unit> = catching {
+        if (currentBlockchains != getSync(userWalletId).map { it.blockchain }) {
+            walletStoresStorage.update { prevStores ->
+                prevStores.apply {
+                    this[userWalletId] = this[userWalletId]
+                        ?.filter { it.blockchain in currentBlockchains }
+                        .orEmpty()
+                }
+            }
+        }
+    }
+
+    override suspend fun clear(): CompletionResult<Unit> = catching {
+        walletStoresStorage.update { hashMapOf() }
+    }
+
+    override suspend fun storeOrUpdate(
+        userWalletId: UserWalletId,
+        walletStore: WalletStoreModel,
+    ): CompletionResult<Unit> = catching {
+        walletStoresStorage.update { prevStores ->
+            prevStores.addOrUpdate(userWalletId, walletStore)
+        }
+    }
+
+    private suspend fun HashMap<UserWalletId, List<WalletStoreModel>>.addOrUpdate(
+        userWalletId: UserWalletId,
+        walletStore: WalletStoreModel,
+    ): HashMap<UserWalletId, List<WalletStoreModel>> = withContext(Dispatchers.Default) {
+        val currentWalletStores = this@addOrUpdate
+        val userWalletStores = currentWalletStores[userWalletId]
+
+        if (userWalletStores.isNullOrEmpty()) {
+            currentWalletStores.apply {
+                set(userWalletId, listOf(walletStore))
+            }
+        } else {
+            val currentWalletStore = userWalletStores.find(walletStore::isSameWalletStore)
+            if (currentWalletStore == null) {
+                currentWalletStores.apply {
+                    set(userWalletId, userWalletStores + walletStore)
+                }
+            } else {
+                currentWalletStores.replaceWalletStore(
+                    walletStoreToUpdate = currentWalletStore,
+                    update = { it.updateWithSelf(walletStore) },
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletDataOperations.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletDataOperations.kt
new file mode 100644
index 0000000000..7ad0e38363
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletDataOperations.kt
@@ -0,0 +1,180 @@
+package com.tangem.tap.domain.walletStores.repository.implementation.utils
+
+import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.BlockchainSdkError
+import com.tangem.blockchain.common.Wallet
+import com.tangem.common.core.TangemError
+import com.tangem.tap.domain.extensions.amountToCreateAccount
+import com.tangem.tap.domain.getFirstToken
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.getPendingTransactions
+import java.math.BigDecimal
+
+internal fun WalletDataModel.updateWithFiatRate(
+    fiatRate: BigDecimal?,
+): WalletDataModel {
+    return this.copy(
+        fiatRate = fiatRate,
+    )
+}
+
+internal fun List<WalletDataModel>.updateWithFiatRates(
+    fiatRates: Map<String, Double>,
+): List<WalletDataModel> {
+    return this.map { walletData ->
+        val rate = fiatRates[walletData.currency.coinId]?.toBigDecimal()
+        walletData.updateWithFiatRate(rate)
+    }
+}
+
+internal fun WalletDataModel.updateWithAmount(wallet: Wallet): WalletDataModel {
+    val pendingTransactions = wallet.getPendingTransactions()
+    return this.copy(
+        status = when (val currency = this.currency) {
+            is Currency.Blockchain -> {
+                val amount = wallet.fundsAvailable(AmountType.Coin)
+                if (pendingTransactions.isEmpty()) {
+                    WalletDataModel.VerifiedOnline(
+                        amount = amount,
+                    )
+                } else {
+                    WalletDataModel.TransactionInProgress(
+                        amount = amount,
+                        pendingTransactions = pendingTransactions,
+                    )
+                }
+            }
+            is Currency.Token -> {
+                val token = currency.token
+                val amount = wallet.fundsAvailable(AmountType.Token(token))
+                val hasTokenPendingTransactions = pendingTransactions
+                    .any { it.transactionData.amount.currencySymbol == token.symbol }
+                when {
+                    hasTokenPendingTransactions -> {
+                        WalletDataModel.TransactionInProgress(
+                            amount = amount,
+                            pendingTransactions = pendingTransactions,
+                        )
+                    }
+                    pendingTransactions.isNotEmpty() -> {
+                        WalletDataModel.SameCurrencyTransactionInProgress(
+                            amount = amount,
+                            pendingTransactions = pendingTransactions,
+                        )
+                    }
+                    else -> {
+                        WalletDataModel.VerifiedOnline(
+                            amount = amount,
+                        )
+                    }
+                }
+            }
+        },
+    )
+}
+
+internal fun List<WalletDataModel>.updateWithAmounts(wallet: Wallet): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.updateWithAmount(wallet)
+    }
+}
+
+internal fun WalletDataModel.updateWithError(
+    wallet: Wallet,
+    error: TangemError,
+): WalletDataModel {
+    return this.copy(
+        status = when (error) {
+            is BlockchainSdkError.AccountNotFound -> {
+                val amountToCreateAccount = wallet.blockchain
+                    .amountToCreateAccount(wallet.getFirstToken())
+
+                if (amountToCreateAccount != null) {
+                    WalletDataModel.NoAccount(
+                        amountToCreateAccount = amountToCreateAccount,
+                    )
+                } else {
+                    WalletDataModel.Unreachable(
+                        errorMessage = error.customMessage,
+                    )
+                }
+            }
+            else -> WalletDataModel.Unreachable(
+                errorMessage = error.customMessage,
+            )
+        },
+    )
+}
+
+internal fun List<WalletDataModel>.updateWithError(
+    wallet: Wallet,
+    error: TangemError,
+): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.updateWithError(wallet, error)
+    }
+}
+
+internal fun WalletDataModel.updateWithSelf(
+    newWalletData: WalletDataModel,
+): WalletDataModel {
+    val oldWalletData = this
+    val oldStatus = oldWalletData.status
+    return oldWalletData.copy(
+        status = when (val newStatus = newWalletData.status) {
+            is WalletDataModel.Loading -> when (oldStatus) {
+                is WalletDataModel.MissedDerivation -> WalletDataModel.Loading
+                else -> oldStatus
+            }
+            is WalletDataModel.MissedDerivation,
+            is WalletDataModel.NoAccount,
+            is WalletDataModel.Unreachable,
+            is WalletDataModel.SameCurrencyTransactionInProgress,
+            is WalletDataModel.TransactionInProgress,
+            is WalletDataModel.VerifiedOnline,
+            -> newStatus
+        },
+        walletAddresses = newWalletData.walletAddresses,
+        existentialDeposit = newWalletData.existentialDeposit,
+        fiatRate = newWalletData.fiatRate ?: oldWalletData.fiatRate,
+    )
+}
+
+internal fun List<WalletDataModel>.updateWithMissedDerivation(): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.copy(
+            status = WalletDataModel.MissedDerivation,
+        )
+    }
+}
+
+internal fun List<WalletDataModel>.updateWithUnreachable(): List<WalletDataModel> {
+    return this.map { walletData ->
+        walletData.copy(
+            status = WalletDataModel.Unreachable(errorMessage = null),
+        )
+    }
+}
+
+internal fun List<WalletDataModel>.updateWithSelf(
+    walletsData: List<WalletDataModel>,
+): List<WalletDataModel> {
+    val oldWalletsData = this
+    val updatedWalletsData = arrayListOf<WalletDataModel>()
+
+    walletsData.forEach { newWalletData ->
+        val walletDataToUpdate = oldWalletsData.find(newWalletData::isSameWalletData)
+        if (walletDataToUpdate != null) {
+            updatedWalletsData.add(walletDataToUpdate.updateWithSelf(newWalletData))
+        } else {
+            updatedWalletsData.add(newWalletData)
+        }
+    }
+
+    return updatedWalletsData
+}
+
+internal fun WalletDataModel.isSameWalletData(other: WalletDataModel): Boolean {
+    return currency == other.currency
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletStoreOperations.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletStoreOperations.kt
new file mode 100644
index 0000000000..2aa7ffcf2d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/repository/implementation/utils/WalletStoreOperations.kt
@@ -0,0 +1,126 @@
+package com.tangem.tap.domain.walletStores.repository.implementation.utils
+
+import com.tangem.blockchain.common.Wallet
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletStoreModel
+import timber.log.Timber
+
+internal inline fun HashMap<UserWalletId, List<WalletStoreModel>>.replaceWalletStore(
+    walletStoreToUpdate: WalletStoreModel,
+    update: (walletStore: WalletStoreModel) -> WalletStoreModel,
+): HashMap<UserWalletId, List<WalletStoreModel>> {
+    return replaceWalletStores(listOf(walletStoreToUpdate), update)
+}
+
+internal inline fun HashMap<UserWalletId, List<WalletStoreModel>>.replaceWalletStores(
+    walletStoresToUpdate: List<WalletStoreModel>,
+    update: (walletStore: WalletStoreModel) -> WalletStoreModel,
+): HashMap<UserWalletId, List<WalletStoreModel>> {
+    return this.apply {
+        val currentWalletStores = this
+        walletStoresToUpdate
+            .groupBy { it.userWalletId }
+            .forEach { (userWalletId, walletStoresToUpdate) ->
+                currentWalletStores[userWalletId] = currentWalletStores[userWalletId]
+                    ?.replaceWalletStores(walletStoresToUpdate, update)
+                    .orEmpty()
+            }
+    }
+}
+
+internal fun WalletStoreModel.updateWithError(
+    wallet: Wallet,
+    error: TangemError,
+): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithError(
+            wallet = wallet,
+            error = error,
+        ),
+    )
+}
+
+internal fun WalletStoreModel.updateWithAmounts(
+    wallet: Wallet,
+): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithAmounts(wallet = wallet),
+    )
+}
+
+internal fun WalletStoreModel.updateWithFiatRates(
+    rates: Map<String, Double>,
+): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithFiatRates(rates),
+    )
+}
+
+internal fun WalletStoreModel.updateWithSelf(
+    newWalletStore: WalletStoreModel,
+): WalletStoreModel {
+    val oldStore = this
+    return oldStore.copy(
+        derivationPath = newWalletStore.derivationPath,
+        walletsData = oldStore.walletsData.updateWithSelf(newWalletStore.walletsData),
+        walletRent = newWalletStore.walletRent,
+        blockchainNetwork = newWalletStore.blockchainNetwork,
+        walletManager = newWalletStore.walletManager,
+    )
+}
+
+internal fun WalletStoreModel.updateWithMissedDerivation(): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithMissedDerivation(),
+    )
+}
+
+internal fun WalletStoreModel.updateWithUnreachable(): WalletStoreModel {
+    return this.copy(
+        walletsData = walletsData.updateWithUnreachable(),
+    )
+}
+
+internal fun WalletStoreModel.updateWithRent(rent: WalletStoreModel.WalletRent?): WalletStoreModel {
+    return this.copy(
+        walletRent = rent,
+    )
+}
+
+internal fun WalletStoreModel.isSameWalletStore(other: WalletStoreModel): Boolean {
+    return this.blockchain == other.blockchain &&
+        this.derivationPath == other.derivationPath
+}
+
+private inline fun List<WalletStoreModel>.replaceWalletStores(
+    walletStoresToUpdate: List<WalletStoreModel>,
+    update: (walletStore: WalletStoreModel) -> WalletStoreModel,
+): List<WalletStoreModel> {
+    val mutableStores = ArrayList<WalletStoreModel>(this)
+
+    walletStoresToUpdate
+        .asSequence()
+        .map { it.blockchain to it.derivationPath }
+        .forEach { (blockchain, derivationPath) ->
+            val index = mutableStores.indexOfFirst {
+                it.blockchain == blockchain && it.derivationPath == derivationPath
+            }
+            val currentWalletStore = mutableStores[index]
+            val updatedWalletStore = update(currentWalletStore)
+
+            if (currentWalletStore != updatedWalletStore) {
+                Timber.d(
+                    """
+                        Update wallet store in storage
+                        |- User wallet ID: ${updatedWalletStore.userWalletId}
+                        |- Blockchain: ${updatedWalletStore.blockchain}
+                    """.trimIndent(),
+                )
+
+                mutableStores[index] = updatedWalletStore
+            }
+        }
+
+    return mutableStores
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletManagerStorage.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletManagerStorage.kt
new file mode 100644
index 0000000000..3646e38f6a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletManagerStorage.kt
@@ -0,0 +1,38 @@
+package com.tangem.tap.domain.walletStores.storage
+
+import com.tangem.blockchain.common.WalletManager
+import com.tangem.domain.common.util.UserWalletId
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+internal object WalletManagerStorage {
+    private val managers =
+        MutableSharedFlow<HashMap<UserWalletId, List<WalletManager>>>(replay = 1)
+
+    init {
+        managers.tryEmit(hashMapOf())
+    }
+
+    fun getAll(): SharedFlow<Map<UserWalletId, List<WalletManager>>> {
+        return managers.asSharedFlow()
+    }
+
+    private val mutex = Mutex()
+    suspend fun update(
+        f: suspend (HashMap<UserWalletId, List<WalletManager>>) -> HashMap<UserWalletId, List<WalletManager>>,
+    ) {
+        while (mutex.isLocked) {
+            delay(timeMillis = 60)
+        }
+
+        mutex.withLock {
+            val prevState = managers.first()
+            managers.emit(f(prevState))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletStoresStorage.kt b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletStoresStorage.kt
new file mode 100644
index 0000000000..93cdfb508f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/domain/walletStores/storage/WalletStoresStorage.kt
@@ -0,0 +1,38 @@
+package com.tangem.tap.domain.walletStores.storage
+
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.WalletStoreModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+internal object WalletStoresStorage {
+    private val stores =
+        MutableSharedFlow<HashMap<UserWalletId, List<WalletStoreModel>>>(replay = 1)
+
+    init {
+        stores.tryEmit(hashMapOf())
+    }
+
+    fun getAll(): SharedFlow<Map<UserWalletId, List<WalletStoreModel>>> {
+        return stores.asSharedFlow()
+    }
+
+    private val mutex = Mutex()
+    suspend fun update(
+        f: suspend (HashMap<UserWalletId, List<WalletStoreModel>>) -> HashMap<UserWalletId, List<WalletStoreModel>>,
+    ) {
+        while (mutex.isLocked) {
+            delay(timeMillis = 60)
+        }
+
+        mutex.withLock {
+            val prevState = stores.first()
+            stores.emit(f(prevState))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
index f95b187f09..37e488ccf8 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectManager.kt
@@ -4,8 +4,8 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.ScanResponse
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.logWcEvent
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.WalletConnect
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TapError
@@ -226,11 +226,7 @@ class WalletConnectManager {
     }
 
     private fun onSessionClosed(session: WCSession) {
-        store.state.globalState.analyticsHandler.logWcEvent(
-            AnalyticsAnOld.WcAnalyticsEvent.Session(
-                AnalyticsAnOld.WcSessionEvent.Disconnect, sessions[session]?.peerMeta?.url,
-            ),
-        )
+        Analytics.send(WalletConnect.SessionDisconnected())
         sessions.remove(session)
         walletConnectRepository.removeSession(session)
         store.dispatchOnMain(WalletConnectAction.RemoveSession(session))
@@ -375,11 +371,7 @@ class WalletConnectManager {
                             ),
                         )
                     }
-                    store.state.globalState.analyticsHandler.logWcEvent(
-                        AnalyticsAnOld.WcAnalyticsEvent.Session(
-                            AnalyticsAnOld.WcSessionEvent.Connect, peer.url,
-                        ),
-                    )
+                    Analytics.send(WalletConnect.NewSessionEstablished())
                 }
             }
         }
@@ -390,11 +382,11 @@ class WalletConnectManager {
         }
         client.onEthSendTransaction = { id: Long, transaction: WCEthereumTransaction ->
             Timber.d("onEthSendTransaction: $transaction")
-            store.state.globalState.analyticsHandler.logWcEvent(
-                AnalyticsAnOld.WcAnalyticsEvent.Action(
-                    AnalyticsAnOld.WcAction.SendTransaction,
-                ),
-            )
+            // Analytics.logWcEvent(
+            //     AnalyticsAnOld.WcAnalyticsEvent.Action(
+            //         AnalyticsAnOld.WcAction.SendTransaction
+            //     )
+            // )
             sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
                 store.dispatchOnMain(
                     WalletConnectAction.HandleTransactionRequest(
@@ -408,11 +400,11 @@ class WalletConnectManager {
         }
         client.onEthSignTransaction = { id: Long, transaction: WCEthereumTransaction ->
             Timber.d("onEthSignTransaction: $transaction")
-            store.state.globalState.analyticsHandler.logWcEvent(
-                AnalyticsAnOld.WcAnalyticsEvent.Action(
-                    AnalyticsAnOld.WcAction.SignTransaction,
-                ),
-            )
+            // Analytics.logWcEvent(
+            //     AnalyticsAnOld.WcAnalyticsEvent.Action(
+            //         AnalyticsAnOld.WcAction.SignTransaction
+            //     )
+            // )
             sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
                 store.dispatchOnMain(
                     WalletConnectAction.HandleTransactionRequest(
@@ -426,11 +418,11 @@ class WalletConnectManager {
         }
         client.onEthSign = { id: Long, message: WCEthereumSignMessage ->
             Timber.d("onEthSign: $message")
-            store.state.globalState.analyticsHandler.logWcEvent(
-                AnalyticsAnOld.WcAnalyticsEvent.Action(
-                    AnalyticsAnOld.WcAction.PersonalSign,
-                ),
-            )
+            // Analytics.logWcEvent(
+            //     AnalyticsAnOld.WcAnalyticsEvent.Action(
+            //         AnalyticsAnOld.WcAction.PersonalSign
+            //     )
+            // )
             sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
                 store.dispatchOnMain(
                     WalletConnectAction.HandlePersonalSignRequest(
@@ -483,40 +475,6 @@ class WalletConnectManager {
                 store.dispatchOnMain(WalletConnectAction.SwitchBlockchain(blockchain, session))
             }
         }
-        client.onCustomRequest = { id: Long, data: String ->
-            Timber.d("Custom Request")
-            Timber.d(data)
-            val request = EthSignHelper.parseCustomRequest(data)
-
-            when (request.method) {
-                WCMethodExtended.ETH_SIGN_TYPE_DATA_V4 -> handleTypedDataV4(request, client, id)
-                else -> {
-                    Timber.d("WC: unrecognized custom request")
-                }
-            }
-        }
-
-    }
-
-    private fun handleTypedDataV4(request: CustomJsonRpcRequest, client: WCClient, id: Long) {
-        val message = EthSignHelper.tryToParseEthTypedMessage(request)
-        if (message != null) {
-            Timber.d("onEthSign_v4: $message")
-            store.state.globalState.analyticsHandler.logWcEvent(
-                AnalyticsAnOld.WcAnalyticsEvent.Action(
-                    AnalyticsAnOld.WcAction.PersonalSign,
-                ),
-            )
-            sessions[client.session]?.toWalletConnectSession()?.let { sessionData ->
-                store.dispatchOnMain(
-                    WalletConnectAction.HandlePersonalSignRequest(
-                        message,
-                        sessionData,
-                        id
-                    )
-                )
-            }
-        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt
index 543640ad2f..c796b81261 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt
@@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Types
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toHexString
-import com.tangem.network.common.MoshiConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
 import com.tangem.tap.features.details.redux.walletconnect.WalletForSession
 import com.trustwallet.walletconnect.models.WCPeerMeta
@@ -18,7 +18,7 @@ import java.nio.charset.Charset
 class WalletConnectRepository(val context: Application) {
     private val moshi = MoshiConverter.defaultMoshi()
     private val walletConnectAdapter: JsonAdapter<List<SessionDao>> = moshi.adapter(
-        Types.newParameterizedType(List::class.java, SessionDao::class.java)
+        Types.newParameterizedType(List::class.java, SessionDao::class.java),
     )
 
     fun saveSession(session: WalletConnectSession) {
@@ -76,7 +76,6 @@ class WalletConnectRepository(val context: Application) {
     }
 }
 
-
 @JsonClass(generateAdapter = true)
 data class SessionDao(
     val peerId: String,
@@ -91,7 +90,7 @@ data class SessionDao(
             remotePeerId = remotePeerId,
             wallet = wallet,
             session = session,
-            peerMeta = peerMeta
+            peerMeta = peerMeta,
         )
     }
 
@@ -102,7 +101,7 @@ data class SessionDao(
                 remotePeerId = session.remotePeerId,
                 wallet = session.wallet,
                 session = session.session,
-                peerMeta = session.peerMeta
+                peerMeta = session.peerMeta,
             )
         }
     }
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
index eccfbaefdf..def1cb4a92 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
@@ -24,7 +24,8 @@ import com.tangem.common.extensions.toDecompressedPublicKey
 import com.tangem.common.extensions.toHexString
 import com.tangem.crypto.CryptoUtils
 import com.tangem.operations.sign.SignHashCommand
-import com.tangem.tap.common.analytics.AnalyticsAnOld
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.WalletConnect
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.extensions.toFormattedString
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
@@ -38,6 +39,9 @@ import com.tangem.tap.store
 import com.tangem.tap.tangemSdk
 import com.tangem.tap.tangemSdkManager
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage
+import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage.WCSignType.MESSAGE
+import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage.WCSignType.PERSONAL_MESSAGE
+import com.trustwallet.walletconnect.models.ethereum.WCEthereumSignMessage.WCSignType.TYPED_MESSAGE
 import com.trustwallet.walletconnect.models.ethereum.WCEthereumTransaction
 import timber.log.Timber
 import java.math.BigDecimal
@@ -87,8 +91,8 @@ class WalletConnectSdkHelper {
             extras = EthereumTransactionExtras(
                 data = transaction.data.removePrefix(HEX_PREFIX).hexToBytes(),
                 gasLimit = gas.toBigInteger(),
-                nonce = transaction.nonce?.hexToBigDecimal()?.toBigInteger()
-            )
+                nonce = transaction.nonce?.hexToBigDecimal()?.toBigInteger(),
+            ),
         )
         val dialogData = TransactionRequestDialogData(
             dAppName = session.peerMeta.name,
@@ -100,7 +104,7 @@ class WalletConnectSdkHelper {
             isEnoughFundsToSend = (balance - total) >= BigDecimal.ZERO,
             session = session.session,
             id = id,
-            type = type
+            type = type,
         )
         return WcTransactionData(
             type = type,
@@ -108,7 +112,7 @@ class WalletConnectSdkHelper {
             session = session,
             id = id,
             walletManager = walletManager,
-            dialogData = dialogData
+            dialogData = dialogData,
         )
     }
 
@@ -122,7 +126,7 @@ class WalletConnectSdkHelper {
         val blockchain = session.wallet.getBlockchainForSession()
         return factory.makeWalletManager(
             blockchain = blockchain,
-            publicKey = publicKey
+            publicKey = publicKey,
         )
     }
 
@@ -143,10 +147,7 @@ class WalletConnectSdkHelper {
                 HEX_PREFIX + data.walletManager.wallet.recentTransactions.last().hash
             }
             is SimpleResult.Failure -> {
-                store.state.globalState.analyticsHandler.handleBlockchainSdkErrorEvent(
-                    result.error,
-                    AnalyticsAnOld.ActionToLog.WalletConnectTransaction,
-                )
+                (result.error as? TangemSdkError)?.let { Analytics.send(WalletConnect.TransactionError(it)) }
                 Timber.e(result.error as BlockchainSdkError)
                 null
             }
@@ -172,12 +173,7 @@ class WalletConnectSdkHelper {
                 HEX_PREFIX + result.data
             }
             is CompletionResult.Failure -> {
-                (result.error as? TangemSdkError)?.let { error ->
-                    store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.WalletConnectSign,
-                    )
-                }
+                (result.error as? TangemSdkError)?.let { Analytics.send(WalletConnect.SignError(it)) }
                 Timber.e(result.error.customMessage)
                 null
             }
@@ -197,16 +193,11 @@ class WalletConnectSdkHelper {
                     ?: session.wallet.walletPublicKey.toDecompressedPublicKey()
                 getBnbResultString(
                     key.toHexString(),
-                    result.data.signature.toHexString()
+                    result.data.signature.toHexString(),
                 )
             }
             is CompletionResult.Failure -> {
-                (result.error as? TangemSdkError)?.let { error ->
-                    store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.WalletConnectTransaction,
-                    )
-                }
+                (result.error as? TangemSdkError)?.let { Analytics.send(WalletConnect.TransactionError(it)) }
                 Timber.e(result.error.customMessage)
                 null
             }
@@ -218,34 +209,40 @@ class WalletConnectSdkHelper {
         session: WalletConnectSession,
         id: Long,
     ): WcPersonalSignData {
-        val messageData =
-            try {
-                message.data.removePrefix(HEX_PREFIX).hexToBytes()
-            } catch (exception: Exception) {
-                message.data.asciiToHex()!!.hexToBytes()
-            }
+        val messageData = when (message.type) {
+            MESSAGE, PERSONAL_MESSAGE -> createMessageData(message)
+            TYPED_MESSAGE -> EthereumUtils.makeTypedDataHash(message.data)
+        }
+
         val messageString = message.data.hexToAscii()
             ?: EthSignHelper.tryToParseEthTypedMessageString(message.data)
             ?: message.data
 
-        val prefixData = (ETH_MESSAGE_PREFIX + messageData.size.toString()).toByteArray()
-        val hashToSign = (prefixData + messageData).toKeccak()
-
-
         val dialogData = PersonalSignDialogData(
             dAppName = session.peerMeta.name,
             message = messageString,
             session = session.session,
-            id = id
+            id = id,
         )
         return WcPersonalSignData(
-            hash = hashToSign,
+            hash = messageData,
             session = session,
             id = id,
-            dialogData = dialogData
+            dialogData = dialogData,
         )
     }
 
+    private fun createMessageData(message: WCEthereumSignMessage): ByteArray {
+        val messageData = try {
+            message.data.removePrefix(HEX_PREFIX).hexToBytes()
+        } catch (exception: Exception) {
+            message.data.asciiToHex()?.hexToBytes() ?: byteArrayOf()
+        }
+
+        val prefixData = (ETH_MESSAGE_PREFIX + messageData.size.toString()).toByteArray()
+        return (prefixData + messageData).toKeccak()
+    }
+
     private fun String.hexToAscii(): String? {
         return try {
             removePrefix(HEX_PREFIX).hexToBytes()
@@ -277,12 +274,7 @@ class WalletConnectSdkHelper {
                 )
             }
             is CompletionResult.Failure -> {
-                (result.error as? TangemSdkError)?.let { error ->
-                    store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                        error,
-                        AnalyticsAnOld.ActionToLog.WalletConnectSign,
-                    )
-                }
+                (result.error as? TangemSdkError)?.let { Analytics.send(WalletConnect.SignError(it)) }
                 Timber.e(result.error.customMessage)
                 null
             }
diff --git a/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt b/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
index 66d09bdbf0..1e97beb6e0 100644
--- a/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
+++ b/app/src/main/java/com/tangem/tap/features/demo/Extentions.kt
@@ -1,10 +1,10 @@
 package com.tangem.tap.features.demo
 
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 
 /**
 [REDACTED_AUTHOR]
  */
 fun ScanResponse.isDemoCard(): Boolean = DemoHelper.isDemoCardId(card.cardId)
-fun Card.isDemoCard(): Boolean = DemoHelper.isDemoCardId(cardId)
\ No newline at end of file
+fun CardDTO.isDemoCard(): Boolean = DemoHelper.isDemoCardId(cardId)
\ No newline at end of file
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 b421b69730..d08fd627f5 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
@@ -1,7 +1,7 @@
 package com.tangem.tap.features.details.redux
 
 import com.tangem.blockchain.common.Wallet
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.domain.termsOfUse.CardTou
@@ -30,7 +30,7 @@ sealed class DetailsAction : Action {
 
     object ScanCard : DetailsAction()
 
-    data class PrepareCardSettingsData(val card: Card) : DetailsAction()
+    data class PrepareCardSettingsData(val card: CardDTO) : DetailsAction()
     object ResetCardSettingsData : DetailsAction()
 
     sealed class ManageSecurity : DetailsAction() {
@@ -45,8 +45,24 @@ sealed class DetailsAction : Action {
     }
 
     sealed class AppSettings : DetailsAction() {
-        data class SwitchPrivacySetting(val enable: Boolean, val setting: PrivacySetting) :
-            AppSettings()
+        data class SwitchPrivacySetting(
+            val enable: Boolean,
+            val setting: PrivacySetting,
+        ) : AppSettings() {
+            data class Success(
+                val enable: Boolean,
+                val setting: PrivacySetting,
+            ) : AppSettings()
+        }
+
+        data class CheckBiometricsStatus(
+            val awaitStatusChange: Boolean,
+        ) : AppSettings()
+
+        object EnrollBiometrics : AppSettings()
+        data class BiometricsStatusChanged(
+            val needEnrollBiometrics: Boolean,
+        ) : AppSettings()
     }
 
     data class ChangeAppCurrency(val fiatCurrency: FiatCurrency) : DetailsAction()
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 3595380cb6..9fe984d9c9 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
@@ -2,90 +2,93 @@ package com.tangem.tap.features.details.redux
 
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemSdkError
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.common.flatMap
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.extensions.dispatchDialogShow
-import com.tangem.tap.common.extensions.dispatchNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.domain.extensions.getUserWalletId
+import com.tangem.tap.domain.model.builders.UserWalletBuilder
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.onboarding.products.twins.redux.CreateTwinWalletMode
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
-import com.tangem.tap.features.wallet.models.hasSendableAmountsOrPendingTransactions
+import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userTokensRepository
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletStoresManager
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.rekotlin.Action
 import org.rekotlin.Middleware
+import timber.log.Timber
 
 class DetailsMiddleware {
     private val eraseWalletMiddleware = EraseWalletMiddleware()
     private val manageSecurityMiddleware = ManageSecurityMiddleware()
     private val managePrivacyMiddleware = ManagePrivacyMiddleware()
-    val detailsMiddleware: Middleware<AppState> = { _, state ->
+    val detailsMiddleware: Middleware<AppState> = { _, stateProvider ->
         { next ->
             { action ->
-                handleAction(state, action)
+                if (!DemoHelper.tryHandle(stateProvider, action)) {
+                    val detailsState = stateProvider()?.detailsState
+                    if (detailsState != null) {
+                        handleAction(detailsState, action)
+                    }
+                }
                 next(action)
             }
         }
     }
 
-    private fun handleAction(state: () -> AppState?, action: Action) {
-        if (DemoHelper.tryHandle(state, action)) return
-
+    private fun handleAction(state: DetailsState, action: Action) {
         when (action) {
             is DetailsAction.ResetToFactory -> eraseWalletMiddleware.handle(action)
             is DetailsAction.ManageSecurity -> manageSecurityMiddleware.handle(action)
-            is DetailsAction.AppSettings -> managePrivacyMiddleware.handle(action)
+            is DetailsAction.AppSettings -> managePrivacyMiddleware.handle(state, action)
             is DetailsAction.ShowDisclaimer -> {
-                val uri = store.state.detailsState.cardTermsOfUseUrl
+                val uri = state.cardTermsOfUseUrl
                 if (uri != null) {
                     store.dispatch(NavigationAction.OpenDocument(uri))
                 }
             }
             is DetailsAction.ReCreateTwinsWallet -> {
-                val wallet =
-                    store.state.walletState.walletManagers.map { it.wallet }.firstOrNull()
-                if (wallet == null) {
-                    store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
-                    store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
-                } else {
-                    if (wallet.hasSendableAmountsOrPendingTransactions()) {
-                        val walletIsNotEmpty =
-                            store.state.globalState.resources.strings.walletIsNotEmpty
-                        store.dispatchNotification(walletIsNotEmpty)
-                    } else {
-                        store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
-                        store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
-                    }
-                }
+                store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet))
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingTwins))
             }
             is DetailsAction.CreateBackup -> {
-                store.state.detailsState.scanResponse?.let {
+                state.scanResponse?.let {
                     store.dispatch(GlobalAction.Onboarding.Start(it, canSkipBackup = false))
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
                 }
             }
             DetailsAction.ScanCard -> {
                 scope.launch {
-                    when (val result = tangemSdkManager.scanCard()) {
-                        is CompletionResult.Success -> {
-                            val card = result.data
-                            if (card.getUserWalletId() ==
-                                store.state.globalState.scanResponse?.card?.getUserWalletId()
-                            ) {
-                                store.dispatchOnMain(DetailsAction.PrepareCardSettingsData(card))
+                    tangemSdkManager.scanProduct(userTokensRepository)
+                        .doOnSuccess { scanResponse ->
+                            val currentUserWalletId = state.scanResponse
+                                ?.let { UserWalletIdBuilder.scanResponse(it).build() }
+                            val scannedUserWalletId = UserWalletIdBuilder.scanResponse(scanResponse)
+                                .build()
+                            val isSameWallet = currentUserWalletId == scannedUserWalletId
+
+                            if (isSameWallet) {
+                                store.dispatchOnMain(DetailsAction.PrepareCardSettingsData(scanResponse.card))
                             } else {
                                 store.dispatchDialogShow(
                                     AppDialog.SimpleOkDialogRes(
@@ -95,9 +98,6 @@ class DetailsMiddleware {
                                 )
                             }
                         }
-                        is CompletionResult.Failure -> {
-                        }
-                    }
                 }
             }
         }
@@ -118,25 +118,35 @@ class DetailsMiddleware {
                 is DetailsAction.ResetToFactory.Proceed -> {
                     val card = store.state.detailsState.cardSettingsState?.card ?: return
                     scope.launch {
-                        val result = tangemSdkManager.resetToFactorySettings(card)
-                            when (result) {
-                                is CompletionResult.Success -> {
+                        val userWalletId = UserWalletIdBuilder.card(card).build()
+
+                        tangemSdkManager.resetToFactorySettings(card.cardId)
+                            .flatMap { userWalletsListManager.delete(listOfNotNull(userWalletId)) }
+                            .flatMap { tangemSdkManager.deleteSavedUserCodes(setOf(card.cardId)) }
+                            .doOnSuccess {
+                                Analytics.send(Settings.CardSettings.FactoryResetFinished())
+
+                                val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+                                if (selectedUserWallet != null) {
+                                    if (userWalletsListManager.isLockedSync) {
+                                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
+                                    } else {
+                                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                                        store.onUserWalletSelected(selectedUserWallet)
+                                    }
+                                } else {
+                                    userWalletsListManager.lock()
                                     store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
                                 }
-                                is CompletionResult.Failure -> {
-                                    (result.error as? TangemSdkError)?.let { error ->
-                                        store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                                            error,
-                                            AnalyticsAnOld.ActionToLog.PurgeWallet,
-                                            card = store.state.detailsState.scanResponse?.card,
-                                        )
-                                    }
+                            }
+                            .doOnFailure { error ->
+                                (error as? TangemSdkError)?.let { sdkError ->
+                                    Analytics.send(Settings.CardSettings.FactoryResetFinished(sdkError))
                                 }
-                        }
+                            }
                     }
                 }
-                else -> { /* no-op */
-                }
+                else -> Unit
             }
         }
     }
@@ -156,33 +166,24 @@ class DetailsMiddleware {
                             SecurityOption.LongTap -> tangemSdkManager.setLongTap(cardId)
                             SecurityOption.PassCode -> tangemSdkManager.setPasscode(cardId)
                             SecurityOption.AccessCode -> tangemSdkManager.setAccessCode(cardId)
-                            else -> null
+                            else -> return@launch
                         }
                         withContext(Dispatchers.Main) {
+                            val paramValue = AnalyticsParam.SecurityMode.from(selectedOption)
                             when (result) {
                                 is CompletionResult.Success -> {
-                                    selectedOption?.let {
-                                        store.dispatch(GlobalAction.UpdateSecurityOptions(it))
-                                    }
+                                    Analytics.send(Settings.CardSettings.SecurityModeChanged(paramValue))
+                                    store.dispatch(GlobalAction.UpdateSecurityOptions(selectedOption))
                                     store.dispatch(NavigationAction.PopBackTo())
                                     store.dispatch(DetailsAction.ManageSecurity.SaveChanges.Success)
                                 }
                                 is CompletionResult.Failure -> {
                                     (result.error as? TangemSdkError)?.let { error ->
-                                        store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                                            error = error,
-                                            action = AnalyticsAnOld.ActionToLog.ChangeSecOptions,
-                                            params = mapOf(
-                                                AnalyticsParamAnOld.NEW_SECURITY_OPTION to
-                                                    (selectedOption?.name ?: ""),
-                                            ),
-                                            card = store.state.detailsState.scanResponse?.card,
-                                        )
+                                        Analytics.send(Settings.CardSettings.SecurityModeChanged(paramValue, error))
                                     }
                                     store.dispatch(DetailsAction.ManageSecurity.SaveChanges.Failure)
                                 }
-                                else -> { /* no-op */
-                                }
+                                else -> Unit
                             }
                         }
                     }
@@ -190,22 +191,172 @@ class DetailsMiddleware {
                 is DetailsAction.ManageSecurity.ChangeAccessCode -> {
                     val card = store.state.detailsState.cardSettingsState?.card ?: return
                     scope.launch {
-                        tangemSdkManager.setAccessCode(card.cardId)
+                        when (tangemSdkManager.setAccessCode(card.cardId)) {
+                            is CompletionResult.Success -> Analytics.send(Settings.CardSettings.UserCodeChanged())
+                            is CompletionResult.Failure -> {}
+                        }
                     }
                 }
-                else -> { /* no-op */
-                }
+                else -> Unit
             }
         }
     }
 
     class ManagePrivacyMiddleware {
-        fun handle(action: DetailsAction.AppSettings) {
+        fun handle(state: DetailsState, action: DetailsAction.AppSettings) {
             when (action) {
                 is DetailsAction.AppSettings.SwitchPrivacySetting -> {
-//                    TODO()
+                    when (action.setting) {
+                        PrivacySetting.SaveWallets -> toggleSaveWallets(state, enable = action.enable)
+                        PrivacySetting.SaveAccessCode -> toggleSaveAccessCodes(state, enable = action.enable)
+                    }
+                }
+                is DetailsAction.AppSettings.CheckBiometricsStatus -> {
+                    checkBiometricsStatus(action.awaitStatusChange, state)
+                }
+                is DetailsAction.AppSettings.EnrollBiometrics -> {
+                    enrollBiometrics()
+                }
+                is DetailsAction.AppSettings.SwitchPrivacySetting.Success,
+                is DetailsAction.AppSettings.BiometricsStatusChanged,
+                -> Unit
+            }
+        }
+
+        /**
+         * @param awaitStatusChange If true then start a new coroutine and check the biometric status every 100
+         * milliseconds until it changes
+         * */
+        private fun checkBiometricsStatus(awaitStatusChange: Boolean, state: DetailsState) {
+            scope.launch {
+                if (awaitStatusChange) {
+                    while (state.needEnrollBiometrics == tangemSdkManager.needEnrollBiometrics) {
+                        delay(timeMillis = 100)
+                    }
+                }
+                store.dispatchOnMain(
+                    DetailsAction.AppSettings.BiometricsStatusChanged(
+                        needEnrollBiometrics = tangemSdkManager.needEnrollBiometrics,
+                    ),
+                )
+            }
+        }
+
+        private fun enrollBiometrics() {
+            Analytics.send(Settings.AppSettings.ButtonEnableBiometricAuthentication)
+            store.dispatchOnMain(NavigationAction.OpenBiometricsSettings)
+        }
+
+        private fun toggleSaveWallets(state: DetailsState, enable: Boolean) = scope.launch {
+            if (state.saveWallets == enable) return@launch
+            if (enable) {
+                saveCurrentWallet(state)
+            } else {
+                deleteSavedWallets()
+                if (state.saveAccessCodes) {
+                    deleteSavedAccessCodes()
                 }
             }
         }
+
+        private fun toggleSaveAccessCodes(state: DetailsState, enable: Boolean) = scope.launch {
+            if (state.saveAccessCodes == enable) return@launch
+            if (enable) {
+                saveAccessCodes(state)
+                if (!state.saveWallets) {
+                    saveCurrentWallet(state)
+                }
+            } else {
+                deleteSavedAccessCodes()
+            }
+        }
+
+        private suspend fun saveCurrentWallet(state: DetailsState) {
+            val scanResponse = state.scanResponse ?: return
+            val userWallet = UserWalletBuilder(scanResponse).build() ?: return
+
+            userWalletsListManager.save(userWallet)
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.On))
+
+                    preferencesStorage.shouldShowSaveUserWalletScreen = false
+                    preferencesStorage.shouldSaveUserWallets = true
+
+                    store.dispatchOnMain(
+                        DetailsAction.AppSettings.SwitchPrivacySetting.Success(
+                            setting = PrivacySetting.SaveWallets,
+                            enable = true,
+                        ),
+                    )
+
+                    store.onUserWalletSelected(userWallet)
+                }
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to save user wallet")
+                }
+        }
+
+        private suspend fun deleteSavedWallets() {
+            userWalletsListManager.clear()
+                .flatMap { walletStoresManager.clear() }
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveWalletSwitcherChanged(AnalyticsParam.OnOffState.Off))
+
+                    preferencesStorage.shouldSaveUserWallets = false
+
+                    store.dispatchOnMain(
+                        DetailsAction.AppSettings.SwitchPrivacySetting.Success(
+                            setting = PrivacySetting.SaveWallets,
+                            enable = false,
+                        ),
+                    )
+
+                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+                }
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to delete saved wallets")
+                }
+        }
+
+        private fun saveAccessCodes(state: DetailsState) {
+            Analytics.send(Settings.AppSettings.SaveAccessCodeSwitcherChanged(AnalyticsParam.OnOffState.On))
+
+            preferencesStorage.shouldSaveAccessCodes = true
+            tangemSdkManager.setAccessCodeRequestPolicy(
+                useBiometricsForAccessCode = state.scanResponse?.card?.isAccessCodeSet == true,
+            )
+
+            store.dispatchOnMain(
+                DetailsAction.AppSettings.SwitchPrivacySetting.Success(
+                    setting = PrivacySetting.SaveAccessCode,
+                    enable = true,
+                ),
+            )
+        }
+
+        private suspend fun deleteSavedAccessCodes() {
+            tangemSdkManager.clearSavedUserCodes()
+                .doOnSuccess {
+                    Analytics.send(Settings.AppSettings.SaveAccessCodeSwitcherChanged(AnalyticsParam.OnOffState.Off))
+
+                    preferencesStorage.shouldSaveAccessCodes = false
+                    tangemSdkManager.setAccessCodeRequestPolicy(
+                        useBiometricsForAccessCode = false,
+                    )
+
+                    tangemSdkManager.clearSavedUserCodes()
+                        .doOnSuccess {
+                            store.dispatchOnMain(
+                                DetailsAction.AppSettings.SwitchPrivacySetting.Success(
+                                    setting = PrivacySetting.SaveAccessCode,
+                                    enable = false,
+                                ),
+                            )
+                        }
+                }
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to delete saved access codes")
+                }
+        }
     }
-}
+}
\ No newline at end of file
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 ef4a0aa975..11b737097a 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
@@ -1,6 +1,6 @@
 package com.tangem.tap.features.details.redux
 
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.TapWorkarounds.isTangemNote
@@ -8,7 +8,9 @@ import com.tangem.domain.common.isTangemTwin
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.extensions.isWalletDataSupported
 import com.tangem.tap.domain.extensions.signedHashesCount
+import com.tangem.tap.preferencesStorage
 import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
 import org.rekotlin.Action
 import java.util.*
 
@@ -51,12 +53,15 @@ private fun handlePrepareScreen(
         scanResponse = action.scanResponse,
         wallets = action.wallets,
         cardTermsOfUseUrl = action.cardTou.getUrl(action.scanResponse.card),
-        createBackupAllowed = action.scanResponse.card.backupStatus == Card.BackupStatus.NoBackup,
+        createBackupAllowed = action.scanResponse.card.backupStatus == CardDTO.BackupStatus.NoBackup,
         appCurrency = store.state.globalState.appCurrency,
+        isBiometricsAvailable = tangemSdkManager.canUseBiometry,
+        saveWallets = preferencesStorage.shouldSaveUserWallets,
+        saveAccessCodes = preferencesStorage.shouldSaveAccessCodes,
     )
 }
 
-private fun handlePrepareCardSettingsScreen(card: Card, state: DetailsState): DetailsState {
+private fun handlePrepareCardSettingsScreen(card: CardDTO, state: DetailsState): DetailsState {
     val cardSettingsState = CardSettingsState(
         cardInfo = card.toCardInfo(),
         manageSecurityState = prepareSecurityOptions(card),
@@ -66,14 +71,16 @@ private fun handlePrepareCardSettingsScreen(card: Card, state: DetailsState): De
     return state.copy(cardSettingsState = cardSettingsState)
 }
 
-private fun prepareSecurityOptions(card: Card): ManageSecurityState {
+private fun prepareSecurityOptions(card: CardDTO): ManageSecurityState {
     val securityOption = when {
         card.isAccessCodeSet -> {
             SecurityOption.AccessCode
         }
+
         card.isPasscodeSet == true -> {
             SecurityOption.PassCode
         }
+
         else -> {
             SecurityOption.LongTap
         }
@@ -94,7 +101,7 @@ private fun prepareSecurityOptions(card: Card): ManageSecurityState {
     )
 }
 
-private fun isResetToFactoryAllowedByCard(card: Card): Boolean {
+private fun isResetToFactoryAllowedByCard(card: CardDTO): Boolean {
     val notAllowedByAnyWallet = card.wallets.any { it.settings.isPermanent }
     val notAllowedByCard = notAllowedByAnyWallet ||
         (card.isWalletDataSupported && (!card.isTangemNote && !card.settings.isBackupAllowed)) ||
@@ -114,7 +121,8 @@ private fun handleEraseWallet(
 }
 
 private fun handleSecurityAction(
-    action: DetailsAction.ManageSecurity, state: DetailsState,
+    action: DetailsAction.ManageSecurity,
+    state: DetailsState,
 ): DetailsState {
     return when (action) {
         is DetailsAction.ManageSecurity.SelectOption -> {
@@ -144,20 +152,27 @@ private fun handleSecurityAction(
 }
 
 private fun handlePrivacyAction(
-    action: DetailsAction.AppSettings, state: DetailsState,
+    action: DetailsAction.AppSettings,
+    state: DetailsState,
 ): DetailsState {
     return when (action) {
-        is DetailsAction.AppSettings.SwitchPrivacySetting -> {
-            when (action.setting) {
-                PrivacySetting.SaveWallets -> state.copy(saveWallets = action.enable)
-                PrivacySetting.SaveAccessCode -> state.copy(saveAccessCodes = action.enable)
-            }
+        is DetailsAction.AppSettings.SwitchPrivacySetting.Success -> when (action.setting) {
+            PrivacySetting.SaveWallets -> state.copy(saveWallets = action.enable)
+            PrivacySetting.SaveAccessCode -> state.copy(saveAccessCodes = action.enable)
         }
+        is DetailsAction.AppSettings.BiometricsStatusChanged -> state.copy(
+            needEnrollBiometrics = action.needEnrollBiometrics,
+        )
+        is DetailsAction.AppSettings.SwitchPrivacySetting,
+        is DetailsAction.AppSettings.EnrollBiometrics,
+        is DetailsAction.AppSettings.CheckBiometricsStatus,
+        -> state
     }
 }
 
 private fun prepareAllowedSecurityOptions(
-    card: Card?, currentSecurityOption: SecurityOption?,
+    card: CardDTO?,
+    currentSecurityOption: SecurityOption?,
 ): EnumSet<SecurityOption> {
     val allowedSecurityOptions = EnumSet.of(SecurityOption.LongTap)
 
@@ -173,7 +188,7 @@ private fun prepareAllowedSecurityOptions(
     return allowedSecurityOptions
 }
 
-private fun Card.toCardInfo(): CardInfo {
+private fun CardDTO.toCardInfo(): CardInfo {
     val cardId = this.cardId.chunked(4).joinToString(separator = " ")
     val issuer = this.issuer.name
     val signedHashes = this.signedHashesCount()
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 8e02856097..3cb211b7c5 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
@@ -2,7 +2,7 @@ package com.tangem.tap.features.details.redux
 
 import android.net.Uri
 import com.tangem.blockchain.common.Wallet
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.entities.Button
 import com.tangem.tap.common.entities.FiatCurrency
@@ -20,13 +20,15 @@ data class DetailsState(
     val privacyPolicyUrl: String? = null,
     val createBackupAllowed: Boolean = false,
     val appCurrency: FiatCurrency = FiatCurrency.Default,
-    val saveWallets: Boolean = true,
-    val saveAccessCodes: Boolean = true,
+    val saveWallets: Boolean = false,
+    val saveAccessCodes: Boolean = false,
+    val isBiometricsAvailable: Boolean = false,
+    val needEnrollBiometrics: Boolean = false,
 ) : StateType {
 
     // if you do not delegate - the application crashes on startup,
     // because twinCardsState has not been created yet
-    val twinCardsState: TwinCardsState by ReadOnlyProperty<Any, TwinCardsState> { thisRef, property ->
+    val twinCardsState: TwinCardsState by ReadOnlyProperty<Any, TwinCardsState> { _, _ ->
         store.state.twinCardsState
     }
 
@@ -42,7 +44,7 @@ data class CardInfo(
 
 data class CardSettingsState(
     val cardInfo: CardInfo,
-    val card: Card,
+    val card: CardDTO,
     val manageSecurityState: ManageSecurityState?,
     val resetCardAllowed: Boolean,
     val resetConfirmed: Boolean = false,
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
index ed2c68c8d6..7818f367b3 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt
@@ -3,8 +3,8 @@ package com.tangem.tap.features.details.redux.walletconnect
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.card.Card
 import com.tangem.common.extensions.guard
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.extensions.withMainContext
@@ -240,7 +240,7 @@ class WalletConnectMiddleware {
         handleScanResponse(scanResponse = scanResponse, session = session, blockchain = blockchain)
     }
 
-    private fun getAvailableBlockchains(card: Card, walletState: WalletState): List<Blockchain> {
+    private fun getAvailableBlockchains(card: CardDTO, walletState: WalletState): List<Blockchain> {
         return walletState.currencies.filter {
             it.isBlockchain() && !it.isCustomCurrency(card.derivationStyle) && it.blockchain.isEvm()
         }.map { it.blockchain }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
index bea7b87171..25a6cd0902 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
@@ -25,8 +25,9 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.slide_right)
+        enterTransition = inflater.inflateTransition(R.transition.fade)
         exitTransition = inflater.inflateTransition(R.transition.fade)
+        viewModel.checkBiometricsStatus()
     }
 
     override fun onCreateView(
@@ -37,7 +38,7 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     AppSettingsScreen(
                         state = screenState.value,
                         onBackPressed = {
@@ -59,6 +60,11 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.refreshBiometricsStatus()
+    }
+
     override fun onStop() {
         super.onStop()
         store.unsubscribe(this)
@@ -68,4 +74,4 @@ class AppSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         if (activity == null || view == null) return
         screenState.value = viewModel.updateState(state)
     }
-}
+}
\ 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 34018707cf..b072be7b74 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
@@ -1,33 +1,31 @@
 package com.tangem.tap.features.details.ui.appsettings
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 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.size
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.material.AlertDialog
-import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.TangemTypography
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerH32
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.components.SpacerW32
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.features.details.redux.PrivacySetting
+import com.tangem.tap.features.details.ui.appsettings.components.EnrollBiometricsCard
+import com.tangem.tap.features.details.ui.appsettings.components.SettingsAlertDialog
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.tap.features.details.ui.common.TangemSwitch
 import com.tangem.wallet.R
@@ -60,7 +58,6 @@ private fun AppSettings(
             element = it,
             onDialogStateChange = onDialogStateChange,
             onSettingToggled = state.onSettingToggled,
-            modifier = modifier,
         )
     }
 
@@ -68,28 +65,36 @@ private fun AppSettings(
         modifier = modifier
             .fillMaxSize(),
     ) {
+        if (state.showEnrollBiometricsCard) {
+            EnrollBiometricsCard(
+                modifier = Modifier
+                    .padding(horizontal = TangemTheme.dimens.spacing8)
+                    .fillMaxWidth(),
+                onClick = state.onEnrollBiometrics,
+            )
+            SpacerH24()
+        }
+
         AppSettingsElement(
             state = state,
             setting = PrivacySetting.SaveWallets,
             onDialogStateChange = onDialogStateChange,
-            modifier = modifier,
         )
-        Spacer(modifier = Modifier.size(32.dp))
+        SpacerH32()
         AppSettingsElement(
             state = state,
             setting = PrivacySetting.SaveAccessCode,
             onDialogStateChange = onDialogStateChange,
-            modifier = modifier,
         )
     }
 }
 
 @Composable
 private fun AppSettingsElement(
+    modifier: Modifier = Modifier,
     state: AppSettingsScreenState,
     setting: PrivacySetting,
     onDialogStateChange: (PrivacySetting?) -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     val titleRes = when (setting) {
         PrivacySetting.SaveWallets -> R.string.app_settings_saved_wallet
@@ -101,48 +106,63 @@ private fun AppSettingsElement(
     }
     val checked = state.settings[setting] ?: false
 
+    val titleTextColor by rememberUpdatedState(
+        newValue = if (state.isTogglesEnabled) {
+            TangemTheme.colors.text.primary1
+        } else {
+            TangemTheme.colors.text.secondary
+        },
+    )
+    val descriptionTextColor by rememberUpdatedState(
+        newValue = if (state.isTogglesEnabled) {
+            TangemTheme.colors.text.secondary
+        } else {
+            TangemTheme.colors.text.tertiary
+        },
+    )
+
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .padding(start = 20.dp),
+            .padding(horizontal = TangemTheme.dimens.spacing20),
         verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
     ) {
         Column(
+            modifier = Modifier.weight(weight = .9f),
             verticalArrangement = Arrangement.Center,
-            modifier = modifier
-                .weight(0.6f)
-                .padding(end = 4.dp),
         ) {
             Text(
                 text = stringResource(id = titleRes),
-                style = TangemTypography.subtitle1,
-                color = colorResource(id = R.color.text_primary_1),
+                style = TangemTheme.typography.subtitle1,
+                color = titleTextColor,
             )
-            Spacer(modifier = Modifier.size(4.dp))
+            SpacerH4()
             Text(
                 text = stringResource(id = subtitleRes),
-                style = TangemTypography.body2,
-                color = colorResource(id = R.color.text_secondary),
+                style = TangemTheme.typography.body2,
+                color = descriptionTextColor,
             )
         }
+        SpacerW32()
         TangemSwitch(
             checked = checked,
-            onCheckedChange = {
+            enabled = state.isTogglesEnabled,
+            onCheckedChange = { isChecked ->
                 onCheckedChange(
                     element = setting,
-                    enabled = it,
+                    enabled = isChecked,
                     onSettingToggled = state.onSettingToggled,
                     onDialogStateChange = onDialogStateChange,
                 )
             },
-            modifier = modifier
-                .padding(20.dp),
         )
     }
 }
 
 private fun onCheckedChange(
-    element: PrivacySetting, enabled: Boolean,
+    element: PrivacySetting,
+    enabled: Boolean,
     onSettingToggled: (PrivacySetting, Boolean) -> Unit,
     onDialogStateChange: (PrivacySetting?) -> Unit,
 ) {
@@ -150,81 +170,88 @@ private fun onCheckedChange(
     if (!enabled) {
         onDialogStateChange(element)
     } else {
-        onSettingToggled(element, enabled)
+        onSettingToggled(element, true)
     }
 }
 
+// region Preview
 @Composable
-private fun SettingsAlertDialog(
-    element: PrivacySetting,
-    onDialogStateChange: (PrivacySetting?) -> Unit,
-    onSettingToggled: (PrivacySetting, Boolean) -> Unit,
+private fun AppSettingsScreenSample(
     modifier: Modifier = Modifier,
 ) {
-    val text = when (element) {
-        PrivacySetting.SaveWallets -> R.string.app_settings_off_saved_wallet_alert_message
-        PrivacySetting.SaveAccessCode -> R.string.app_settings_off_saved_access_code_alert_message
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        AppSettingsScreen(
+            state = AppSettingsScreenState(
+                settings = mapOf(
+                    PrivacySetting.SaveWallets to true,
+                    PrivacySetting.SaveAccessCode to false,
+                ),
+                showEnrollBiometricsCard = false,
+                isTogglesEnabled = true,
+                onSettingToggled = { _, _ -> },
+                onEnrollBiometrics = {},
+            ),
+            onBackPressed = { },
+        )
     }
-    AlertDialog(
-        onDismissRequest = { onDialogStateChange(null) },
-        confirmButton = {
-            TextButton(
-                onClick = {
-                    onDialogStateChange(null)
-                },
-            ) {
-                Text(
-                    text = stringResource(id = R.string.common_cancel),
-                    color = colorResource(id = R.color.text_secondary),
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Medium,
-                )
-            }
-        },
-        dismissButton = {
-            TextButton(
-                onClick = {
-                    onDialogStateChange(null)
-                    onSettingToggled(element, false)
-                },
-                modifier = modifier.padding(bottom = 14.dp),
-            ) {
-                Text(
-                    text = stringResource(id = R.string.common_delete),
-                    color = colorResource(id = R.color.text_warning),
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Medium,
-                )
-            }
-        },
-        title = {
-            Text(
-                text = stringResource(id = R.string.common_attention),
-                color = colorResource(id = R.color.text_primary_1),
-            )
-        },
-        text = {
-            Text(
-                text = stringResource(id = text),
-                color = colorResource(id = R.color.text_secondary),
-            )
-        },
-        shape = MaterialTheme.shapes.medium.copy(all = CornerSize(size = 28.dp)),
-        modifier = modifier.padding(vertical = 34.dp, horizontal = 24.dp),
-    )
 }
 
-@Preview
+@Preview(showBackground = true, widthDp = 360)
 @Composable
-fun AppSettingsScreenPreview() {
-    AppSettingsScreen(
-        state = AppSettingsScreenState(
-            settings = mapOf(
-                PrivacySetting.SaveWallets to true,
-                PrivacySetting.SaveAccessCode to false,
+private fun AppSettingsScreenPreview_Light() {
+    TangemTheme {
+        AppSettingsScreenSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun AppSettingsScreenPreview_Dark() {
+    TangemTheme(isDark = true) {
+        AppSettingsScreenSample()
+    }
+}
+
+@Composable
+private fun AppSettingsScreen_EnrollBiometrics_Sample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        AppSettingsScreen(
+            state = AppSettingsScreenState(
+                settings = mapOf(
+                    PrivacySetting.SaveWallets to true,
+                    PrivacySetting.SaveAccessCode to false,
+                ),
+                showEnrollBiometricsCard = true,
+                isTogglesEnabled = false,
+                onSettingToggled = { _, _ -> },
+                onEnrollBiometrics = {},
             ),
-            onSettingToggled = { _, _ -> },
-        ),
-        onBackPressed = { },
-    )
-}
\ No newline at end of file
+            onBackPressed = { },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun AppSettingsScreen_EnrollBiometrics_Preview_Light() {
+    TangemTheme {
+        AppSettingsScreen_EnrollBiometrics_Sample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun AppSettingsScreen_EnrollBiometrics_Preview_Dark() {
+    TangemTheme(isDark = true) {
+        AppSettingsScreen_EnrollBiometrics_Sample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
index 043423b3d3..615a0a167d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsScreenState.kt
@@ -3,8 +3,9 @@ package com.tangem.tap.features.details.ui.appsettings
 import com.tangem.tap.features.details.redux.PrivacySetting
 
 data class AppSettingsScreenState(
-    val settings: Map<PrivacySetting, Boolean>,
-    val onSettingToggled: (PrivacySetting, Boolean) -> Unit,
-)
-
-
+    val settings: Map<PrivacySetting, Boolean> = emptyMap(),
+    val showEnrollBiometricsCard: Boolean = false,
+    val isTogglesEnabled: Boolean = true,
+    val onSettingToggled: (PrivacySetting, Boolean) -> Unit = { _, _ -> /* no-op */ },
+    val onEnrollBiometrics: () -> Unit = { /* no-op */ },
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
index 65dd12eaeb..802435f578 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/AppSettingsViewModel.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.details.ui.appsettings
 
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
@@ -11,17 +12,33 @@ import org.rekotlin.Store
 class AppSettingsViewModel(private val store: Store<AppState>) {
     private val _uiState = MutableStateFlow(updateState(store.state.detailsState))
     val uiState: StateFlow<AppSettingsScreenState> = _uiState
+
     fun updateState(state: DetailsState): AppSettingsScreenState {
         return AppSettingsScreenState(
             settings = mapOf(
                 PrivacySetting.SaveWallets to state.saveWallets,
                 PrivacySetting.SaveAccessCode to state.saveAccessCodes,
             ),
-            onSettingToggled = { privacySetting, enabled -> onSettingsToggled(privacySetting, enabled) },
+            showEnrollBiometricsCard = state.needEnrollBiometrics,
+            isTogglesEnabled = !state.needEnrollBiometrics,
+            onSettingToggled = { privacySetting, enabled ->
+                onSettingsToggled(privacySetting, enabled)
+            },
+            onEnrollBiometrics = {
+                store.dispatchOnMain(DetailsAction.AppSettings.EnrollBiometrics)
+            },
         )
     }
 
     private fun onSettingsToggled(setting: PrivacySetting, enable: Boolean) {
         store.dispatch(DetailsAction.AppSettings.SwitchPrivacySetting(enable = enable, setting = setting))
     }
+
+    fun checkBiometricsStatus() {
+        store.dispatch(DetailsAction.AppSettings.CheckBiometricsStatus(awaitStatusChange = false))
+    }
+
+    fun refreshBiometricsStatus() {
+        store.dispatch(DetailsAction.AppSettings.CheckBiometricsStatus(awaitStatusChange = true))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt
new file mode 100644
index 0000000000..fddc2b0e7b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/EnrollBiometricsCard.kt
@@ -0,0 +1,92 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+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.res.TangemTheme
+import com.tangem.wallet.R
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+internal fun EnrollBiometricsCard(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+) {
+    Surface(
+        modifier = modifier,
+        color = TangemTheme.colors.background.primary,
+        shape = TangemTheme.shapes.roundedCornersLarge,
+        onClick = onClick,
+    ) {
+        Row(
+            modifier = Modifier.padding(all = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceEvenly,
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_alert_circle_24),
+                tint = TangemTheme.colors.icon.attention,
+                contentDescription = null,
+            )
+            SpacerW16()
+            Column {
+                Text(
+                    text = stringResource(id = R.string.app_settings_enable_biometrics_title),
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.primary1,
+                )
+                SpacerH4()
+                Text(
+                    text = stringResource(id = R.string.app_settings_enable_biometrics_description),
+                    style = TangemTheme.typography.body2,
+                    color = TangemTheme.colors.text.secondary,
+                )
+            }
+        }
+    }
+}
+
+// region Preview
+@Composable
+private fun EnrollBiometricsCardSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.secondary),
+    ) {
+        EnrollBiometricsCard(onClick = {})
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun EnrollBiometricsCardPreview_Light() {
+    TangemTheme {
+        EnrollBiometricsCardSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun EnrollBiometricsCardPreview_Dark() {
+    TangemTheme(isDark = true) {
+        EnrollBiometricsCardSample()
+    }
+}
+// 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
new file mode 100644
index 0000000000..65514a2f86
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/appsettings/components/SettingsAlertDialog.kt
@@ -0,0 +1,101 @@
+package com.tangem.tap.features.details.ui.appsettings.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.TextButton
+import com.tangem.core.ui.components.WarningTextButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.redux.PrivacySetting
+import com.tangem.wallet.R
+
+@Composable
+internal fun SettingsAlertDialog(
+    element: PrivacySetting,
+    onDialogStateChange: (PrivacySetting?) -> Unit,
+    onSettingToggled: (PrivacySetting, Boolean) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val text = when (element) {
+        PrivacySetting.SaveWallets -> R.string.app_settings_off_saved_wallet_alert_message
+        PrivacySetting.SaveAccessCode -> R.string.app_settings_off_saved_access_code_alert_message
+    }
+
+    AlertDialog(
+        onDismissRequest = { onDialogStateChange(null) },
+        confirmButton = {
+            TextButton(
+                modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing12),
+                text = stringResource(id = R.string.common_cancel),
+                onClick = {
+                    onDialogStateChange(null)
+                },
+            )
+        },
+        dismissButton = {
+            WarningTextButton(
+                text = stringResource(id = R.string.common_delete),
+                onClick = {
+                    onDialogStateChange(null)
+                    onSettingToggled(element, false)
+                },
+            )
+        },
+        title = {
+            Text(
+                text = stringResource(id = R.string.common_attention),
+                color = TangemTheme.colors.text.primary1,
+                style = TangemTheme.typography.h2,
+            )
+        },
+        text = {
+            Text(
+                text = stringResource(id = text),
+                color = TangemTheme.colors.text.secondary,
+                style = TangemTheme.typography.body2,
+            )
+        },
+        shape = TangemTheme.shapes.roundedCornersLarge,
+        modifier = modifier,
+    )
+}
+
+// region Preview
+@Composable
+private fun SettingsAlertDialogSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        SettingsAlertDialog(
+            element = PrivacySetting.SaveAccessCode,
+            onDialogStateChange = {},
+            onSettingToggled = { _, _ -> },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsAlertDialogPreview_Light() {
+    TangemTheme {
+        SettingsAlertDialogSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SettingsAlertDialogPreview_Dark() {
+    TangemTheme(isDark = true) {
+        SettingsAlertDialogSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
index a679020e84..a42f4a1d38 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.details.redux.DetailsState
@@ -39,7 +39,7 @@ class CardSettingsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     CardSettingsScreen(
                         state = screenState.value,
                         onBackPressed = {
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 2de4f118fb..5a4d1bdc53 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
@@ -23,6 +23,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.compose.TangemTypography
 import com.tangem.tap.features.details.ui.common.DetailsMainButton
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
@@ -34,14 +35,18 @@ fun CardSettingsScreen(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val needReadCard = state.cardDetails == null
+
     SettingsScreensScaffold(
-        content =
-        if (state.cardDetails == null) {
-            { CardSettingsReadCard(state.onScanCardClick, modifier = modifier) }
-        } else {
-            { CardSettings(state = state, modifier = modifier) }
+        content = {
+            if (needReadCard) {
+                CardSettingsReadCard(state.onScanCardClick, modifier = modifier)
+            } else {
+                CardSettings(state = state, modifier = modifier)
+            }
         },
         titleRes = R.string.card_settings_title,
+        backgroundColor = TangemTheme.colors.background.secondary,
         onBackClick = onBackPressed,
     )
 }
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 e7354df5c5..927780750e 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
@@ -15,18 +15,18 @@ data class CardSettingsScreenState(
 )
 
 sealed class CardInfo(
-    val titleRes: TextReference, val subtitle: TextReference, val clickable: Boolean = false,
+    val titleRes: TextReference,
+    val subtitle: TextReference,
+    val clickable: Boolean = false,
 ) {
     class CardId(subtitle: String) : CardInfo(
         titleRes = TextReference.Res(R.string.details_row_title_cid),
-        subtitle = TextReference
-            .Str(subtitle),
+        subtitle = TextReference.Str(subtitle),
     )
 
     class Issuer(subtitle: String) : CardInfo(
         titleRes = TextReference.Res(R.string.details_row_title_issuer),
-        subtitle = TextReference
-            .Str(subtitle),
+        subtitle = TextReference.Str(subtitle),
     )
 
     class SignedHashes(hashes: String) : CardInfo(
@@ -34,10 +34,7 @@ sealed class CardInfo(
         subtitle = TextReference.Res(R.string.details_row_subtitle_signed_hashes_format, hashes),
     )
 
-    class SecurityMode(
-        securityOption: SecurityOption,
-        clickable: Boolean,
-    ) : CardInfo(
+    class SecurityMode(securityOption: SecurityOption, clickable: Boolean) : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_security_mode),
         subtitle = TextReference.Res(securityOption.toTitleRes()),
         clickable = clickable,
@@ -49,9 +46,9 @@ sealed class CardInfo(
         clickable = true,
     )
 
-    object ResetToFactorySettings : CardInfo(
+    class ResetToFactorySettings(subtitle: TextReference.Res) : CardInfo(
         titleRes = TextReference.Res(R.string.card_settings_reset_card_to_factory),
-        subtitle = TextReference.Res(R.string.card_settings_reset_card_to_factory_footer),
+        subtitle = subtitle,
         clickable = true,
     )
 }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
index b238ffe8f2..ce9da7f8b0 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/CardSettingsViewModel.kt
@@ -2,9 +2,13 @@ package com.tangem.tap.features.details.ui.cardsettings
 
 import com.tangem.domain.common.TapWorkarounds.isTangemTwins
 import com.tangem.domain.common.getTwinCardIdForUser
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.details.redux.CardSettingsState
 import com.tangem.tap.features.details.redux.DetailsAction
+import com.tangem.wallet.R
 import org.rekotlin.Store
 
 class CardSettingsViewModel(private val store: Store<AppState>) {
@@ -43,7 +47,17 @@ class CardSettingsViewModel(private val store: Store<AppState>) {
                 cardDetails.add(CardInfo.ChangeAccessCode)
             }
             if (state.resetCardAllowed) {
-                cardDetails.add(CardInfo.ResetToFactorySettings)
+                cardDetails.add(
+                    CardInfo.ResetToFactorySettings(
+                        subtitle = TextReference.Res(
+                            if (state.card.backupStatus?.isActive == true) {
+                                R.string.reset_card_with_backup_to_factory_message
+                            } else {
+                                R.string.reset_card_without_backup_to_factory_message
+                            },
+                        ),
+                    ),
+                )
             }
 
             CardSettingsScreenState(
@@ -59,12 +73,15 @@ class CardSettingsViewModel(private val store: Store<AppState>) {
     private fun handleClickingItem(item: CardInfo) {
         when (item) {
             is CardInfo.ChangeAccessCode -> {
+                Analytics.send(Settings.CardSettings.ButtonChangeUserCode(AnalyticsParam.UserCode.AccessCode))
                 store.dispatch(DetailsAction.ManageSecurity.ChangeAccessCode)
             }
             is CardInfo.ResetToFactorySettings -> {
+                Analytics.send(Settings.CardSettings.ButtonFactoryReset())
                 store.dispatch(DetailsAction.ResetToFactory.Start)
             }
             is CardInfo.SecurityMode -> {
+                Analytics.send(Settings.CardSettings.ButtonChangeSecurityMode())
                 store.dispatch(DetailsAction.ManageSecurity.OpenSecurity)
             }
             else -> {}
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 d8e6bf1b11..dd6f290ebe 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
@@ -25,18 +25,19 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.compose.TangemTypography
 import com.tangem.wallet.R
 
 @Composable
 fun SettingsScreensScaffold(
+    modifier: Modifier = Modifier,
     content: @Composable () -> Unit,
     background: @Composable (() -> Unit)? = null,
     fab: @Composable (() -> Unit)? = null,
-    backgroundColor: Color = colorResource(id = R.color.background_primary),
+    backgroundColor: Color = TangemTheme.colors.background.secondary,
     titleRes: Int? = null,
     onBackClick: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     BackHandler(true, onBackClick)
 
@@ -58,9 +59,13 @@ fun SettingsScreensScaffold(
                 Column(modifier = modifier.fillMaxWidth()) {
                     Text(
                         text = stringResource(id = titleRes),
-                        modifier = modifier.padding(start = 20.dp, end = 20.dp, bottom = 52.dp),
-                        style = TangemTypography.headline1,
-                        color = colorResource(id = R.color.text_primary_1),
+                        modifier = modifier.padding(
+                            start = TangemTheme.dimens.spacing20,
+                            end = TangemTheme.dimens.spacing20,
+                            bottom = TangemTheme.dimens.spacing54,
+                        ),
+                        style = TangemTheme.typography.h1,
+                        color = TangemTheme.colors.text.primary1,
                     )
                     content()
                 }
@@ -86,18 +91,20 @@ fun ScreenTitle(
 
 @Composable
 fun EmptyTopBarWithNavigation(
-    onBackClick: () -> Unit,
-    backgroundColor: Color = colorResource(id = R.color.background_primary),
     modifier: Modifier = Modifier,
+    onBackClick: () -> Unit,
+    backgroundColor: Color = TangemTheme.colors.background.primary,
 ) {
     TopAppBar(
+        modifier = modifier,
         title = { },
         navigationIcon =
         {
             IconButton(onClick = onBackClick) {
                 Icon(
-                    painterResource(id = R.drawable.ic_back), "",
-                    tint = colorResource(id = R.color.icon_primary_1),
+                    painter = painterResource(id = R.drawable.ic_back),
+                    contentDescription = null,
+                    tint = TangemTheme.colors.icon.primary1,
                 )
             }
         },
@@ -108,10 +115,10 @@ fun EmptyTopBarWithNavigation(
 
 @Composable
 fun DetailsMainButton(
+    modifier: Modifier = Modifier,
     title: String,
     enabled: Boolean = true,
     onClick: (() -> Unit),
-    modifier: Modifier = Modifier,
 ) {
     Button(
         onClick = onClick,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt b/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
index bf5268bf6f..d511348af9 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/common/TangemSwitch.kt
@@ -33,10 +33,11 @@ import com.tangem.wallet.R
 @Composable
 fun TangemSwitch(
     modifier: Modifier = Modifier,
-    enabledColor: Color = colorResource(id = R.color.control_checked),
-    disabledColor: Color = colorResource(id = R.color.icon_informative),
+    checkedColor: Color = colorResource(id = R.color.control_checked),
+    uncheckedColor: Color = colorResource(id = R.color.icon_informative),
     size: Dp = 48.dp,
     checked: Boolean = false,
+    enabled: Boolean = true,
     onCheckedChange: (Boolean) -> Unit,
 ) {
     val transition = updateTransition(checked, label = "SwitchState")
@@ -45,8 +46,8 @@ fun TangemSwitch(
             tween(durationMillis = 200, easing = FastOutLinearInEasing)
         },
         label = "",
-    ) { enabled ->
-        if (enabled) enabledColor else disabledColor
+    ) { isChecked ->
+        if (isChecked) checkedColor else uncheckedColor
     }
     val interactionSource = remember { MutableInteractionSource() }
 
@@ -55,6 +56,7 @@ fun TangemSwitch(
             .clickable(
                 interactionSource = interactionSource,
                 indication = null,
+                enabled = enabled,
             ) {
                 onCheckedChange(!checked)
             }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
index 6674371319..4cecec1a8f 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsFragment.kt
@@ -9,7 +9,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
@@ -24,7 +26,7 @@ class DetailsFragment : Fragment(), StoreSubscriber<DetailsState> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        Analytics.send(Settings.ScreenOpened())
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(android.R.transition.fade)
         exitTransition = inflater.inflateTransition(android.R.transition.fade)
@@ -38,7 +40,7 @@ class DetailsFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     DetailsScreen(
                         state = detailsScreenState.value,
                         onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
index e0b4f1f186..1346fa4f24 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreen.kt
@@ -25,6 +25,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.tap.common.compose.TangemTypography
 import com.tangem.tap.features.details.ui.common.ScreenTitle
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
@@ -36,6 +38,10 @@ fun DetailsScreen(
     onBackPressed: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    SystemBarsEffect {
+        setSystemBarsColor(color = TangemColorPalette.Light1)
+    }
+
     SettingsScreensScaffold(
         content = { Content(state = state, modifier = modifier) },
         onBackClick = onBackPressed,
@@ -162,8 +168,8 @@ fun DetailsItem(
 
 @Composable
 fun TangemSocialAccounts(
-    links: List<TangemLink>,
-    onSocialNetworkClick: (String) -> Unit,
+    links: List<SocialNetworkLink>,
+    onSocialNetworkClick: (SocialNetworkLink) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyRow(
@@ -171,11 +177,11 @@ fun TangemSocialAccounts(
     ) {
         items(links) {
             Icon(
-                painter = painterResource(id = it.iconRes),
+                painter = painterResource(id = it.network.iconRes),
                 contentDescription = "",
                 modifier = modifier
                     .padding(8.dp)
-                    .clickable { onSocialNetworkClick(it.url) },
+                    .clickable { onSocialNetworkClick(it) },
                 tint = colorResource(id = R.color.icon_informative),
             )
         }
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
index 1962a53261..e55525ae1d 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt
@@ -1,57 +1,71 @@
 package com.tangem.tap.features.details.ui.details
 
+import androidx.compose.runtime.Immutable
 import com.tangem.wallet.R
 
+@Immutable
 data class DetailsScreenState(
     val elements: List<SettingsElement>,
-    val tangemLinks: List<TangemLink>,
+    val tangemLinks: List<SocialNetworkLink>,
     val tangemVersion: String,
     val appCurrency: String,
     val onItemsClick: (SettingsElement) -> Unit,
-    val onSocialNetworkClick: (String) -> Unit,
+    val onSocialNetworkClick: (SocialNetworkLink) -> Unit,
 ) {
     val appNameRes: Int = R.string.app_name
 }
 
+@Immutable
 enum class SettingsElement(
     val iconRes: Int,
     val titleRes: Int,
 ) {
     WalletConnect(R.drawable.ic_walletconnect, R.string.wallet_connect_title),
-    Chat(R.drawable.ic_chat, R.string.details_ask_a_question),
+    Chat(R.drawable.ic_chat, R.string.details_chat),
     SendFeedback(R.drawable.ic_comment, R.string.details_row_title_send_feedback),
+    // ReferralProgram(R.drawable.ic_add_friends, R.string.details_referral_title),
     CardSettings(R.drawable.ic_card_settings, R.string.card_settings_title),
     AppCurrency(R.drawable.ic_currency, R.string.details_row_title_currency),
     AppSettings(R.drawable.ic_settings, R.string.app_settings_title),
     LinkMoreCards(R.drawable.ic_more_cards, R.string.details_row_title_create_backup),
     TermsOfService(R.drawable.ic_text, R.string.disclaimer_title), // General Terms of Service of the App
     TermsOfUse(R.drawable.ic_text, R.string.details_row_title_card_tou), // Terms of Use for S2C cards only
-    PrivacyPolicy(R.drawable.ic_lock, R.string.details_row_privacy_policy),
-    ;
+    PrivacyPolicy(R.drawable.ic_lock_24, R.string.details_row_privacy_policy);
 }
 
-data class TangemLink(
-    val iconRes: Int,
+@Immutable
+data class SocialNetworkLink(
+    val network: SocialNetwork,
     val url: String,
 )
 
+sealed class SocialNetwork(val id: String, val iconRes: Int) {
+    object Telegram : SocialNetwork("Telegram", R.drawable.ic_telegram)
+    object Twitter : SocialNetwork("Twitter", R.drawable.ic_twitter)
+    object Facebook : SocialNetwork("Facebook", R.drawable.ic_facebook)
+    object Instagram : SocialNetwork("Instagram", R.drawable.ic_instagram)
+    object GitHub : SocialNetwork("GitHub", R.drawable.ic_github)
+    object Youtube : SocialNetwork("Youtube", R.drawable.ic_youtube)
+    object LinkedIn : SocialNetwork("LinkedIn", R.drawable.ic_linkedin)
+}
+
 object TangemSocialAccounts {
-    val accountsEn: List<TangemLink> = listOf(
-        TangemLink(R.drawable.ic_telegram, "https://t.me/TangemCards"),
-        TangemLink(R.drawable.ic_twitter, "https://twitter.com/tangem"),
-        TangemLink(R.drawable.ic_facebook, "https://m.facebook.com/TangemCards/"),
-        TangemLink(R.drawable.ic_instagram, "https://instagram.com/tangemcards"),
-        TangemLink(R.drawable.ic_github, "https://github.com/tangem"),
-        TangemLink(R.drawable.ic_youtube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
-        TangemLink(R.drawable.ic_linkedin, "https://www.linkedin.com/company/tangem"),
+    val accountsEn: List<SocialNetworkLink> = listOf(
+        SocialNetworkLink(SocialNetwork.Telegram, "https://t.me/TangemCards"),
+        SocialNetworkLink(SocialNetwork.Twitter, "https://twitter.com/tangem"),
+        SocialNetworkLink(SocialNetwork.Facebook, "https://m.facebook.com/TangemCards/"),
+        SocialNetworkLink(SocialNetwork.Instagram, "https://instagram.com/tangemcards"),
+        SocialNetworkLink(SocialNetwork.GitHub, "https://github.com/tangem"),
+        SocialNetworkLink(SocialNetwork.Youtube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
+        SocialNetworkLink(SocialNetwork.LinkedIn, "https://www.linkedin.com/company/tangem"),
     )
-    val accountsRu: List<TangemLink> = listOf(
-        TangemLink(R.drawable.ic_telegram, "https://t.me/tangem_ru"),
-        TangemLink(R.drawable.ic_twitter, "https://twitter.com/tangem"),
-        TangemLink(R.drawable.ic_facebook, "https://m.facebook.com/TangemCards/"),
-        TangemLink(R.drawable.ic_instagram, "https://instagram.com/tangemcards"),
-        TangemLink(R.drawable.ic_github, "https://github.com/tangem"),
-        TangemLink(R.drawable.ic_youtube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
-        TangemLink(R.drawable.ic_linkedin, "https://www.linkedin.com/company/tangem"),
+    val accountsRu: List<SocialNetworkLink> = listOf(
+        SocialNetworkLink(SocialNetwork.Telegram, "https://t.me/tangem_ru"),
+        SocialNetworkLink(SocialNetwork.Twitter, "https://twitter.com/tangem"),
+        SocialNetworkLink(SocialNetwork.Facebook, "https://m.facebook.com/TangemCards/"),
+        SocialNetworkLink(SocialNetwork.Instagram, "https://instagram.com/tangemcards"),
+        SocialNetworkLink(SocialNetwork.GitHub, "https://github.com/tangem"),
+        SocialNetworkLink(SocialNetwork.Youtube, "https://youtube.com/channel/UCFGwLS7yggzVkP6ozte0m1w"),
+        SocialNetworkLink(SocialNetwork.LinkedIn, "https://www.linkedin.com/company/tangem"),
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
index 1de39fa063..319524eccd 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsViewModel.kt
@@ -2,6 +2,8 @@ package com.tangem.tap.features.details.ui.details
 
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.feedback.FeedbackEmail
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.AppState
@@ -34,7 +36,7 @@ class DetailsViewModel(private val store: Store<AppState>) {
                 SettingsElement.PrivacyPolicy -> {
                     if (state.privacyPolicyUrl != null) it else null
                 }
-                SettingsElement.AppSettings -> null // TODO: until we implement settings from this screen
+                SettingsElement.AppSettings -> if (state.isBiometricsAvailable) it else null
                 SettingsElement.AppCurrency -> if (state.scanResponse?.card?.isMultiwalletAllowed != true) it else null
                 SettingsElement.TermsOfUse -> if (state.scanResponse?.card?.isStart2Coin == true) it else null
                 else -> it
@@ -42,7 +44,7 @@ class DetailsViewModel(private val store: Store<AppState>) {
         }
 
         return DetailsScreenState(
-            settings,
+            elements = settings,
             tangemLinks = getSocialLinks(),
             tangemVersion = getTangemAppVersion(),
             appCurrency = state.appCurrency.name,
@@ -51,8 +53,9 @@ class DetailsViewModel(private val store: Store<AppState>) {
         )
     }
 
-    private fun handleSocialNetworkClick(url: String) {
-        store.dispatch(NavigationAction.OpenUrl(url))
+    private fun handleSocialNetworkClick(link: SocialNetworkLink) {
+        Analytics.send(Settings.ButtonSocialNetwork(link.network))
+        store.dispatch(NavigationAction.OpenUrl(link.url))
     }
 
     private fun handleClickingSettingsItem(item: SettingsElement) {
@@ -61,21 +64,26 @@ class DetailsViewModel(private val store: Store<AppState>) {
                 store.dispatch(NavigationAction.NavigateTo(AppScreen.WalletConnectSessions))
             }
             SettingsElement.Chat -> {
+                Analytics.send(Settings.ButtonChat())
                 store.dispatch(GlobalAction.OpenChat(SupportInfo()))
             }
             SettingsElement.SendFeedback -> {
+                Analytics.send(Settings.ButtonSendFeedback())
                 store.dispatch(GlobalAction.SendEmail(FeedbackEmail()))
             }
             SettingsElement.CardSettings -> {
+                Analytics.send(Settings.ButtonCardSettings())
                 store.dispatch(NavigationAction.NavigateTo(AppScreen.CardSettings))
             }
             SettingsElement.AppCurrency -> {
                 store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency)
             }
             SettingsElement.AppSettings -> {
-                store.dispatch(NavigationAction.NavigateTo(AppScreen.AppSettings)) //TODO: To be available later
+                Analytics.send(Settings.ButtonAppSettings())
+                store.dispatch(NavigationAction.NavigateTo(AppScreen.AppSettings))
             }
             SettingsElement.LinkMoreCards -> {
+                Analytics.send(Settings.ButtonCreateBackup())
                 store.dispatch(DetailsAction.CreateBackup)
             }
             SettingsElement.TermsOfService -> {
@@ -87,10 +95,13 @@ class DetailsViewModel(private val store: Store<AppState>) {
             SettingsElement.PrivacyPolicy -> {
                 // TODO: To be available later
             }
+            // SettingsElement.ReferralProgram -> {
+            //     store.dispatch(NavigationAction.NavigateTo(AppScreen.ReferralProgram))
+            // }
         }
     }
 
-    private fun getSocialLinks(): List<TangemLink> {
+    private fun getSocialLinks(): List<SocialNetworkLink> {
         val locale = LocaleRegionProvider().getRegion()
         return if (locale.lowercase() == RUSSIA_COUNTRY_CODE) {
             TangemSocialAccounts.accountsRu
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
index fa63874859..10270c8ecb 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
@@ -38,7 +38,7 @@ class ResetCardFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     ResetCardScreen(
                         state = screenState.value,
                         onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
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 6f29a508b1..944e4c715f 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
@@ -1,7 +1,6 @@
 package com.tangem.tap.features.details.ui.resetcard
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -33,77 +32,64 @@ import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
 import com.tangem.wallet.R
 
 @Composable
-fun ResetCardScreen(
-    state: ResetCardScreenState,
-    onBackPressed: () -> Unit,
-    modifier: Modifier = Modifier,
-) {
-        SettingsScreensScaffold(
-            content = { ResetCardView(state = state, modifier = modifier) },
-            onBackClick = onBackPressed,
-            backgroundColor = Color.Transparent,
-        )
+fun ResetCardScreen(state: ResetCardScreenState, onBackPressed: () -> Unit) {
+    SettingsScreensScaffold(
+        content = { ResetCardView(state = state) },
+        onBackClick = onBackPressed,
+        backgroundColor = Color.Transparent,
+    )
 }
 
 @Composable
-fun ResetCardView(
-    state: ResetCardScreenState,
-    modifier: Modifier = Modifier,
-) {
+fun ResetCardView(state: ResetCardScreenState) {
     Column(
-        modifier = modifier
+        modifier = Modifier
             .fillMaxSize()
             .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.SpaceBetween,
     ) {
-        Box(
-            modifier = modifier,
-        ) {
+        Box {
             Image(
                 painter = painterResource(id = R.drawable.ic_reset_background),
-                contentDescription = "",
-                modifier = modifier.offset(y = (-82).dp),
+                contentDescription = null,
+                modifier = Modifier.offset(y = (-82).dp),
             )
-            ScreenTitle(titleRes = R.string.reset_card_to_factory_navigation_title)
+            ScreenTitle(titleRes = R.string.card_settings_reset_card_to_factory)
         }
-        Spacer(
-            modifier = modifier.weight(1f),
-        )
+        Spacer(modifier = Modifier.weight(1f))
         Column(
-            modifier = modifier
-                .offset(y = (-32).dp),
+            modifier = Modifier.offset(y = (-32).dp),
             verticalArrangement = Arrangement.Bottom,
         ) {
             Text(
                 text = stringResource(id = R.string.common_attention),
-                modifier = modifier.padding(start = 20.dp, end = 20.dp),
+                modifier = Modifier.padding(start = 20.dp, end = 20.dp),
                 style = TangemTypography.headline3,
                 color = colorResource(id = R.color.text_primary_1),
             )
 
-            Spacer(modifier = modifier.size(24.dp))
+            Spacer(modifier = Modifier.size(24.dp))
 
             Text(
-                text = stringResource(id = R.string.reset_card_to_factory_message),
-                modifier = modifier
-                    .padding(start = 20.dp, end = 20.dp),
+                text = stringResource(id = state.descriptionResId),
+                modifier = Modifier.padding(start = 20.dp, end = 20.dp),
                 style = TangemTypography.body1,
                 color = colorResource(id = R.color.text_secondary),
             )
 
-            Spacer(modifier = modifier.size(28.dp))
+            Spacer(modifier = Modifier.size(28.dp))
             Row(
-                modifier = modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .clickable(
-                    onClick = { state.onAcceptWarningToggleClick(!state.accepted) },
-                )
+                        onClick = { state.onAcceptWarningToggleClick(!state.accepted) },
+                    )
                     .padding(top = 16.dp, bottom = 16.dp),
             ) {
                 IconToggleButton(
                     checked = state.accepted,
                     onCheckedChange = state.onAcceptWarningToggleClick,
-                    modifier = modifier.padding(start = 20.dp, end = 20.dp),
+                    modifier = Modifier.padding(start = 20.dp, end = 20.dp),
                 ) {
                     Icon(
                         painter = painterResource(
@@ -125,15 +111,13 @@ fun ResetCardView(
                     text = stringResource(id = R.string.reset_card_to_factory_warning_message),
                     style = TangemTypography.body2,
                     color = colorResource(id = R.color.text_secondary),
-                    modifier = modifier
-                        .padding(end = 20.dp),
+                    modifier = Modifier.padding(end = 20.dp),
                 )
             }
 
-            Spacer(modifier = modifier.size(16.dp))
+            Spacer(modifier = Modifier.size(16.dp))
             Box(
-                modifier = modifier
-                    .padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
+                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
             ) {
                 DetailsMainButton(
                     title = stringResource(id = R.string.reset_card_to_factory_button_title),
@@ -147,8 +131,14 @@ fun ResetCardView(
 
 @Composable
 @Preview
-fun ResetCardScreenPreview(
-
-) {
-    ResetCardScreen(state = ResetCardScreenState(onAcceptWarningToggleClick = {}, accepted = true) {}, {})
+fun ResetCardScreenPreview() {
+    ResetCardScreen(
+        state = ResetCardScreenState(
+            descriptionResId = R.string.reset_card_without_backup_to_factory_message,
+            accepted = false,
+            onAcceptWarningToggleClick = {},
+            onResetButtonClick = {},
+        ),
+        onBackPressed = {},
+    )
 }
\ No newline at end of file
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 f658eac463..54693e7557 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
@@ -1,6 +1,9 @@
 package com.tangem.tap.features.details.ui.resetcard
 
+import androidx.annotation.StringRes
+
 data class ResetCardScreenState(
+    @StringRes val descriptionResId: Int,
     val accepted: Boolean = false,
     val onAcceptWarningToggleClick: (Boolean) -> Unit,
     val onResetButtonClick: () -> Unit,
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
index 15f891dba3..1606631d68 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardViewModel.kt
@@ -3,12 +3,18 @@ package com.tangem.tap.features.details.ui.resetcard
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.details.redux.CardSettingsState
 import com.tangem.tap.features.details.redux.DetailsAction
+import com.tangem.wallet.R
 import org.rekotlin.Store
 
 class ResetCardViewModel(private val store: Store<AppState>) {
 
     fun updateState(state: CardSettingsState?): ResetCardScreenState {
         return ResetCardScreenState(
+            descriptionResId = if (state?.card?.backupStatus?.isActive == true) {
+                R.string.reset_card_with_backup_to_factory_message
+            } else {
+                R.string.reset_card_without_backup_to_factory_message
+            },
             accepted = state?.resetConfirmed ?: false,
             onAcceptWarningToggleClick = { store.dispatch(DetailsAction.ResetToFactory.Confirm(it)) },
             onResetButtonClick = { store.dispatch(DetailsAction.ResetToFactory.Proceed) },
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
index 96d55a808a..567c74c007 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/securitymode/SecurityModeFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.DetailsState
 import com.tangem.tap.store
@@ -38,7 +38,7 @@ class SecurityModeFragment : Fragment(), StoreSubscriber<DetailsState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     SecurityModeScreen(
                         state = screenState.value,
                         onBackPressed = { store.dispatch(NavigationAction.PopBackTo()) },
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
index 8d3de292ae..ec42337992 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
-import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.core.ui.res.TangemTheme
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectState
@@ -36,7 +36,7 @@ class WalletConnectFragment : Fragment(), StoreSubscriber<WalletConnectState> {
         return ComposeView(requireContext()).apply {
             setContent {
                 isTransitionGroup = true
-                AppCompatTheme {
+                TangemTheme {
                     WalletConnectScreen(
                         state = screenState.value,
                         onBackPressed = {
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
index 168bd4a024..499f31ddcf 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
@@ -30,6 +30,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.compose.TangemTypography
 import com.tangem.tap.common.extensions.getFromClipboard
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
@@ -53,7 +55,12 @@ fun WalletConnectScreen(
         },
         fab = {
             if (!state.isLoading) {
-                AddSessionFab(onAddSession = { state.onAddSession(context.getFromClipboard()?.toString()) })
+                AddSessionFab(
+                    onAddSession = {
+                        Analytics.send(Settings.ButtonStartWalletConnectSession())
+                        state.onAddSession(context.getFromClipboard()?.toString())
+                    },
+                )
             }
         },
         titleRes = R.string.wallet_connect_title,
@@ -147,7 +154,10 @@ private fun WalletConnectSessions(
                     modifier = modifier.weight(1f),
                 )
                 IconButton(
-                    onClick = { state.onRemoveSession(session.sessionId) },
+                    onClick = {
+                        Analytics.send(Settings.ButtonStopWalletConnectSession())
+                        state.onRemoveSession(session.sessionId)
+                    },
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_cross_rounded_24),
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
index ab95ef6ef8..da8e03c3b8 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt
@@ -12,17 +12,19 @@ import com.tangem.wallet.R
 class ApproveWcSessionDialog {
     companion object {
         fun create(session: WalletConnectSession, networks: List<Blockchain>, context: Context): AlertDialog {
+            val sessionBlockchain = requireNotNull(session.wallet.blockchain) { "session network is null" }
             val message = context.getString(
                 R.string.wallet_connect_request_session_start,
                 session.peerMeta.name,
+                sessionBlockchain.fullName,
                 session.peerMeta.url,
             )
             return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                 setMessage(message)
                 setPositiveButton(context.getText(R.string.common_start)) { _, _ ->
                     store.dispatch(GlobalAction.HideDialog)
-                    store.dispatch(WalletConnectAction.ChooseNetwork(session.wallet.blockchain!!))
+                    store.dispatch(WalletConnectAction.ChooseNetwork(sessionBlockchain))
                 }
                 if (networks.size > 1) {
                     setNeutralButton(context.getText(R.string.wallet_connect_select_network)) { _, _ ->
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
index 3d0fb57930..8de826231f 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/BnbTransactionDialog.kt
@@ -26,14 +26,14 @@ class BnbTransactionDialog {
                         it.symbol,
                         it.price,
                         it.quantity,
-                        it.amount
+                        it.amount,
                     )
-                }.joinToString ( "\n\n" )
+                }.joinToString(separator = "\n\n")
                 is BinanceMessageData.Transfer -> context.getString(
                     R.string.wallet_connect_bnb_transaction_message,
                     data.address,
                     data.outputAddress,
-                    data.amount
+                    data.amount,
                 )
             }
 
@@ -44,14 +44,16 @@ class BnbTransactionDialog {
             val positiveButtonTitle = context.getText(R.string.common_sign)
 
             return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                 setMessage(fullMessage)
                 setPositiveButton(positiveButtonTitle) { _, _ ->
-                        store.dispatch(WalletConnectAction.BinanceTransaction.Sign(
+                    store.dispatch(
+                        WalletConnectAction.BinanceTransaction.Sign(
                             id = sessionId,
                             data = data.data,
-                            sessionData = session
-                        ))
+                            sessionData = session,
+                        ),
+                    )
                 }
                 setNegativeButton(context.getText(R.string.common_reject)) { _, _ ->
                     store.dispatch(WalletConnectAction.RejectRequest(session, sessionId))
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
index 809b37cf66..0213971713 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt
@@ -13,7 +13,7 @@ class ClipboardOrScanQrDialog {
     companion object {
         fun create(wcUri: String, context: Context): AlertDialog {
             return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                 setMessage(context.getText(R.string.wallet_connect_clipboard_alert))
                 setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ ->
                     store.dispatch(WalletConnectAction.OpenSession(wcUri))
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
index 5d6e001087..c78549f273 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/PersonalSignDialog.kt
@@ -10,19 +10,10 @@ import com.trustwallet.walletconnect.models.session.WCSession
 
 class PersonalSignDialog {
     companion object {
-        fun create(
-            data: PersonalSignDialogData,
-            context: Context,
-        ): AlertDialog {
-            val message =
-                context.getString(R.string.wallet_connect_alert_sign_message) +
-                    context.getString(
-                        R.string.wallet_connect_personal_sign_message,
-                        data.dAppName,
-                        data.message,
-                    )
+        fun create(data: PersonalSignDialogData, context: Context): AlertDialog {
+            val message = context.getString(R.string.wallet_connect_alert_sign_message, data.message)
             return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                 setMessage(message)
                 setPositiveButton(context.getText(R.string.common_sign)) { _, _ ->
                     store.dispatch(WalletConnectAction.SignMessage(data.session))
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
index 245cbd2ae0..cd45c1c9be 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/TransactionDialog.kt
@@ -22,7 +22,7 @@ class TransactionDialog {
                 data.amount,
                 data.gasAmount,
                 data.totalAmount,
-                data.balance
+                data.balance,
             )
 
             val positiveButtonTitle = when (data.type) {
@@ -30,7 +30,7 @@ class TransactionDialog {
                 WcTransactionType.EthSendTransaction -> context.getText(R.string.common_sign_and_send)
             }
             return AlertDialog.Builder(context).apply {
-                setTitle(context.getString(R.string.wallet_connect))
+                setTitle(context.getString(R.string.wallet_connect_title))
                 setMessage(message)
                 setPositiveButton(positiveButtonTitle) { _, _ ->
                     if (data.isEnoughFundsToSend) {
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerAction.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerAction.kt
index ca82ff1fee..5461c66441 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerAction.kt
@@ -9,9 +9,19 @@ sealed class DisclaimerAction : Action {
         val type: DisclaimerType,
     ) : DisclaimerAction()
 
-    data class Show(val onAcceptCallback: VoidCallback? = null) : DisclaimerAction()
+    data class Show(
+        val onAcceptCallback: VoidCallback? = null,
+        val onDismissCallback: VoidCallback? = null,
+    ) : DisclaimerAction()
+
     data class AcceptDisclaimer(val type: DisclaimerType) : DisclaimerAction()
 
     internal data class UpdateState(val type: DisclaimerType, val accepted: Boolean) : DisclaimerAction()
-    internal data class SetOnAcceptCallback(val onAcceptCallback: VoidCallback? = null) : DisclaimerAction()
+
+    internal data class SetCallbacks(
+        val onAcceptCallback: VoidCallback? = null,
+        val onDismissCallback: VoidCallback? = null,
+    ) : DisclaimerAction()
+
+    object OnBackPressed : DisclaimerAction()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerMiddleware.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerMiddleware.kt
index 1b42d7b4fc..01e5de971a 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerMiddleware.kt
@@ -28,7 +28,7 @@ private fun handleDisclaimerMiddleware(action: Action, appState: AppState) {
         }
         is DisclaimerAction.Show -> {
             handleUpdateState = state.type.createUpdateState()
-            store.dispatch(DisclaimerAction.SetOnAcceptCallback(action.onAcceptCallback))
+            store.dispatch(DisclaimerAction.SetCallbacks(action.onAcceptCallback, action.onDismissCallback))
             store.dispatch(NavigationAction.NavigateTo(AppScreen.Disclaimer))
         }
         is DisclaimerAction.AcceptDisclaimer -> {
@@ -36,7 +36,13 @@ private fun handleDisclaimerMiddleware(action: Action, appState: AppState) {
             handleUpdateState = action.type.createUpdateState()
             store.dispatch(NavigationAction.PopBackTo())
             state.onAcceptCallback?.invoke()
-            store.dispatch(DisclaimerAction.SetOnAcceptCallback(null))
+            store.dispatch(DisclaimerAction.SetCallbacks(null, null))
+        }
+        is DisclaimerAction.OnBackPressed -> {
+            state.onDismissCallback?.invoke()
+            store.dispatch(DisclaimerAction.SetCallbacks(null, null))
+            store.dispatch(NavigationAction.PopBackTo())
+
         }
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerReducer.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerReducer.kt
index 1b282877f2..766c6a42ca 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerReducer.kt
@@ -19,8 +19,9 @@ private fun internalReduce(action: Action, state: AppState): DisclaimerState {
             type = action.type,
             accepted = action.accepted,
         )
-        is DisclaimerAction.SetOnAcceptCallback -> disclaimerState.copy(
+        is DisclaimerAction.SetCallbacks -> disclaimerState.copy(
             onAcceptCallback = action.onAcceptCallback,
+            onDismissCallback = action.onDismissCallback,
         )
         else -> disclaimerState
     }
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerState.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerState.kt
index 530a4afb78..d7ca859973 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerState.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerState.kt
@@ -1,8 +1,8 @@
 package com.tangem.tap.features.disclaimer.redux
 
 import android.net.Uri
-import com.tangem.common.card.Card
 import com.tangem.common.extensions.VoidCallback
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import org.rekotlin.StateType
@@ -11,6 +11,7 @@ data class DisclaimerState(
     val accepted: Boolean = false,
     val type: DisclaimerType = DisclaimerType.Tangem,
     val onAcceptCallback: VoidCallback? = null,
+    val onDismissCallback: VoidCallback? = null,
 ) : StateType
 
 sealed class DisclaimerType(
@@ -22,7 +23,7 @@ sealed class DisclaimerType(
     companion object {
         fun get(scanResponse: ScanResponse): DisclaimerType = get(scanResponse.card)
 
-        fun get(card: Card): DisclaimerType = when {
+        fun get(card: CardDTO): DisclaimerType = when {
             card.isSaltPay -> SaltPay
             else -> Tangem
         }
diff --git a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
index b13e5b588b..7761de53b6 100644
--- a/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt
@@ -2,13 +2,14 @@ package com.tangem.tap.features.disclaimer.ui
 
 import android.os.Bundle
 import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
+import com.tangem.core.ui.fragments.setStatusBarColor
 import com.tangem.tap.common.extensions.configureSettings
 import com.tangem.tap.common.extensions.hide
-import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.features.BaseFragment
+import com.tangem.tap.features.addBackPressHandler
 import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
 import com.tangem.tap.features.disclaimer.redux.DisclaimerState
 import com.tangem.tap.store
@@ -16,32 +17,24 @@ import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentDisclaimerBinding
 import org.rekotlin.StoreSubscriber
 
-class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer),
-    StoreSubscriber<DisclaimerState> {
+class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubscriber<DisclaimerState> {
 
     private val binding: FragmentDisclaimerBinding by viewBinding(FragmentDisclaimerBinding::bind)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        activity?.onBackPressedDispatcher?.addCallback(
-            this,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    store.dispatch(NavigationAction.PopBackTo())
-                }
-            },
-        )
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(android.R.transition.slide_bottom)
-        exitTransition = inflater.inflateTransition(android.R.transition.slide_top)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        addBackPressHandler(handler = this)
+        binding.toolbar.setNavigationOnClickListener { handleOnBackPressed() }
+        binding.webView.configureSettings()
     }
 
     override fun onStart() {
         super.onStart()
-        store.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.disclaimerState == newState.disclaimerState
-            }.select { it.disclaimerState }
+        setStatusBarColor(R.color.backgroundLightGray)
+        store.subscribe(subscriber = this) { state ->
+            state
+                .skipRepeats { oldState, newState -> oldState.disclaimerState == newState.disclaimerState }
+                .select(AppState::disclaimerState)
         }
     }
 
@@ -50,16 +43,11 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer),
         store.unsubscribe(this)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.toolbar.setNavigationOnClickListener {
-            store.dispatch(NavigationAction.PopBackTo())
-        }
-        initViews()
-    }
-
-    private fun initViews() {
-        binding.webView.configureSettings()
+    override fun configureTransitions() {
+        super.configureTransitions()
+        val inflater = TransitionInflater.from(requireContext())
+        enterTransition = inflater.inflateTransition(android.R.transition.fade)
+        exitTransition = inflater.inflateTransition(android.R.transition.fade)
     }
 
     override fun newState(state: DisclaimerState) = with(binding) {
@@ -76,4 +64,8 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer),
 
         webView.loadUrl(state.type.uri.toString())
     }
+
+    override fun handleOnBackPressed() {
+        store.dispatch(DisclaimerAction.OnBackPressed)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
index 1d5243d02b..450d428367 100644
--- a/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
@@ -11,6 +12,8 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import com.google.accompanist.appcompattheme.AppCompatTheme
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.home.compose.StoriesScreen
@@ -24,10 +27,10 @@ import org.rekotlin.StoreSubscriber
 class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
     private var homeState: MutableState<HomeState> = mutableStateOf(store.state.homeState)
-    private var composeView: ComposeView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Analytics.send(IntroductionProcess.ScreenOpened())
         store.dispatch(HomeAction.Init)
     }
 
@@ -35,20 +38,20 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        val context = container?.context ?: return null
-
+    ): View {
         store.dispatch(BackupAction.CheckForUnfinishedBackup)
 
-        composeView = ComposeView(context).apply {
+        return ComposeView(inflater.context).apply {
             setContent {
+                BackHandler {
+                    requireActivity().finish()
+                }
+
                 AppCompatTheme {
                     ScreenContent()
                 }
             }
         }
-
-        return composeView
     }
 
     override fun onStart() {
@@ -68,7 +71,6 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
     override fun onDestroyView() {
         super.onDestroyView()
         rollbackStatusBarIconsColor()
-        composeView = null
     }
 
     override fun newState(state: HomeState) {
@@ -81,9 +83,16 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
     private fun ScreenContent() {
         StoriesScreen(
             homeState,
-            onScanButtonClick = { store.dispatch(HomeAction.ReadCard) },
-            onShopButtonClick = { store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode)) },
+            onScanButtonClick = {
+                Analytics.send(IntroductionProcess.ButtonScanCard())
+                store.dispatch(HomeAction.ReadCard)
+            },
+            onShopButtonClick = {
+                Analytics.send(IntroductionProcess.ButtonBuyCards())
+                store.dispatch(HomeAction.GoToShop(store.state.globalState.userCountryCode))
+            },
             onSearchTokensClick = {
+                Analytics.send(IntroductionProcess.ButtonTokensList())
                 store.dispatch(NavigationAction.NavigateTo(AppScreen.AddTokens))
                 store.dispatch(TokensAction.AllowToAddTokens(false))
                 store.dispatch(TokensAction.LoadCurrencies())
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
index 9ee80263c3..e8a6b447f7 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt
@@ -2,7 +2,11 @@ package com.tangem.tap.features.home.compose.content
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -20,8 +24,8 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.SpacerH16
-import com.tangem.tap.common.compose.SpacerH32
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH32
 import com.tangem.tap.features.home.compose.StoriesBottomImageAnimation
 import com.tangem.tap.features.home.compose.StoriesTextAnimation
 import com.tangem.wallet.R
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
index 198e71d324..85ec581b07 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/CurrenciesWeb3Content.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import com.tangem.tap.common.compose.SpacerH
+import com.tangem.core.ui.components.SpacerH12
 import com.tangem.tap.common.compose.extensions.dpSize
 import com.tangem.tap.common.compose.extensions.halfHeight
 import com.tangem.tap.common.compose.extensions.toPx
@@ -64,7 +64,7 @@ fun StoriesCurrenciesContent(
                     targetOffset = animateTo.toPx(),
                     contentDescription = "Currency row",
                 )
-                SpacerH(12.dp)
+                SpacerH12()
             }
         }
     }
@@ -118,7 +118,7 @@ fun StoriesWeb3Content(
 
 @Composable
 private fun LightenBox(content: @Composable () -> Unit) {
-    Box() {
+    Box {
         content()
         Box(
             modifier = Modifier
@@ -130,10 +130,10 @@ private fun LightenBox(content: @Composable () -> Unit) {
                             Color.White.copy(alpha = 0f),
                             Color.White.copy(alpha = 0.75f),
                             Color.White.copy(alpha = 0.95f),
-                            Color.White
-                        )
-                    )
-                )
+                            Color.White,
+                        ),
+                    ),
+                ),
         ) {}
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
index cb40186a87..cea593e6fe 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/HomeButtons.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.tangem.tap.common.compose.SpacerS8
+import com.tangem.core.ui.components.SpacerS8
 import com.tangem.wallet.R
 
 @Composable
@@ -51,7 +51,7 @@ fun HomeButtons(
             },
             content = {
                 Text(
-                    text = stringResource(id = R.string.home_button_scan),
+                    text = stringResource(id = R.string.welcome_unlock_card),
                     fontWeight = FontWeight.Medium,
                     fontSize = 16.sp,
                     textAlign = TextAlign.Center,
diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
index 096b87cb0b..3779f57358 100644
--- a/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/compose/views/StoriesProgressBar.kt
@@ -4,7 +4,12 @@ import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
@@ -13,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.tangem.tap.common.compose.SpacerW4
+import com.tangem.core.ui.components.SpacerW4
 
 @Composable
 fun StoriesProgressBar(
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
index 0a276dff4f..6b71aee0f7 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
@@ -14,4 +14,4 @@ sealed class HomeAction : Action {
     data class GoToShop(val userCountryCode: String?) : HomeAction()
 
     data class ChangeScanCardButtonState(val state: IndeterminateProgressButton) : HomeAction()
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
index 75ce02a22a..fdacaa5bd1 100644
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@@ -1,53 +1,34 @@
 package com.tangem.tap.features.home.redux
 
-import com.tangem.common.card.Card
-import com.tangem.common.core.TangemError
-import com.tangem.common.services.Result
-import com.tangem.domain.common.ScanResponse
-import com.tangem.domain.common.extensions.withIOContext
-import com.tangem.domain.common.extensions.withMainContext
-import com.tangem.operations.backup.BackupService
-import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
-import com.tangem.tap.backupService
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
-import com.tangem.tap.common.analytics.GetCardSourceParamsAnOld
-import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnResult
+import com.tangem.common.doOnSuccess
 import com.tangem.tap.common.entities.IndeterminateProgressButton
-import com.tangem.tap.common.extensions.dispatchDialogShow
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.onCardScanned
-import com.tangem.tap.common.extensions.primaryCardIsSaltPayVisa
+import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.postUiDelayBg
-import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.common.redux.navigation.FragmentShareTransition
 import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.features.disclaimer.redux.DisclaimerAction
-import com.tangem.tap.features.disclaimer.redux.DisclaimerType
-import com.tangem.tap.features.disclaimer.redux.isAccepted
+import com.tangem.tap.domain.model.builders.UserWalletBuilder
+import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.features.home.BELARUS_COUNTRY_CODE
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
 import com.tangem.tap.features.home.redux.HomeMiddleware.Companion.BUY_WALLET_URL
-import com.tangem.tap.features.onboarding.OnboardingHelper
-import com.tangem.tap.features.onboarding.OnboardingSaltPayHelper
-import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsAction
-import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsStep
-import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayExceptionHandler
-import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayAction
-import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayState
 import com.tangem.tap.features.send.redux.states.ButtonState
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
-import com.tangem.wallet.R
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userWalletsListManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
-import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
+import timber.log.Timber
 
 class HomeMiddleware {
     companion object {
@@ -57,16 +38,16 @@ class HomeMiddleware {
     }
 }
 
-private val homeMiddleware: Middleware<AppState> = { dispatch, state ->
+private val homeMiddleware: Middleware<AppState> = { _, _ ->
     { next ->
         { action ->
-            handleHomeAction(state, action, dispatch)
+            handleHomeAction(action)
             next(action)
         }
     }
 }
 
-private fun handleHomeAction(appState: () -> AppState?, action: Action, dispatch: DispatchFunction) {
+private fun handleHomeAction(action: Action) {
     when (action) {
         is HomeAction.Init -> {
             store.dispatch(GlobalAction.RestoreAppCurrency)
@@ -79,167 +60,62 @@ private fun handleHomeAction(appState: () -> AppState?, action: Action, dispatch
                 postUiDelayBg(700) { store.dispatch(HomeAction.ReadCard) }
             }
         }
-        is HomeAction.ReadCard -> {
-            changeButtonState(ButtonState.PROGRESS)
-            val scanCardAction = GlobalAction.ScanCard(
-                onSuccess = { scanResponse ->
-                    store.dispatch(HomeAction.ScanInProgress(false))
-                    checkForUnfinishedBackupForSaltPay(
-                        backupService = backupService,
-                        scanResponse = scanResponse,
-                        nextHandler = {
-                            showDisclaimerIfNeed(
-                                scanResponse = scanResponse,
-                                nextHandler = ::onScanSuccess,
-                            )
-                        },
-                    )
-                },
-                onFailure = ::onScanFailure,
-            )
-            store.dispatch(HomeAction.ScanInProgress(true))
-            postUiDelayBg(300) { store.dispatch(scanCardAction) }
-        }
+        is HomeAction.ReadCard -> readCard()
         is HomeAction.GoToShop -> {
             when (action.userCountryCode) {
                 RUSSIA_COUNTRY_CODE, BELARUS_COUNTRY_CODE -> store.dispatchOpenUrl(BUY_WALLET_URL)
                 else -> store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop))
             }
-            store.state.globalState.analyticsHandler.handleAnalyticsEvent(
-                event = AnalyticsEventAnOld.GET_CARD,
-                params = mapOf(AnalyticsParamAnOld.SOURCE.param to GetCardSourceParamsAnOld.WELCOME.param),
-            )
         }
     }
 }
 
-/**
- * It checks only the SaltPay cards. To check for unfinished backups for the standard Wallet cards
- * see BackupAction.CheckForUnfinishedBackup
- * If user touches card other than Visa SaltPay - show dialog and block next processing
- */
-private fun checkForUnfinishedBackupForSaltPay(
-    backupService: BackupService,
-    scanResponse: ScanResponse,
-    nextHandler: (ScanResponse) -> Unit,
-) {
-    if (!backupService.hasIncompletedBackup || !backupService.primaryCardIsSaltPayVisa()) {
-        nextHandler(scanResponse)
-        return
-    }
-
-    fun isTheSamePrimaryCard(card: Card): Boolean {
-        return backupService.primaryCardId?.let { it == card.cardId } ?: false
-    }
-
-    if (scanResponse.isSaltPayWallet() || !isTheSamePrimaryCard(scanResponse.card)) {
-        changeButtonState(ButtonState.ENABLED)
-        showSaltPayTapVisaLogoCardDialog()
-    } else {
-        nextHandler(scanResponse)
-    }
-}
-
-private fun showDisclaimerIfNeed(scanResponse: ScanResponse, nextHandler: (ScanResponse) -> Unit) {
-    val disclaimerType = DisclaimerType.get(scanResponse)
-    store.dispatch(DisclaimerAction.SetDisclaimerType(disclaimerType))
-
-    if (disclaimerType.isAccepted()) {
-        nextHandler((scanResponse))
-    } else {
-        changeButtonState(ButtonState.ENABLED)
-        store.dispatch(
-            DisclaimerAction.Show {
+private fun readCard() = scope.launch {
+    delay(timeMillis = 200)
+    tangemSdkManager.setAccessCodeRequestPolicy(
+        useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
+    )
+    ScanCardProcessor.scan(
+        onProgressStateChange = { showProgress ->
+            if (showProgress) {
                 changeButtonState(ButtonState.PROGRESS)
-                nextHandler(scanResponse)
-            },
-        )
-    }
-}
-
-private fun onScanSuccess(scanResponse: ScanResponse) {
-    val globalState = store.state.globalState
-    val tapWalletManager = globalState.tapWalletManager
-    tapWalletManager.updateConfigManager(scanResponse)
-
-    globalState.analyticsHandler.attachToAllEvents(AnalyticsParam.BatchId, scanResponse.card.batchId)
-
-    store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
-
-    if (scanResponse.isSaltPay()) {
-        if (scanResponse.isSaltPayVisa()) {
+            }
+            // else { //todo hide this because
+            //     changeButtonState(ButtonState.ENABLED)
+            // }
+        },
+        onScanStateChange = { scanInProgress ->
+            store.dispatch(HomeAction.ScanInProgress(scanInProgress))
+        },
+        onFailure = {
+            changeButtonState(ButtonState.ENABLED)
+        },
+        onSuccess = { scanResponse ->
             scope.launch {
-                val (manager, config) = OnboardingSaltPayState.initDependency(scanResponse)
-                val result = OnboardingSaltPayHelper.isOnboardingCase(scanResponse, manager)
-                delay(500)
-                withMainContext {
-                    when (result) {
-                        is Result.Success -> {
-                            val isOnboardingCase = result.data
-                            if (isOnboardingCase) {
-                                store.dispatch(GlobalAction.Onboarding.Start(scanResponse, canSkipBackup = false))
-                                store.dispatch(OnboardingSaltPayAction.Init.SetDependencies(manager, config))
-                                store.dispatch(OnboardingSaltPayAction.Update)
-                                navigateTo(AppScreen.OnboardingWallet)
-                            } else {
-                                navigateTo(AppScreen.Wallet)
-                                withIOContext { store.onCardScanned(scanResponse) }
-                            }
+                if (preferencesStorage.shouldSaveUserWallets) {
+                    val userWallet = UserWalletBuilder(scanResponse).build() ?: return@launch
+                    userWalletsListManager.save(userWallet)
+                        .doOnFailure { error ->
+                            Timber.e(error, "Unable to save user wallet")
+                            store.onCardScanned(scanResponse)
                         }
-                        is Result.Failure -> {
+                        .doOnSuccess {
+                            scope.launch { store.onUserWalletSelected(userWallet) }
+                        }
+                        .doOnResult {
                             changeButtonState(ButtonState.ENABLED)
-                            SaltPayExceptionHandler.handle(result.error)
+                            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
                         }
-                    }
+                } else {
+                    store.onCardScanned(scanResponse)
+                    changeButtonState(ButtonState.ENABLED)
+                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
                 }
             }
-        } else {
-            if (scanResponse.card.backupStatus?.isActive == false) {
-                changeButtonState(ButtonState.ENABLED)
-                showSaltPayTapVisaLogoCardDialog()
-            } else {
-                navigateTo(AppScreen.Wallet, null)
-                scope.launch { store.onCardScanned(scanResponse) }
-            }
-        }
-    } else {
-        if (OnboardingHelper.isOnboardingCase(scanResponse)) {
-            store.dispatch(GlobalAction.Onboarding.Start(scanResponse, canSkipBackup = true))
-            val appScreen = OnboardingHelper.whereToNavigate(scanResponse)
-            navigateTo(appScreen)
-        } else {
-            if (scanResponse.twinsIsTwinned() && !preferencesStorage.wasTwinsOnboardingShown()) {
-                store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.WelcomeOnly))
-                navigateTo(AppScreen.OnboardingTwins)
-            } else {
-                navigateTo(AppScreen.Wallet, null)
-            }
-            scope.launch { store.onCardScanned(scanResponse) }
-        }
-    }
-}
-
-private fun showSaltPayTapVisaLogoCardDialog() {
-    store.dispatchDialogShow(
-        AppDialog.SimpleOkDialogRes(
-            headerId = R.string.saltpay_error_empty_backup_title,
-            messageId = R.string.saltpay_error_empty_backup_message,
-        ),
+        },
     )
 }
 
-private fun onScanFailure(error: TangemError) {
-    store.dispatch(HomeAction.ScanInProgress(false))
-    changeButtonState(ButtonState.ENABLED)
-}
-
 private fun changeButtonState(state: ButtonState) {
     store.dispatch(HomeAction.ChangeScanCardButtonState(IndeterminateProgressButton(state)))
-}
-
-private fun navigateTo(screen: AppScreen, transition: FragmentShareTransition? = null) {
-    postUiDelayBg(DELAY_SDK_DIALOG_CLOSE) {
-        changeButtonState(ButtonState.ENABLED)
-        store.dispatch(NavigationAction.NavigateTo(screen, transition))
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt
index 50faf24376..b56ddaf6cd 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt
@@ -5,12 +5,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.copyToClipboard
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.extensions.dispatchShare
 import com.tangem.tap.common.extensions.dispatchToastNotification
+import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.redux.AppDialog
-import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.AddressData
 import com.tangem.tap.store
 import com.tangem.wallet.R
@@ -21,7 +23,7 @@ import com.tangem.wallet.databinding.DialogOnboardingAddressInfoBinding
  */
 class AddressInfoBottomSheetDialog(
     private val stateDialog: AppDialog.AddressInfoDialog,
-    context: Context
+    context: Context,
 ) : BottomSheetDialog(context) {
 
     var binding: DialogOnboardingAddressInfoBinding? = null
@@ -40,6 +42,7 @@ class AddressInfoBottomSheetDialog(
 
     override fun show() {
         super.show()
+        Analytics.send(Token.Recieve.ScreenOpened())
         showData(data = stateDialog.addressData)
     }
 
@@ -51,32 +54,20 @@ class AddressInfoBottomSheetDialog(
         imvQrCode.setImageBitmap(data.qrCode)
         tvAddress.text = data.address
         btnFlCopyAddress.setOnClickListener {
+            Analytics.send(Token.Recieve.ButtonCopyAddress())
             context.copyToClipboard(data.address)
             store.dispatchToastNotification(R.string.copy_toast_msg)
         }
         btnFlShare.setOnClickListener {
+            Analytics.send(Token.Recieve.ButtonShareAddress())
             store.dispatchShare(data.shareUrl)
         }
-        tvReceiveMessage.text = getQRReceiveMessage(tvReceiveMessage.context, stateDialog.currency)
-    }
-}
-
-fun getQRReceiveMessage(context: Context, currency: Currency): String {
-    return when (currency) {
-        is Currency.Blockchain -> {
-            context.getString(
-                R.string.address_qr_code_message_format,
-                currency.blockchain.fullName,
-                currency.currencySymbol
-            )
-        }
-        is Currency.Token -> {
-            context.getString(
-                R.string.address_qr_code_message_token_format,
-                currency.token.name,
-                currency.currencySymbol,
-                currency.blockchain.fullName
-            )
-        }
+        val blockchain = stateDialog.currency.blockchain
+        tvReceiveMessage.text = tvReceiveMessage.getString(
+            id = R.string.address_qr_code_message_format,
+            blockchain.fullName,
+            blockchain.currency,
+            blockchain.fullName,
+        )
     }
 }
\ No newline at end of file
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 85a26859f5..cb01879840 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
@@ -2,9 +2,17 @@ package com.tangem.tap.features.onboarding
 
 import com.tangem.domain.common.ProductType
 import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.onCardScanned
 import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.domain.extensions.hasWallets
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
 import com.tangem.tap.preferencesStorage
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 /**
 [REDACTED_AUTHOR]
@@ -14,15 +22,16 @@ class OnboardingHelper {
 
         fun isOnboardingCase(response: ScanResponse): Boolean {
             val cardInfoStorage = preferencesStorage.usedCardsPrefStorage
+            val cardId = response.card.cardId
             return when {
                 response.isTangemTwins() -> {
                     if (!response.twinsIsTwinned()) {
                         true
                     } else {
-                        cardInfoStorage.activationIsStarted(response.card.cardId)
+                        cardInfoStorage.isActivationInProgress(cardId)
                     }
                 }
-                response.card.hasWallets() -> cardInfoStorage.activationIsStarted(response.card.cardId)
+                response.card.wallets.isNotEmpty() -> cardInfoStorage.isActivationInProgress(cardId)
                 else -> true
             }
         }
@@ -42,5 +51,48 @@ class OnboardingHelper {
                 )
             }
         }
+
+        fun trySaveWalletAndNavigateToWalletScreen(
+            scanResponse: ScanResponse,
+            accessCode: String? = null,
+            backupCardsIds: List<String>? = null,
+        ) {
+            when {
+                // When should save user wallets, then save card without navigate to save wallet screen
+                preferencesStorage.shouldSaveUserWallets -> scope.launch {
+                    store.dispatchOnMain(
+                        SaveWalletAction.ProvideBackupInfo(
+                            scanResponse = scanResponse,
+                            accessCode = accessCode,
+                            backupCardsIds = backupCardsIds?.toSet(),
+                        ),
+                    )
+                    store.dispatchOnMain(SaveWalletAction.Save)
+                }
+                // When should not save user wallets but device has biometry and save wallet screen has not been shown,
+                // then open save wallet screen
+                tangemSdkManager.canUseBiometry &&
+                    preferencesStorage.shouldShowSaveUserWalletScreen -> scope.launch {
+                    store.onCardScanned(scanResponse)
+
+                    delay(timeMillis = 1_200)
+
+                    store.dispatchOnMain(
+                        SaveWalletAction.ProvideBackupInfo(
+                            scanResponse = scanResponse,
+                            accessCode = accessCode,
+                            backupCardsIds = backupCardsIds?.toSet(),
+                        ),
+                    )
+                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.SaveWallet))
+                }
+                // If device has no biometry and save wallet screen has been shown, then go through old scenario
+                else -> scope.launch {
+                    store.onCardScanned(scanResponse)
+                }
+            }
+
+            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt
index 8284efcd3d..853044464b 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingManager.kt
@@ -67,8 +67,10 @@ class OnboardingManager(
             }
         }
 
-        return balance.copy(currency = Currency.Blockchain(
-            walletManager.wallet.blockchain, walletManager.wallet.publicKey.derivationPath?.rawPath)
+        return balance.copy(
+            currency = Currency.Blockchain(
+                walletManager.wallet.blockchain, walletManager.wallet.publicKey.derivationPath?.rawPath,
+            ),
         )
     }
 
@@ -79,6 +81,14 @@ class OnboardingManager(
     fun activationFinished(cardId: String) {
         usedCardsPrefStorage.activationFinished(cardId)
     }
+
+    fun isActivationFinished(cardId: String): Boolean {
+        return usedCardsPrefStorage.isActivationFinished(cardId)
+    }
+
+    fun isActivationStarted(cardId: String): Boolean {
+        return usedCardsPrefStorage.isActivationStarted(cardId)
+    }
 }
 
 data class OnboardingWalletBalance(
@@ -98,23 +108,23 @@ data class OnboardingWalletBalance(
     companion object {
         fun error(error: TapError): OnboardingWalletBalance = OnboardingWalletBalance(
             state = ProgressState.Error,
-            error = error
+            error = error,
         )
 
         fun criticalError(error: TapError): OnboardingWalletBalance = OnboardingWalletBalance(
             state = ProgressState.Error,
-            criticalError = error
+            criticalError = error,
         )
 
         fun loading(value: BigDecimal = BigDecimal.ZERO): OnboardingWalletBalance = OnboardingWalletBalance(
             value,
-            state = ProgressState.Loading
+            state = ProgressState.Loading,
         )
 
         fun done(value: BigDecimal, hasTransactions: Boolean): OnboardingWalletBalance = OnboardingWalletBalance(
             value,
             hasIncomingTransaction = hasTransactions,
-            state = ProgressState.Done
+            state = ProgressState.Done,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
index a54a27bd28..558c71a9f6 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/OnboardingNoteFragment.kt
@@ -9,6 +9,8 @@ import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
 import coil.load
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.getDrawableCompat
 import com.tangem.tap.common.extensions.stripZeroPlainString
 import com.tangem.tap.common.redux.navigation.ShareElement
@@ -41,6 +43,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
         binding.toolbar.setTitle(R.string.onboarding_title)
         btnRefreshBalanceWidget = RefreshBalanceWidget(mainBinding.onboardingTopContainer.onboardingWalletContainer)
 
+        store.dispatch(OnboardingNoteAction.Init)
         store.dispatch(OnboardingNoteAction.LoadCardArtwork)
         store.dispatch(OnboardingNoteAction.DetermineStepOfScreen)
     }
@@ -108,7 +111,10 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
     private fun setupCreateWalletState(state: OnboardingNoteState) =
         with(mainBinding.onboardingActionContainer) {
             btnMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
-            btnMainAction.setOnClickListener { store.dispatch(OnboardingNoteAction.CreateWallet) }
+            btnMainAction.setOnClickListener {
+                Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
+                store.dispatch(OnboardingNoteAction.CreateWallet)
+            }
             btnAlternativeAction.setText(R.string.onboarding_button_what_does_it_mean)
             btnAlternativeAction.setOnClickListener { }
 
@@ -172,7 +178,7 @@ class OnboardingNoteFragment : BaseOnboardingFragment<OnboardingNoteState>() {
     }
 
     private fun setupDoneState(state: OnboardingNoteState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
         btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingNoteAction.Done)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteAction.kt
index 5b377fd072..8e7046f114 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteAction.kt
@@ -10,6 +10,7 @@ import org.rekotlin.Action
  */
 sealed class OnboardingNoteAction : Action {
     // from user, ui
+    object Init : OnboardingNoteAction()
     object LoadCardArtwork : OnboardingNoteAction()
     object CreateWallet : OnboardingNoteAction()
     object TopUp : OnboardingNoteAction()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
index abe0536c76..7119dfaf0d 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/note/redux/OnboardingNoteMiddleware.kt
@@ -4,27 +4,29 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Onboarding
+import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.getAddressData
-import com.tangem.tap.common.extensions.getToUpUrl
-import com.tangem.tap.common.extensions.onCardScanned
+import com.tangem.tap.common.extensions.getTopUpUrl
 import com.tangem.tap.common.postUi
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
-import com.tangem.tap.domain.extensions.hasWallets
 import com.tangem.tap.domain.extensions.makePrimaryWalletManager
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.RUSSIA_COUNTRY_CODE
+import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
@@ -61,6 +63,11 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
     val noteState = store.state.onboardingNoteState
 
     when (action) {
+        is OnboardingNoteAction.Init -> {
+            if (!onboardingManager.isActivationStarted(card.cardId)) {
+                Analytics.send(Onboarding.Started())
+            }
+        }
         is OnboardingNoteAction.LoadCardArtwork -> {
             scope.launch {
                 val artworkUrl = onboardingManager.loadArtworkUrl()
@@ -69,7 +76,7 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
         }
         is OnboardingNoteAction.DetermineStepOfScreen -> {
             val step = when {
-                !card.hasWallets() -> OnboardingNoteStep.CreateWallet
+                card.wallets.isEmpty() -> OnboardingNoteStep.CreateWallet
                 noteState.walletBalance.balanceIsToppedUp() -> OnboardingNoteStep.Done
                 else -> OnboardingNoteStep.TopUpWallet
             }
@@ -77,10 +84,15 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
         }
         is OnboardingNoteAction.SetStepOfScreen -> {
             when (action.step) {
+                OnboardingNoteStep.CreateWallet -> {
+                    Analytics.send(Onboarding.CreateWallet.ScreenOpened())
+                }
                 OnboardingNoteStep.TopUpWallet -> {
+                    Analytics.send(Onboarding.Topup.ScreenOpened())
                     store.dispatch(OnboardingNoteAction.Balance.Update)
                 }
                 OnboardingNoteStep.Done -> {
+                    Analytics.send(Onboarding.Finished())
                     onboardingManager.activationFinished(card.cardId)
                     postUi(DELAY_SDK_DIALOG_CLOSE) { store.dispatch(OnboardingNoteAction.Confetti.Show) }
                 }
@@ -92,6 +104,7 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
                 withMainContext {
                     when (result) {
                         is CompletionResult.Success -> {
+                            Analytics.send(Onboarding.CreateWallet.WalletCreatedSuccessfully())
                             val updatedResponse = scanResponse.copy(card = result.data.card)
                             onboardingManager.scanResponse = updatedResponse
                             onboardingManager.activationStarted(updatedResponse.card.cardId)
@@ -150,23 +163,32 @@ private fun handleNoteAction(appState: () -> AppState?, action: Action, dispatch
         is OnboardingNoteAction.ShowAddressInfoDialog -> {
             val addressData = noteState.walletManager?.getAddressData() ?: return
 
+            Analytics.send(Onboarding.Topup.ButtonShowWalletAddress())
             val appDialog = AppDialog.AddressInfoDialog(noteState.walletBalance.currency, addressData)
             store.dispatchDialogShow(appDialog)
         }
         is OnboardingNoteAction.TopUp -> {
-            val topUpUrl = noteState.walletManager?.getToUpUrl() ?: return
-            if (globalState.userCountryCode == RUSSIA_COUNTRY_CODE) {
-                store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog(topUpUrl))
+            val walletManager = noteState.walletManager.guard {
+                store.dispatchDebugErrorNotification("NPE: WalletManager")
                 return
             }
+
+            val topUpUrl = walletManager.getTopUpUrl() ?: return
+            val blockchain = walletManager.wallet.blockchain
+            if (globalState.userCountryCode == RUSSIA_COUNTRY_CODE) {
+                val dialogData = WalletDialog.RussianCardholdersWarningDialog.Data(topUpUrl, blockchain)
+                store.dispatchOnMain(WalletAction.DialogAction.RussianCardholdersWarningDialog(dialogData))
+                return
+            }
+
+            val currencyType = AnalyticsParam.CurrencyType.Blockchain(blockchain)
+            Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
+
             store.dispatchOpenUrl(topUpUrl)
         }
         OnboardingNoteAction.Done -> {
             store.dispatch(GlobalAction.Onboarding.Stop)
-            scope.launch {
-                store.onCardScanned(scanResponse)
-                withMainContext { store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) }
-            }
+            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
index 0ed23143da..b0b8ae343d 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/OnboardingOtherCardsFragment.kt
@@ -8,6 +8,8 @@ import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.view.isVisible
 import androidx.transition.TransitionManager
 import coil.load
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.getDrawableCompat
 import com.tangem.tap.common.redux.navigation.ShareElement
 import com.tangem.tap.common.transitions.InternalNoteLayoutTransition
@@ -33,6 +35,7 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
         mainBinding.onboardingTopContainer.imvFrontCard.transitionName = ShareElement.imvFrontCard
 
         binding.toolbar.setTitle(R.string.onboarding_title)
+        store.dispatch(OnboardingOtherCardsAction.Init)
         store.dispatch(OnboardingOtherCardsAction.LoadCardArtwork)
         store.dispatch(OnboardingOtherCardsAction.DetermineStepOfScreen)
     }
@@ -68,7 +71,10 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
 
     private fun setupCreateWalletState() = with(mainBinding.onboardingActionContainer) {
         btnMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
-        btnMainAction.setOnClickListener { store.dispatch(OnboardingOtherCardsAction.CreateWallet) }
+        btnMainAction.setOnClickListener {
+            Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
+            store.dispatch(OnboardingOtherCardsAction.CreateWallet)
+        }
         btnAlternativeAction.setText(R.string.onboarding_button_what_does_it_mean)
         btnAlternativeAction.setOnClickListener { }
 
@@ -85,20 +91,20 @@ class OnboardingOtherCardsFragment : BaseOnboardingFragment<OnboardingOtherCards
     }
 
     private fun setupDoneState() = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
         btnMainAction.setOnClickListener {
             showConfetti(false)
             store.dispatch(OnboardingOtherCardsAction.Done)
         }
 
         btnAlternativeAction.isVisible = false
-        btnAlternativeAction.setText("")
+        btnAlternativeAction.text = ""
         btnAlternativeAction.setOnClickListener { }
 
         tvHeader.setText(R.string.onboarding_done_header)
         tvBody.setText(R.string.onboarding_done_body)
 
-        mainBinding.onboardingTopContainer.imvCardBackground?.setBackgroundDrawable(
+        mainBinding.onboardingTopContainer.imvCardBackground.setBackgroundDrawable(
             requireContext().getDrawableCompat(R.drawable.shape_rectangle_rounded_8),
         )
         updateConstraints(R.layout.lp_onboarding_done)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsAction.kt
index 2cd82314b3..405f129d44 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsAction.kt
@@ -7,6 +7,7 @@ import org.rekotlin.Action
  */
 sealed class OnboardingOtherCardsAction : Action {
     // from user, ui
+    object Init : OnboardingOtherCardsAction()
     object LoadCardArtwork : OnboardingOtherCardsAction()
     object CreateWallet : OnboardingOtherCardsAction()
 
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
index 02950c3b3a..91536792a9 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
@@ -4,14 +4,13 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
-import com.tangem.tap.common.extensions.onCardScanned
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.postUi
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.domain.extensions.hasWallets
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
@@ -19,7 +18,6 @@ import com.tangem.tap.tangemSdkManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
-import org.rekotlin.DispatchFunction
 import org.rekotlin.Middleware
 
 class OnboardingOtherCardsMiddleware {
@@ -28,16 +26,16 @@ class OnboardingOtherCardsMiddleware {
     }
 }
 
-private val onboardingOtherCardsMiddleware: Middleware<AppState> = { dispatch, state ->
+private val onboardingOtherCardsMiddleware: Middleware<AppState> = { dispatch, _ ->
     { next ->
         { action ->
-            handleOtherCardsAction(action, dispatch)
+            handleOtherCardsAction(action)
             next(action)
         }
     }
 }
 
-private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
+private fun handleOtherCardsAction(action: Action) {
     if (action !is OnboardingOtherCardsAction) return
     val globalState = store.state.globalState
     val onboardingManager = globalState.onboardingState.onboardingManager ?: return
@@ -45,6 +43,11 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
     val card = onboardingManager.scanResponse.card
 
     when (action) {
+        is OnboardingOtherCardsAction.Init -> {
+            if (!onboardingManager.isActivationStarted(card.cardId)) {
+                Analytics.send(Onboarding.Started())
+            }
+        }
         is OnboardingOtherCardsAction.LoadCardArtwork -> {
             scope.launch {
                 val artworkUrl = onboardingManager.loadArtworkUrl()
@@ -53,15 +56,21 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
         }
         is OnboardingOtherCardsAction.DetermineStepOfScreen -> {
             val step = when {
-                !card.hasWallets() -> OnboardingOtherCardsStep.CreateWallet
+                card.wallets.isEmpty() -> OnboardingOtherCardsStep.CreateWallet
                 else -> OnboardingOtherCardsStep.Done
             }
             store.dispatch((OnboardingOtherCardsAction.SetStepOfScreen(step)))
         }
         is OnboardingOtherCardsAction.SetStepOfScreen -> {
-            if (action.step == OnboardingOtherCardsStep.Done) {
-                onboardingManager.activationFinished(card.cardId)
-                postUi(200) { store.dispatch(OnboardingOtherCardsAction.Confetti.Show) }
+            when (action.step) {
+                OnboardingOtherCardsStep.CreateWallet -> {
+                    Analytics.send(Onboarding.CreateWallet.ScreenOpened())
+                }
+                OnboardingOtherCardsStep.Done -> {
+                    Analytics.send(Onboarding.Finished())
+                    onboardingManager.activationFinished(card.cardId)
+                    postUi(200) { store.dispatch(OnboardingOtherCardsAction.Confetti.Show) }
+                }
             }
         }
         is OnboardingOtherCardsAction.CreateWallet -> {
@@ -70,24 +79,36 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
                 withMainContext {
                     when (result) {
                         is CompletionResult.Success -> {
+                            Analytics.send(Onboarding.CreateWallet.WalletCreatedSuccessfully())
                             val updatedResponse = onboardingManager.scanResponse.copy(
-                                card = result.data.card
+                                card = result.data.card,
                             )
+                            val updatedCard = updatedResponse.card
                             onboardingManager.scanResponse = updatedResponse
-                            onboardingManager.activationStarted(updatedResponse.card.cardId)
+                            onboardingManager.activationStarted(updatedCard.cardId)
 
                             val primaryBlockchain = updatedResponse.getBlockchain()
                             val blockchainNetworks = if (primaryBlockchain != Blockchain.Unknown) {
                                 val primaryToken = updatedResponse.getPrimaryToken()
                                 val blockchainNetwork =
-                                    BlockchainNetwork(primaryBlockchain, updatedResponse.card).updateTokens(
-                                        listOfNotNull(primaryToken),
+                                    BlockchainNetwork(
+                                        blockchain = primaryBlockchain,
+                                        card = updatedCard,
                                     )
+                                        .updateTokens(
+                                            listOfNotNull(primaryToken),
+                                        )
                                 listOf(blockchainNetwork)
                             } else {
                                 listOf(
-                                    BlockchainNetwork(Blockchain.Bitcoin, updatedResponse.card),
-                                    BlockchainNetwork(Blockchain.Ethereum, updatedResponse.card),
+                                    BlockchainNetwork(
+                                        blockchain = Blockchain.Bitcoin,
+                                        card = updatedCard,
+                                    ),
+                                    BlockchainNetwork(
+                                        blockchain = Blockchain.Ethereum,
+                                        card = updatedCard,
+                                    ),
                                 )
                             }
 
@@ -107,10 +128,11 @@ private fun handleOtherCardsAction(action: Action, dispatch: DispatchFunction) {
         }
         OnboardingOtherCardsAction.Done -> {
             store.dispatch(GlobalAction.Onboarding.Stop)
-            scope.launch {
-                store.onCardScanned(onboardingManager.scanResponse)
-                withMainContext { store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet)) }
-            }
+            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(onboardingManager.scanResponse)
         }
+        is OnboardingOtherCardsAction.Confetti.Hide,
+        is OnboardingOtherCardsAction.SetArtworkUrl,
+        is OnboardingOtherCardsAction.Confetti.Show,
+        -> Unit
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsAction.kt
index 5c915f9cb0..8b25bf8e00 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsAction.kt
@@ -45,7 +45,6 @@ sealed class TwinCardsAction : Action {
         data class LaunchThirdStep(val message: Message) : TwinCardsAction()
     }
 
-
     // for the onboarding
     data class SetPairCardId(val cardId: String) : TwinCardsAction()
     object TopUp : TwinCardsAction()
@@ -53,6 +52,10 @@ sealed class TwinCardsAction : Action {
     data class SetWalletManager(val walletManager: WalletManager) : TwinCardsAction()
     object Done : TwinCardsAction()
 
+    data class SaveScannedTwinCardAndNavigateToWallet(
+        val scanResponse: ScanResponse,
+    ) : TwinCardsAction()
+
     sealed class Balance {
         object Update : TwinCardsAction()
         data class Set(val balance: OnboardingWalletBalance) : TwinCardsAction()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
index 47dd842d1d..b5bd3c7504 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsMiddleware.kt
@@ -1,17 +1,21 @@
 package com.tangem.tap.features.onboarding.products.twins.redux
 
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.extensions.Result
 import com.tangem.common.CompletionResult
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchErrorNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.getAddressData
-import com.tangem.tap.common.extensions.getToUpUrl
-import com.tangem.tap.common.extensions.onCardScanned
+import com.tangem.tap.common.extensions.getTopUpUrl
 import com.tangem.tap.common.postUi
 import com.tangem.tap.common.redux.AppDialog
 import com.tangem.tap.common.redux.AppState
@@ -20,12 +24,15 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.makePrimaryWalletManager
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
 import com.tangem.tap.domain.twins.TwinCardsManager
+import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Action
@@ -64,7 +71,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
     fun updateScanResponse(response: ScanResponse) {
         when (twinCardsState.mode) {
             CreateTwinWalletMode.CreateWallet -> onboardingManager?.scanResponse = response
-            CreateTwinWalletMode.RecreateWallet -> store.dispatch(GlobalAction.SaveScanNoteResponse(response))
+            CreateTwinWalletMode.RecreateWallet -> store.dispatch(GlobalAction.SaveScanResponse(response))
         }
     }
 
@@ -76,6 +83,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
 
     fun finishCardActivation() {
         if (twinCardsState.mode == CreateTwinWalletMode.CreateWallet) {
+            Analytics.send(Onboarding.Finished())
             onboardingManager?.activationFinished(getScanResponse().card.cardId)
             twinCardsState.pairCardId?.let { onboardingManager?.activationFinished(it) }
         }
@@ -83,13 +91,23 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
 
     when (action) {
         is TwinCardsAction.Init -> {
-            if (twinCardsState.currentStep == TwinCardsStep.WelcomeOnly) return
+            if (twinCardsState.currentStep is TwinCardsStep.WelcomeOnly) return
+
+            val scanResponse = getScanResponse()
+            onboardingManager?.apply {
+                if (!isActivationStarted(scanResponse.card.cardId)) {
+                    Analytics.send(Onboarding.Started())
+                }
+            }
 
             when (twinCardsState.mode) {
                 CreateTwinWalletMode.CreateWallet -> {
                     if (preferencesStorage.wasTwinsOnboardingShown()) {
                         val step = when {
-                            !getScanResponse().twinsIsTwinned() -> TwinCardsStep.CreateFirstWallet
+                            !scanResponse.twinsIsTwinned() -> {
+                                Analytics.send(Onboarding.CreateWallet.ScreenOpened())
+                                TwinCardsStep.CreateFirstWallet
+                            }
                             twinCardsState.walletBalance.balanceIsToppedUp() -> TwinCardsStep.Done
                             else -> TwinCardsStep.TopUpWallet
                         }
@@ -105,8 +123,8 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
         }
         is TwinCardsAction.Wallet.HandleOnBackPressed -> {
             val shouldReturnCardBack = twinCardsState.mode == CreateTwinWalletMode.CreateWallet
-                    && twinCardsState.currentStep != TwinCardsStep.TopUpWallet
-                    && twinCardsState.currentStep != TwinCardsStep.Done
+                && twinCardsState.currentStep != TwinCardsStep.TopUpWallet
+                && twinCardsState.currentStep != TwinCardsStep.Done
 
             if (twinCardsState.showAlert) {
                 val onInterruptPrompt = {
@@ -126,26 +144,41 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
         }
         is TwinCardsAction.SetStepOfScreen -> {
             when (action.step) {
-                TwinCardsStep.WelcomeOnly -> preferencesStorage.saveTwinsOnboardingShown()
-                TwinCardsStep.Welcome -> preferencesStorage.saveTwinsOnboardingShown()
+                is TwinCardsStep.WelcomeOnly, TwinCardsStep.Welcome -> {
+                    Analytics.send(Onboarding.Twins.ScreenOpened())
+                    preferencesStorage.saveTwinsOnboardingShown()
+                }
                 TwinCardsStep.TopUpWallet -> store.dispatch(TwinCardsAction.Balance.Update)
                 TwinCardsStep.Done -> {
                     finishCardActivation()
                     postUi(500) { store.dispatch(TwinCardsAction.Confetti.Show) }
                 }
+                TwinCardsStep.CreateFirstWallet -> {
+                    scope.launch {
+                        userWalletsListManager.delete(
+                            listOfNotNull(UserWalletIdBuilder.scanResponse(getScanResponse()).build()),
+                        )
+                    }
+                }
+                TwinCardsStep.None,
+                TwinCardsStep.Warning,
+                TwinCardsStep.CreateSecondWallet,
+                TwinCardsStep.CreateThirdWallet,
+                -> Unit
             }
         }
         is TwinCardsAction.Wallet.LaunchFirstStep -> {
+            Analytics.send(Onboarding.Twins.SetupStarted())
             val manager = TwinCardsManager(
                 card = getScanResponse().card,
                 assetReader = action.reader,
-                analyticsHandler = store.state.globalState.analyticsHandler
             )
             store.dispatch(TwinCardsAction.CardsManager.Set(manager))
 
             scope.launch {
                 when (val result = manager.createFirstWallet(action.initialMessage)) {
                     is CompletionResult.Success -> {
+                        Analytics.send(Onboarding.CreateWallet.WalletCreatedSuccessfully())
                         startCardActivation(result.data.cardId)
                         delay(DELAY_SDK_DIALOG_CLOSE)
                         withMainContext {
@@ -164,7 +197,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                 val result = manager.createSecondWallet(
                     action.initialMessage,
                     action.preparingMessage,
-                    action.creatingWalletMessage
+                    action.creatingWalletMessage,
                 )
                 when (result) {
                     is CompletionResult.Success -> {
@@ -186,6 +219,7 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
             scope.launch {
                 when (val result = manager.complete(action.message)) {
                     is Result.Success -> {
+                        Analytics.send(Onboarding.Twins.SetupFinished())
                         updateScanResponse(result.data)
                         delay(DELAY_SDK_DIALOG_CLOSE)
                         withMainContext {
@@ -222,11 +256,11 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
             val balanceIsLoading = twinCardsState.walletBalance.copy(
                 currency = Currency.Blockchain(
                     walletManager.wallet.blockchain,
-                    walletManager.wallet.publicKey.derivationPath?.rawPath
+                    walletManager.wallet.publicKey.derivationPath?.rawPath,
                 ),
                 state = ProgressState.Loading,
                 error = null,
-                criticalError = null
+                criticalError = null,
             )
             store.dispatch(TwinCardsAction.Balance.Set(balanceIsLoading))
 
@@ -240,7 +274,6 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
                     store.dispatch(TwinCardsAction.Balance.SetNonCriticalError(loadedBalance.error))
                 }
             }
-
         }
         is TwinCardsAction.Balance.Set -> {
             if (action.balance.balanceIsToppedUp()) {
@@ -256,25 +289,33 @@ private fun handle(action: Action, dispatch: DispatchFunction) {
             store.dispatchDialogShow(appDialog)
         }
         is TwinCardsAction.TopUp -> {
-            val topUpUrl = twinCardsState.walletManager?.getToUpUrl() ?: return
+            val topUpUrl = twinCardsState.walletManager?.getTopUpUrl() ?: return
+
+            val currencyType = AnalyticsParam.CurrencyType.Blockchain(Blockchain.Bitcoin)
+            Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
+
             store.dispatchOpenUrl(topUpUrl)
         }
         TwinCardsAction.Done -> {
-            scope.launch {
-                val scanResponse = getScanResponse()
-                store.onCardScanned(scanResponse)
-                withMainContext {
-                    when (twinCardsState.mode) {
-                        CreateTwinWalletMode.CreateWallet -> {
-                            store.dispatch(GlobalAction.Onboarding.Stop)
-                            store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet))
-                        }
-                        CreateTwinWalletMode.RecreateWallet -> {
-                            store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-                        }
+            val scanResponse = getScanResponse()
+            when (twinCardsState.mode) {
+                CreateTwinWalletMode.CreateWallet -> {
+                    store.dispatchOnMain(GlobalAction.Onboarding.Stop)
+                    OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
+                }
+                CreateTwinWalletMode.RecreateWallet -> {
+                    if (preferencesStorage.shouldSaveUserWallets) {
+                        OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(scanResponse)
+                    } else {
+                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
                     }
                 }
             }
         }
+        is TwinCardsAction.SaveScannedTwinCardAndNavigateToWallet -> {
+            OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(
+                scanResponse = action.scanResponse,
+            )
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
index 0b2e4b4d1a..0e1078584e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/redux/TwinCardsState.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.onboarding.products.twins.redux
 
 import com.tangem.blockchain.common.WalletManager
+import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.twins.TwinCardsManager
@@ -62,9 +63,19 @@ data class TwinCardsState(
 
 enum class CreateTwinWalletMode { CreateWallet, RecreateWallet }
 
-enum class TwinCardsStep {
-    None, WelcomeOnly, Welcome, Warning, CreateFirstWallet, CreateSecondWallet, CreateThirdWallet,
+sealed class TwinCardsStep {
+    object None : TwinCardsStep()
+    data class WelcomeOnly(
+        val scanResponse: ScanResponse,
+    ) : TwinCardsStep()
+
+    object Welcome : TwinCardsStep()
+    object Warning : TwinCardsStep()
+    object CreateFirstWallet : TwinCardsStep()
+    object CreateSecondWallet : TwinCardsStep()
+    object CreateThirdWallet : TwinCardsStep()
 
     // for the onboarding
-    TopUpWallet, Done
+    object TopUpWallet : TwinCardsStep()
+    object Done : TwinCardsStep()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
index d4c6826a3c..36e386325e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/twins/ui/TwinsCardsFragment.kt
@@ -13,16 +13,18 @@ import coil.load
 import com.tangem.Message
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.extensions.VoidCallback
+import com.tangem.core.ui.fragments.setStatusBarColor
+import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
 import com.tangem.tap.common.AndroidAssetReader
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.getDrawableCompat
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.extensions.stripZeroPlainString
-import com.tangem.tap.common.redux.navigation.AppScreen
-import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.redux.navigation.ShareElement
 import com.tangem.tap.common.toggleWidget.RefreshBalanceWidget
 import com.tangem.tap.common.transitions.InternalNoteLayoutTransition
@@ -41,7 +43,7 @@ import com.tangem.wallet.databinding.LayoutOnboardingContainerTopBinding
 class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
     private val mainBinding by lazy { binding.vMain }
-    private var previousStep = TwinCardsStep.None
+    private var previousStep: TwinCardsStep = TwinCardsStep.None
 
     private lateinit var twinsWidget: TwinsCardWidget
     private lateinit var btnRefreshBalanceWidget: RefreshBalanceWidget
@@ -96,6 +98,11 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        setStatusBarColor(R.color.backgroundWhite)
+    }
+
     private fun reconfigureLayoutForTwins(containerBinding: LayoutOnboardingContainerTopBinding) =
         with(containerBinding) {
             imvFrontCard.hide()
@@ -125,7 +132,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         pbBinding.pbState.progress = state.progress
 
         when (state.currentStep) {
-            TwinCardsStep.WelcomeOnly -> setupWelcomeOnlyState(state)
+            is TwinCardsStep.WelcomeOnly -> setupWelcomeOnlyState(state, state.currentStep.scanResponse)
             TwinCardsStep.Welcome -> setupWelcomeState(state)
             TwinCardsStep.Warning -> setupWarningState(state)
             TwinCardsStep.CreateFirstWallet -> setupCreateFirstWalletState(state)
@@ -155,9 +162,9 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
         }
     }
 
-    private fun setupWelcomeOnlyState(state: TwinCardsState) {
+    private fun setupWelcomeOnlyState(state: TwinCardsState, scanResponse: ScanResponse) {
         setupWelcomeState(state) {
-            store.dispatch(NavigationAction.NavigateTo(AppScreen.Wallet))
+            store.dispatch(TwinCardsAction.SaveScannedTwinCardAndNavigateToWallet(scanResponse))
             store.dispatch(TwinCardsAction.SetStepOfScreen(TwinCardsStep.None))
         }
     }
@@ -238,6 +245,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
 
         btnMainAction.text = getString(R.string.twins_recreate_button_format, twinIndexNumber)
         btnMainAction.setOnClickListener {
+            Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
             store.dispatch(
                 TwinCardsAction.Wallet.LaunchFirstStep(
                     Message(getString(R.string.twins_recreate_title_format, twinIndexNumber)),
@@ -349,7 +357,7 @@ class TwinsCardsFragment : BaseOnboardingFragment<TwinCardsState>() {
     }
 
     private fun setupDoneState(state: TwinCardsState) = with(mainBinding.onboardingActionContainer) {
-        btnMainAction.setText(R.string.onboarding_done_button_continue)
+        btnMainAction.setText(R.string.common_continue)
         btnMainAction.setOnClickListener {
             store.dispatch(TwinCardsAction.Confetti.Hide)
             store.dispatch(TwinCardsAction.Done)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
index 885f57fa99..f3ff070f97 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletAction.kt
@@ -5,7 +5,6 @@ import org.rekotlin.Action
 
 sealed class OnboardingWalletAction : Action {
     object Init : OnboardingWalletAction()
-    object StartSaltPayCardActivation : OnboardingWalletAction()
     object GetToCreateWalletStep : OnboardingWalletAction()
     object GetToSaltPayStep : OnboardingWalletAction()
     object CreateWallet : OnboardingWalletAction()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 8438c8b760..37e629800a 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -2,11 +2,15 @@ package com.tangem.tap.features.onboarding.products.wallet.redux
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.CompletionResult
-import com.tangem.common.card.Card
+import com.tangem.common.extensions.ifNotNull
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.operations.backup.BackupService
 import com.tangem.tap.backupService
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.primaryCardIsSaltPayVisa
@@ -14,10 +18,10 @@ import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
-import com.tangem.tap.domain.extensions.hasWallets
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
+import com.tangem.tap.features.onboarding.OnboardingHelper
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.dialog.SaltPayDialog
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayAction
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayState
@@ -61,39 +65,40 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
 
     when (action) {
         OnboardingWalletAction.Init -> {
+            ifNotNull(onboardingManager, card) { manager, card ->
+                if (!card.isSaltPay && !manager.isActivationStarted(card.cardId)) {
+                    Analytics.send(Onboarding.Started())
+                }
+            }
             when {
                 card == null -> {
                     // it's possible when found unfinished backup for standard Wallet cards
                     store.dispatch(OnboardingWalletAction.ResumeBackup)
                 }
-                card.hasWallets() && card.backupStatus == Card.BackupStatus.NoBackup -> {
+                card.wallets.isNotEmpty() && card.backupStatus == CardDTO.BackupStatus.NoBackup -> {
                     store.dispatch(OnboardingWalletAction.ResumeBackup)
                 }
-                card.hasWallets() && card.backupStatus?.isActive == true -> {
+                card.wallets.isNotEmpty() && card.backupStatus?.isActive == true -> {
                     when {
                         // check for unfinished backup for saltPay cards. See more
                         scanResponse.isSaltPay() && backupService.hasIncompletedBackup -> {
                             store.dispatch(OnboardingWalletAction.ResumeBackup)
                         }
+
                         scanResponse.isSaltPay() -> {
                             store.dispatch(OnboardingWalletAction.GetToSaltPayStep)
                             store.dispatch(BackupAction.FinishBackup)
                         }
+
                         else -> store.dispatch(BackupAction.FinishBackup)
                     }
                 }
                 else -> {
                     store.dispatch(OnboardingWalletAction.GetToCreateWalletStep)
+                    Analytics.send(Onboarding.CreateWallet.ScreenOpened())
                 }
             }
         }
-        is OnboardingWalletAction.StartSaltPayCardActivation -> {
-            // we need to do this because the standard activation happens in the OnboardingWalletAction.CreateWallet
-            // step which is omitted for SaltPay cards
-            if (onboardingWalletState.isSaltPay && scanResponse != null) {
-                startCardActivation(scanResponse)
-            }
-        }
         is OnboardingWalletAction.LoadArtwork -> {
             scope.launch {
                 val artwork = onboardingManager?.loadArtworkUrl()
@@ -112,6 +117,7 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                 withMainContext {
                     when (result) {
                         is CompletionResult.Success -> {
+                            Analytics.send(Onboarding.CreateWallet.WalletCreatedSuccessfully())
                             //here we must use updated scanResponse after createWallet & derivation
                             val updatedResponse = globalState.onboardingState.onboardingManager.scanResponse.copy(
                                 card = result.data.card,
@@ -120,8 +126,14 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                             )
                             onboardingManager.scanResponse = updatedResponse
                             val blockchainNetworks = listOf(
-                                BlockchainNetwork(Blockchain.Bitcoin, result.data.card),
-                                BlockchainNetwork(Blockchain.Ethereum, result.data.card),
+                                BlockchainNetwork(
+                                    blockchain = Blockchain.Bitcoin,
+                                    card = result.data.card,
+                                ),
+                                BlockchainNetwork(
+                                    blockchain = Blockchain.Ethereum,
+                                    card = result.data.card,
+                                ),
                             )
                             store.dispatch(
                                 WalletAction.MultiWallet.SaveCurrencies(
@@ -148,11 +160,11 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
             } else {
                 val backupState = store.state.onboardingWalletState.backupState
                 val updatedScanResponse = updateScanResponseAfterBackup(scanResponse, backupState)
-                if (onboardingWalletState.isSaltPay) {
-                    finishCardActivation(backupState, scanResponse.card)
-                }
-                scope.launch { globalState.tapWalletManager.onCardScanned(updatedScanResponse) }
-                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                OnboardingHelper.trySaveWalletAndNavigateToWalletScreen(
+                    scanResponse = updatedScanResponse,
+                    accessCode = backupState.accessCode,
+                    backupCardsIds = backupState.backupCardIds,
+                )
             }
         }
         is OnboardingWalletAction.ResumeBackup -> {
@@ -166,6 +178,7 @@ private fun handleWalletAction(action: Action, state: () -> AppState?, dispatch:
                         if (onboardingWalletState.isSaltPay) {
                             BackupAction.StartBackup
                         } else {
+                            Analytics.send(Onboarding.Backup.ScreenOpened())
                             BackupAction.IntroduceBackup
                         }
                     } else {
@@ -190,7 +203,7 @@ private fun updateScanResponseAfterBackup(
     val card = if (backupState.backupCardsNumber > 0) {
         val cardsCount = backupState.backupCardsNumber
         scanResponse.card.copy(
-            backupStatus = Card.BackupStatus.Active(cardCount = cardsCount),
+            backupStatus = CardDTO.BackupStatus.Active(cardCount = cardsCount),
             isAccessCodeSet = true,
         )
     } else {
@@ -221,6 +234,7 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
 
     when (action) {
         is BackupAction.StartBackup -> {
+            Analytics.send(Onboarding.Backup.Started())
             backupService.discardSavedBackup()
             val primaryCard = scanResponse?.primaryCard
             if (primaryCard != null) {
@@ -266,7 +280,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                 store.dispatchOnMain(GlobalAction.ShowDialog(BackupDialog.AddMoreBackupCards))
             }
         }
+        is BackupAction.ShowEnterAccessCodeScreen -> {
+            Analytics.send(Onboarding.Backup.SettingAccessCodeStarted())
+        }
         is BackupAction.CheckAccessCode -> {
+            Analytics.send(Onboarding.Backup.AccessCodeEntered())
             if (action.accessCode.length < 4) {
                 store.dispatch(BackupAction.SetAccessCodeError(AccessCodeError.CodeTooShort))
             } else {
@@ -275,6 +293,7 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             }
         }
         is BackupAction.SaveAccessCodeConfirmation -> {
+            Analytics.send(Onboarding.Backup.AccessCodeReEntered())
             if (action.accessCodeConfirmation == backupState.accessCode) {
                 store.dispatch(BackupAction.SetAccessCodeError(null))
                 backupService.setAccessCode(action.accessCodeConfirmation)
@@ -312,7 +331,9 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             }
         }
         is BackupAction.FinishBackup -> {
+            Analytics.send(Onboarding.Backup.Finished(backupState.backupCardsNumber))
             if (!onboardingWalletState.isSaltPay) {
+                Analytics.send(Onboarding.Finished())
                 finishCardActivation(backupState, card)
             }
         }
@@ -320,7 +341,10 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             backupService.discardSavedBackup()
         }
         is BackupAction.DiscardSavedBackup -> {
-            backupService.primaryCardId?.let { finishCardsActivationForDiscardedUnfinishedBackup(it) }
+            backupService.primaryCardId?.let {
+                Analytics.send(Onboarding.Finished())
+                finishCardsActivationForDiscardedUnfinishedBackup(it)
+            }
             backupService.discardSavedBackup()
         }
         is BackupAction.CheckForUnfinishedBackup -> {
@@ -333,6 +357,7 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             store.dispatch(NavigationAction.NavigateTo(AppScreen.OnboardingWallet))
         }
         is BackupAction.DismissBackup -> {
+            Analytics.send(Onboarding.Backup.Skipped())
             if (onboardingWalletState.isSaltPay) throw UnsupportedOperationException()
             store.dispatch(BackupAction.FinishBackup)
         }
@@ -351,9 +376,10 @@ private fun startCardActivation(scanResponse: ScanResponse) {
  * Standard Wallet cards finish activation at BackupAction.FinishBackup
  * SaltPay cards finish activation at OnboardingWalletAction.FinishOnboarding
  */
-private fun finishCardActivation(backupState: BackupState, card: Card?) {
+internal fun finishCardActivation(backupState: BackupState, card: CardDTO?) {
     (listOf(backupState.primaryCardId, card?.cardId) + backupState.backupCardIds)
-        .distinct().filterNotNull()
+        .distinct()
+        .filterNotNull()
         .forEach { cardId ->
             preferencesStorage.usedCardsPrefStorage.activationFinished(cardId)
         }
@@ -377,7 +403,7 @@ private fun initSaltPayOnBackupFinishedIfNeeded(
         if (scanResponse == null) throw IllegalArgumentException()
 
         val (manager, config) = OnboardingSaltPayState.initDependency(scanResponse)
-        store.dispatchOnMain(OnboardingSaltPayAction.Init.SetDependencies(manager, config))
+        store.dispatchOnMain(OnboardingSaltPayAction.SetDependencies(manager, config))
         store.dispatchOnMain(OnboardingSaltPayAction.Update)
     }
 }
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt
index 4ef4b407d2..187425c2af 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt
@@ -11,16 +11,16 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.extensions.isZero
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.successOr
-import com.tangem.network.api.paymentology.AttestationResponse
-import com.tangem.network.api.paymentology.PaymentologyApiService
-import com.tangem.network.api.paymentology.RegisterKYCRequest
-import com.tangem.network.api.paymentology.RegisterWalletRequest
-import com.tangem.network.api.paymentology.RegisterWalletResponse
-import com.tangem.network.api.paymentology.RegistrationResponse
-import com.tangem.network.api.paymentology.tryExtractError
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.datasource.api.paymentology.AttestationResponse
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.paymentology.RegisterKYCRequest
+import com.tangem.datasource.api.paymentology.RegisterWalletRequest
+import com.tangem.datasource.api.paymentology.RegisterWalletResponse
+import com.tangem.datasource.api.paymentology.RegistrationResponse
+import com.tangem.datasource.api.paymentology.tryExtractError
 import com.tangem.operations.attestation.AttestWalletKeyResponse
 import com.tangem.tap.common.extensions.safeUpdate
-import com.tangem.tap.domain.extensions.UserWalletId
 import com.tangem.tap.domain.getFirstToken
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError
 import java.math.BigDecimal
@@ -123,7 +123,7 @@ class SaltPayActivationManager(
     }
 
     suspend fun claim(amountToClaim: BigDecimal, signer: TransactionSigner): Result<Unit> {
-        val result = gnosisRegistrator.transferFrom(amountToClaim, signer).successOr {
+        gnosisRegistrator.transferFrom(amountToClaim, signer).successOr {
             return Result.Failure(SaltPayActivationError.ClaimTransactionFailed)
         }
         return Result.Success(Unit)
@@ -152,12 +152,13 @@ class SaltPayActivationManager(
         )
     }
 
-    private fun makeRegisterKYCRequest(): RegisterKYCRequest = RegisterKYCRequest(
-        cardId = cardId,
-        publicKey = cardPublicKey,
-        kycProvider = "UTORG",
-        kycRefId = kycUrlProvider.kycRefId,
-    )
+    private fun makeRegisterKYCRequest(): RegisterKYCRequest =
+        RegisterKYCRequest(
+            cardId = cardId,
+            publicKey = cardPublicKey,
+            kycProvider = "UTORG",
+            kycRefId = kycUrlProvider.kycRefId,
+        )
 
     companion object {
         fun stub(): SaltPayActivationManager = SaltPayActivationManager(
@@ -192,4 +193,4 @@ class KYCUrlProvider(
             .appendQueryParameter(kycProvider.externalIdParameterKey, kycRefId)
             .build().toString()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayAction.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayAction.kt
index 009f2350ad..a2194e9568 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayAction.kt
@@ -10,12 +10,12 @@ import java.math.BigDecimal
 [REDACTED_AUTHOR]
  */
 sealed class OnboardingSaltPayAction : Action {
-    sealed class Init : OnboardingSaltPayAction() {
-        data class SetDependencies(
-            val registrationManager: SaltPayActivationManager,
-            val saltPayConfig: SaltPayConfig,
-        ) : Init()
-    }
+    object Init : OnboardingSaltPayAction()
+
+    data class SetDependencies(
+        val registrationManager: SaltPayActivationManager,
+        val saltPayConfig: SaltPayConfig,
+    ) : OnboardingSaltPayAction()
 
     data class SetInProgress(val isInProgress: Boolean) : OnboardingSaltPayAction()
     data class SetClaimRefreshInProgress(val isInProgress: Boolean) : OnboardingSaltPayAction()
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
index 51a593e33c..4d6c4a3c00 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayMiddleware.kt
@@ -8,17 +8,20 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.successOr
 import com.tangem.domain.common.extensions.withMainContext
-import com.tangem.network.api.paymentology.KYCStatus
-import com.tangem.network.api.paymentology.RegistrationResponse
-import com.tangem.tap.common.analytics.GlobalAnalyticsEventHandler
+import com.tangem.datasource.api.paymentology.KYCStatus
+import com.tangem.datasource.api.paymentology.RegistrationResponse
+import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Onboarding
+import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.isPositive
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TangemSigner
 import com.tangem.tap.features.demo.DemoHelper
+import com.tangem.tap.features.onboarding.OnboardingManager
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletState
+import com.tangem.tap.features.onboarding.products.wallet.redux.finishCardActivation
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.AllSymbolsTheSameFilter
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayActivationManager
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayExceptionHandler
@@ -58,10 +61,23 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
 
     fun getAppState(): AppState = appState()!!
     fun getOnboardingWalletState(): OnboardingWalletState = getAppState().onboardingWalletState
+    fun getOnboardingManager(): OnboardingManager? = getAppState().globalState.onboardingState.onboardingManager
     fun getState(): OnboardingSaltPayState = getOnboardingWalletState().onboardingSaltPayState!!
-    val analyticsHandler = getAppState().globalState.analyticsHandler
 
     when (action) {
+        is OnboardingSaltPayAction.Init -> {
+            if (!getOnboardingWalletState().isSaltPay) return
+            val onboardingManager = getOnboardingManager().guard {
+                // onboardingManager may be null if it's started from standard Wallet unfinished backup
+                return
+            }
+
+            val card = onboardingManager.scanResponse.card
+            if (!onboardingManager.isActivationStarted(card.cardId)) {
+                Analytics.send(Onboarding.Started())
+                onboardingManager.activationStarted(card.cardId)
+            }
+        }
         is OnboardingSaltPayAction.Update -> {
             handleInProgress = true
 
@@ -77,8 +93,6 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
             }
         }
         is OnboardingSaltPayAction.RegisterCard -> {
-            analyticsHandler.handleAnalyticsEvent(Onboarding.ButtonConnect())
-
             handleInProgress = true
             val state = getState()
 
@@ -151,7 +165,7 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
         is OnboardingSaltPayAction.TrySetPin -> {
             try {
                 assertPinValid(action.pin, getState().pinLength)
-                analyticsHandler.handleAnalyticsEvent(Onboarding.PinCodeSet())
+                Analytics.send(Onboarding.PinCodeSet())
                 store.dispatch(OnboardingSaltPayAction.SetPin(action.pin))
                 store.dispatch(OnboardingSaltPayAction.SetStep(SaltPayActivationStep.CardRegistration))
             } catch (error: SaltPayActivationError) {
@@ -159,7 +173,6 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
             }
         }
         is OnboardingSaltPayAction.Claim -> {
-            analyticsHandler.handleAnalyticsEvent(Onboarding.ButtonClaim())
             val state = getState()
             handleInProgress = true
 
@@ -192,7 +205,7 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
                 }
 
                 handleInProgress = false
-                analyticsHandler.handleAnalyticsEvent(Onboarding.ClaimWasSuccessfully())
+                Analytics.send(Onboarding.ClaimWasSuccessfully())
                 dispatchOnMain(OnboardingSaltPayAction.SetStep(SaltPayActivationStep.ClaimInProgress))
                 dispatchOnMain(OnboardingSaltPayAction.RefreshClaim)
             }
@@ -233,23 +246,31 @@ private fun handleOnboardingSaltPayAction(anyAction: Action, appState: () -> App
                 }
             }
         }
-        is OnboardingSaltPayAction.SetStep -> handleAnalytics(analyticsHandler, action.newStep)
+        is OnboardingSaltPayAction.SetStep -> {
+            when (action.newStep) {
+                SaltPayActivationStep.KycStart -> Analytics.send(Onboarding.KYCStarted())
+                SaltPayActivationStep.KycWaiting -> Analytics.send(Onboarding.KYCInProgress())
+                SaltPayActivationStep.KycReject -> Analytics.send(Onboarding.KYCRejected())
+                SaltPayActivationStep.Claim -> Analytics.send(Onboarding.ClaimScreenOpened())
+                SaltPayActivationStep.ClaimSuccess, SaltPayActivationStep.Success -> {
+                    Analytics.send(Onboarding.Finished())
+                    val onboardingManager = getOnboardingManager().guard {
+                        // Null is possible if it is started from a standard pending backup and in this case
+                        // it is impossible to get here
+                        store.dispatchDebugErrorNotification("OnboardingManager can't be NULL")
+                        return
+                    }
+                    finishCardActivation(getOnboardingWalletState().backupState, onboardingManager.scanResponse.card)
+                }
+                else -> {}
+            }
+        }
         else -> {
             /* do nothing, only reduce */
         }
     }
 }
 
-private fun handleAnalytics(analyticsHandler: GlobalAnalyticsEventHandler, step: SaltPayActivationStep) {
-    when (step) {
-        SaltPayActivationStep.KycStart -> analyticsHandler.handleAnalyticsEvent(Onboarding.KYCStarted())
-        SaltPayActivationStep.KycWaiting -> analyticsHandler.handleAnalyticsEvent(Onboarding.KYCInProgress())
-        SaltPayActivationStep.KycReject -> analyticsHandler.handleAnalyticsEvent(Onboarding.KYCRejected())
-        SaltPayActivationStep.Claim -> analyticsHandler.handleAnalyticsEvent(Onboarding.ClaimScreenOpened())
-        else -> {}
-    }
-}
-
 suspend fun SaltPayActivationManager.update(
     currentStep: SaltPayActivationStep,
     currentAmountToClaim: Amount?,
@@ -265,7 +286,7 @@ suspend fun SaltPayActivationManager.update(
         return Result.Failure(ex)
     }
 
-    checkGasIfNeeded(this, newStep).successOr { return it }
+    // checkGasIfNeeded(this, newStep).successOr { return it }
 
     Timber.d("update: success: %s", newStep)
     return Result.Success(newStep)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayReducer.kt
index 264829c157..71570fd52e 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayReducer.kt
@@ -17,7 +17,7 @@ class OnboardingSaltPayReducer {
 private fun internalReduce(anyAction: Action, onboardingWalletState: OnboardingWalletState): OnboardingWalletState {
     val action = anyAction as? OnboardingSaltPayAction ?: return onboardingWalletState
 
-    if (onboardingWalletState.onboardingSaltPayState == null && action is OnboardingSaltPayAction.Init.SetDependencies) {
+    if (onboardingWalletState.onboardingSaltPayState == null && action is OnboardingSaltPayAction.SetDependencies) {
         return onboardingWalletState.copy(
             onboardingSaltPayState = OnboardingSaltPayState(
                 saltPayManager = action.registrationManager,
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt
index 6acbe4bdd2..e1317622a4 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt
@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.SaltPayWorkaround
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
 import com.tangem.tap.common.toggleWidget.WidgetState
 import com.tangem.tap.domain.extensions.makeSaltPayWalletManager
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.GnosisRegistrator
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt
index 90321f426a..fcbcfb74ff 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt
@@ -14,6 +14,8 @@ import coil.size.Scale
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.button.MaterialButton
 import com.tangem.common.extensions.guard
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.compose.PinCodeWidget
 import com.tangem.tap.common.extensions.configureSettings
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
@@ -178,6 +180,7 @@ internal class OnboardingSaltPayView(
         showOnlyView(connectCard.root) {
             progressButton = SaltPayProgressButton(connectCard.root)
             connectCard.btnConnect.setOnClickListener {
+                Analytics.send(Onboarding.ButtonConnect())
                 store.dispatch(OnboardingSaltPayAction.RegisterCard)
             }
         }
@@ -247,7 +250,7 @@ internal class OnboardingSaltPayView(
     }
 
     private fun handleClaim(state: OnboardingSaltPayState) = with(walletFragment.bindingSaltPay) {
-        toolbar.title = getText(R.string.onboarding_navbar_claim)
+        toolbar.title = getText(R.string.onboarding_getting_started)
         val btnMain = actionContainer.btnContainer.findViewById<MaterialButton>(R.id.btn_main_action)
         val tvHeader = actionContainer.tvHeader
         val tvBody = actionContainer.tvBody
@@ -286,6 +289,7 @@ internal class OnboardingSaltPayView(
                 btnMain.text = getText(R.string.onboarding_button_claim)
                 btnMain.isEnabled
                 btnMain.setOnClickListener {
+                    Analytics.send(Onboarding.ButtonClaim())
                     store.dispatch(OnboardingSaltPayAction.Claim)
                 }
                 progressButton = SaltPayProgressButton(actionContainer.root)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupAnimator.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupAnimator.kt
index d57205ce46..66f90f159c 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupAnimator.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/BackupAnimator.kt
@@ -68,7 +68,7 @@ class WalletBackupAnimator(
         when (backupCardsCounts) {
             0 -> {
                 when (currentStep) {
-                    STEP_CREATE_WALLET -> {
+                    UNDEFINED, STEP_CREATE_WALLET -> {
                         cardsWidget.toFolded(false) { cardsWidget.toFan() }
 
                         FIRST_BACKUP.animateAlpha(0.6f, 0)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 47b6beb3aa..2ca75121a9 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -19,6 +19,8 @@ import com.tangem.common.CardIdFormatter
 import com.tangem.common.core.CardIdDisplayFormat
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.PropertyCalculator
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.inflate
 import com.tangem.tap.common.extensions.show
@@ -32,6 +34,7 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.BackupStep
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletAction
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletState
 import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWalletStep
+import com.tangem.tap.features.onboarding.products.wallet.saltPay.redux.OnboardingSaltPayAction
 import com.tangem.tap.features.onboarding.products.wallet.saltPay.ui.OnboardingSaltPayView
 import com.tangem.tap.features.onboarding.products.wallet.ui.dialogs.AccessCodeDialog
 import com.tangem.tap.store
@@ -81,7 +84,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
         addBackPressHandler(this)
 
         store.dispatch(OnboardingWalletAction.Init)
-        store.dispatch(OnboardingWalletAction.StartSaltPayCardActivation)
+        store.dispatch(OnboardingSaltPayAction.Init)
         store.dispatch(OnboardingWalletAction.LoadArtwork)
     }
 
@@ -170,7 +173,10 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
 
     private fun setupCreateWalletState() = with(binding) {
         layoutButtonsCommon.btnWalletMainAction.setText(R.string.onboarding_create_wallet_button_create_wallet)
-        layoutButtonsCommon.btnWalletMainAction.setOnClickListener { store.dispatch(OnboardingWalletAction.CreateWallet) }
+        layoutButtonsCommon.btnWalletMainAction.setOnClickListener {
+            Analytics.send(Onboarding.CreateWallet.ButtonCreateWallet())
+            store.dispatch(OnboardingWalletAction.CreateWallet)
+        }
         layoutButtonsCommon.btnWalletAlternativeAction.hide()
 
         toolbar.title = getText(R.string.onboarding_getting_started)
@@ -325,7 +331,7 @@ class OnboardingWalletFragment : BaseFragment(R.layout.fragment_onboarding_walle
             tvBody.text = getString(R.string.onboarding_twins_interrupt_warning)
             layoutButtonsCommon.btnWalletMainAction.text = getText(R.string.onboarding_saltpay_button_backup_origin)
         } else {
-            tvHeader.text = getText(R.string.onboarding_title_prepare_origin)
+            tvHeader.text = getText(R.string.common_origin_card)
             tvBody.text = getString(
                 R.string.onboarding_subtitle_scan_primary_card_format,
                 state.primaryCardId?.let { cardIdFormatter.getFormattedCardId(it) },
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
index 883ce390dc..d98e9907b9 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/AddMoreBackupCardsDialog.kt
@@ -8,21 +8,21 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 
 class AddMoreBackupCardsDialog {
-        companion object {
-            fun create(context: Context): AlertDialog {
-                return AlertDialog.Builder(context).apply {
-                    setTitle(R.string.alert_title)
-                    setMessage(R.string.onboarding_alert_message_not_max_backup_cards_added)
-                    setPositiveButton(R.string.common_continue) { _, _ ->
-                        store.dispatch(BackupAction.ShowAccessCodeInfoScreen)
-                    }
-                    setNegativeButton(R.string.onboarding_button_add_more_cards) { _, _ ->
+    companion object {
+        fun create(context: Context): AlertDialog {
+            return AlertDialog.Builder(context).apply {
+                setTitle(R.string.common_warning)
+                setMessage(R.string.onboarding_alert_message_not_max_backup_cards_added)
+                setPositiveButton(R.string.common_continue) { _, _ ->
+                    store.dispatch(BackupAction.ShowAccessCodeInfoScreen)
+                }
+                setNegativeButton(R.string.common_cancel) { _, _ ->
 
-                    }
-                    setOnDismissListener {
-                        store.dispatch(GlobalAction.HideDialog)
-                    }
-                }.create()
-            }
+                }
+                setOnDismissListener {
+                    store.dispatch(GlobalAction.HideDialog)
+                }
+            }.create()
         }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
index 9b619eef7d..e4fa7525b5 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/BackupInProgressDialog.kt
@@ -10,7 +10,7 @@ class BackupInProgressDialog {
     companion object {
         fun create(context: Context): AlertDialog {
             return AlertDialog.Builder(context).apply {
-                setTitle(R.string.alert_title)
+                setTitle(R.string.common_warning)
                 setMessage(R.string.onboarding_backup_exit_warning)
                 setPositiveButton(R.string.warning_button_ok) { _, _ ->
                     store.dispatch(GlobalAction.HideDialog)
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
index 697dc71f67..d13afaa088 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/UnfinishedBackupFoundDialog.kt
@@ -12,7 +12,7 @@ class UnfinishedBackupFoundDialog {
     companion object {
         fun create(context: Context): AlertDialog {
             return AlertDialog.Builder(context).apply {
-                setTitle(R.string.alert_title)
+                setTitle(R.string.common_warning)
                 setMessage(R.string.welcome_interrupted_backup_alert_message)
                 setPositiveButton(R.string.welcome_interrupted_backup_alert_resume) { _, _ ->
                     store.dispatch(GlobalAction.HideDialog)
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt
new file mode 100644
index 0000000000..30ebdd258f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletAction.kt
@@ -0,0 +1,28 @@
+package com.tangem.tap.features.saveWallet.redux
+
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.ScanResponse
+import org.rekotlin.Action
+
+internal sealed interface SaveWalletAction : Action {
+    data class ProvideBackupInfo(
+        val scanResponse: ScanResponse,
+        val accessCode: String?,
+        val backupCardsIds: Set<String>?,
+    ) : SaveWalletAction
+
+    object Save : SaveWalletAction {
+        object Success : SaveWalletAction
+        data class Error(val error: TangemError) : SaveWalletAction
+    }
+
+    object Dismiss : SaveWalletAction
+
+    object CloseError : SaveWalletAction
+    object EnrollBiometrics : SaveWalletAction {
+        object Enroll : SaveWalletAction
+        object Cancel : SaveWalletAction
+    }
+
+    object SaveWalletWasShown : SaveWalletAction
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
new file mode 100644
index 0000000000..60bc2e076e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -0,0 +1,144 @@
+package com.tangem.tap.features.saveWallet.redux
+
+import com.tangem.common.CompletionResult
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.common.flatMap
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.Onboarding
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.onUserWalletSelected
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.domain.model.builders.UserWalletBuilder
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userWalletsListManager
+import kotlinx.coroutines.launch
+import org.rekotlin.Middleware
+
+internal class SaveWalletMiddleware {
+    val middleware: Middleware<AppState> = { _, stateProvider ->
+        { next ->
+            { action ->
+                val state = stateProvider()
+                if (action is SaveWalletAction && state != null) {
+                    handleAction(action, state.saveWalletState)
+                }
+                next(action)
+            }
+        }
+    }
+
+    private fun handleAction(action: SaveWalletAction, state: SaveWalletState) {
+        when (action) {
+            is SaveWalletAction.Save -> saveWalletIfBiometricsEnrolled(state)
+            is SaveWalletAction.EnrollBiometrics.Enroll -> enrollBiometrics()
+            is SaveWalletAction.SaveWalletWasShown -> saveWalletWasShown()
+            is SaveWalletAction.Dismiss -> dismiss(state)
+            is SaveWalletAction.Save.Success,
+            is SaveWalletAction.ProvideBackupInfo,
+            is SaveWalletAction.CloseError,
+            is SaveWalletAction.Save.Error,
+            is SaveWalletAction.EnrollBiometrics,
+            is SaveWalletAction.EnrollBiometrics.Cancel,
+            -> Unit
+        }
+    }
+
+    private fun enrollBiometrics() {
+        store.dispatchOnMain(NavigationAction.OpenBiometricsSettings)
+    }
+
+    private fun saveWalletIfBiometricsEnrolled(state: SaveWalletState) {
+        if (tangemSdkManager.needEnrollBiometrics) {
+            store.dispatchOnMain(SaveWalletAction.EnrollBiometrics)
+        } else {
+            saveWallet(state)
+        }
+    }
+
+    /**
+
+     * or from [SaveWalletState.backupInfo] if provided from
+     * [com.tangem.tap.features.onboarding.OnboardingHelper.trySaveWalletAndNavigateToWalletScreen]
+     *
+     * If saved user's wallet was selected then pop back to [AppScreen.Wallet]
+     * or navigate to [AppScreen.WalletSelector] otherwise
+     *
+     * TODO: Update that logic after onboarding and backup features refactoring
+     * */
+    private fun saveWallet(state: SaveWalletState) {
+        val scanResponse = state.backupInfo?.scanResponse
+            ?: store.state.globalState.scanResponse
+            ?: return
+
+        if (state.backupInfo != null) {
+            // TODO: Remove after onboarding refactoring
+            Analytics.send(Onboarding.EnableBiometrics(AnalyticsParam.OnOffState.On))
+        } else {
+            Analytics.send(MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.On))
+        }
+
+        scope.launch {
+            val userWallet = UserWalletBuilder(scanResponse)
+                .backupCardsIds(state.backupInfo?.backupCardsIds)
+                .build() ?: return@launch
+
+            val isFirstSavedWallet = !userWalletsListManager.hasSavedUserWallets
+
+            saveAccessCodeIfNeeded(state.backupInfo?.accessCode, userWallet.cardsInWallet)
+                .flatMap { userWalletsListManager.save(userWallet, canOverride = true) }
+                .doOnFailure { error ->
+                    store.dispatchOnMain(SaveWalletAction.Save.Error(error))
+                }
+                .doOnSuccess {
+                    preferencesStorage.shouldSaveUserWallets = true
+
+                    // Enable saving access codes only if this is the first time user save the wallet
+                    preferencesStorage.shouldSaveAccessCodes = isFirstSavedWallet ||
+                        preferencesStorage.shouldSaveAccessCodes
+
+                    store.dispatchOnMain(SaveWalletAction.Save.Success)
+
+                    store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                    store.onUserWalletSelected(userWallet)
+                }
+        }
+    }
+
+    private fun dismiss(state: SaveWalletState) {
+        if (state.backupInfo != null) {
+            // TODO: Remove after onboarding refactoring
+            Analytics.send(Onboarding.EnableBiometrics(AnalyticsParam.OnOffState.Off))
+        } else {
+            Analytics.send(MainScreen.EnableBiometrics(AnalyticsParam.OnOffState.Off))
+        }
+    }
+
+    private fun saveWalletWasShown() {
+        preferencesStorage.shouldShowSaveUserWalletScreen = false
+    }
+
+    private suspend fun saveAccessCodeIfNeeded(
+        accessCode: String?,
+        cardsInWallet: Set<String>,
+    ): CompletionResult<Unit> {
+        return when {
+            accessCode != null -> {
+                tangemSdkManager.saveAccessCode(
+                    accessCode = accessCode,
+                    cardsIds = cardsInWallet,
+                )
+            }
+            else -> {
+                CompletionResult.Success(Unit)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletReducer.kt
new file mode 100644
index 0000000000..89eefd41db
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletReducer.kt
@@ -0,0 +1,51 @@
+package com.tangem.tap.features.saveWallet.redux
+
+import com.tangem.tap.common.redux.AppState
+import org.rekotlin.Action
+
+internal object SaveWalletReducer {
+    fun reduce(action: Action, state: AppState): SaveWalletState {
+        return if (action is SaveWalletAction) {
+            internalReduce(action, state.saveWalletState)
+        } else state.saveWalletState
+    }
+
+    private fun internalReduce(action: SaveWalletAction, state: SaveWalletState): SaveWalletState {
+        return when (action) {
+            is SaveWalletAction.ProvideBackupInfo -> state.copy(
+                backupInfo = SaveWalletState.WalletBackupInfo(
+                    scanResponse = action.scanResponse,
+                    accessCode = action.accessCode,
+                    backupCardsIds = action.backupCardsIds,
+                ),
+            )
+            is SaveWalletAction.Save -> state.copy(
+                isSaveInProgress = true,
+            )
+            is SaveWalletAction.Save.Error -> state.copy(
+                error = action.error,
+                isSaveInProgress = false,
+            )
+            is SaveWalletAction.Save.Success -> state.copy(
+                backupInfo = null,
+                isSaveInProgress = false,
+            )
+            is SaveWalletAction.Dismiss -> state.copy(
+                backupInfo = null,
+            )
+            is SaveWalletAction.CloseError -> state.copy(
+                error = null,
+            )
+            is SaveWalletAction.EnrollBiometrics -> state.copy(
+                needEnrollBiometrics = true,
+            )
+            is SaveWalletAction.EnrollBiometrics.Enroll,
+            is SaveWalletAction.EnrollBiometrics.Cancel,
+            -> state.copy(
+                needEnrollBiometrics = false,
+                isSaveInProgress = false,
+            )
+            is SaveWalletAction.SaveWalletWasShown -> state
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletState.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletState.kt
new file mode 100644
index 0000000000..38af8d0b6f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletState.kt
@@ -0,0 +1,18 @@
+package com.tangem.tap.features.saveWallet.redux
+
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.ScanResponse
+import org.rekotlin.StateType
+
+data class SaveWalletState(
+    val backupInfo: WalletBackupInfo? = null,
+    val isSaveInProgress: Boolean = false,
+    val needEnrollBiometrics: Boolean = false,
+    val error: TangemError? = null,
+) : StateType {
+    data class WalletBackupInfo(
+        val scanResponse: ScanResponse,
+        val accessCode: String?,
+        val backupCardsIds: Set<String>?,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
new file mode 100644
index 0000000000..f4663eda6e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletBottomSheetFragment.kt
@@ -0,0 +1,84 @@
+package com.tangem.tap.features.saveWallet.ui
+
+import android.content.DialogInterface
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.SnackbarHost
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.fragment.app.viewModels
+import com.tangem.core.ui.fragments.ComposeBottomSheetFragment
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.cardsettings.resolveReference
+import com.tangem.tap.features.saveWallet.ui.components.EnrollBiometricsDialogContent
+import com.tangem.tap.features.saveWallet.ui.components.SaveWalletScreenContent
+import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
+
+internal class SaveWalletBottomSheetFragment : ComposeBottomSheetFragment<SaveWalletScreenState>() {
+    override val expandedHeightFraction: Float = .98f
+
+    private val viewModel by viewModels<SaveWalletViewModel>()
+
+    override fun onDismiss(dialog: DialogInterface) {
+        viewModel.dismiss()
+        super.onDismiss(dialog)
+    }
+
+    @Composable
+    override fun provideState(): State<SaveWalletScreenState> {
+        return viewModel.state.collectAsState()
+    }
+
+    @Composable
+    override fun ScreenContent(
+        modifier: Modifier,
+        state: SaveWalletScreenState,
+    ) {
+        val snackbarHostState = remember { SnackbarHostState() }
+        val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
+        val enrollBiometricsDialog by rememberUpdatedState(newValue = state.enrollBiometricsDialog)
+
+        Box(modifier = modifier) {
+            SaveWalletScreenContent(
+                showProgress = state.showProgress,
+                onSaveWalletClick = viewModel::saveWallet,
+                onCloseClick = this@SaveWalletBottomSheetFragment::dismissAllowingStateLoss,
+            )
+
+            SnackbarHost(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(vertical = TangemTheme.dimens.spacing16)
+                    .fillMaxWidth(),
+                hostState = snackbarHostState,
+            )
+        }
+
+        EnrollBiometricsDialog(dialog = enrollBiometricsDialog)
+
+        LaunchedEffect(key1 = errorMessage) {
+            errorMessage?.let {
+                snackbarHostState.showSnackbar(it)
+                viewModel.closeError()
+            }
+        }
+    }
+
+    @Composable
+    private fun EnrollBiometricsDialog(
+        modifier: Modifier = Modifier,
+        dialog: EnrollBiometricsDialog?,
+    ) {
+        if (dialog == null) return
+        EnrollBiometricsDialogContent(modifier, dialog)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt
new file mode 100644
index 0000000000..51dbdcadc0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletScreenState.kt
@@ -0,0 +1,12 @@
+package com.tangem.tap.features.saveWallet.ui
+
+import androidx.compose.runtime.Immutable
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
+
+@Immutable
+internal data class SaveWalletScreenState(
+    val showProgress: Boolean = false,
+    val enrollBiometricsDialog: EnrollBiometricsDialog? = null,
+    val error: TextReference? = null,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt
new file mode 100644
index 0000000000..14cae87732
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/SaveWalletViewModel.kt
@@ -0,0 +1,70 @@
+package com.tangem.tap.features.saveWallet.ui
+
+import androidx.lifecycle.ViewModel
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.saveWallet.redux.SaveWalletAction
+import com.tangem.tap.features.saveWallet.redux.SaveWalletState
+import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
+import com.tangem.tap.store
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import org.rekotlin.StoreSubscriber
+
+internal class SaveWalletViewModel : ViewModel(), StoreSubscriber<SaveWalletState> {
+    private val stateInternal = MutableStateFlow(SaveWalletScreenState())
+    val state: StateFlow<SaveWalletScreenState> = stateInternal
+
+    init {
+        subscribeToStoreChanges()
+        store.dispatchOnMain(SaveWalletAction.SaveWalletWasShown)
+    }
+
+    fun saveWallet() {
+        store.dispatch(SaveWalletAction.Save)
+    }
+
+    fun dismiss() {
+        store.dispatch(SaveWalletAction.Dismiss)
+    }
+
+    fun closeError() {
+        store.dispatch(SaveWalletAction.CloseError)
+    }
+
+    override fun newState(state: SaveWalletState) {
+        stateInternal.update { prevState ->
+            prevState.copy(
+                showProgress = state.isSaveInProgress,
+                enrollBiometricsDialog = if (state.needEnrollBiometrics) createEnrollBiometricsDialog() else null,
+                error = state.error
+                    ?.takeUnless { it.silent }
+                    ?.let { error ->
+                        error.messageResId?.let { TextReference.Res(it) }
+                            ?: TextReference.Str(error.customMessage)
+                    },
+            )
+        }
+    }
+
+    override fun onCleared() {
+        store.unsubscribe(this)
+    }
+
+    private fun subscribeToStoreChanges() {
+        store.subscribe(this) { appState ->
+            appState.skip { old, new -> old.saveWalletState == new.saveWalletState }
+                .select { it.saveWalletState }
+        }
+    }
+
+    private fun createEnrollBiometricsDialog() = EnrollBiometricsDialog(
+        onEnroll = {
+            store.dispatchOnMain(SaveWalletAction.EnrollBiometrics.Enroll)
+        },
+        onCancel = {
+            store.dispatchOnMain(SaveWalletAction.EnrollBiometrics.Cancel)
+        },
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt
new file mode 100644
index 0000000000..d79531b7ee
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/EnrollBiometricsDialogConent.kt
@@ -0,0 +1,97 @@
+package com.tangem.tap.features.saveWallet.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerW8
+import com.tangem.core.ui.components.TextButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.saveWallet.ui.models.EnrollBiometricsDialog
+
+@Composable
+fun EnrollBiometricsDialogContent(
+    modifier: Modifier = Modifier,
+    dialog: EnrollBiometricsDialog,
+) {
+    Dialog(onDismissRequest = dialog.onCancel) {
+        Column(
+            modifier = modifier
+                .background(
+                    shape = TangemTheme.shapes.roundedCornersLarge,
+                    color = TangemTheme.colors.background.plain,
+                )
+                .padding(all = TangemTheme.dimens.spacing24),
+        ) {
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(R.string.save_user_wallet_agreement_enroll_biometrics_title),
+                style = TangemTheme.typography.h3,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH16()
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(R.string.save_user_wallet_agreement_enroll_biometrics_description),
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH24()
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.End,
+            ) {
+                TextButton(
+                    text = stringResource(R.string.common_cancel),
+                    onClick = dialog.onCancel,
+                )
+                SpacerW8()
+                TextButton(
+                    text = stringResource(R.string.common_enable),
+                    onClick = dialog.onEnroll,
+                )
+            }
+        }
+    }
+}
+
+// region Preview
+@Composable
+private fun EnrollBiometricDialogContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        EnrollBiometricsDialogContent(dialog = EnrollBiometricsDialog({}, {}))
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun EnrollBiometricDialogContentPreview_Light() {
+    TangemTheme {
+        EnrollBiometricDialogContentSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun EnrollBiometricDialogContentPreview_Dark() {
+    TangemTheme(isDark = true) {
+        EnrollBiometricDialogContentSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
new file mode 100644
index 0000000000..40b84a07d4
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt
@@ -0,0 +1,252 @@
+package com.tangem.tap.features.saveWallet.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH32
+import com.tangem.core.ui.components.SpacerH4
+import com.tangem.core.ui.components.SpacerHHalf
+import com.tangem.core.ui.components.SpacerW24
+import com.tangem.core.ui.components.SpacerW8
+import com.tangem.core.ui.components.atoms.Hand
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.wallet.R
+
+@Composable
+internal fun SaveWalletScreenContent(
+    modifier: Modifier = Modifier,
+    showProgress: Boolean,
+    onSaveWalletClick: () -> Unit,
+    onCloseClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Header(
+            modifier = Modifier.fillMaxWidth(),
+            onCloseClick = onCloseClick,
+        )
+        SpacerHHalf()
+        Title(
+            modifier = Modifier
+                .widthIn(max = TangemTheme.dimens.size200),
+        )
+        SpacerH32()
+        Description(
+            modifier = Modifier
+                .padding(
+                    start = TangemTheme.dimens.spacing34,
+                    end = TangemTheme.dimens.spacing56,
+                )
+                .fillMaxWidth(),
+        )
+        SpacerHHalf()
+        Footer(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .fillMaxWidth(),
+            showProgress = showProgress,
+            onSaveWalletClick = onSaveWalletClick,
+        )
+        SpacerH16()
+    }
+}
+
+@Composable
+private fun Header(
+    modifier: Modifier = Modifier,
+    onCloseClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),
+    ) {
+        Hand()
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.End,
+        ) {
+            IconButton(
+                modifier = Modifier.size(TangemTheme.dimens.size32),
+                onClick = onCloseClick,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = R.drawable.ic_close),
+                    tint = TangemTheme.colors.icon.secondary,
+                    contentDescription = stringResource(id = R.string.common_cancel),
+                )
+            }
+            SpacerW8()
+        }
+    }
+}
+
+@Composable
+private fun Title(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing32),
+    ) {
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size56),
+            painter = painterResource(id = R.drawable.ic_fingerprint_24),
+            tint = TangemTheme.colors.icon.primary1,
+            contentDescription = null,
+        )
+        Text(
+            text = stringResource(id = R.string.save_user_wallet_agreement_header_biometrics),
+            style = TangemTheme.typography.h2,
+            color = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Composable
+private fun Description(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing24),
+        horizontalAlignment = Alignment.Start,
+    ) {
+        DescriptionItem(
+            iconPainter = painterResource(id = R.drawable.ic_face_recognition_24),
+            title = stringResource(id = R.string.save_user_wallet_agreement_access_title),
+            description = stringResource(id = R.string.save_user_wallet_agreement_access_description),
+        )
+        DescriptionItem(
+            iconPainter = painterResource(id = R.drawable.ic_lock_24),
+            title = stringResource(id = R.string.save_user_wallet_agreement_code_title),
+            description = stringResource(id = R.string.save_user_wallet_agreement_code_description_biometrics),
+        )
+    }
+}
+
+@Composable
+private fun Footer(
+    modifier: Modifier = Modifier,
+    showProgress: Boolean,
+    onSaveWalletClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+    ) {
+        PrimaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            showProgress = showProgress,
+            text = stringResource(id = R.string.save_user_wallet_agreement_allow_biometrics),
+            onClick = onSaveWalletClick,
+        )
+        Text(
+            modifier = Modifier.fillMaxWidth(fraction = .7f),
+            text = stringResource(R.string.save_user_wallet_agreement_notice),
+            style = TangemTheme.typography.caption,
+            color = TangemTheme.colors.text.tertiary,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@Composable
+private fun DescriptionItem(
+    modifier: Modifier = Modifier,
+    iconPainter: Painter,
+    title: String,
+    description: String,
+) {
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.Top,
+        horizontalArrangement = Arrangement.SpaceEvenly,
+    ) {
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size24),
+            painter = iconPainter,
+            tint = TangemTheme.colors.icon.primary1,
+            contentDescription = null,
+        )
+        SpacerW24()
+        Column {
+            Text(
+                text = title,
+                style = TangemTheme.typography.subtitle1,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH4()
+            Text(
+                text = description,
+                style = TangemTheme.typography.body2,
+                color = TangemTheme.colors.text.secondary,
+            )
+        }
+    }
+}
+
+// region Preview
+@Composable
+private fun SaveWalletScreenContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        SaveWalletScreenContent(
+            modifier = Modifier
+                .padding(top = TangemTheme.dimens.spacing32)
+                .fillMaxSize()
+                .background(
+                    color = TangemTheme.colors.background.plain,
+                    shape = TangemTheme.shapes.bottomSheet,
+                ),
+            showProgress = false,
+            onSaveWalletClick = { /* no-op */ },
+            onCloseClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SaveWalletScreenContentPreview_Light() {
+    TangemTheme {
+        SaveWalletScreenContentSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SaveWalletScreenContentPreview_Dark() {
+    TangemTheme(isDark = true) {
+        SaveWalletScreenContentSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt
new file mode 100644
index 0000000000..7f785a95cf
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/models/EnrollBiometricsDialog.kt
@@ -0,0 +1,9 @@
+package com.tangem.tap.features.saveWallet.ui.models
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class EnrollBiometricsDialog(
+    val onEnroll: () -> Unit,
+    val onCancel: () -> Unit,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
index 22cd5ad13a..5bf0618fbb 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@@ -11,15 +11,15 @@ import com.tangem.blockchain.common.TransactionError
 import com.tangem.blockchain.common.TransactionSender
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.extensions.SimpleResult
-import com.tangem.common.card.Card
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.services.Result
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
-import com.tangem.tap.common.analytics.AnalyticsAnOld
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
-import com.tangem.tap.common.analytics.AnalyticsParamAnOld
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
@@ -48,15 +48,17 @@ import com.tangem.tap.features.send.redux.states.ButtonState
 import com.tangem.tap.features.send.redux.states.ExternalTransactionData
 import com.tangem.tap.features.send.redux.states.MainCurrencyType
 import com.tangem.tap.features.send.redux.states.TransactionExtrasState
+import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdk
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletCurrenciesManager
 import com.tangem.wallet.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.rekotlin.Action
 import org.rekotlin.Middleware
 import java.util.*
@@ -150,7 +152,7 @@ private fun sendTransaction(
     feeAmount: Amount,
     destinationAddress: String,
     transactionExtras: TransactionExtrasState,
-    card: Card,
+    card: CardDTO,
     externalTransactionData: ExternalTransactionData?,
     dispatch: (Action) -> Unit,
 ) {
@@ -219,13 +221,10 @@ private fun sendTransaction(
             dispatch(SendAction.ChangeSendButtonState(ButtonState.ENABLED))
             tangemSdk.config.linkedTerminal = isLinkedTerminal
 
+            val currencyType = AnalyticsParam.CurrencyType.Amount(amountToSend)
             when (sendResult) {
                 is SimpleResult.Success -> {
-                    store.state.globalState.analyticsHandler?.handleAnalyticsEvent(
-                        event = AnalyticsEventAnOld.TRANSACTION_IS_SENT,
-                        card = card,
-                        blockchain = walletManager.wallet.blockchain.currency,
-                    )
+                    Analytics.send(Token.Send.TransactionSent(currencyType))
                     dispatch(SendAction.SendSuccess)
 
                     if (externalTransactionData != null) {
@@ -234,13 +233,9 @@ private fun sendTransaction(
                         dispatch(NavigationAction.PopBackTo())
                     }
                     scope.launch(Dispatchers.IO) {
-                        withContext(Dispatchers.Main) {
-                            dispatch(WalletAction.LoadWallet(BlockchainNetwork.fromWalletManager(walletManager)))
-                        }
+                        updateWallet(walletManager)
                         delay(11000) // more than 10000 to avoid throttling
-                        withContext(Dispatchers.Main) {
-                            dispatch(WalletAction.LoadWallet(BlockchainNetwork.fromWalletManager(walletManager)))
-                        }
+                        updateWallet(walletManager)
                     }
                 }
                 is SimpleResult.Failure -> {
@@ -250,15 +245,10 @@ private fun sendTransaction(
                         feeAmount = feeAmount,
                         destinationAddress = destinationAddress,
                     )
-                    store.state.globalState.analyticsHandler?.handleBlockchainSdkErrorEvent(
-                        error = sendResult.error,
-                        action = AnalyticsAnOld.ActionToLog.SendTransaction,
-                        params = mapOf(AnalyticsParamAnOld.BLOCKCHAIN to walletManager.wallet.blockchain.currency),
-                        card = card,
-                    )
-
                     val error = (sendResult.error as? BlockchainSdkError) ?: return@withMainContext
 
+                    Analytics.send(Token.Send.TransactionSent(currencyType, error))
+
                     when (error) {
                         is BlockchainSdkError.WrappedTangemError -> {
                             val tangemSdkError = (error.tangemError as? TangemSdkError) ?: return@withMainContext
@@ -335,4 +325,20 @@ private fun updateWarnings(dispatch: (Action) -> Unit) {
 
     val warnings = warningsManager.getWarnings(WarningMessage.Location.SendScreen, listOf(blockchain))
     dispatch(SendAction.Warnings.Set(warnings))
+}
+
+private suspend fun updateWallet(walletManager: WalletManager) {
+    val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+    if (selectedUserWallet != null) {
+        val wallet = walletManager.wallet
+        walletCurrenciesManager.update(
+            userWallet = selectedUserWallet,
+            currency = Currency.Blockchain(
+                blockchain = wallet.blockchain,
+                derivationPath = wallet.publicKey.derivationPath?.rawPath,
+            ),
+        )
+    } else {
+        store.dispatchOnMain(WalletAction.LoadWallet(BlockchainNetwork.fromWalletManager(walletManager)))
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
index 4837aa7449..a4f93f7949 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt
@@ -16,6 +16,8 @@ import com.google.android.material.textfield.TextInputEditText
 import com.tangem.Message
 import com.tangem.tangem_sdk_new.extensions.hideSoftKeyboard
 import com.tangem.tap.common.KeyboardObserver
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.getFromClipboard
 import com.tangem.tap.common.extensions.setOnImeActionListener
@@ -61,6 +63,11 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
 
     val binding: FragmentSendBinding by viewBinding(FragmentSendBinding::bind)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Analytics.send(Token.Send.ScreenOpened())
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         addBackPressHandler(this)
@@ -101,10 +108,12 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
                 .launchIn(mainScope)
 
         imvPaste.setOnClickListener {
+            Analytics.send(Token.Send.ButtonPaste())
             store.dispatch(PasteAddressPayId(requireContext().getFromClipboard()?.toString() ?: ""))
             store.dispatch(TruncateOrRestore(!etAddressOrPayId.isFocused))
         }
         imvQrCode.setOnClickListener {
+            Analytics.send(Token.Send.ButtonQRCode())
             startActivityForResult(
                 Intent(requireContext(), ScanQrCodeActivity::class.java),
                 ScanQrCodeActivity.SCAN_QR_REQUEST_CODE
@@ -165,6 +174,7 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) {
         store.dispatch(AmountAction.SetDecimalSeparator(decimalSeparator))
 
         binding.lSendAmount.tvAmountCurrency.setOnClickListener {
+            Analytics.send(Token.Send.ButtonSwapCurrency())
             store.dispatch(ToggleMainCurrency)
             store.dispatch(ReceiptAction.RefreshReceipt)
             store.dispatch(SendAction.ChangeSendButtonState(store.state.sendState.getButtonState()))
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt
index 669ec571f0..353989e76c 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt
@@ -18,7 +18,7 @@ class RequestFeeErrorDialog {
             val errorMessage = dialog.error.customMessage
 
             return AlertDialog.Builder(context).apply {
-                setTitle(R.string.send_error_fee_request_failed)
+                setTitle(R.string.common_fee_error)
                 setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage))
                 setNegativeButton(R.string.alert_button_send_feedback) { _, _ ->
                     store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage)))
diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
index 4d6d80e6ce..de2fd70ef6 100644
--- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt
@@ -230,12 +230,12 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
 
         val balanceText = when (state.mainCurrency.type) {
             MainCurrencyType.FIAT -> fg.getString(
-                R.string.send_balance_subtitle_format,
-                state.viewBalanceValue, state.mainCurrency.currencySymbol,
+                R.string.common_balance,
+                "${state.viewBalanceValue} ${state.mainCurrency.currencySymbol}",
             ).remove(":")
             MainCurrencyType.CRYPTO -> fg.getString(
-                R.string.send_balance_subtitle_format,
-                state.mainCurrency.currencySymbol, state.viewBalanceValue,
+                R.string.common_balance,
+                "${state.mainCurrency.currencySymbol} ${state.viewBalanceValue}",
             )
         }
 
@@ -304,7 +304,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
 
                 val willSent = getString(
                     R.string.send_total_subtitle_format,
-                    receipt.willSentCrypto, receipt.symbols.crypto,
+                    "${receipt.willSentCrypto} ${receipt.symbols.crypto}",
                 )
                 llTotalContainer.tvWillBeSentValue.update(willSent)
             }
@@ -316,15 +316,13 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
                 tvReceiptAmountValue.update("${receipt.amountCrypto} ${receipt.symbols.crypto}")
                 tvReceiptFeeValue.update("${receipt.feeCrypto} ${receipt.symbols.crypto}")
                 llTotalContainer.tvTotalValue.update("${receipt.totalCrypto} ${receipt.symbols.crypto}")
-
-                val willSent = SpannableStringBuilder()
-                    .bold {
-                        append(roughOrEmpty(receipt.willSentFiat)).append(" ")
-                        append(receipt.symbols.fiat)
-                        append(" (fee: ${receipt.feeFiat} ")
-                        append(receipt.symbols.fiat).append(")")
-                    }
-                llTotalContainer.tvWillBeSentValue.update(willSent.toString())
+                llTotalContainer.tvWillBeSentValue.update(
+                    getString(
+                        R.string.send_total_subtitle_fiat_format,
+                        "${roughOrEmpty(receipt.willSentFiat)} ${receipt.symbols.fiat}",
+                        "${receipt.feeFiat} ${receipt.symbols.fiat}",
+                    ),
+                )
             }
             ReceiptLayoutType.TOKEN_FIAT -> {
                 val receipt = state.tokenFiat ?: return
@@ -337,8 +335,8 @@ class SendStateSubscriber(fragment: BaseStoreFragment) :
 
                 val willSent = getString(
                     R.string.send_total_subtitle_asset_format,
-                    receipt.symbols.token ?: "", receipt.willSentToken,
-                    receipt.symbols.crypto, receipt.willSentFeeCoin,
+                    "${receipt.symbols.token ?: ""} ${receipt.willSentToken}",
+                    "${receipt.symbols.crypto} ${receipt.willSentFeeCoin}",
                 )
                 llTotalContainer.tvWillBeSentValue.update(willSent)
             }
diff --git a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
index ceba9a5217..f7f126c05f 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
@@ -119,13 +119,8 @@ private fun handle(action: Action) {
 
         is ShopAction.FinishSuccessfulOrder -> {
             scope.launch {
-                shopService.waitForCheckout(
-                    productType = shopState.selectedProduct,
-                    analyticsHandler = store.state.globalState.analyticsHandler
-                )
+                shopService.waitForCheckout(shopState.selectedProduct)
             }
         }
-
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt b/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
index 51fe6cb54c..338561267b 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
@@ -12,6 +12,8 @@ import androidx.activity.OnBackPressedCallback
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.tangem.tap.common.GlobalLayoutStateHandler
 import com.tangem.tap.common.KeyboardObserver
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.common.shop.data.ProductType
@@ -41,6 +43,8 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Analytics.send(Shop.ScreenOpened())
+
         activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 store.dispatch(NavigationAction.PopBackTo())
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt
index 2192fd0477..3954882be5 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/AddCustomTokenFragment.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.platform.ComposeView
 import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 import com.tangem.domain.redux.domainStore
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.compose.ClosePopupTrigger
 import com.tangem.tap.features.BaseStoreFragment
 import com.tangem.tap.features.FragmentOnBackPressedHandler
@@ -28,6 +30,11 @@ class AddCustomTokenFragment : BaseStoreFragment(R.layout.view_compose_fragment)
 
     private var state: MutableState<AddCustomTokenState> = mutableStateOf(domainStore.state.addCustomTokensState)
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        Analytics.send(ManageTokens.CustomToken.ScreenOpened())
+    }
+
     override fun subscribeToStore() {
         domainStore.subscribe(this) { state ->
             state.skipRepeats { oldState, newState ->
@@ -45,30 +52,29 @@ class AddCustomTokenFragment : BaseStoreFragment(R.layout.view_compose_fragment)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
-        view.findViewById<Toolbar>(R.id.toolbar)?.let {
-            it.setTitle(R.string.add_custom_token_title)
-        }
+        requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+        view.findViewById<Toolbar>(R.id.toolbar)?.setTitle(R.string.add_custom_token_title)
 
         val closePopupTrigger = initClosingPopupTriggerEvent()
         view.findViewById<ComposeView>(R.id.view_compose)?.setContent {
             AppCompatTheme(requireContext()) {
-                Box(modifier = Modifier
-                    .fillMaxSize()
+                Box(
+                    modifier = Modifier
+                        .fillMaxSize(),
                 ) {
                     AddCustomTokenScreen(state, closePopupTrigger)
                 }
 
             }
         }
-
-
     }
 
     private fun initClosingPopupTriggerEvent(): ClosePopupTrigger = ClosePopupTrigger().apply {
         onCloseComplete = ::handleOnBackPressed
-        addBackPressHandler(object : FragmentOnBackPressedHandler {
-            override fun handleOnBackPressed() = close()
-        })
+        addBackPressHandler(
+            object : FragmentOnBackPressedHandler {
+                override fun handleOnBackPressed() = close()
+            },
+        )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt
index fd792714be..bc4c0ae9c6 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/FormFieldViews.kt
@@ -6,14 +6,25 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.SpacerH8
 import com.tangem.domain.common.form.Field
 import com.tangem.domain.features.addCustomToken.TokenBlockchainField
 import com.tangem.domain.features.addCustomToken.TokenDerivationPathField
 import com.tangem.domain.features.addCustomToken.TokenField
-import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.*
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenContractAddressChanged
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDecimalsChanged
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenDerivationPathChanged
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNameChanged
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenNetworkChanged
+import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenAction.OnTokenSymbolChanged
 import com.tangem.domain.features.addCustomToken.redux.AddCustomTokenState
 import com.tangem.domain.redux.domainStore
-import com.tangem.tap.common.compose.*
+import com.tangem.tap.common.compose.BlockchainSpinner
+import com.tangem.tap.common.compose.ClearButton
+import com.tangem.tap.common.compose.ClosePopupTrigger
+import com.tangem.tap.common.compose.OutlinedTextFieldWidget
+import com.tangem.tap.common.compose.PasteButton
+import com.tangem.tap.common.compose.TitleSubtitle
 import com.tangem.tap.common.extensions.getFromClipboard
 import com.tangem.wallet.R
 
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
index 23781967f0..5dc938ed1c 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/addCustomToken/compose/SelectTokenNetworkDialog.kt
@@ -13,9 +13,9 @@ import com.tangem.wallet.R
 @Composable
 fun SelectTokenNetworkDialog(dialog: DomainDialog.SelectTokenDialog, onDismissRequest: () -> Unit) {
     SimpleDialog(
-        title = stringResource(id = R.string.custom_token_type_network),
+        title = stringResource(id = R.string.custom_token_network_input_title),
         items = dialog.items,
         onSelect = dialog.onSelect,
-        onDismissRequest = onDismissRequest
+        onDismissRequest = onDismissRequest,
     ) { network -> TitleSubtitle(dialog.networkIdConverter(network.networkId), network.contractAddress ?: "") }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
index 04eb4ac5b0..af6ab1607f 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/redux/TokensMiddleware.kt
@@ -7,6 +7,7 @@ import com.tangem.common.CompletionResult
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.extensions.ByteArrayKey
 import com.tangem.common.extensions.toMapKey
+import com.tangem.common.flatMap
 import com.tangem.common.hdWallet.DerivationPath
 import com.tangem.common.services.Result
 import com.tangem.domain.DomainWrapped
@@ -20,6 +21,8 @@ import com.tangem.domain.redux.domainStore
 import com.tangem.operations.derivation.ExtendedPublicKeysMap
 import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
 import com.tangem.tap.assetReader
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.redux.AppState
@@ -35,6 +38,8 @@ import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletCurrenciesManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.rekotlin.Middleware
@@ -47,13 +52,12 @@ class TokensMiddleware {
                 when (action) {
                     is TokensAction.LoadCurrencies -> handleLoadCurrencies(action.scanResponse)
                     is TokensAction.SaveChanges -> handleSaveChanges(action)
-                    is TokensAction.PrepareAndNavigateToAddCustomToken -> {
-                        handleAddingCustomToken(action)
-                    }
+                    is TokensAction.PrepareAndNavigateToAddCustomToken -> handleAddingCustomToken()
                     is TokensAction.SetSearchInput -> {
+                        Analytics.send(ManageTokens.TokenSearched())
                         handleLoadCurrencies(
                             scanResponse = store.state.globalState.scanResponse,
-                            newSearchInput = action.searchInput
+                            newSearchInput = action.searchInput,
                         )
                     }
                     is TokensAction.LoadMore -> {
@@ -103,8 +107,8 @@ class TokensMiddleware {
                         .filter(supportedBlockchains.toSet())
                     store.dispatchOnMain(
                         TokensAction.LoadCurrencies.Success(
-                            currencies, loadCoinsResult.data.moreAvailable
-                        )
+                            currencies, loadCoinsResult.data.moreAvailable,
+                        ),
                     )
                 }
                 is Result.Failure -> store.dispatchOnMain(TokensAction.LoadCurrencies.Failure)
@@ -113,14 +117,14 @@ class TokensMiddleware {
         }
     }
 
-    private fun handleSaveChanges(action: TokensAction.SaveChanges) {
-        val scanResponse = store.state.globalState.scanResponse ?: return
+    private fun handleSaveChanges(action: TokensAction.SaveChanges) = scope.launch {
+        val scanResponse = store.state.globalState.scanResponse ?: return@launch
 
         val currentTokens = store.state.tokensState.addedWallets.toNonCustomTokensWithBlockchains(
-            scanResponse.card.derivationStyle
+            scanResponse.card.derivationStyle,
         )
         val currentBlockchains = store.state.tokensState.addedWallets.toNonCustomBlockchains(
-            scanResponse.card.derivationStyle
+            scanResponse.card.derivationStyle,
         )
 
         val blockchainsToAdd = action.addedBlockchains.filter { !currentBlockchains.contains(it) }
@@ -145,8 +149,8 @@ class TokensMiddleware {
             && blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
         ) {
             store.dispatchDebugErrorNotification("Nothing to save")
-            store.dispatch(NavigationAction.PopBackTo())
-            return
+            store.dispatchOnMain(NavigationAction.PopBackTo())
+            return@launch
         }
 
         val currencyList = convertToCurrencies(
@@ -181,7 +185,7 @@ class TokensMiddleware {
         }
     }
 
-    private fun deriveMissingBlockchains(
+    fun deriveMissingBlockchains(
         scanResponse: ScanResponse,
         currencyList: List<Currency>,
         onSuccess: (ScanResponse) -> Unit,
@@ -197,9 +201,10 @@ class TokensMiddleware {
         }
 
         scope.launch {
+            val card = scanResponse.card
             val result = tangemSdkManager.derivePublicKeys(
-                scanResponse.card.cardId,
-                derivations
+                cardId = card.cardId,
+                derivations = derivations,
             )
             when (result) {
                 is CompletionResult.Success -> {
@@ -216,10 +221,12 @@ class TokensMiddleware {
                     val updatedScanResponse = scanResponse.copy(
                         derivedKeys = updatedDerivedKeys,
                     )
-                    store.dispatchOnMain(GlobalAction.SaveScanNoteResponse(updatedScanResponse))
+                    store.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
                     delay(DELAY_SDK_DIALOG_CLOSE)
+
                     onSuccess(updatedScanResponse)
                 }
+
                 is CompletionResult.Failure -> {
                     store.dispatchDebugErrorNotification(TapError.CustomError("Error adding tokens"))
                 }
@@ -272,50 +279,81 @@ class TokensMiddleware {
         scanResponse: ScanResponse,
         currencyList: List<Currency>,
     ) {
-        val factory = store.state.globalState.tapWalletManager.walletManagerFactory
-        val derivationStyle = scanResponse.card.derivationStyle
-
-        val addActions = currencyList.mapIndexedNotNull { index, currency ->
-            when (currency) {
-                is Currency.Blockchain -> {
-                    val derivationPath = currency.derivationPath?.let { DerivationPath(it) }
-
-                    val derivationParams = derivationStyle?.let {
-                        when (derivationPath) {
-                            null -> DerivationParams.Default(derivationStyle)
-                            else -> DerivationParams.Custom(derivationPath)
-                        }
+        val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+        if (selectedUserWallet != null) {
+            scope.launch {
+                userWalletsListManager.update(
+                    userWalletId = selectedUserWallet.walletId,
+                    update = { userWallet ->
+                        userWallet.copy(
+                            scanResponse = scanResponse,
+                        )
+                    },
+                )
+                    .flatMap { updatedUserWallet ->
+                        walletCurrenciesManager.addCurrencies(
+                            userWallet = updatedUserWallet,
+                            currenciesToAdd = currencyList,
+                        )
+                    }
+            }
+        } else {
+            val factory = store.state.globalState.tapWalletManager.walletManagerFactory
+            val derivationStyle = scanResponse.card.derivationStyle
+
+            val addActions = currencyList.mapIndexedNotNull { index, currency ->
+                when (currency) {
+                    is Currency.Blockchain -> {
+                        val derivationPath = currency.derivationPath?.let { DerivationPath(it) }
+
+                        val derivationParams = derivationStyle?.let {
+                            when (derivationPath) {
+                                null -> DerivationParams.Default(derivationStyle)
+                                else -> DerivationParams.Custom(derivationPath)
+                            }
+                        }
+                        val walletManager = factory.makeWalletManagerForApp(
+                            scanResponse = scanResponse,
+                            blockchain = currency.blockchain,
+                            derivationParams = derivationParams,
+                        ) ?: return@mapIndexedNotNull null
+                        val blockchainNetwork = BlockchainNetwork.fromWalletManager(walletManager)
+                        WalletAction.MultiWallet.AddBlockchain(
+                            blockchain = blockchainNetwork,
+                            walletManager = walletManager,
+                            save = index == currencyList.lastIndex,
+                        )
+                    }
+                    is Currency.Token -> {
+                        val rawDerivationPath = currency.derivationPath
+                            ?: currency.blockchain.derivationPath(derivationStyle)?.rawPath
+                        val blockchainNetwork =
+                            BlockchainNetwork(currency.blockchain, rawDerivationPath, listOf(currency.token))
+                        WalletAction.MultiWallet.AddToken(
+                            token = currency.token,
+                            blockchain = blockchainNetwork,
+                            save = index == currencyList.lastIndex,
+                        )
                     }
-                    val walletManager = factory.makeWalletManagerForApp(
-                        scanResponse = scanResponse,
-                        blockchain = currency.blockchain,
-                        derivationParams = derivationParams,
-                    ) ?: return@mapIndexedNotNull null
-                    val blockchainNetwork = BlockchainNetwork.fromWalletManager(walletManager)
-                    WalletAction.MultiWallet.AddBlockchain(
-                        blockchain = blockchainNetwork,
-                        walletManager = walletManager,
-                        save = index == currencyList.lastIndex,
-                    )
-                }
-                is Currency.Token -> {
-                    val rawDerivationPath = currency.derivationPath
-                        ?: currency.blockchain.derivationPath(derivationStyle)?.rawPath
-                    val blockchainNetwork =
-                        BlockchainNetwork(currency.blockchain, rawDerivationPath, listOf(currency.token))
-                    WalletAction.MultiWallet.AddToken(
-                        token = currency.token,
-                        blockchain = blockchainNetwork,
-                        save = index == currencyList.lastIndex,
-                    )
                 }
             }
+            addActions.forEach { store.dispatchOnMain(it) }
         }
-        addActions.forEach { store.dispatchOnMain(it) }
     }
 
-    private fun removeCurrenciesIfNeeded(currencies: List<Currency>) {
-        if (currencies.isNotEmpty()) store.dispatch(WalletAction.MultiWallet.RemoveWallets(currencies))
+    private suspend fun removeCurrenciesIfNeeded(currencies: List<Currency>) {
+        when {
+            currencies.isEmpty() -> Unit
+            userWalletsListManager.hasSavedUserWallets -> {
+                walletCurrenciesManager.removeCurrencies(
+                    userWallet = userWalletsListManager.selectedUserWalletSync!!,
+                    currenciesToRemove = currencies,
+                )
+            }
+            else -> {
+                store.dispatch(WalletAction.MultiWallet.RemoveWallets(currencies))
+            }
+        }
     }
 
     private fun isNeedToDerive(scanResponse: ScanResponse, currency: Currency): Boolean {
@@ -324,7 +362,7 @@ class TokensMiddleware {
         } ?: false
     }
 
-    private fun handleAddingCustomToken(action: TokensAction.PrepareAndNavigateToAddCustomToken) {
+    private fun handleAddingCustomToken() = scope.launch {
         val onAddCustomToken = fun(customCurrency: CustomCurrency) {
             val scanResponse = store.state.globalState.scanResponse ?: return
 
@@ -335,6 +373,7 @@ class TokensMiddleware {
                 store.dispatchOnMain(NavigationAction.PopBackTo())
             }
 
+            Analytics.send(ManageTokens.CustomToken.TokenWasAdded(customCurrency))
             val currency = Currency.fromCustomCurrency(customCurrency)
             val isNeedToDerive = isNeedToDerive(scanResponse, currency)
             val currencyList = listOf(currency)
@@ -347,7 +386,7 @@ class TokensMiddleware {
             }
         }
 
-        val addedCurrencies = store.state.walletState.wallets.map { walletStore ->
+        val addedCurrencies = store.state.walletState.walletsStores.map { walletStore ->
             walletStore.walletsData.map { walletData -> walletData.currency }
         }.flatten().map {
             when (it) {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
index 9a9052115c..2fa1ab2971 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
@@ -5,21 +5,23 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.accompanist.appcompattheme.AppCompatTheme
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.extensions.copyToClipboard
 import com.tangem.tap.common.extensions.dispatchNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.features.BaseFragment
+import com.tangem.tap.features.addBackPressHandler
 import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 import com.tangem.tap.features.tokens.redux.TokensAction
@@ -38,8 +40,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.rekotlin.StoreSubscriber
 
-class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
-    StoreSubscriber<TokensState> {
+class AddTokensFragment : BaseFragment(R.layout.fragment_add_tokens), StoreSubscriber<TokensState> {
 
     private val binding: FragmentAddTokensBinding by viewBinding(FragmentAddTokensBinding::bind)
     private var tokensState: MutableState<TokensState> = mutableStateOf(store.state.tokensState)
@@ -48,38 +49,18 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                store.dispatch(NavigationAction.PopBackTo())
-                store.dispatch(TokensAction.ResetState)
-            }
-        })
-        val inflater = TransitionInflater.from(requireContext())
-        enterTransition = inflater.inflateTransition(R.transition.slide_right)
-        exitTransition = inflater.inflateTransition(R.transition.fade)
-    }
-
-    override fun onStart() {
-        super.onStart()
-        store.subscribe(this) { state ->
-            state.skipRepeats { oldState, newState ->
-                oldState.tokensState == newState.tokensState
-            }.select { it.tokensState }
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-        store.unsubscribe(this)
+        Analytics.send(ManageTokens.ScreenOpened())
+        addBackPressHandler(this)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
         super.onViewCreated(view, savedInstanceState)
 
         (activity as? AppCompatActivity)?.setSupportActionBar(toolbar)
-        toolbar.setNavigationOnClickListener { activity?.onBackPressed() }
+        toolbar.setNavigationOnClickListener { handleOnBackPressed() }
 
         val onSaveChanges = { tokens: List<TokenWithBlockchain>, blockchains: List<Blockchain> ->
+            Analytics.send(ManageTokens.ButtonSaveChanges())
             store.dispatch(TokensAction.SaveChanges(tokens, blockchains))
         }
         val onNetworkItemClicked = { contractAddress: ContractAddress ->
@@ -88,11 +69,7 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
         }
 
         val onLoadMore = {
-                store.dispatch(
-                    TokensAction.LoadMore(
-                        scanResponse = store.state.globalState.scanResponse
-                    )
-                )
+            store.dispatch(TokensAction.LoadMore(scanResponse = store.state.globalState.scanResponse))
         }
 
         cvCurrencies.setContent {
@@ -101,29 +78,29 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
                     tokensState = tokensState,
                     onSaveChanges = onSaveChanges,
                     onNetworkItemClicked = onNetworkItemClicked,
-                    onLoadMore = onLoadMore
+                    onLoadMore = onLoadMore,
                 )
             }
         }
     }
 
-    override fun newState(state: TokensState) {
-        if (activity == null || view == null) return
-        val toolbarTitle =
-            if (state.allowToAdd) R.string.add_tokens_title else R.string.search_tokens_title
-        tokensState.value = state
-        binding.toolbar.title = getString(toolbarTitle)
+    override fun onStart() {
+        super.onStart()
+        store.subscribe(this) { state ->
+            state
+                .skipRepeats { oldState, newState -> oldState.tokensState == newState.tokensState }
+                .select { it.tokensState }
+        }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.menu_search -> true
-            R.id.menu_navigate_add_custom_token -> {
-                store.dispatch(TokensAction.PrepareAndNavigateToAddCustomToken)
-                true
-            }
-            else -> super.onOptionsItemSelected(item)
-        }
+    override fun onStop() {
+        super.onStop()
+        store.unsubscribe(this)
+    }
+
+    override fun onDestroy() {
+        store.dispatch(TokensAction.ResetState)
+        super.onDestroy()
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -134,7 +111,7 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
 
         val menuItem = menu.findItem(R.id.menu_search)
         val searchView: SearchView = menuItem.actionView as SearchView
-        searchView.queryHint = searchView.getString(R.string.add_token_search_hint)
+        searchView.queryHint = searchView.getString(R.string.common_search)
         searchView.maxWidth = android.R.attr.width
         searchView.inputtedTextAsFlow()
             .debounce(800)
@@ -147,22 +124,49 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
         return super.onCreateOptionsMenu(menu, inflater)
     }
 
-    override fun onDestroy() {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.menu_search -> true
+            R.id.menu_navigate_add_custom_token -> {
+                Analytics.send(ManageTokens.ButtonCustomToken())
+                store.dispatch(TokensAction.PrepareAndNavigateToAddCustomToken)
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    override fun configureTransitions() {
+        super.configureTransitions()
+        val inflater = TransitionInflater.from(requireContext())
+        enterTransition = inflater.inflateTransition(R.transition.slide_right)
+        exitTransition = inflater.inflateTransition(R.transition.fade)
+    }
+
+    override fun handleOnBackPressed() {
+        store.dispatch(NavigationAction.PopBackTo())
         store.dispatch(TokensAction.ResetState)
-        super.onDestroy()
+    }
+
+    override fun newState(state: TokensState) {
+        if (activity == null || view == null) return
+        val toolbarTitle =
+            if (state.allowToAdd) R.string.main_manage_tokens else R.string.search_tokens_title
+        tokensState.value = state
+        binding.toolbar.title = getString(toolbarTitle)
     }
 }
 
 fun SearchView.inputtedTextAsFlow(): Flow<String> = callbackFlow {
-    val watcher = setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-        override fun onQueryTextSubmit(query: String?): Boolean {
-            return false
-        }
+    val watcher = setOnQueryTextListener(
+        object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String?): Boolean = false
 
-        override fun onQueryTextChange(newText: String?): Boolean {
-            trySend(newText ?: "")
-            return false
-        }
-    })
+            override fun onQueryTextChange(newText: String?): Boolean {
+                trySend(newText ?: "")
+                return false
+            }
+        },
+    )
     awaitClose { (watcher) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
index 49886cbf86..149fd2b517 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/CurrenciesScreen.kt
@@ -8,8 +8,16 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.ExtendedFloatingActionButton
+import androidx.compose.material.FabPosition
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -18,8 +26,12 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation
 import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.ManageTokens
 import com.tangem.tap.common.compose.Keyboard
 import com.tangem.tap.common.compose.extensions.addAndNotify
 import com.tangem.tap.common.compose.extensions.removeAndNotify
@@ -41,7 +53,7 @@ fun CurrenciesScreen(
     tokensState: MutableState<TokensState> = mutableStateOf(store.state.tokensState),
     onSaveChanges: (List<TokenWithBlockchain>, List<Blockchain>) -> Unit,
     onNetworkItemClicked: (ContractAddress) -> Unit,
-    onLoadMore: () -> Unit
+    onLoadMore: () -> Unit,
 ) {
     val tokensAddedOnMainScreen = remember { tokensState.value.addedTokens }
     val blockchainsAddedOnMainScreen = remember { tokensState.value.addedBlockchains }
@@ -70,33 +82,34 @@ fun CurrenciesScreen(
         }
     }
 
+    val statusBarColor = colorResource(id = R.color.backgroundLightGray)
+    SystemBarsEffect {
+        setSystemBarsColor(color = statusBarColor)
+    }
+
     Scaffold(
         floatingActionButton = {
-            if (tokensState.value.allowToAdd) SaveChangesButton(isKeyboardOpen) {
-                onSaveChanges(addedTokensState.value, addedBlockchainsState.value)
+            if (tokensState.value.allowToAdd) {
+                SaveChangesButton(isKeyboardOpen) {
+                    onSaveChanges(addedTokensState.value, addedBlockchainsState.value)
+                }
             }
         },
         floatingActionButtonPosition = FabPosition.Center,
     ) {
-
         AnimatedVisibility(
             visible = tokensState.value.loadCoinsState == LoadCoinsState.LOADING,
             enter = fadeIn(),
-            exit = fadeOut()
+            exit = fadeOut(),
         ) {
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier.fillMaxSize()
-            ) {
-                CircularProgressIndicator(
-                    color = Color(0xFF1ACE80)
-                )
+            Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                CircularProgressIndicator(color = Color(0xFF1ACE80))
             }
         }
         AnimatedVisibility(
             visible = tokensState.value.loadCoinsState == LoadCoinsState.LOADED,
             enter = fadeIn(animationSpec = tween(1000)),
-            exit = fadeOut(animationSpec = tween(1000))
+            exit = fadeOut(animationSpec = tween(1000)),
         ) {
             Column {
                 val showHeader = tokensState.value.scanResponse?.card?.useOldStyleDerivation == true
@@ -110,7 +123,7 @@ fun CurrenciesScreen(
                         onAddCurrencyToggleClick(currency, token)
                     },
                     onNetworkItemClicked = onNetworkItemClicked,
-                    onLoadMore = onLoadMore
+                    onLoadMore = onLoadMore,
                 )
             }
         }
@@ -122,29 +135,37 @@ private fun toggleBlockchain(
     blockchain: Blockchain,
     blockchainsAddedOnMainScreen: List<Blockchain>,
     addedBlockchainsState: MutableState<List<Blockchain>>,
-    addedTokens: List<TokenWithBlockchain>
+    addedTokens: List<TokenWithBlockchain>,
 ) {
     val isTryingToRemove = addedBlockchainsState.value.contains(blockchain)
     val isAddedOnMainScreen = blockchainsAddedOnMainScreen.contains(blockchain)
     val isTokenWithSameBlockchainFound = addedTokens.any { it.blockchain == blockchain }
+    val analyticsCurrencyTypeParam = AnalyticsParam.CurrencyType.Blockchain(blockchain)
 
     if (isTryingToRemove) {
         if (isTokenWithSameBlockchainFound) {
-            store.dispatchDialogShow(WalletDialog.TokensAreLinkedDialog(
-                currencyTitle = blockchain.name,
-                currencySymbol = blockchain.currency
-            ))
-        } else {
-            if (isAddedOnMainScreen) {
-                store.dispatchDialogShow(WalletDialog.RemoveWalletDialog(
+            store.dispatchDialogShow(
+                WalletDialog.TokensAreLinkedDialog(
                     currencyTitle = blockchain.name,
-                    onOk = { addedBlockchainsState.removeAndNotify(blockchain) }
-                ))
-            } else {
-                addedBlockchainsState.removeAndNotify(blockchain)
-            }
+                    currencySymbol = blockchain.currency,
+                ),
+            )
+        } else if (isAddedOnMainScreen) {
+            store.dispatchDialogShow(
+                WalletDialog.RemoveWalletDialog(
+                    currencyTitle = blockchain.name,
+                    onOk = {
+                        analyticsCurrencyTypeParam.sendOn()
+                        addedBlockchainsState.removeAndNotify(blockchain)
+                    },
+                ),
+            )
+        } else {
+            analyticsCurrencyTypeParam.sendOff()
+            addedBlockchainsState.removeAndNotify(blockchain)
         }
     } else {
+        analyticsCurrencyTypeParam.sendOn()
         addedBlockchainsState.addAndNotify(blockchain)
     }
 }
@@ -158,28 +179,46 @@ private fun toggleToken(
     val isTryingToRemove = addedTokensState.value.contains(token)
     val isAddedOnMainScreen = tokensAddedOnMainScreen.contains(token)
     val isUnsupportedToken = !tokensState.canHandleToken(token)
+    val analyticsCurrencyTypeParam = AnalyticsParam.CurrencyType.Token(token.token)
 
     if (isTryingToRemove) {
         if (isAddedOnMainScreen) {
-            store.dispatchDialogShow(WalletDialog.RemoveWalletDialog(
-                currencyTitle = token.token.name,
-                onOk = { addedTokensState.removeAndNotify(token) }
-            ))
+            store.dispatchDialogShow(
+                WalletDialog.RemoveWalletDialog(
+                    currencyTitle = token.token.name,
+                    onOk = {
+                        analyticsCurrencyTypeParam.sendOff()
+                        addedTokensState.removeAndNotify(token)
+                    },
+                ),
+            )
         } else {
+            analyticsCurrencyTypeParam.sendOff()
             addedTokensState.removeAndNotify(token)
         }
     } else {
         if (isUnsupportedToken) {
-            store.dispatchDialogShow(AppDialog.SimpleOkDialogRes(
-                headerId = R.string.common_warning,
-                messageId = R.string.alert_manage_tokens_unsupported_message,
-            ))
+            store.dispatchDialogShow(
+                AppDialog.SimpleOkDialogRes(
+                    headerId = R.string.common_warning,
+                    messageId = R.string.alert_manage_tokens_unsupported_message,
+                ),
+            )
         } else {
+            analyticsCurrencyTypeParam.sendOn()
             addedTokensState.addAndNotify(token)
         }
     }
 }
 
+private fun AnalyticsParam.CurrencyType.sendOn() {
+    Analytics.send(ManageTokens.TokenSwitcherChanged(this, AnalyticsParam.OnOffState.On))
+}
+
+private fun AnalyticsParam.CurrencyType.sendOff() {
+    Analytics.send(ManageTokens.TokenSwitcherChanged(this, AnalyticsParam.OnOffState.Off))
+}
+
 @Composable
 fun SaveChangesButton(keyboardState: Keyboard, onSaveChanges: () -> Unit) {
 
@@ -198,6 +237,6 @@ fun SaveChangesButton(keyboardState: Keyboard, onSaveChanges: () -> Unit) {
         onClick = onSaveChanges,
         backgroundColor = colorResource(id = R.color.accent),
         contentColor = Color.White,
-        modifier = Modifier.padding(bottom = padding.dp)
+        modifier = Modifier.padding(bottom = padding.dp),
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt
index cded760ba9..c4b1b21abe 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/compose/currencyItem/CurrencyExpandedContent.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.tap.domain.tokens.Contract
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
@@ -30,22 +31,20 @@ fun CurrencyExpandedContent(
         exit = fadeOut() + shrinkVertically(),
     ) {
         val blockchains = currency.contracts.map { it.blockchain }
-        Column(
-            modifier = Modifier
-                .fillMaxWidth(),
-        ) {
+        Column(modifier = Modifier.fillMaxWidth()) {
             blockchains.mapIndexed { index, blockchain ->
-                val contract = currency.contracts.firstOrNull { it.blockchain == blockchain }
+                val currencyContract = currency.contracts
+                    .firstOrNull { it.blockchain == blockchain }
                     ?: return@mapIndexed
 
-                val added = if (contract.address != null) {
-                    addedTokens.map { it.token.contractAddress }.contains(contract.address)
+                val added = if (currencyContract.address != null) {
+                    addedTokens.any(currencyContract::isInclude)
                 } else {
                     addedBlockchains.contains(blockchain)
                 }
                 NetworkItem(
                     currency = currency,
-                    contract = contract,
+                    contract = currencyContract,
                     blockchain = blockchain,
                     allowToAdd = allowToAdd,
                     added = added,
@@ -57,4 +56,7 @@ fun CurrencyExpandedContent(
             }
         }
     }
-}
\ No newline at end of file
+}
+
+private fun Contract.isInclude(addedToken: TokenWithBlockchain): Boolean =
+    address == addedToken.token.contractAddress && blockchain == addedToken.blockchain
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/models/Currency.kt b/app/src/main/java/com/tangem/tap/features/wallet/models/Currency.kt
index 06e3cbae64..146d622d16 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/models/Currency.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/models/Currency.kt
@@ -1,16 +1,16 @@
 package com.tangem.tap.features.wallet.models
 
-import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
-import com.tangem.blockchain.common.Token
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.domain.common.extensions.toCoinId
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.domain.features.addCustomToken.CustomCurrency
-import com.tangem.network.api.tangemTech.TokenResponse
+import com.tangem.datasource.api.tangemTech.TokenResponse
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
+import com.tangem.blockchain.common.Blockchain as SdkBlockchain
+import com.tangem.blockchain.common.Token as SdkToken
 
 sealed interface Currency {
     val coinId: String?
@@ -18,7 +18,7 @@ sealed interface Currency {
             is Blockchain -> blockchain.toCoinId()
             is Token -> token.id
         }
-    val blockchain: com.tangem.blockchain.common.Blockchain
+    val blockchain: SdkBlockchain
     val currencySymbol: CryptoCurrencyName
     val derivationPath: String?
     val currencyName: String
@@ -33,15 +33,15 @@ sealed interface Currency {
         }
 
     data class Token(
-        val token: com.tangem.blockchain.common.Token,
-        override val blockchain: com.tangem.blockchain.common.Blockchain,
+        val token: SdkToken,
+        override val blockchain: SdkBlockchain,
         override val derivationPath: String?,
     ) : Currency {
         override val currencySymbol = token.symbol
     }
 
     data class Blockchain(
-        override val blockchain: com.tangem.blockchain.common.Blockchain,
+        override val blockchain: SdkBlockchain,
         override val derivationPath: String?,
     ) : Currency {
         override val currencySymbol: CryptoCurrencyName = blockchain.currency
@@ -72,7 +72,7 @@ sealed interface Currency {
     companion object {
         fun fromBlockchainNetwork(
             blockchainNetwork: BlockchainNetwork,
-            token: com.tangem.blockchain.common.Token? = null,
+            token: SdkToken? = null,
         ): Currency {
             return if (token != null) {
                 Token(
@@ -115,7 +115,7 @@ sealed interface Currency {
                 ?: return null
             return when {
                 tokenResponse.contractAddress != null -> Token(
-                    com.tangem.blockchain.common.Token(
+                    token = SdkToken(
                         name = tokenResponse.name,
                         symbol = tokenResponse.symbol,
                         contractAddress = tokenResponse.contractAddress!!,
@@ -148,8 +148,8 @@ fun List<Currency>.toBlockchainNetworks(): List<BlockchainNetwork> {
     return this.filter { it.isBlockchain() }.map { BlockchainNetwork(it.blockchain, it.derivationPath, getTokens(it)) }
 }
 
-private fun List<Currency>.getTokens(currency: Currency): List<Token> {
+fun List<Currency>.getTokens(currency: Currency): List<SdkToken> {
     return this
         .filter { it.isToken() && it.blockchain == currency.blockchain && it.derivationPath == currency.derivationPath }
         .mapNotNull { if (it is Currency.Token) it.token else null }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt b/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
index 3b80a95845..e2709d2bb9 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/models/WalletWarning.kt
@@ -8,7 +8,7 @@ sealed class WalletWarning(
         val edStringValueWithSymbol: String,
     ) : WalletWarning(1)
 
-    object TransactionInProgress : WalletWarning(10)
+    data class TransactionInProgress(val currencyName: String) : WalletWarning(10)
     data class BalanceNotEnoughForFee(val blockchainFullName: String) : WalletWarning(30)
     data class Rent(val walletRent: WalletRent) : WalletWarning(40)
 }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
index b9451b117a..0cc8039e96 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt
@@ -7,32 +7,36 @@ import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchain.common.address.AddressType
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.tap.common.entities.FiatCurrency
-import com.tangem.tap.common.redux.ErrorAction
 import com.tangem.tap.common.redux.NotificationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.TotalBalance
+import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.wallet.R
 import org.rekotlin.Action
 import java.math.BigDecimal
 
 sealed class WalletAction : Action {
 
-    data class ResetState(val newCardId: String) : WalletAction()
+    data class ResetState(val newCard: CardDTO) : WalletAction()
 
     data class SetIfTestnetCard(val isTestnet: Boolean) : WalletAction()
 
     object LoadData : WalletAction() {
         object Refresh : WalletAction()
-        data class Failure(val error: TapError) : WalletAction()
+        object Success : WalletAction()
+        data class Failure(val error: TapError?) : WalletAction()
     }
 
     data class LoadWallet(
         val blockchain: BlockchainNetwork? = null,
-        val walletManager: WalletManager? = null
+        val walletManager: WalletManager? = null,
     ) : WalletAction() {
         data class Success(val wallet: Wallet, val blockchain: BlockchainNetwork) : WalletAction()
         data class NoAccount(
@@ -54,22 +58,30 @@ sealed class WalletAction : Action {
     sealed class MultiWallet : WalletAction() {
         data class SetIsMultiwalletAllowed(val isMultiwalletAllowed: Boolean) : MultiWallet()
 
+        data class AddBlockchains(
+            val blockchains: List<BlockchainNetwork>,
+            val walletManagers: List<WalletManager>,
+        ) : MultiWallet()
+
+        data class AddTokens(
+            val tokens: List<Token>,
+            val blockchain: BlockchainNetwork,
+        ) : MultiWallet()
+
         data class AddBlockchain(
             val blockchain: BlockchainNetwork,
             val walletManager: WalletManager?,
             val save: Boolean,
         ) : MultiWallet()
 
-        data class AddBlockchains(
-            val blockchains: List<BlockchainNetwork>, val walletManagers: List<WalletManager>, val save: Boolean,
+        data class AddToken(
+            val token: Token,
+            val blockchain: BlockchainNetwork,
+            val save: Boolean,
         ) : MultiWallet()
 
-        data class AddTokens(val tokens: List<Token>, val blockchain: BlockchainNetwork, val save: Boolean) :
-            MultiWallet()
-
-        data class AddToken(val token: Token, val blockchain: BlockchainNetwork, val save: Boolean) : MultiWallet()
         data class SaveCurrencies(
-            val blockchainNetworks: List<BlockchainNetwork>, val card: Card? = null,
+            val blockchainNetworks: List<BlockchainNetwork>, val card: CardDTO? = null,
         ) : MultiWallet()
 
         data class TokenLoaded(
@@ -78,7 +90,8 @@ sealed class WalletAction : Action {
             val blockchain: BlockchainNetwork,
         ) : MultiWallet()
 
-        data class SelectWallet(val walletData: WalletData?) : MultiWallet()
+        data class SelectWallet(val currency: Currency?) : MultiWallet()
+        data class SetSingleWalletCurrency(val currency: Currency?) : MultiWallet()
 
         data class TryToRemoveWallet(val currency: Currency) : MultiWallet()
         data class RemoveWallet(val currency: Currency) : MultiWallet()
@@ -116,15 +129,15 @@ sealed class WalletAction : Action {
         val wallet: Wallet? = null, val coinsList: List<Currency>? = null,
     ) : WalletAction() {
         data class Success(
-            val fiatRates: Map<Currency, BigDecimal?>
+            val fiatRates: Map<Currency, BigDecimal?>,
         ) : WalletAction()
 
         object Failure : WalletAction()
     }
 
-    class LoadCardInfo(val card: Card) : WalletAction()
+    class LoadCardInfo(val card: CardDTO) : WalletAction()
 
-    data class LoadArtwork(val card: Card, val artworkId: String?) : WalletAction() {
+    data class LoadArtwork(val card: CardDTO, val artworkId: String?) : WalletAction() {
         data class Success(val artwork: Artwork) : WalletAction()
         object Failure : WalletAction()
     }
@@ -133,10 +146,6 @@ sealed class WalletAction : Action {
 
     data class Send(val amount: Amount? = null) : WalletAction()
 
-    object EmptyField : WalletAction(), ErrorAction {
-        override val error = TapError.PayIdEmptyField
-    }
-
     data class CopyAddress(val address: String, val context: Context) : WalletAction() {
         object Success : WalletAction(), NotificationAction {
             override val messageResource = R.string.wallet_notification_address_copied
@@ -154,7 +163,9 @@ sealed class WalletAction : Action {
         object SignedHashesMultiWalletDialog : DialogAction()
         object ChooseTradeActionDialog : DialogAction()
         data class ChooseCurrency(val amounts: List<Amount>?) : DialogAction()
-        data class RussianCardholdersWarningDialog(val topUpUrl: String? = null) : DialogAction()
+        data class RussianCardholdersWarningDialog(
+            val dialogData: WalletDialog.RussianCardholdersWarningDialog.Data? = null,
+        ) : DialogAction()
 
         object Hide : DialogAction()
     }
@@ -163,18 +174,21 @@ sealed class WalletAction : Action {
 
     object CreateWallet : WalletAction()
     object EmptyWallet : WalletAction()
+    object ChangeWallet : WalletAction()
+    object ShowSaveWalletIfNeeded : WalletAction()
 
     sealed class TradeCryptoAction : WalletAction() {
         object Sell : TradeCryptoAction()
         data class Buy(
             val checkUserLocation: Boolean = true,
         ) : TradeCryptoAction()
+
         data class FinishSelling(val transactionId: String) : TradeCryptoAction()
         data class SendCrypto(
             val currencyId: String,
             val amount: String,
             val destinationAddress: String,
-            val transactionId: String
+            val transactionId: String,
         ) : TradeCryptoAction()
     }
 
@@ -183,7 +197,7 @@ sealed class WalletAction : Action {
     data class SetWalletRent(
         val wallet: Wallet,
         val minRent: String,
-        val rentExempt: String
+        val rentExempt: String,
     ) : WalletAction()
 
     data class RemoveWalletRent(val wallet: Wallet) : WalletAction()
@@ -192,4 +206,11 @@ sealed class WalletAction : Action {
         object ChooseAppCurrency : AppCurrencyAction()
         data class SelectAppCurrency(val fiatCurrency: FiatCurrency) : AppCurrencyAction()
     }
+
+    data class UserWalletChanged(val userWallet: UserWallet) : WalletAction()
+    data class WalletStoresChanged(val walletStores: List<WalletStoreModel>) : WalletAction() {
+        data class UpdateWalletStores(val reduxWalletStores: List<WalletStore>) : WalletAction()
+    }
+
+    data class TotalFiatBalanceChanged(val balance: TotalBalance) : WalletAction()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
index 6219fea552..49773a9854 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletState.kt
@@ -24,6 +24,7 @@ import com.tangem.tap.features.wallet.redux.reducers.findProgressState
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
 import org.rekotlin.StateType
 import java.math.BigDecimal
 import kotlin.properties.ReadOnlyProperty
@@ -35,7 +36,7 @@ data class WalletState(
     val cardImage: Artwork? = null,
     val hashesCountVerified: Boolean? = null,
     val mainWarningsList: List<WarningMessage> = mutableListOf(),
-    val wallets: List<WalletStore> = listOf(),
+    val walletsStores: List<WalletStore> = listOf(),
     val isMultiwalletAllowed: Boolean = false,
     val cardCurrency: CryptoCurrencyName? = null,
     val selectedCurrency: Currency? = null,
@@ -46,8 +47,15 @@ data class WalletState(
     val showBackupWarning: Boolean = false,
     val missingDerivations: List<BlockchainNetwork> = emptyList(),
     val loadingUserTokens: Boolean = false,
+    val walletCardsCount: Int? = null,
 ) : StateType {
 
+    val walletsDataFromStores: List<WalletData>
+        get() = walletsStores.map { it.walletsData }.flatten()
+
+    val selectedWalletData: WalletData?
+        get() = walletsDataFromStores.firstOrNull { it.currency == selectedCurrency }
+
     // if you do not delegate - the application crashes on startup,
     // because twinCardsState has not been created yet
     val twinCardsState: TwinCardsState by ReadOnlyProperty<Any, TwinCardsState> { _, _ ->
@@ -61,37 +69,37 @@ data class WalletState(
         get() = store.state.globalState.exchangeManager.featureIsSwitchedOn()
 
     val blockchains: List<Blockchain>
-        get() = wallets.mapNotNull { it.walletManager?.wallet?.blockchain }
+        get() = walletsStores.mapNotNull { it.walletManager?.wallet?.blockchain }
 
     val currencies: List<Currency>
-        get() = wallets.flatMap { it.walletsData }.map { it.currency }
-
-    val walletsData: List<WalletData>
-        get() = wallets.flatMap { it.walletsData }
+        get() = walletsStores.flatMap { it.walletsData }.map { it.currency }
 
     val walletManagers: List<WalletManager>
-        get() = wallets.mapNotNull { it.walletManager }
+        get() = walletsStores.mapNotNull { it.walletManager }
 
-    val primaryWallet: WalletData? = wallets.firstOrNull()?.walletsData?.firstOrNull()
+    val primaryWallet: WalletData? = walletsStores.firstOrNull()?.walletsData?.firstOrNull()
 
-    val primaryWalletManager: WalletManager? = if (wallets.isNotEmpty()) wallets[0].walletManager else null
+    val primaryWalletManager: WalletManager? = if (walletsStores.isNotEmpty()) walletsStores[0].walletManager else null
 
     val shouldShowDetails: Boolean =
         primaryWallet?.currencyData?.status != BalanceStatus.EmptyCard &&
             primaryWallet?.currencyData?.status != BalanceStatus.UnknownBlockchain
 
+    val hasSavedWallets: Boolean
+        get() = userWalletsListManager.hasSavedUserWallets
+
     fun getWalletManager(currency: Currency?): WalletManager? {
         if (currency?.blockchain == null) return null
         return getWalletStore(currency)?.walletManager
     }
 
     fun getWalletManager(blockchain: BlockchainNetwork): WalletManager? {
-        return wallets.find { it.blockchainNetwork == blockchain }?.walletManager
+        return walletsStores.find { it.blockchainNetwork == blockchain }?.walletManager
     }
 
     fun getWalletData(blockchain: BlockchainNetwork?): WalletData? {
         if (blockchain == null) return null
-        return walletsData.find {
+        return walletsDataFromStores.find {
             it.currency is Currency.Blockchain &&
                 it.currency.blockchain == blockchain.blockchain &&
                 it.currency.derivationPath == blockchain.derivationPath
@@ -100,7 +108,7 @@ data class WalletState(
 
     fun getWalletStore(currency: Currency?): WalletStore? {
         if (currency == null) return null
-        return wallets.firstOrNull {
+        return walletsStores.firstOrNull {
             it.blockchainNetwork.derivationPath == currency.derivationPath &&
                 (it.blockchainNetwork.blockchain == currency.blockchain)
         }
@@ -115,7 +123,7 @@ data class WalletState(
 
     fun getWalletStore(blockchainNetwork: BlockchainNetwork?): WalletStore? {
         if (blockchainNetwork == null) return null
-        return wallets.firstOrNull {
+        return walletsStores.firstOrNull {
             it.blockchainNetwork.derivationPath == blockchainNetwork.derivationPath &&
                 (it.blockchainNetwork.blockchain == blockchainNetwork.blockchain)
         }
@@ -126,10 +134,6 @@ data class WalletState(
         return getWalletStore(currency)?.walletsData?.firstOrNull { it.currency == currency }
     }
 
-    fun getSelectedWalletData(): WalletData? {
-        return walletsData.find { it.currency == selectedCurrency }
-    }
-
     private fun isPrimaryCurrency(walletData: WalletData): Boolean {
         return (walletData.currency is Currency.Blockchain &&
             walletData.currency.blockchain == store.state.walletState.primaryBlockchain)
@@ -137,10 +141,10 @@ data class WalletState(
             walletData.currency.token == store.state.walletState.primaryToken)
     }
 
-    fun replaceWalletInWallets(wallet: WalletStore?): List<WalletStore> {
-        if (wallet == null) return wallets
+    fun replaceWalletStoreInWalletsStores(wallet: WalletStore?): List<WalletStore> {
+        if (wallet == null) return walletsStores
         var changed = false
-        val updatedWallets = wallets.map {
+        val updatedWallets = walletsStores.map {
             if (it.blockchainNetwork == wallet.blockchainNetwork) {
                 changed = true
                 wallet
@@ -148,7 +152,7 @@ data class WalletState(
                 it
             }
         }
-        return if (changed) updatedWallets else wallets + wallet
+        return if (changed) updatedWallets else walletsStores + wallet
     }
 
     fun updateWalletData(walletData: WalletData?): WalletState {
@@ -156,26 +160,23 @@ data class WalletState(
         return updateWalletsData(listOf(walletData))
     }
 
-    fun updateWalletsData(
-        walletsData: List<WalletData>
-    ): WalletState {
-
+    fun updateWalletsData(walletsData: List<WalletData>): WalletState {
         val walletStores = walletsData
             .map { BlockchainNetwork(it.currency.blockchain, it.currency.derivationPath, emptyList()) }
             .distinct().map { getWalletStore(it) }.mapNotNull { it?.updateWallets(walletsData) }
 
-        return updateWalletStores(walletStores)
+        return updateWalletsStores(walletStores)
     }
 
     fun updateWalletStore(walletStore: WalletStore?): WalletState {
-        return copy(wallets = replaceWalletInWallets(walletStore))
+        return copy(walletsStores = replaceWalletStoreInWalletsStores(walletStore))
             .updateTotalBalance()
             .updateProgressState()
     }
 
-    private fun updateWalletStores(walletStores: List<WalletStore>): WalletState {
+    private fun updateWalletsStores(walletStores: List<WalletStore>): WalletState {
         val walletStoresMutable = walletStores.toMutableList()
-        val updatedWallets = wallets.map { oldWalletStore ->
+        val updatedWallets = walletsStores.map { oldWalletStore ->
             val walletStore = walletStoresMutable.find {
                 it.blockchainNetwork == oldWalletStore.blockchainNetwork
             }
@@ -186,20 +187,20 @@ data class WalletState(
                 oldWalletStore
             }
         }
-        return copy(wallets = updatedWallets + walletStoresMutable)
+        return copy(walletsStores = updatedWallets + walletStoresMutable)
             .updateTotalBalance()
             .updateProgressState()
     }
 
-    fun removeWallet(walletData: WalletData?): WalletState {
+    fun removeWalletData(walletData: WalletData?): WalletState {
         if (walletData == null) return this
         return when (val currency = walletData.currency) {
             is Currency.Blockchain -> {
-                val walletStores = wallets.filterNot {
+                val walletStores = walletsStores.filterNot {
                     it.blockchainNetwork.blockchain == currency.blockchain
                         && it.blockchainNetwork.derivationPath == currency.derivationPath
                 }
-                copy(wallets = walletStores)
+                copy(walletsStores = walletStores)
                     .updateTotalBalance()
                     .updateProgressState()
             }
@@ -218,23 +219,8 @@ data class WalletState(
         }
     }
 
-    fun replaceSomeWallets(newWallets: List<WalletData>): List<WalletData> {
-        val remainingWallets: MutableList<WalletData> = newWallets.toMutableList()
-        val updatedWallets = walletsData.map { wallet ->
-            val newWallet = newWallets
-                .firstOrNull { wallet.currency == it.currency }
-            if (newWallet == null) {
-                wallet
-            } else {
-                remainingWallets.remove(newWallet)
-                newWallet
-            }
-        }
-        return updatedWallets + remainingWallets
-    }
-
     private fun updateTotalBalance(): WalletState {
-        val walletsData = this.wallets
+        val walletsData = this.walletsStores
             .flatMap(WalletStore::walletsData)
 
         return if (walletsData.isNotEmpty()) {
@@ -242,16 +228,16 @@ data class WalletState(
                 totalBalance = TotalBalance(
                     state = walletsData.findProgressState(),
                     fiatAmount = walletsData.calculateTotalFiatAmount(),
-                    fiatCurrency = store.state.globalState.appCurrency
-                )
+                    fiatCurrency = store.state.globalState.appCurrency,
+                ),
             )
         } else this.copy(
-            totalBalance = null
+            totalBalance = null,
         )
     }
 
     private fun updateProgressState(): WalletState {
-        val walletsData = this.wallets
+        val walletsData = this.walletsStores
             .flatMap(WalletStore::walletsData)
 
         return if (walletsData.isNotEmpty()) {
@@ -259,7 +245,7 @@ data class WalletState(
 
             this.copy(
                 state = walletsData.findProgressState(),
-                error = this.error.takeIf { newProgressState == ProgressState.Error }
+                error = this.error.takeIf { newProgressState == ProgressState.Error },
             )
         } else this
     }
@@ -271,6 +257,21 @@ data class WalletState(
     }
 }
 
+fun List<WalletData>.replaceSomeWalletsData(newWallets: List<WalletData>): List<WalletData> {
+    val remainingWallets: MutableList<WalletData> = newWallets.toMutableList()
+    val updatedWallets = this.map { wallet ->
+        val newWallet = newWallets
+            .firstOrNull { wallet.currency == it.currency }
+        if (newWallet == null) {
+            wallet
+        } else {
+            remainingWallets.remove(newWallet)
+            newWallet
+        }
+    }
+    return updatedWallets + remainingWallets
+}
+
 enum class ProgressState : WidgetState { Loading, Refreshing, Done, Error }
 
 enum class ErrorType { NoInternetConnection }
@@ -282,7 +283,7 @@ sealed class WalletMainButton(enabled: Boolean) : Button(enabled) {
 
 data class WalletAddresses(
     val selectedAddress: AddressData,
-    val list: List<AddressData>
+    val list: List<AddressData>,
 )
 
 data class AddressData(
@@ -296,7 +297,7 @@ data class AddressData(
 
 data class Artwork(
     val artworkId: String,
-    val artwork: Bitmap? = null
+    val artwork: Bitmap? = null,
 ) {
     companion object {
         const val DEFAULT_IMG_URL = "https://app.tangem.com/cards/card_default.png"
@@ -350,7 +351,7 @@ data class WalletData(
 
     private fun assembleNonTypedWarnings(walletWarnings: MutableList<WalletWarning>) {
         if (currencyData.status == BalanceStatus.SameCurrencyTransactionInProgress) {
-            walletWarnings.add(WalletWarning.TransactionInProgress)
+            walletWarnings.add(WalletWarning.TransactionInProgress(currency.currencyName))
         }
     }
 
@@ -369,7 +370,7 @@ data class WalletData(
         }
     }
 
-    private fun assembleTokenWarnings(walletWarnings: MutableList<WalletWarning>){
+    private fun assembleTokenWarnings(walletWarnings: MutableList<WalletWarning>) {
         if (!currency.isToken()) return
 
         val blockchainFullName = currency.blockchain.fullName
@@ -386,7 +387,7 @@ data class WalletData(
 data class WalletStore(
     val walletManager: WalletManager?,
     val blockchainNetwork: BlockchainNetwork,
-    val walletsData: List<WalletData>
+    val walletsData: List<WalletData>,
 ) {
     fun updateWallets(walletDataList: List<WalletData>): WalletStore {
         val relevantWalletDataList = walletDataList.filter {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
index f1fb6371cc..c60632f60e 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/AppCurrencyMiddleware.kt
@@ -1,8 +1,11 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.CurrenciesResponse
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.CurrenciesResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -10,9 +13,11 @@ import com.tangem.tap.domain.TapWalletManager
 import com.tangem.tap.features.details.redux.DetailsAction
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.models.WalletDialog
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorAction
 import com.tangem.tap.persistence.FiatCurrenciesPrefStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
 import kotlinx.coroutines.launch
 
 class AppCurrencyMiddleware(
@@ -61,11 +66,20 @@ class AppCurrencyMiddleware(
     }
 
     private fun selectCurrency(action: WalletAction.AppCurrencyAction.SelectAppCurrency) {
-        tapWalletManager.rates.clear()
+        Analytics.send(MainScreen.MainCurrencyChanged(AnalyticsParam.CurrencyType.FiatCurrency(action.fiatCurrency)))
         fiatCurrenciesPrefStorage.saveAppCurrency(action.fiatCurrency)
         store.dispatch(GlobalAction.ChangeAppCurrency(action.fiatCurrency))
         store.dispatch(DetailsAction.ChangeAppCurrency(action.fiatCurrency))
-        store.dispatch(WalletAction.LoadFiatRate())
+        store.dispatch(WalletSelectorAction.ChangeAppCurrency(action.fiatCurrency))
+        val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+        if (selectedUserWallet != null) {
+            scope.launch {
+                tapWalletManager.loadData(selectedUserWallet, refresh = true)
+            }
+        } else {
+            tapWalletManager.rates.clear()
+            store.dispatch(WalletAction.LoadFiatRate())
+        }
     }
 
     private fun List<CurrenciesResponse.Currency>.mapToUiModel(): List<FiatCurrency> {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
new file mode 100644
index 0000000000..dbb030f67f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/Mapper.kt
@@ -0,0 +1,133 @@
+package com.tangem.tap.features.wallet.redux.middlewares
+
+import com.tangem.common.extensions.isZero
+import com.tangem.tap.common.extensions.stripZeroPlainString
+import com.tangem.tap.common.extensions.toFiatRateString
+import com.tangem.tap.common.extensions.toFiatValue
+import com.tangem.tap.common.extensions.toFormattedCurrencyString
+import com.tangem.tap.common.extensions.toFormattedFiatValue
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.features.wallet.models.Currency
+import com.tangem.tap.features.wallet.models.TotalBalance
+import com.tangem.tap.features.wallet.models.WalletRent
+import com.tangem.tap.features.wallet.redux.ProgressState
+import com.tangem.tap.features.wallet.redux.WalletAddresses
+import com.tangem.tap.features.wallet.redux.WalletData
+import com.tangem.tap.features.wallet.redux.WalletMainButton
+import com.tangem.tap.features.wallet.redux.WalletStore
+import com.tangem.tap.features.wallet.ui.BalanceStatus
+import com.tangem.tap.features.wallet.ui.BalanceWidgetData
+import com.tangem.tap.features.wallet.ui.TokenData
+import com.tangem.tap.store
+
+internal fun List<WalletStoreModel>.mapToReduxModels(
+    isMultiWalletAllowed: Boolean,
+): List<WalletStore> {
+    return this.map { walletStoreModel ->
+        walletStoreModel.mapToReduxModel(isMultiWalletAllowed)
+    }
+}
+
+internal fun TotalFiatBalance.mapToReduxModel(): TotalBalance {
+    return TotalBalance(
+        state = when (this) {
+            is TotalFiatBalance.Loading -> ProgressState.Loading
+            is TotalFiatBalance.Error -> ProgressState.Error
+            is TotalFiatBalance.Loaded -> ProgressState.Done
+        },
+        fiatAmount = amount,
+        fiatCurrency = store.state.globalState.appCurrency,
+    )
+}
+
+internal fun WalletStoreModel.mapToReduxModel(
+    isMultiWalletAllowed: Boolean,
+): WalletStore {
+    return WalletStore(
+        walletManager = walletManager,
+        blockchainNetwork = blockchainNetwork,
+        walletsData = walletsData.mapToReduxModel(isMultiWalletAllowed, walletRent),
+    )
+}
+
+private fun List<WalletDataModel>.mapToReduxModel(
+    isMultiWalletAllowed: Boolean,
+    walletRent: WalletStoreModel.WalletRent?,
+): List<WalletData> {
+    return this.map { walletDataModel ->
+        with(walletDataModel) {
+            val amount = status.amount
+            val amountFormatted = amount.toFormattedCurrencyString(
+                decimals = currency.decimals,
+                currency = currency.currencySymbol,
+            )
+            val appCurrency = store.state.globalState.appCurrency
+            val fiatAmount = fiatRate?.let { status.amount.toFiatValue(it) }
+            val fiatAmountFormatted = fiatAmount
+                ?.takeIf { !status.isErrorStatus }
+                ?.toFormattedFiatValue(appCurrency.symbol)
+            val fiatRateFormatted = fiatRate?.toFiatRateString(appCurrency.symbol)
+
+            WalletData(
+                currency = currency,
+                walletAddresses = walletAddresses.getOrNull(0)?.let { selectedAddress ->
+                    WalletAddresses(
+                        selectedAddress = selectedAddress,
+                        list = walletAddresses,
+                    )
+                },
+                existentialDepositString = existentialDeposit?.toPlainString(),
+                fiatRate = fiatRate,
+                fiatRateString = fiatRateFormatted,
+                pendingTransactions = status.pendingTransactions,
+                mainButton = WalletMainButton.SendButton(
+                    enabled = !status.amount.isZero() && status.pendingTransactions.isEmpty(),
+                ),
+                walletRent = walletRent?.let {
+                    WalletRent(
+                        minRentValue = "${it.rent.stripZeroPlainString()} ${currency.blockchain.currency}",
+                        rentExemptValue = "${it.exemptionAmount.stripZeroPlainString()} ${currency.blockchain.currency}",
+                    )
+                },
+                currencyData = BalanceWidgetData(
+                    status = when (status) {
+                        is WalletDataModel.Loading -> BalanceStatus.Loading
+                        is WalletDataModel.NoAccount -> BalanceStatus.NoAccount
+                        is WalletDataModel.SameCurrencyTransactionInProgress -> BalanceStatus.SameCurrencyTransactionInProgress
+                        is WalletDataModel.TransactionInProgress -> BalanceStatus.TransactionInProgress
+                        is WalletDataModel.Unreachable -> BalanceStatus.Unreachable
+                        is WalletDataModel.MissedDerivation -> BalanceStatus.MissedDerivation
+                        is WalletDataModel.VerifiedOnline -> BalanceStatus.VerifiedOnline
+                    },
+                    currency = currency.currencyName,
+                    currencySymbol = currency.currencySymbol,
+                    blockchainAmount = status.amount,
+                    amount = amount,
+                    amountFormatted = amountFormatted,
+                    fiatAmount = fiatAmount,
+                    fiatAmountFormatted = fiatAmountFormatted,
+                    token = when {
+                        !isMultiWalletAllowed && currency is Currency.Token -> {
+                            TokenData(
+                                amount = amount,
+                                amountFormatted = amountFormatted,
+                                fiatAmount = fiatAmount,
+                                fiatAmountFormatted = fiatAmountFormatted,
+                                tokenSymbol = currency.currencySymbol,
+                                fiatRate = fiatRate,
+                                fiatRateString = fiatRateFormatted,
+                            )
+                        }
+                        else -> null
+                    },
+                    amountToCreateAccount = (status as? WalletDataModel.NoAccount)
+                        ?.amountToCreateAccount
+                        ?.toString(),
+                    errorMessage = status.errorMessage,
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
index b457d7e622..ba82d17ccd 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/MultiWalletMiddleware.kt
@@ -3,10 +3,16 @@ package com.tangem.tap.features.wallet.redux.middlewares
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.WalletManager
+import com.tangem.common.doOnSuccess
 import com.tangem.common.extensions.guard
 import com.tangem.domain.common.extensions.withMainContext
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.Token.ButtonRemoveToken
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchErrorNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.common.redux.global.GlobalState
@@ -14,6 +20,8 @@ import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.makeWalletManagerForApp
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.scanCard.ScanCardProcessor
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.demo.isDemoCard
@@ -26,6 +34,8 @@ import com.tangem.tap.features.wallet.redux.reducers.toWallet
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.userTokensRepository
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletCurrenciesManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -42,7 +52,7 @@ class MultiWalletMiddleware {
                 handleAddingWalletManagers(globalState, action.walletManagers)
             }
             is WalletAction.MultiWallet.SelectWallet -> {
-                if (action.walletData != null) {
+                if (action.currency != null) {
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.WalletDetails))
                 }
             }
@@ -50,7 +60,7 @@ class MultiWalletMiddleware {
                 addTokens(listOf(action.token), action.blockchain, walletState, globalState, action.save)
             }
             is WalletAction.MultiWallet.AddTokens -> {
-                addTokens(action.tokens, action.blockchain, walletState, globalState, action.save)
+                addTokens(action.tokens, action.blockchain, walletState, globalState, save = false)
             }
             is WalletAction.MultiWallet.AddBlockchain -> {
                 action.walletManager?.let {
@@ -109,6 +119,7 @@ class MultiWalletMiddleware {
                         WalletDialog.RemoveWalletDialog(
                             currencyTitle = currency.currencyName,
                             onOk = {
+                                Analytics.send(ButtonRemoveToken(AnalyticsParam.CurrencyType.Currency(currency)))
                                 store.dispatch(WalletAction.MultiWallet.RemoveWallet(currency))
                                 store.dispatch(NavigationAction.PopBackTo())
                             },
@@ -117,19 +128,27 @@ class MultiWalletMiddleware {
                 }
             }
             is WalletAction.MultiWallet.RemoveWallet -> {
-                val currency = action.currency
-                val card = globalState.scanResponse?.card.guard {
-                    store.dispatchErrorNotification(TapError.UnsupportedState("card is NULL"))
-                    store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
-                    return
+                val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+                if (selectedUserWallet != null) scope.launch {
+                    walletCurrenciesManager.removeCurrency(
+                        userWallet = selectedUserWallet,
+                        currencyToRemove = action.currency,
+                    )
+                } else {
+                    val currency = action.currency
+                    val card = globalState.scanResponse?.card.guard {
+                        store.dispatchErrorNotification(TapError.UnsupportedState("card is NULL"))
+                        store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
+                        return
+                    }
+                    var currencies = walletState?.currencies ?: emptyList()
+                    currencies = currencies.filterNot { it == currency }
+                    if (currency.isBlockchain()) {
+                        currencies
+                            .filter { it.blockchain == currency.blockchain && it.derivationPath == currency.derivationPath }
+                    }
+                    scope.launch { userTokensRepository.saveUserTokens(card, currencies) }
                 }
-                var currencies = walletState?.currencies ?: emptyList()
-                currencies = currencies.filterNot { it == currency }
-                if (currency.isBlockchain()) {
-                    currencies
-                        .filter { it.blockchain == currency.blockchain && it.derivationPath == currency.derivationPath }
-                }
-                scope.launch { userTokensRepository.saveUserTokens(card, currencies) }
             }
             is WalletAction.MultiWallet.RemoveWallets -> {
                 val card = globalState.scanResponse?.card.guard {
@@ -150,11 +169,40 @@ class MultiWalletMiddleware {
                 }
             }
             is WalletAction.MultiWallet.ScanToGetDerivations -> {
-                store.dispatch(WalletAction.Scan)
+                val selectedWallet = userWalletsListManager.selectedUserWalletSync
+                if (selectedWallet != null) {
+                    scanAndUpdateCard(selectedWallet, walletState)
+                } else {
+                    store.dispatch(WalletAction.Scan)
+                }
             }
         }
     }
 
+    private fun scanAndUpdateCard(
+        selectedUserWallet: UserWallet,
+        state: WalletState?,
+    ) = scope.launch(Dispatchers.Default) {
+        Analytics.send(MainScreen.CardWasScanned())
+        ScanCardProcessor.scan(
+            cardId = selectedUserWallet.cardId,
+            additionalBlockchainsToDerive = state?.missingDerivations?.map { it.blockchain },
+        ) { scanResponse ->
+            userWalletsListManager.update(
+                userWalletId = selectedUserWallet.walletId,
+                update = { userWallet ->
+                    userWallet.copy(
+                        scanResponse = scanResponse,
+                    )
+                },
+            )
+                .doOnSuccess { updatedUserWallet ->
+                    store.dispatchOnMain(WalletAction.MultiWallet.AddMissingDerivations(emptyList()))
+                    store.state.globalState.tapWalletManager.loadData(updatedUserWallet, refresh = true)
+                }
+        }
+    }
+
     private fun addDummyBalances(walletManagers: List<WalletManager>) {
         walletManagers.forEach {
             if (it.wallet.fundsAvailable(AmountType.Coin) == BigDecimal.ZERO) {
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 f5040c42f4..df69426a2c 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
@@ -2,8 +2,12 @@ package com.tangem.tap.features.wallet.redux.middlewares
 
 import com.tangem.blockchain.blockchains.ethereum.EthereumWalletManager
 import com.tangem.blockchain.common.AmountType
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
@@ -19,7 +23,6 @@ import com.tangem.tap.scope
 import com.tangem.tap.store
 import kotlinx.coroutines.launch
 
-
 class TradeCryptoMiddleware {
     fun handle(state: () -> AppState?, action: WalletAction.TradeCryptoAction) {
         if (DemoHelper.tryHandle(state, action)) return
@@ -41,7 +44,7 @@ class TradeCryptoMiddleware {
             return
         }
 
-        val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return
+        val selectedWalletData = store.state.walletState.selectedWalletData ?: return
         val card = store.state.globalState.scanResponse?.card ?: return
 
         val addresses = selectedWalletData.walletAddresses?.list.orEmpty()
@@ -50,6 +53,7 @@ class TradeCryptoMiddleware {
         val exchangeManager = store.state.globalState.exchangeManager
         val appCurrency = store.state.globalState.appCurrency
         val currency = selectedWalletData.currency
+        Analytics.send(Token.ButtonBuy(AnalyticsParam.CurrencyType.Currency(currency)))
 
         if (currency is Currency.Token && currency.blockchain.isTestnet()) {
             val walletManager = store.state.walletState.getWalletManager(currency)
@@ -62,7 +66,7 @@ class TradeCryptoMiddleware {
                 exchangeManager.buyErc20TestnetTokens(
                     card = card,
                     walletManager = walletManager,
-                    token = currency.token
+                    token = currency.token,
                 )
             }
             return
@@ -73,41 +77,55 @@ class TradeCryptoMiddleware {
             blockchain = currency.blockchain,
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
-            walletAddress = addresses[0].address
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+            walletAddress = addresses[0].address,
+        )?.let {
+            store.dispatchOpenUrl(it)
+            Analytics.send(Token.Topup.ScreenOpened())
+        }
     }
 
     private fun proceedSellAction() {
-        val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return
+        val selectedWalletData = store.state.walletState.selectedWalletData ?: return
 
         val appCurrency = store.state.globalState.appCurrency
         val addresses = selectedWalletData.walletAddresses?.list.orEmpty()
         if (addresses.isEmpty()) return
 
         val currency = selectedWalletData.currency
+        Analytics.send(Token.ButtonSell(AnalyticsParam.CurrencyType.Currency(currency)))
+
         store.state.globalState.exchangeManager.getUrl(
             action = CurrencyExchangeManager.Action.Sell,
             blockchain = currency.blockchain,
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
-            walletAddress = addresses[0].address
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+            walletAddress = addresses[0].address,
+        )?.let {
+            store.dispatchOpenUrl(it)
+            Analytics.send(Token.Withdraw.ScreenOpened())
+        }
     }
 
     private fun preconfigureAndOpenSendScreen(action: WalletAction.TradeCryptoAction.SendCrypto) {
-        val selectedWalletData = store.state.walletState.getSelectedWalletData() ?: return
+        val selectedWalletData = store.state.walletState.selectedWalletData ?: return
+
+        Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(selectedWalletData.currency)))
 
         val walletManager = store.state.walletState.getWalletManager(selectedWalletData.currency)
-        store.dispatchOnMain(PrepareSendScreen(
-            coinAmount = walletManager?.wallet?.amounts?.get(AmountType.Coin),
-            coinRate = selectedWalletData.fiatRate,
-            walletManager = walletManager
-        ))
-        store.dispatchOnMain(SendAction.SendSpecificTransaction(
-            sendAmount = action.amount,
-            destinationAddress = action.destinationAddress,
-            transactionId = action.transactionId
-        ))
+        store.dispatchOnMain(
+            PrepareSendScreen(
+                coinAmount = walletManager?.wallet?.amounts?.get(AmountType.Coin),
+                coinRate = selectedWalletData.fiatRate,
+                walletManager = walletManager,
+            ),
+        )
+        store.dispatchOnMain(
+            SendAction.SendSpecificTransaction(
+                sendAmount = action.amount,
+                destinationAddress = action.destinationAddress,
+                transactionId = action.transactionId,
+            ),
+        )
         store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Send))
     }
 
@@ -116,6 +134,6 @@ class TradeCryptoMiddleware {
         store.state.globalState.exchangeManager.getSellCryptoReceiptUrl(
             action = CurrencyExchangeManager.Action.Sell,
             transactionId = transactionId,
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+        )?.let { store.dispatchOpenUrl(it) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt
index 5191319318..fb6ff1dd3f 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletDialogsMiddleware.kt
@@ -1,5 +1,8 @@
 package com.tangem.tap.features.wallet.redux.middlewares
 
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.redux.AppDialog
@@ -14,6 +17,9 @@ class WalletDialogsMiddleware {
                 store.dispatchDialogShow(WalletDialog.SignedHashesMultiWalletDialog)
             }
             is WalletAction.DialogAction.ChooseTradeActionDialog -> {
+                store.state.walletState.selectedWalletData?.let {
+                    Analytics.send(Token.ButtonExchange(AnalyticsParam.CurrencyType.Currency(it.currency)))
+                }
                 store.dispatchDialogShow(WalletDialog.ChooseTradeActionDialog)
             }
             is WalletAction.DialogAction.QrCode -> {
@@ -21,18 +27,18 @@ class WalletDialogsMiddleware {
                     AppDialog.AddressInfoDialog(
                         currency = action.currency,
                         addressData = action.selectedAddress,
-                    )
+                    ),
                 )
             }
             is WalletAction.DialogAction.ChooseCurrency -> {
                 store.dispatchDialogShow(
                     WalletDialog.SelectAmountToSendDialog(
-                            amounts = action.amounts
-                    )
+                        amounts = action.amounts,
+                    ),
                 )
             }
             is WalletAction.DialogAction.RussianCardholdersWarningDialog -> {
-                store.dispatchDialogShow(WalletDialog.RussianCardholdersWarningDialog(action.topUpUrl))
+                store.dispatchDialogShow(WalletDialog.RussianCardholdersWarningDialog(action.dialogData))
             }
             is WalletAction.DialogAction.Hide -> {
                 store.dispatchDialogHide()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index ea47afc58a..243ab5eab6 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -6,19 +6,21 @@ import com.tangem.blockchain.common.Amount
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.common.CompletionResult
-import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.isZero
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.operations.attestation.Attestation
 import com.tangem.operations.attestation.OnlineCardVerifier
-import com.tangem.tap.common.analytics.AnalyticsAnOld
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.copyToClipboard
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.dispatchToastNotification
+import com.tangem.tap.common.extensions.isGreaterThan
 import com.tangem.tap.common.extensions.onCardScanned
 import com.tangem.tap.common.extensions.shareText
 import com.tangem.tap.common.extensions.stripZeroPlainString
@@ -29,6 +31,8 @@ import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.failedRates
 import com.tangem.tap.domain.loadedRates
+import com.tangem.tap.domain.model.WalletDataModel
+import com.tangem.tap.domain.model.WalletStoreModel
 import com.tangem.tap.features.demo.DemoHelper
 import com.tangem.tap.features.home.redux.HomeAction
 import com.tangem.tap.features.send.redux.PrepareSendScreen
@@ -47,7 +51,11 @@ import com.tangem.tap.preferencesStorage
 import com.tangem.tap.scope
 import com.tangem.tap.store
 import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.totalFiatBalanceCalculator
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.userWalletsListManagerSafe
 import com.tangem.wallet.R
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.launch
@@ -89,11 +97,7 @@ class WalletMiddleware {
         when (action) {
             is WalletAction.TradeCryptoAction -> tradeCryptoMiddleware.handle(state, action)
             is WalletAction.Warnings -> warningsMiddleware.handle(action, globalState)
-            is WalletAction.MultiWallet -> multiWalletMiddleware.handle(
-                action,
-                walletState,
-                globalState
-            )
+            is WalletAction.MultiWallet -> multiWalletMiddleware.handle(action, walletState, globalState)
             is WalletAction.AppCurrencyAction -> appCurrencyMiddleware.handle(action)
             is WalletAction.DialogAction -> walletDialogMiddleware.handle(action)
             is WalletAction.LoadWallet -> {
@@ -121,9 +125,7 @@ class WalletMiddleware {
                                 true,
                             ),
                         )
-                        store.dispatch(
-                            action = WalletAction.LoadWallet.Success(action.wallet, action.blockchain)
-                        )
+                        store.dispatch(WalletAction.LoadWallet.Success(action.wallet, action.blockchain))
                     }
                 }
                 store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
@@ -142,7 +144,7 @@ class WalletMiddleware {
                         action.coinsList != null -> action.coinsList
                         else -> {
                             if (walletState.isMultiwalletAllowed) {
-                                walletState.walletsData.map { it.currency }
+                                walletState.walletsDataFromStores.map { it.currency }
                             } else {
                                 val derivationPath = walletState.primaryWallet?.currency?.derivationPath
                                 val primaryBlockchain = walletState.primaryBlockchain
@@ -167,7 +169,7 @@ class WalletMiddleware {
                                 Timber.e(
                                     throwable,
                                     "Loading rates failed for [%s]",
-                                    currency.currencySymbol
+                                    currency.currencySymbol,
                                 )
                             }
                         }
@@ -180,24 +182,13 @@ class WalletMiddleware {
             }
             is WalletAction.CreateWallet -> {
                 scope.launch {
-                    val result = tangemSdkManager.createWallet(
-                        globalState.scanResponse?.card?.cardId
-                    )
+                    val result = tangemSdkManager.createWallet(globalState.scanResponse?.card?.cardId)
                     when (result) {
                         is CompletionResult.Success -> {
-                            val scanNoteResponse =
-                                globalState.scanResponse?.copy(card = result.data)
-                            scanNoteResponse?.let { store.onCardScanned(scanNoteResponse) }
-                        }
-                        is CompletionResult.Failure -> {
-                            (result.error as? TangemSdkError)?.let { error ->
-                                store.state.globalState.analyticsHandler.handleCardSdkErrorEvent(
-                                    error,
-                                    AnalyticsAnOld.ActionToLog.CreateWallet,
-                                    card = store.state.detailsState.scanResponse?.card,
-                                )
-                            }
+                            val scanResponse = globalState.scanResponse?.copy(card = result.data)
+                            scanResponse?.let { store.onCardScanned(scanResponse) }
                         }
+                        is CompletionResult.Failure -> {}
                     }
                 }
             }
@@ -210,9 +201,7 @@ class WalletMiddleware {
                 store.dispatchOnMain(GlobalAction.SetIfCardVerifiedOnline(!attestationFailed))
 
                 scope.launch {
-                    val response = OnlineCardVerifier().getCardInfo(
-                        action.card.cardId, action.card.cardPublicKey
-                    )
+                    val response = OnlineCardVerifier().getCardInfo(action.card.cardId, action.card.cardPublicKey)
                     when (response) {
                         is Result.Success -> {
                             val actionList = listOf(
@@ -227,20 +216,35 @@ class WalletMiddleware {
                 }
             }
             is WalletAction.LoadData,
-            is WalletAction.LoadData.Refresh -> {
+            is WalletAction.LoadData.Refresh,
+            -> {
+                val selectedWallet = userWalletsListManager.selectedUserWalletSync
                 scope.launch {
-                    val scanNoteResponse = globalState.scanResponse ?: return@launch
-                    if (walletState.walletsData.isNotEmpty()) {
-                        globalState.tapWalletManager.reloadData(scanNoteResponse)
+                    if (selectedWallet != null) {
+                        globalState.tapWalletManager.loadData(
+                            userWallet = selectedWallet,
+                            refresh = action is WalletAction.LoadData.Refresh,
+                        )
                     } else {
-                        globalState.tapWalletManager.loadData(scanNoteResponse)
+                        val scanResponse = globalState.scanResponse ?: return@launch
+
+                        if (walletState.walletsDataFromStores.isNotEmpty()) {
+                            globalState.tapWalletManager.reloadData(scanResponse)
+                        } else {
+                            globalState.tapWalletManager.loadData(scanResponse)
+                        }
                     }
                 }
             }
             is NetworkStateChanged -> {
-                globalState.scanResponse?.let { scanNoteResponse ->
-                    store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
-                    scope.launch { globalState.tapWalletManager.loadData(scanNoteResponse) }
+                store.dispatch(WalletAction.Warnings.CheckHashesCount.CheckHashesCountOnline)
+                val selectedUserWallet = userWalletsListManagerSafe?.selectedUserWalletSync
+                if (selectedUserWallet != null) {
+                    scope.launch { globalState.tapWalletManager.loadData(selectedUserWallet) }
+                } else {
+                    globalState.scanResponse?.let { scanNoteResponse ->
+                        scope.launch { globalState.tapWalletManager.loadData(scanNoteResponse) }
+                    }
                 }
             }
             is WalletAction.CopyAddress -> {
@@ -251,6 +255,7 @@ class WalletMiddleware {
                 action.context.shareText(action.address)
             }
             is WalletAction.ExploreAddress -> {
+                Analytics.send(Token.ButtonExplore())
                 store.dispatchOpenUrl(action.exploreUrl)
             }
             is WalletAction.Send -> {
@@ -262,7 +267,7 @@ class WalletMiddleware {
                 if (newAction is PrepareSendScreen && newAction.walletManager == null) {
                     store.dispatch(NavigationAction.PopBackTo(screen = AppScreen.Home))
                     FirebaseCrashlytics.getInstance().recordException(
-                        IllegalStateException("PrepareSendScreen: walletManager is null")
+                        IllegalStateException("PrepareSendScreen: walletManager is null"),
                     )
                     store.dispatchToastNotification(R.string.internal_error_wallet_manager_not_found)
                 } else {
@@ -272,11 +277,99 @@ class WalletMiddleware {
                     }
                 }
             }
+            is WalletAction.ShowSaveWalletIfNeeded -> {
+                showSaveWalletIfNeeded()
+            }
+            is WalletAction.ChangeWallet -> {
+                changeWallet()
+            }
+            is WalletAction.UserWalletChanged -> Unit
+            is WalletAction.WalletStoresChanged -> {
+                updateWalletStores(action.walletStores, walletState)
+                fetchTotalFiatBalance(action.walletStores, walletState)
+                findMissedDerivations(action.walletStores)
+                tryToShowAppRatingWarning(action.walletStores)
+            }
+            is WalletAction.TotalFiatBalanceChanged -> Unit
+        }
+    }
+
+    private fun updateWalletStores(wallStores: List<WalletStoreModel>, state: WalletState) {
+        scope.launch(Dispatchers.Default) {
+            if (!state.isMultiwalletAllowed) {
+                wallStores.firstOrNull()?.walletsData?.firstOrNull()?.let {
+                    store.dispatchOnMain(WalletAction.MultiWallet.SetSingleWalletCurrency(it.currency))
+                }
+            }
+
+            val reduxWalletStores = wallStores.mapToReduxModels(state.isMultiwalletAllowed)
+            store.dispatchOnMain(
+                WalletAction.WalletStoresChanged.UpdateWalletStores(
+                    reduxWalletStores = reduxWalletStores,
+                ),
+            )
+        }
+    }
+
+    private fun fetchTotalFiatBalance(walletStores: List<WalletStoreModel>, state: WalletState) {
+        scope.launch(Dispatchers.Default) {
+            val totalFiatBalance = totalFiatBalanceCalculator.calculateOrNull(
+                prevAmount = state.totalBalance?.fiatAmount,
+                walletStores = walletStores,
+            )?.mapToReduxModel()
+
+            if (totalFiatBalance != null) {
+                store.dispatchOnMain(WalletAction.TotalFiatBalanceChanged(totalFiatBalance))
+            }
+        }
+    }
+
+    private fun findMissedDerivations(wallStores: List<WalletStoreModel>) {
+        scope.launch(Dispatchers.Default) {
+            val missedDerivations = wallStores
+                .filter { store ->
+                    store.walletsData.any { it.status is WalletDataModel.MissedDerivation }
+                }
+                .map { it.blockchainNetwork }
+
+            store.dispatchOnMain(WalletAction.MultiWallet.AddMissingDerivations(missedDerivations))
+        }
+    }
+
+    private fun tryToShowAppRatingWarning(walletStores: List<WalletStoreModel>) {
+        scope.launch(Dispatchers.Default) {
+            warningsMiddleware.tryToShowAppRatingWarning(
+                hasNonZeroWallets = walletStores
+                    .flatMap { it.walletsData }
+                    .any { it.status.amount.isGreaterThan(BigDecimal.ZERO) },
+            )
+        }
+    }
+
+    private fun showSaveWalletIfNeeded() {
+        if (preferencesStorage.shouldShowSaveUserWalletScreen
+            && tangemSdkManager.canUseBiometry
+            && store.state.navigationState.backStack.lastOrNull() == AppScreen.Wallet
+        ) {
+            store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.SaveWallet))
+        }
+    }
+
+    private fun changeWallet() {
+        when {
+            userWalletsListManager.hasSavedUserWallets -> {
+                Analytics.send(MainScreen.ButtonMyWallets())
+                store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.WalletSelector))
+            }
+            else -> {
+                Analytics.send(MainScreen.ButtonScanCard())
+                store.dispatch(WalletAction.Scan)
+            }
         }
     }
 
     private fun prepareSendAction(amount: Amount?, state: WalletState?): Action {
-        val selectedWalletData = state?.getSelectedWalletData()
+        val selectedWalletData = state?.selectedWalletData
         val currency = selectedWalletData?.currency
         val walletStore = state?.getWalletStore(currency)
 
@@ -291,36 +384,34 @@ class WalletMiddleware {
             if (currency != null && state.isMultiwalletAllowed) {
                 when (currency) {
                     is Currency.Blockchain -> {
-                        val amountToSend =
-                            amounts?.find { it.currencySymbol == currency.blockchain.currency }
-                                ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
+                        val amountToSend = amounts?.find { it.currencySymbol == currency.blockchain.currency }
+                            ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
                         PrepareSendScreen(
                             coinAmount = amountToSend,
                             coinRate = selectedWalletData.fiatRate,
-                            walletManager = walletStore.walletManager
+                            walletManager = walletStore.walletManager,
                         )
                     }
                     is Currency.Token -> {
-                        val amountToSend =
-                            amounts?.find { it.currencySymbol == currency.token.symbol }
-                                ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
+                        val amountToSend = amounts?.find { it.currencySymbol == currency.token.symbol }
+                            ?: return WalletAction.DialogAction.ChooseCurrency(amounts)
                         prepareSendActionForToken(
                             amount = amountToSend,
                             state = state,
                             selectedWalletData = selectedWalletData,
-                            walletStore = walletStore
+                            walletStore = walletStore,
                         )
                     }
                 }
             } else {
-                if (amounts?.size ?: 0 > 1) {
+                if ((amounts?.size ?: 0) > 1) {
                     WalletAction.DialogAction.ChooseCurrency(amounts)
                 } else {
                     val amountToSend = amounts?.first()
                     PrepareSendScreen(
                         coinAmount = amountToSend,
                         coinRate = selectedWalletData?.fiatRate,
-                        walletManager = walletStore?.walletManager
+                        walletManager = walletStore?.walletManager,
                     )
                 }
             }
@@ -331,7 +422,7 @@ class WalletMiddleware {
         amount: Amount,
         state: WalletState?,
         selectedWalletData: WalletData?,
-        walletStore: WalletStore?
+        walletStore: WalletStore?,
     ): PrepareSendScreen {
         val coinRate = state?.getWalletData(walletStore?.blockchainNetwork)?.fiatRate
         val tokenRate = if (state?.isMultiwalletAllowed == true) {
@@ -346,7 +437,7 @@ class WalletMiddleware {
             coinRate = coinRate,
             walletManager = walletStore?.walletManager,
             tokenAmount = amount,
-            tokenRate = tokenRate
+            tokenRate = tokenRate,
         )
     }
 
@@ -362,7 +453,7 @@ class WalletMiddleware {
 
                     val balance = walletManager.wallet.fundsAvailable(AmountType.Coin)
                     val outgoingTxs = walletManager.wallet.getPendingTransactions(
-                        PendingTransactionType.Outgoing
+                        PendingTransactionType.Outgoing,
                     ).filterByCoin()
 
                     val rentExempt = result.data
@@ -380,8 +471,8 @@ class WalletMiddleware {
                             WalletAction.SetWalletRent(
                                 wallet = walletManager.wallet,
                                 minRent = ("${rentProvider.rentAmount().stripZeroPlainString()} $currency"),
-                                rentExempt = ("${rentExempt.stripZeroPlainString()} $currency")
-                            )
+                                rentExempt = ("${rentExempt.stripZeroPlainString()} $currency"),
+                            ),
                         )
                     } else {
                         dispatchOnMain(WalletAction.RemoveWalletRent(walletManager.wallet))
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
index 8bf72ef3c7..b2ef29f6b3 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt
@@ -4,20 +4,17 @@ import com.tangem.blockchain.common.BlockchainSdkError
 import com.tangem.blockchain.common.SignatureCountValidator
 import com.tangem.blockchain.common.Wallet
 import com.tangem.blockchain.extensions.SimpleResult
-import com.tangem.common.card.Card
 import com.tangem.common.card.FirmwareVersion
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.TapWorkarounds.isTestCard
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.isGreaterThan
 import com.tangem.tap.common.redux.global.GlobalState
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessage
 import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager
-import com.tangem.tap.domain.extensions.getSingleWallet
 import com.tangem.tap.domain.extensions.hasSignedHashes
 import com.tangem.tap.domain.extensions.isMultiwalletAllowed
-import com.tangem.tap.domain.extensions.remainingSignatures
 import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.network.NetworkConnectivity
@@ -54,14 +51,10 @@ class WarningsMiddleware {
                 if (action.remainingSignatures != null &&
                     action.remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING
                 ) {
-                    store.state.globalState.warningManager
-                        ?.removeWarnings(
-                            messageRes = R.string.warning_low_signatures_format
-                        )
+                    store.state.globalState.warningManager?.removeWarnings(R.string.warning_low_signatures_format)
                     addWarningMessage(
-                        warning =
-                        WarningMessagesManager.remainingSignaturesNotEnough(action.remainingSignatures),
-                        autoUpdate = true
+                        warning = WarningMessagesManager.remainingSignaturesNotEnough(action.remainingSignatures),
+                        autoUpdate = true,
                     )
                 }
             }
@@ -69,7 +62,17 @@ class WarningsMiddleware {
             is WalletAction.Warnings.CheckHashesCount,
             is WalletAction.Warnings.CheckHashesCount.ConfirmHashesCount,
             is WalletAction.Warnings.CheckHashesCount.NeedToCheckHashesCountOnline,
-            is WalletAction.Warnings.Set -> Unit
+            is WalletAction.Warnings.Set,
+            -> Unit
+        }
+    }
+
+    fun tryToShowAppRatingWarning(hasNonZeroWallets: Boolean) {
+        if (hasNonZeroWallets) {
+            preferencesStorage.appRatingLaunchObserver.foundWalletWithFunds()
+        }
+        if (preferencesStorage.appRatingLaunchObserver.isReadyToShow()) {
+            addWarningMessage(WarningMessagesManager.appRatingWarning(), true)
         }
     }
 
@@ -77,13 +80,7 @@ class WarningsMiddleware {
         val nonZeroWalletsCount = wallet.amounts.filter {
             it.value.value?.isGreaterThan(BigDecimal.ZERO) ?: false
         }.size
-        if (nonZeroWalletsCount > 0) {
-            preferencesStorage.appRatingLaunchObserver.foundWalletWithFunds()
-        }
-        if (preferencesStorage.appRatingLaunchObserver.isReadyToShow()) {
-            store.state.globalState.analyticsHandler?.handleAnalyticsEvent(AnalyticsEventAnOld.APP_RATING_DISPLAYED)
-            addWarningMessage(WarningMessagesManager.appRatingWarning(), true)
-        }
+        tryToShowAppRatingWarning(hasNonZeroWallets = nonZeroWalletsCount > 0)
     }
 
     private fun showCardWarningsIfNeeded(globalState: GlobalState?) {
@@ -113,16 +110,12 @@ class WarningsMiddleware {
         }
     }
 
-    private fun showWarningLowRemainingSignaturesIfNeeded(card: Card) {
-        val remainingSignatures = card.remainingSignatures
+    private fun showWarningLowRemainingSignaturesIfNeeded(card: CardDTO) {
+        val remainingSignatures = card.wallets.firstOrNull()?.remainingSignatures
         if (remainingSignatures != null &&
             remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING
         ) {
-            addWarningMessage(
-                WarningMessagesManager.remainingSignaturesNotEnough(
-                    remainingSignatures
-                )
-            )
+            addWarningMessage(WarningMessagesManager.remainingSignaturesNotEnough(remainingSignatures))
         }
     }
 
@@ -132,7 +125,8 @@ class WarningsMiddleware {
         if (scanResponse.isTangemTwins() || scanResponse.isDemoCard()) return null
 
         if (scanResponse.card.isMultiwalletAllowed) {
-            return if (scanResponse.card.hasSignedHashes()) {
+            val isBackupForbidden = with(scanResponse.card.settings) { !(isBackupAllowed || isHDWalletAllowed) }
+            return if (scanResponse.card.hasSignedHashes() && isBackupForbidden) {
                 WarningMessagesManager.signedHashesMultiWalletWarning()
             } else {
                 store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
@@ -140,8 +134,7 @@ class WarningsMiddleware {
             }
         }
 
-        val validator = store.state.walletState.walletManagers.firstOrNull()
-            as? SignatureCountValidator
+        val validator = store.state.walletState.walletManagers.firstOrNull() as? SignatureCountValidator
         return if (validator == null) {
             if (scanResponse.card.hasSignedHashes()) {
                 WarningMessagesManager.alreadySignedHashesWarning()
@@ -168,7 +161,7 @@ class WarningsMiddleware {
         val validator = store.state.walletState.walletManagers.firstOrNull()
             as? SignatureCountValidator
         scope.launch {
-            val signedHashes = card.getSingleWallet()?.totalSignedHashes ?: 0
+            val signedHashes = card.wallets.firstOrNull()?.totalSignedHashes ?: 0
             val result = validator?.validateSignatureCount(signedHashes)
             withContext(Dispatchers.Main) {
                 when (result) {
@@ -178,15 +171,9 @@ class WarningsMiddleware {
                     }
                     is SimpleResult.Failure ->
                         if (result.error is BlockchainSdkError.SignatureCountNotMatched) {
-                            addWarningMessage(
-                                WarningMessagesManager.alreadySignedHashesWarning(),
-                                true
-                            )
+                            addWarningMessage(WarningMessagesManager.alreadySignedHashesWarning(), true)
                         } else if (signedHashes > 0) {
-                            addWarningMessage(
-                                WarningMessagesManager.alreadySignedHashesWarning(),
-                                true
-                            )
+                            addWarningMessage(WarningMessagesManager.alreadySignedHashesWarning(), true)
                         }
                     null -> Unit
                 }
@@ -207,7 +194,7 @@ class WarningsMiddleware {
         val warningManager = store.state.globalState.warningManager ?: return emptyList()
         return warningManager.getWarnings(
             WarningMessage.Location.MainScreen,
-            store.state.walletState.blockchains
+            store.state.walletState.blockchains,
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
index b4188f8dd8..fc182e2c4f 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
@@ -1,6 +1,7 @@
 package com.tangem.tap.features.wallet.redux.models
 
 import com.tangem.blockchain.common.Amount
+import com.tangem.blockchain.common.Blockchain
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.redux.StateDialog
 import com.tangem.wallet.R
@@ -31,5 +32,7 @@ sealed interface WalletDialog : StateDialog {
         val titleRes: Int = R.string.token_details_unable_hide_alert_title
     }
 
-    data class RussianCardholdersWarningDialog(val topUpUrl: String?) : WalletDialog
+    data class RussianCardholdersWarningDialog(val data: Data?) : WalletDialog {
+        data class Data(val topUpUrl: String, val blockchain: Blockchain)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
index b75ed1ff6c..afb523a5ca 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/MultiWalletReducer.kt
@@ -1,12 +1,15 @@
 package com.tangem.tap.features.wallet.redux.reducers
 
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tangem.blockchain.blockchains.polkadot.ExistentialDepositProvider
 import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.common.WalletManager
-import com.tangem.common.extensions.guard
+import com.tangem.tap.common.extensions.dispatchToastNotification
 import com.tangem.tap.common.extensions.toFiatString
 import com.tangem.tap.common.extensions.toFormattedCurrencyString
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.getFirstToken
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.Currency
@@ -14,6 +17,7 @@ import com.tangem.tap.features.wallet.models.WalletRent
 import com.tangem.tap.features.wallet.models.filterByToken
 import com.tangem.tap.features.wallet.models.getPendingTransactions
 import com.tangem.tap.features.wallet.models.removeUnknownTransactions
+import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletData
 import com.tangem.tap.features.wallet.redux.WalletMainButton
@@ -24,13 +28,15 @@ import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.features.wallet.ui.TokenData
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
+import com.tangem.wallet.R
 import java.math.BigDecimal
 
 class MultiWalletReducer {
     fun reduce(action: WalletAction.MultiWallet, state: WalletState): WalletState {
         return when (action) {
             is WalletAction.MultiWallet.AddBlockchains -> {
-                val wallets: List<WalletStore> = action.blockchains.mapNotNull { blockchain ->
+                val walletStores: List<WalletStore> = action.blockchains.map { blockchain ->
                     val walletManager = action.walletManagers.firstOrNull {
                         it.wallet.blockchain == blockchain.blockchain &&
                             (it.wallet.publicKey.derivationPath?.rawPath == blockchain.derivationPath)
@@ -46,13 +52,13 @@ class MultiWalletReducer {
                             status = BalanceStatus.Loading,
                             currency = blockchain.blockchain.fullName,
                             currencySymbol = blockchain.blockchain.currency,
-                            token = cardToken
+                            token = cardToken,
                         ),
                         walletAddresses = createAddressList(wallet),
                         mainButton = WalletMainButton.SendButton(false),
                         currency = Currency.Blockchain(
                             blockchain.blockchain,
-                            blockchain.derivationPath
+                            blockchain.derivationPath,
                         ),
                         existentialDepositString = getExistentialDeposit(walletManager),
                     )
@@ -60,18 +66,18 @@ class MultiWalletReducer {
                     WalletStore(
                         walletManager = walletManager,
                         blockchainNetwork = blockchain,
-                        walletsData = listOf(walletData)
+                        walletsData = listOf(walletData),
                     )
                 }
 
-                val selectedCurrency = if (!state.isMultiwalletAllowed) {
-                    wallets.firstOrNull()?.walletsData?.firstOrNull()?.currency
-                } else {
+                val selectedCurrency = if (state.isMultiwalletAllowed) {
                     state.selectedCurrency
+                } else {
+                    walletStores.firstOrNull()?.walletsData?.firstOrNull()?.currency
                 }
                 state.copy(
-                    wallets = wallets,
-                    selectedCurrency = selectedCurrency
+                    walletsStores = walletStores,
+                    selectedCurrency = selectedCurrency,
                 )
             }
             is WalletAction.MultiWallet.AddBlockchain -> {
@@ -88,14 +94,14 @@ class MultiWalletReducer {
                     mainButton = WalletMainButton.SendButton(false),
                     currency = Currency.Blockchain(
                         action.blockchain.blockchain,
-                        action.blockchain.derivationPath
+                        action.blockchain.derivationPath,
                     ),
                     existentialDepositString = getExistentialDeposit(walletManager),
                 )
                 val walletStore = WalletStore(
                     walletManager = walletManager,
                     blockchainNetwork = action.blockchain,
-                    walletsData = listOf(walletData)
+                    walletsData = listOf(walletData),
                 )
 
                 val newState = state.updateWalletStore(walletStore)
@@ -105,16 +111,22 @@ class MultiWalletReducer {
                     newState
                 }
             }
-            is WalletAction.MultiWallet.AddTokens -> {
-                addTokens(action.tokens, action.blockchain, state)
-            }
-            is WalletAction.MultiWallet.AddToken -> {
-                addTokens(listOf(action.token), action.blockchain, state)
-            }
+            is WalletAction.MultiWallet.AddTokens -> addTokens(action.tokens, action.blockchain, state)
+            is WalletAction.MultiWallet.AddToken -> addTokens(listOf(action.token), action.blockchain, state)
             is WalletAction.MultiWallet.TokenLoaded -> {
                 val currency = Currency.fromBlockchainNetwork(action.blockchain, action.token)
-                val walletManager = state.getWalletManager(currency).guard {
-                    throw NullPointerException("MultiWallet.TokenLoaded: WalletManager must be not NULL")
+                val walletManager = state.getWalletManager(currency)
+                if (walletManager == null) {
+                    if (userWalletsListManager.hasSavedUserWallets) {
+                        store.dispatch(NavigationAction.PopBackTo(screen = AppScreen.Welcome))
+                    } else {
+                        store.dispatch(NavigationAction.PopBackTo(screen = AppScreen.Home))
+                    }
+                    FirebaseCrashlytics.getInstance().recordException(
+                        IllegalStateException("MultiWallet.TokenLoaded: walletManager is null"),
+                    )
+                    store.dispatchToastNotification(R.string.internal_error_wallet_manager_not_found)
+                    return state
                 }
                 val wallet = walletManager.wallet
                 val pendingTransactions = wallet.getPendingTransactions()
@@ -133,69 +145,64 @@ class MultiWalletReducer {
                         status = tokenBalanceStatus,
                         amount = action.amount.value,
                         amountFormatted = action.amount.value?.toFormattedCurrencyString(
-                            action.amount.decimals, action.amount.currencySymbol
+                            action.amount.decimals, action.amount.currencySymbol,
                         ),
                         fiatAmountFormatted = tokenWalletData.fiatRate?.let {
                             action.amount.value?.toFiatString(it, store.state.globalState.appCurrency.symbol)
                         } ?: UNKNOWN_AMOUNT_SIGN,
-                        blockchainAmount = wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO
+                        blockchainAmount = wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO,
                     ),
                     pendingTransactions = pendingTransactions.removeUnknownTransactions(),
                     mainButton = WalletMainButton.SendButton(isTokenSendButtonEnabled),
                     currency = Currency.Token(
                         token = action.token,
                         blockchain = action.blockchain.blockchain,
-                        derivationPath = action.blockchain.derivationPath
+                        derivationPath = action.blockchain.derivationPath,
                     ),
-                    walletRent = findWalletRent(state.getWalletStore(walletManager.wallet))
+                    walletRent = findWalletRent(state.getWalletStore(walletManager.wallet)),
                 )
                 state.updateWalletData(newTokenWalletData)
             }
             is WalletAction.MultiWallet.SetIsMultiwalletAllowed ->
                 state.copy(isMultiwalletAllowed = action.isMultiwalletAllowed)
 
-            is WalletAction.MultiWallet.SelectWallet ->
-                state.copy(selectedCurrency = action.walletData?.currency)
+            is WalletAction.MultiWallet.SelectWallet -> {
+                state.copy(selectedCurrency = action.currency)
+            }
+            is WalletAction.MultiWallet.SetSingleWalletCurrency -> {
+                state.copy(selectedCurrency = action.currency)
+            }
             is WalletAction.MultiWallet.TryToRemoveWallet -> state
             is WalletAction.MultiWallet.RemoveWallet -> {
-                state.removeWallet(state.getWalletData(action.currency))
+                state.removeWalletData(state.getWalletData(action.currency))
             }
             is WalletAction.MultiWallet.RemoveWallets -> {
                 var updatedState = state
-                action.currencies.forEach { updatedState = updatedState.removeWallet(state.getWalletData(it)) }
+                action.currencies.forEach { updatedState = updatedState.removeWalletData(state.getWalletData(it)) }
                 updatedState
             }
-            is WalletAction.MultiWallet.SetPrimaryBlockchain ->
-                state.copy(primaryBlockchain = action.blockchain)
-
-            is WalletAction.MultiWallet.SetPrimaryToken ->
-                state.copy(primaryToken = action.token)
+            is WalletAction.MultiWallet.SetPrimaryBlockchain -> state.copy(primaryBlockchain = action.blockchain)
+            is WalletAction.MultiWallet.SetPrimaryToken -> state.copy(primaryToken = action.token)
             is WalletAction.MultiWallet.SaveCurrencies -> state
-            is WalletAction.MultiWallet.ShowWalletBackupWarning -> state.copy(
-                showBackupWarning = action.show,
-            )
+            is WalletAction.MultiWallet.ShowWalletBackupWarning -> state.copy(showBackupWarning = action.show)
             is WalletAction.MultiWallet.AddMissingDerivations -> state.copy(missingDerivations = action.blockchains)
             is WalletAction.MultiWallet.BackupWallet -> state
-            is WalletAction.MultiWallet.ScanToGetDerivations -> state
+            is WalletAction.MultiWallet.ScanToGetDerivations -> state.copy(state = ProgressState.Loading)
         }
     }
 
     private fun findWalletRent(walletStore: WalletStore?): WalletRent? {
-        return walletStore?.walletsData?.firstOrNull {
-            it.walletRent != null
-        }?.walletRent
+        return walletStore?.walletsData?.firstOrNull { it.walletRent != null }?.walletRent
     }
 
     private fun getExistentialDeposit(walletManager: WalletManager?): String? {
         return (walletManager as? ExistentialDepositProvider)?.getExistentialDeposit()?.toPlainString()
     }
-}
 
-private fun addTokens(
-    tokens: List<Token>, blockchain: BlockchainNetwork, state: WalletState
-): WalletState {
-    val wallets = tokens.mapNotNull { token -> token.toWallet(state, blockchain) }
-    return state.updateWalletsData(wallets)
+    private fun addTokens(tokens: List<Token>, blockchain: BlockchainNetwork, state: WalletState): WalletState {
+        val wallets = tokens.mapNotNull { token -> token.toWallet(state, blockchain) }
+        return state.updateWalletsData(wallets)
+    }
 }
 
 fun Token.toWallet(state: WalletState, blockchain: BlockchainNetwork): WalletData? {
@@ -210,10 +217,10 @@ fun Token.toWallet(state: WalletState, blockchain: BlockchainNetwork): WalletDat
         currencyData = BalanceWidgetData(
             status = BalanceStatus.Loading,
             currency = this.name,
-            currencySymbol = this.symbol
+            currencySymbol = this.symbol,
         ),
         walletAddresses = walletAddresses,
         mainButton = WalletMainButton.SendButton(false),
-        currency = currency
+        currency = currency,
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
index 79e84eec36..68e6080883 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/OnWalletLoadedReducer.kt
@@ -17,6 +17,7 @@ import com.tangem.tap.features.wallet.redux.ProgressState
 import com.tangem.tap.features.wallet.redux.WalletMainButton
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.redux.WalletState.Companion.UNKNOWN_AMOUNT_SIGN
+import com.tangem.tap.features.wallet.redux.replaceSomeWalletsData
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
 import com.tangem.tap.features.wallet.ui.TokenData
@@ -106,18 +107,15 @@ class OnWalletLoadedReducer {
                 mainButton = WalletMainButton.SendButton(isTokenSendButtonEnabled),
             )
         }
-        val newWallets = tokens + newWalletData
-        val wallets = walletState.replaceSomeWallets((newWallets))
+        val newWalletsData = tokens + newWalletData
+        val walletsData = walletState.walletsDataFromStores.replaceSomeWalletsData(newWalletsData)
 
-        return walletState
-            .updateWalletsData(wallets)
+        return walletState.updateWalletsData(walletsData)
     }
 
     private fun onSingleWalletLoaded(wallet: Wallet, walletState: WalletState): WalletState {
         if (wallet.blockchain != walletState.primaryBlockchain) return walletState
 
-        // val ratesRespository = store.state.globalState.tapWalletManager.ratesRepository
-        // val tokenCurrency =
         val fiatCurrencyName = store.state.globalState.appCurrency.code
         val token = wallet.getFirstToken()
         val tokenData = if (token != null) {
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt
index 15e44ea361..08a7def4bd 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/TotalBalanceOperations.kt
@@ -17,6 +17,12 @@ fun List<WalletData>.calculateTotalFiatAmount(): BigDecimal {
         .reduce(BigDecimal::plus)
 }
 
+fun List<WalletData>.calculateTotalCryptoAmount(): BigDecimal {
+    return this
+        .map { it.currencyData.amount ?: BigDecimal.ZERO }
+        .reduce(BigDecimal::plus)
+}
+
 private fun List<WalletData>.mapToProgressState(): List<ProgressState> {
     return this.map { wallet ->
         if (wallet.fiatRate == null) ProgressState.Error
@@ -25,12 +31,16 @@ private fun List<WalletData>.mapToProgressState(): List<ProgressState> {
             BalanceStatus.VerifiedOnline,
             BalanceStatus.SameCurrencyTransactionInProgress,
             BalanceStatus.TransactionInProgress,
-            BalanceStatus.NoAccount -> ProgressState.Done
+            BalanceStatus.NoAccount,
+            -> ProgressState.Done
             BalanceStatus.Unreachable,
             BalanceStatus.EmptyCard,
-            BalanceStatus.UnknownBlockchain -> ProgressState.Error
+            BalanceStatus.UnknownBlockchain,
+            BalanceStatus.MissedDerivation,
+            -> ProgressState.Error
             BalanceStatus.Loading,
-            null -> ProgressState.Loading
+            null,
+            -> ProgressState.Loading
         }
     }
 }
@@ -41,20 +51,24 @@ private infix fun ProgressState.or(newState: ProgressState): ProgressState {
             ProgressState.Loading,
             ProgressState.Refreshing,
             ProgressState.Error,
-            ProgressState.Done -> this
+            ProgressState.Done,
+            -> this
         }
         ProgressState.Done,
-        ProgressState.Error -> when (newState) {
+        ProgressState.Error,
+        -> when (newState) {
             ProgressState.Loading,
             ProgressState.Refreshing,
-            ProgressState.Error -> newState
+            ProgressState.Error,
+            -> newState
             ProgressState.Done -> this
         }
         ProgressState.Refreshing -> when (newState) {
             ProgressState.Loading -> this
             ProgressState.Refreshing,
             ProgressState.Error,
-            ProgressState.Done -> newState
+            ProgressState.Done,
+            -> newState
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
index 3a180040a3..2505702c20 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/reducers/WalletReducer.kt
@@ -4,6 +4,8 @@ import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Wallet
 import com.tangem.common.extensions.mapNotNullValues
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tap.common.entities.FiatCurrency
 import com.tangem.tap.common.extensions.toFiatRateString
@@ -14,6 +16,7 @@ import com.tangem.tap.common.extensions.toFormattedFiatValue
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.TapError
 import com.tangem.tap.domain.extensions.getArtworkUrl
+import com.tangem.tap.domain.extensions.isMultiwalletAllowed
 import com.tangem.tap.domain.getFirstToken
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
 import com.tangem.tap.features.wallet.models.Currency
@@ -28,19 +31,22 @@ import com.tangem.tap.features.wallet.redux.WalletData
 import com.tangem.tap.features.wallet.redux.WalletMainButton
 import com.tangem.tap.features.wallet.redux.WalletState
 import com.tangem.tap.features.wallet.redux.WalletStore
+import com.tangem.tap.features.wallet.redux.replaceSomeWalletsData
 import com.tangem.tap.features.wallet.ui.BalanceStatus
 import com.tangem.tap.features.wallet.ui.BalanceWidgetData
+import com.tangem.tap.proxy.AppStateHolder
 import org.rekotlin.Action
 import timber.log.Timber
 import java.math.BigDecimal
 
 class WalletReducer {
     companion object {
-        fun reduce(action: Action, state: AppState): WalletState = internalReduce(action, state)
+        fun reduce(action: Action, state: AppState, appStateHolder: AppStateHolder): WalletState =
+            internalReduce(action, state, appStateHolder)
     }
 }
 
-private fun internalReduce(action: Action, state: AppState): WalletState {
+private fun internalReduce(action: Action, state: AppState, appStateHolder: AppStateHolder): WalletState {
 
     val multiWalletReducer = MultiWalletReducer()
     val onWalletLoadedReducer = OnWalletLoadedReducer()
@@ -54,75 +60,82 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         is WalletAction.Warnings -> newState = handleCheckSignedHashesActions(action, newState)
         is WalletAction.MultiWallet -> newState = multiWalletReducer.reduce(action, newState)
 
-        is WalletAction.ResetState -> newState = WalletState(cardId = action.newCardId)
+        is WalletAction.ResetState -> {
+            newState = WalletState(
+                cardId = action.newCard.cardId,
+                walletCardsCount = action.newCard.findCardsCount(),
+            )
+        }
         is WalletAction.SetIfTestnetCard -> newState = newState.copy(isTestnet = action.isTestnet)
         is WalletAction.EmptyWallet -> {
             newState = newState.copy(
                 state = ProgressState.Done,
-                wallets = listOf(
+                walletsStores = listOf(
                     WalletStore(
                         walletManager = null,
                         blockchainNetwork = BlockchainNetwork(
                             Blockchain.Unknown,
                             null,
-                            emptyList()
+                            emptyList(),
                         ),
                         walletsData = listOf(
                             WalletData(
                                 currencyData = BalanceWidgetData(BalanceStatus.EmptyCard),
                                 mainButton = WalletMainButton.CreateWalletButton(true),
-                                currency = Currency.Blockchain(Blockchain.Unknown, null)
-                            )
-                        )
-                    )
-                )
+                                currency = Currency.Blockchain(Blockchain.Unknown, null),
+                            ),
+                        ),
+                    ),
+                ),
             )
         }
         is WalletAction.LoadData.Failure -> {
             when (action.error) {
                 is TapError.NoInternetConnection -> {
-                    val wallets = newState.wallets
+                    val wallets = newState.walletsStores
                         .map { store ->
                             store.copy(
                                 walletsData = store.walletsData.map {
                                     it.copy(
                                         currencyData = it.currencyData.copy(
-                                            status = BalanceStatus.Unreachable
-                                        )
+                                            status = BalanceStatus.Unreachable,
+                                        ),
                                     )
-                                }
-
+                                },
                             )
                         }
 
                     newState = newState.copy(
                         state = ProgressState.Error,
                         error = ErrorType.NoInternetConnection,
-                        wallets = wallets
+                        walletsStores = wallets,
                     )
                 }
                 is TapError.UnknownBlockchain -> {
                     newState = newState.copy(
                         state = ProgressState.Done,
-                        wallets = listOf(
+                        walletsStores = listOf(
                             WalletStore(
                                 walletManager = null,
                                 blockchainNetwork = BlockchainNetwork(
                                     Blockchain.Unknown,
                                     null,
-                                    emptyList()
+                                    emptyList(),
                                 ),
                                 walletsData = listOf(
                                     WalletData(
                                         currencyData = BalanceWidgetData(BalanceStatus.UnknownBlockchain),
-                                        currency = Currency.Blockchain(Blockchain.Unknown, null)
-                                    )
-                                )
-                            )
-                        )
+                                        currency = Currency.Blockchain(Blockchain.Unknown, null),
+                                    ),
+                                ),
+                            ),
+                        ),
                     )
                 }
-                else -> { /* no-op */
+                else -> {
+                    newState = newState.copy(
+                        state = ProgressState.Error,
+                    )
                 }
             }
         }
@@ -146,7 +159,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                 BalanceStatus.Loading
             }
             if (action.blockchain == null) {
-                val wallets = newState.wallets.map { walletStore ->
+                val wallets = newState.walletsStores.map { walletStore ->
                     walletStore.copy(
                         walletsData = walletStore.walletsData.map { walletData ->
                             walletData.copy(
@@ -163,7 +176,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                 }
                 newState = newState.copy(
                     state = ProgressState.Loading,
-                    wallets = wallets,
+                    walletsStores = wallets,
                 )
             } else {
                 val walletManager = newState.getWalletManager(action.blockchain) ?: return newState
@@ -171,7 +184,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                     walletManager.cardTokens.map {
                         Currency.fromBlockchainNetwork(action.blockchain, it)
                     }
-                val newWallets = newState.walletsData.filter { currencies.contains(it.currency) }
+                val newWalletsData = newState.walletsDataFromStores.filter { currencies.contains(it.currency) }
                     .map { wallet ->
                         wallet.copy(
                             currencyData = wallet.currencyData.copy(
@@ -182,15 +195,15 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                             mainButton = WalletMainButton.SendButton(false),
                         )
                     }
-                val wallets = newState.replaceSomeWallets(newWallets)
-                val walletStore = newState.getWalletStore(action.blockchain)?.updateWallets(wallets)
+                val walletsData = newState.walletsDataFromStores.replaceSomeWalletsData(newWalletsData)
+                val walletStore = newState.getWalletStore(action.blockchain)?.updateWallets(walletsData)
                 newState = newState.updateWalletStore(walletStore)
             }
         }
         is WalletAction.LoadWallet.Success -> newState = onWalletLoadedReducer.reduce(
             wallet = action.wallet,
             blockchainNetwork = action.blockchain,
-            walletState = newState
+            walletState = newState,
         )
         is WalletAction.LoadWallet.NoAccount -> {
             val amount = BigDecimal.ZERO
@@ -209,10 +222,10 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                         ),
                         fiatAmount = fiatAmount,
                         fiatAmountFormatted = fiatAmount.toFormattedFiatValue(
-                            fiatCurrencyName = state.globalState.appCurrency.symbol
+                            fiatCurrencyName = state.globalState.appCurrency.symbol,
                         ),
                         amountToCreateAccount = action.amountToCreateAccount,
-                    )
+                    ),
                 )
             }
             val updatedWalletStore = newState.getWalletStore(action.blockchain)
@@ -232,7 +245,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
             val newWalletData = walletData?.copy(
                 currencyData = walletData.currencyData.copy(
                     status = BalanceStatus.Unreachable,
-                    errorMessage = message
+                    errorMessage = message,
                 ),
             )
             val tokenWallets = action.wallet.getTokens()
@@ -244,8 +257,8 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
                 .map {
                     it.copy(
                         currencyData = it.currencyData.copy(
-                            status = BalanceStatus.Unreachable, errorMessage = message
-                        )
+                            status = BalanceStatus.Unreachable, errorMessage = message,
+                        ),
                     )
                 }
             val updatedWallets = walletStore!!.updateWallets(listOfNotNull(newWalletData) + tokenWallets).walletsData
@@ -253,7 +266,7 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
             newState = newState.updateWalletsData(updatedWallets)
 
             val progressState =
-                if (newState.walletsData.any { it.currencyData.status == BalanceStatus.Loading }) {
+                if (newState.walletsDataFromStores.any { it.currencyData.status == BalanceStatus.Loading }) {
                     ProgressState.Loading
                 } else {
                     ProgressState.Done
@@ -285,20 +298,18 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         }
         is WalletAction.TradeCryptoAction -> return newState
         is WalletAction.ChangeSelectedAddress -> {
-            val selectedWalletData = newState.getWalletData(newState.selectedCurrency)
-
-            val walletAddresses =
-                newState.getWalletData(selectedWalletData?.currency)?.walletAddresses
-                    ?: return newState
+            val walletAddresses = newState.getWalletData(newState.selectedCurrency)?.walletAddresses
+                ?: return newState
             val address = walletAddresses.list.firstOrNull { it.type == action.type }
                 ?: return newState
+
             newState = newState.updateWalletData(
-                selectedWalletData?.copy(
+                newState.selectedWalletData?.copy(
                     walletAddresses = WalletAddresses(
-                        address,
-                        walletAddresses.list
-                    )
-                )
+                        selectedAddress = address,
+                        list = walletAddresses.list,
+                    ),
+                ),
             )
         }
         is WalletAction.SetWalletRent -> {
@@ -317,12 +328,64 @@ private fun internalReduce(action: Action, state: AppState): WalletState {
         }
         is WalletAction.UserTokens.Loading -> newState = newState.copy(loadingUserTokens = true)
         is WalletAction.UserTokens.Loaded -> newState = newState.copy(loadingUserTokens = false)
-        else -> { /* no-op */
+        is WalletAction.UserWalletChanged -> with(action.userWallet) {
+            val card = scanResponse.card
+            newState = WalletState(
+                cardId = card.cardId,
+                isMultiwalletAllowed = isMultiCurrency,
+                cardImage = Artwork(
+                    artworkId = artworkUrl,
+                ),
+                isTestnet = card.isTestCard,
+                state = ProgressState.Loading,
+                showBackupWarning = isMultiCurrency &&
+                    card.settings.isBackupAllowed &&
+                    card.backupStatus == CardDTO.BackupStatus.NoBackup,
+                walletCardsCount = card.findCardsCount(),
+                walletsStores = newState.walletsStores,
+                totalBalance = if (isMultiCurrency) {
+                    newState.totalBalance
+                } else {
+                    null
+                },
+            )
         }
+        is WalletAction.WalletStoresChanged.UpdateWalletStores -> {
+            newState = newState.copy(
+                walletsStores = action.reduxWalletStores,
+            )
+        }
+        is WalletAction.TotalFiatBalanceChanged -> {
+            newState = newState.copy(
+                totalBalance = action.balance,
+            )
+        }
+        is WalletAction.LoadData.Success -> {
+            val selectedCurrency = if (newState.isMultiwalletAllowed) {
+                newState.selectedCurrency
+            } else {
+                newState.walletsStores.firstOrNull()
+                    ?.walletsData
+                    ?.firstOrNull()
+                    ?.currency
+            }
+
+            newState = newState.copy(
+                state = ProgressState.Done,
+                selectedCurrency = selectedCurrency,
+            )
+        }
+        else -> Unit
     }
+    appStateHolder.walletState = newState
     return newState
 }
 
+private fun CardDTO.findCardsCount(): Int? {
+    return (this.backupStatus as? CardDTO.BackupStatus.Active)?.cardCount?.inc()
+        ?.takeIf { this.isMultiwalletAllowed }
+}
+
 fun createAddressList(wallet: Wallet?, walletAddresses: WalletAddresses? = null): WalletAddresses? {
     if (wallet == null) return null
 
@@ -345,7 +408,7 @@ fun Wallet.createAddressesData(): List<AddressData> {
             it.value,
             it.type,
             getShareUri(it.value),
-            getExploreUrl(it.value)
+            getExploreUrl(it.value),
         )
         if (it.type == blockchain.defaultAddressType()) {
             listOfAddressData.add(0, addressData)
@@ -358,27 +421,26 @@ fun Wallet.createAddressesData(): List<AddressData> {
 
 private fun handleCheckSignedHashesActions(
     action: WalletAction.Warnings,
-    state: WalletState
+    state: WalletState,
 ): WalletState {
     return when (action) {
         WalletAction.Warnings.CheckHashesCount.ConfirmHashesCount -> state.copy(hashesCountVerified = true)
         WalletAction.Warnings.CheckHashesCount.NeedToCheckHashesCountOnline -> state.copy(
-            hashesCountVerified = false
+            hashesCountVerified = false,
         )
         is WalletAction.Warnings.Set -> state.copy(mainWarningsList = action.warningList)
         else -> state
     }
 }
 
-
 private fun setNewFiatRate(
     fiatRates: Map<Currency, BigDecimal?>,
     appCurrency: FiatCurrency,
-    state: WalletState
+    state: WalletState,
 ): WalletState {
     val rateFormatter: (BigDecimal) -> String = { rate: BigDecimal ->
         rate.toFiatRateString(
-            fiatCurrencyName = appCurrency.symbol
+            fiatCurrencyName = appCurrency.symbol,
         )
     }
 
@@ -387,7 +449,7 @@ private fun setNewFiatRate(
             fiatRates = fiatRates.mapNotNullValues { it.value },
             rateFormatter = rateFormatter,
             appCurrency = appCurrency,
-            state = state
+            state = state,
         )
     } else {
         setSingleWalletFiatRates(
@@ -403,7 +465,7 @@ private fun setMultiWalletFiatRate(
     fiatRates: Map<Currency, BigDecimal>,
     rateFormatter: (BigDecimal) -> String,
     appCurrency: FiatCurrency,
-    state: WalletState
+    state: WalletState,
 ): WalletState {
     val newWalletsData = fiatRates.mapNotNull { (currency, rate) ->
         val walletStore = state.getWalletStore(currency) ?: return@mapNotNull null
@@ -488,10 +550,9 @@ private fun setSingleWalletFiatRate(
         val walletData = state.primaryWallet.copy(
             currencyData = state.primaryWallet.currencyData.copy(fiatAmountFormatted = fiatAmount),
             fiatRate = rate,
-            fiatRateString = rateFormatted
+            fiatRateString = rateFormatted,
         )
         return state.updateWalletData(walletData)
-
     } else if (currency is Currency.Token && currency.token == token) {
         Timber.e("Working with token fiat rate")
 
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
index 34ca1f10c1..4afc4c08db 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt
@@ -16,7 +16,8 @@ enum class BalanceStatus {
     Refreshing,
     NoAccount,
     EmptyCard,
-    UnknownBlockchain
+    UnknownBlockchain,
+    MissedDerivation,
 }
 
 data class BalanceWidgetData(
@@ -34,7 +35,7 @@ data class BalanceWidgetData(
 )
 
 data class TokenData(
-    val amountFormatted: String,
+    val amountFormatted: String?,
     val amount: BigDecimal? = null,
     val tokenSymbol: String,
     val fiatAmountFormatted: String? = null,
@@ -128,7 +129,7 @@ class BalanceWidget(
                 tvErrorTitle.text = fragment.getText(R.string.wallet_error_no_account)
                 tvErrorDescriptions.text =
                     fragment.getString(
-                        R.string.wallet_error_no_account_subtitle_format,
+                        R.string.no_account_generic,
                         data.amountToCreateAccount, data.currencySymbol
                     )
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
index f43965d8f9..bd1608e7de 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt
@@ -12,13 +12,19 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
+import com.badoo.mvicore.modelWatcher
+import com.tangem.common.doOnResult
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.tangem_sdk_new.extensions.dpToPx
 import com.tangem.tap.common.SnackbarHandler
 import com.tangem.tap.common.TestActions
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.DetailsScreen
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.appendIfNotNull
 import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.fitChipsByGroupWidth
@@ -30,7 +36,6 @@ import com.tangem.tap.common.extensions.toQrCode
 import com.tangem.tap.common.recyclerView.SpaceItemDecoration
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.domain.tokens.models.BlockchainNetwork
-import com.tangem.tap.features.onboarding.getQRReceiveMessage
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.models.PendingTransaction
 import com.tangem.tap.features.wallet.redux.ErrorType
@@ -44,8 +49,13 @@ import com.tangem.tap.features.wallet.ui.adapters.WalletDetailWarningMessagesAda
 import com.tangem.tap.features.wallet.ui.images.load
 import com.tangem.tap.features.wallet.ui.test.TestWallet
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManagerSafe
+import com.tangem.tap.walletCurrenciesManager
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentWalletDetailsBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.rekotlin.StoreSubscriber
 
 class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
@@ -56,15 +66,56 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
 
     private val binding: FragmentWalletDetailsBinding by viewBinding(FragmentWalletDetailsBinding::bind)
 
+    private val walletDataWatcher = modelWatcher<WalletData> {
+        WalletData::pendingTransactions {
+            showPendingTransactionsIfPresent(it)
+        }
+        WalletData::currency {
+            handleCurrencyIcon(it)
+        }
+        WalletData::currencyData {
+            setupBalanceData(it)
+        }
+        (WalletData::currencyData or WalletData::currency) { walletData ->
+            setupCurrency(walletData.currencyData, walletData.currency)
+            setupSwipeRefresh(walletData.currencyData, walletData.currency)
+        }
+    }
+
+    private val walletStateWatcher = modelWatcher<WalletState> {
+        (WalletState::selectedCurrency or WalletState::selectedWalletData) { state ->
+            val selectedWalletData = state.selectedWalletData
+            if (selectedWalletData != null) {
+                walletDataWatcher.invoke(selectedWalletData)
+                setupButtons(selectedWalletData, state.isExchangeServiceFeatureOn)
+                setupAddressCard(selectedWalletData)
+                handleWarnings(selectedWalletData)
+            }
+        }
+        (WalletState::selectedCurrency or WalletState::isExchangeServiceFeatureOn) { state ->
+            if (state.selectedWalletData != null) {
+                setupButtons(state.selectedWalletData!!, state.isExchangeServiceFeatureOn)
+            }
+        }
+        (WalletState::state or WalletState::error) { state ->
+            setupNoInternetHandling(state.state, state.error)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        activity?.onBackPressedDispatcher?.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                store.dispatch(WalletAction.MultiWallet.SelectWallet(null))
-                store.dispatch(NavigationAction.PopBackTo())
-            }
-        })
+
+        Analytics.send(DetailsScreen.ScreenOpened())
+        activity?.onBackPressedDispatcher?.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    store.dispatch(WalletAction.MultiWallet.SelectWallet(null))
+                    store.dispatch(NavigationAction.PopBackTo())
+                }
+            },
+        )
         val inflater = TransitionInflater.from(requireContext())
         enterTransition = inflater.inflateTransition(R.transition.slide_right)
         exitTransition = inflater.inflateTransition(R.transition.fade)
@@ -80,6 +131,8 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
     override fun onStop() {
         super.onStop()
         store.unsubscribe(this)
+        walletDataWatcher.clear()
+        walletStateWatcher.clear()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -125,46 +178,17 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         view?.findViewById<View>(R.id.l_balance)?.let { view ->
             TestActions.initFor(
                 view = view,
-                actions = TestWallet.solanaRentExemptWarning()
+                actions = TestWallet.solanaRentExemptWarning(),
             )
         }
     }
 
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
-        if (state.selectedCurrency == null) return
-        val selectedWallet = state.getSelectedWalletData() ?: return
+        if (state.selectedWalletData == null) return
+        walletStateWatcher.invoke(state)
 
-
-        showPendingTransactionsIfPresent(selectedWallet.pendingTransactions)
-        setupCurrency(selectedWallet.currencyData, selectedWallet.currency)
-        setupAddressCard(selectedWallet)
-        setupNoInternetHandling(state)
-        setupBalanceData(selectedWallet.currencyData)
-        setupButtons(selectedWallet, state.isExchangeServiceFeatureOn)
-
-        handleCurrencyIcon(selectedWallet)
-        handleWarnings(selectedWallet)
         updateViewMeasurements()
-
-        binding.srlWalletDetails.setOnRefreshListener {
-            if (selectedWallet.currencyData.status != BalanceStatus.Loading) {
-                store.dispatch(
-                    WalletAction.LoadWallet(
-                        blockchain = BlockchainNetwork(
-                            selectedWallet.currency.blockchain,
-                            selectedWallet.currency.derivationPath,
-                            emptyList(),
-                        ),
-                    ),
-                )
-                store.dispatch(WalletAction.LoadFiatRate(coinsList = listOf(selectedWallet.currency)))
-            }
-        }
-
-        if (selectedWallet.currencyData.status != BalanceStatus.Loading) {
-            binding.srlWalletDetails.isRefreshing = false
-        }
     }
 
     private fun updateViewMeasurements() {
@@ -183,10 +207,47 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
 
     private fun setupCurrency(currencyData: BalanceWidgetData, currency: Currency) = with(binding) {
         tvCurrencyTitle.text = currencyData.currency
-        tvCurrencySubtitle.text = tvCurrencySubtitle.getString(
-            R.string.wallet_currency_subtitle,
-            currency.blockchain.fullName
-        )
+
+        if (currency is Currency.Token) {
+            tvCurrencySubtitle.text = tvCurrencySubtitle.getString(
+                R.string.wallet_currency_subtitle,
+                currency.blockchain.fullName,
+            )
+            tvCurrencySubtitle.show()
+        } else {
+            tvCurrencySubtitle.hide()
+        }
+    }
+
+    private fun setupSwipeRefresh(currencyData: BalanceWidgetData, currency: Currency) {
+        binding.srlWalletDetails.setOnRefreshListener {
+            if (currencyData.status != BalanceStatus.Loading && currencyData.status != BalanceStatus.Refreshing) {
+                Analytics.send(Token.Refreshed())
+                lifecycleScope.launch(Dispatchers.Default) {
+                    val selectedUserWallet = userWalletsListManagerSafe?.selectedUserWalletSync
+                    if (selectedUserWallet != null) {
+                        walletCurrenciesManager.update(selectedUserWallet, currency)
+                            .doOnResult {
+                                withContext(Dispatchers.Main) {
+                                    binding.srlWalletDetails.isRefreshing = false
+                                }
+                            }
+                    } else {
+                        val blockchainNetwork = BlockchainNetwork(
+                            blockchain = currency.blockchain,
+                            derivationPath = currency.derivationPath,
+                            tokens = emptyList(),
+                        )
+
+                        store.dispatch(WalletAction.LoadWallet(blockchainNetwork))
+                        store.dispatch(WalletAction.LoadFiatRate(coinsList = listOf(currency)))
+                    }
+                }
+            }
+        }
+
+        binding.srlWalletDetails.isRefreshing = currencyData.status == BalanceStatus.Loading ||
+            currencyData.status == BalanceStatus.Refreshing
     }
 
     private fun setupButtons(selectedWallet: WalletData, isExchangeServiceFeatureOn: Boolean) = with(binding) {
@@ -217,9 +278,9 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         rvWarningMessages.show(warningDetails.isNotEmpty())
     }
 
-    private fun handleCurrencyIcon(wallet: WalletData) = with(binding.lWalletDetails.lBalance) {
+    private fun handleCurrencyIcon(currency: Currency) = with(binding.lWalletDetails.lBalance) {
         ivCurrency.load(
-            currency = wallet.currency,
+            currency = currency,
             derivationStyle = store.state.globalState
                 .scanResponse
                 ?.card
@@ -227,7 +288,6 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
         )
     }
 
-
     private fun showPendingTransactionsIfPresent(pendingTransactions: List<PendingTransaction>) {
         pendingTransactionAdapter.submitList(pendingTransactions)
         binding.rvPendingTransaction.show(pendingTransactions.isNotEmpty())
@@ -258,23 +318,36 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
                 store.dispatch(
                     WalletAction.ExploreAddress(
                         state.walletAddresses.selectedAddress.exploreUrl,
-                        requireContext()
-                    )
+                        requireContext(),
+                    ),
                 )
             }
             ivQrCode.setImageBitmap(state.walletAddresses.selectedAddress.shareUrl.toQrCode())
-            tvReceiveMessage.text =
-                getQRReceiveMessage(tvReceiveMessage.context, state.currency)
+
+            tvReceiveMessage.text = when (val currency = state.currency) {
+                is Currency.Blockchain -> tvReceiveMessage.getString(
+                    id = R.string.address_qr_code_message_format,
+                    currency.blockchain.fullName,
+                    currency.currencySymbol,
+                    currency.blockchain.fullName,
+                )
+                is Currency.Token -> tvReceiveMessage.getString(
+                    id = R.string.address_qr_code_message_format,
+                    currency.token.name,
+                    currency.currencySymbol,
+                    currency.blockchain.fullName,
+                )
+            }
         }
     }
 
-    private fun setupNoInternetHandling(state: WalletState) {
-        if (state.state == ProgressState.Error) {
-            if (state.error == ErrorType.NoInternetConnection) {
+    private fun setupNoInternetHandling(progressState: ProgressState, errorType: ErrorType?) {
+        if (progressState == ProgressState.Error) {
+            if (errorType == ErrorType.NoInternetConnection) {
                 binding.srlWalletDetails.isRefreshing = false
                 (activity as? SnackbarHandler)?.showSnackbar(
                     text = R.string.wallet_notification_no_internet,
-                    buttonTitle = R.string.common_retry
+                    buttonTitle = R.string.common_retry,
                 ) { store.dispatch(WalletAction.LoadData) }
             }
         } else {
@@ -294,7 +367,8 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
                 lBalance.tvStatus.setLoadingStatus(R.string.wallet_balance_loading)
             }
             BalanceStatus.VerifiedOnline, BalanceStatus.SameCurrencyTransactionInProgress,
-            BalanceStatus.TransactionInProgress -> {
+            BalanceStatus.TransactionInProgress,
+            -> {
                 lBalanceError.root.hide()
                 lBalance.root.show()
                 lBalance.groupBalance.show()
@@ -317,7 +391,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
                 lBalance.tvError.show()
                 lBalance.tvError.setWarningStatus(
                     R.string.wallet_balance_blockchain_unreachable,
-                    data.errorMessage
+                    data.errorMessage,
                 )
             }
             BalanceStatus.NoAccount -> {
@@ -326,8 +400,8 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
                 lBalanceError.tvErrorTitle.text = getText(R.string.wallet_error_no_account)
                 lBalanceError.tvErrorDescriptions.text =
                     getString(
-                        R.string.wallet_error_no_account_subtitle_format,
-                        data.amountToCreateAccount, data.currencySymbol
+                        R.string.no_account_generic,
+                        data.amountToCreateAccount, data.currencySymbol,
                     )
             }
         }
@@ -336,7 +410,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_remove -> {
-                store.state.walletState.getSelectedWalletData()?.let { walletData ->
+                store.state.walletState.selectedWalletData?.let { walletData ->
                     store.dispatch(WalletAction.MultiWallet.TryToRemoveWallet(walletData.currency))
                     true
                 }
@@ -366,7 +440,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details),
     private fun TextView.setStatus(
         text: String,
         @ColorRes color: Int,
-        @DrawableRes drawable: Int?
+        @DrawableRes drawable: Int?,
     ) {
         this.text = text
         setTextColor(getColor(color))
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index 87a31563fa..f01805dd39 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.features.wallet.ui
 
+import android.content.Context
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
@@ -8,14 +9,23 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
 import coil.load
 import coil.size.Scale
+import com.tangem.core.ui.fragments.setStatusBarColor
+import com.tangem.core.ui.utils.OneTouchClickListener
 import com.tangem.domain.common.TapWorkarounds.isSaltPay
 import com.tangem.tap.MainActivity
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.converters.BasicSignInEventConverter
+import com.tangem.tap.common.analytics.converters.BasicTopUpEventConverter
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.Portfolio
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.common.recyclerView.SpaceItemDecoration
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -36,6 +46,7 @@ import com.tangem.tap.features.wallet.ui.wallet.SaltPaySingleWalletView
 import com.tangem.tap.features.wallet.ui.wallet.SingleWalletView
 import com.tangem.tap.features.wallet.ui.wallet.WalletView
 import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
 import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentWalletBinding
@@ -49,14 +60,31 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
 
     private var walletView: WalletView = SingleWalletView()
 
+    private val viewModel by viewModels<WalletViewModel>()
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        activity?.lifecycleScope?.launchWhenCreated {
+            viewModel.launch()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
+
+        Analytics.send(MainScreen.ScreenOpened())
         activity?.onBackPressedDispatcher?.addCallback(
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    store.dispatch(NavigationAction.PopBackTo(AppScreen.Home))
+                    val popBackTo = if (userWalletsListManager.hasSavedUserWallets) {
+                        userWalletsListManager.lock()
+                        AppScreen.Welcome
+                    } else {
+                        AppScreen.Home
+                    }
+                    store.dispatch(NavigationAction.PopBackTo(popBackTo))
                 }
             },
         )
@@ -67,12 +95,13 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
 
     override fun onStart() {
         super.onStart()
+
+        setStatusBarColor(R.color.background_secondary)
+
         store.subscribe(this) { state ->
             state.select { it.walletState }
         }
         walletView.setFragment(this, binding)
-//        store.dispatch(WalletAction.UpdateWallet(force = false))
-//        store.dispatch(WalletAction.LoadWallet())
     }
 
     override fun onStop() {
@@ -81,13 +110,18 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
         walletView.removeFragment()
     }
 
+    override fun onDestroy() {
+        walletView.onDestroyFragment()
+        super.onDestroy()
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         (activity as? AppCompatActivity)?.setSupportActionBar(binding.toolbar)
 
-        binding.toolbar.setNavigationOnClickListener {
-            store.dispatch(WalletAction.Scan)
-        }
+        binding.toolbar.setNavigationOnClickListener(
+            OneTouchClickListener { store.dispatch(WalletAction.ChangeWallet) },
+        )
         setupWarningsRecyclerView()
         walletView.changeWalletView(this, binding)
         addCustomActionOnCard()
@@ -115,6 +149,7 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     override fun newState(state: WalletState) {
         if (activity == null || view == null) return
 
+        handleBasicAnalyticsEvent(state)
         val isSaltPay = store.state.globalState.scanResponse?.card?.isSaltPay == true
 
         when {
@@ -149,12 +184,16 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
 
         binding.srlWallet.isRefreshing = state.state == ProgressState.Refreshing
         binding.srlWallet.setOnRefreshListener {
-            if (state.state != ProgressState.Loading ||
+            if (state.state != ProgressState.Loading &&
                 state.state != ProgressState.Refreshing
             ) {
+                Analytics.send(Portfolio.Refreshed())
                 store.dispatch(WalletAction.LoadData.Refresh)
             }
         }
+
+        val navigationIconRes = if (state.hasSavedWallets) R.drawable.ic_wallet_24 else R.drawable.ic_tap_card_24
+        binding.toolbar.setNavigationIcon(navigationIconRes)
     }
 
     private fun showWarningsIfPresent(warnings: List<WarningMessage>) {
@@ -204,9 +243,9 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
                 store.state.globalState.scanResponse?.let { scanNoteResponse ->
                     store.dispatch(
                         DetailsAction.PrepareScreen(
-                            scanNoteResponse,
-                            store.state.walletState.walletManagers.map { it.wallet },
-                            CardTou(),
+                            scanResponse = scanNoteResponse,
+                            wallets = store.state.walletState.walletManagers.map { it.wallet },
+                            cardTou = CardTou(),
                         ),
                     )
                     store.dispatch(NavigationAction.NavigateTo(AppScreen.Details))
@@ -221,4 +260,11 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         if (store.state.walletState.shouldShowDetails) inflater.inflate(R.menu.menu_wallet, menu)
     }
+
+    private fun handleBasicAnalyticsEvent(state: WalletState) {
+        val scanResponse = store.state.globalState.scanResponse ?: return
+
+        BasicSignInEventConverter(scanResponse).convert(state)?.let { Analytics.send(it) }
+        BasicTopUpEventConverter(scanResponse).convert(state)?.let { Analytics.send(it) }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
new file mode 100644
index 0000000000..a9fc0ad8cf
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletViewModel.kt
@@ -0,0 +1,43 @@
+package com.tangem.tap.features.wallet.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletStoresManager
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+
+internal class WalletViewModel : ViewModel() {
+    fun launch() {
+        bootstrapSelectedWalletStoresChanges()
+        bootstrapShowSaveWalletIfNeeded()
+    }
+
+    private fun bootstrapSelectedWalletStoresChanges() {
+        userWalletsListManager.selectedUserWallet
+            .map { it.walletId }
+            .distinctUntilChanged()
+            .flatMapLatest { selectedUserWalletId ->
+                walletStoresManager.get(selectedUserWalletId)
+            }
+            .onEach { walletStores ->
+                store.dispatch(WalletAction.WalletStoresChanged(walletStores))
+            }
+            .launchIn(viewModelScope)
+    }
+
+    private fun bootstrapShowSaveWalletIfNeeded() {
+        viewModelScope.launch {
+            delay(timeMillis = 1_800)
+            store.dispatchOnMain(WalletAction.ShowSaveWalletIfNeeded)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
index 624d34da3e..799d029235 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
@@ -27,8 +27,11 @@ class WalletWarningConverter(
                     message.blockchainFullName, message.blockchainFullName,
                 )
             }
-            WalletWarning.TransactionInProgress -> {
-                context.getString(R.string.wallet_pending_transaction_warning)
+            is WalletWarning.TransactionInProgress -> {
+                context.getString(
+                    R.string.token_details_send_blocked_tx_format,
+                    message.currencyName
+                )
             }
             is WalletWarning.Rent -> {
                 context.getString(
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
index a688bb9e42..b07db256f5 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt
@@ -6,9 +6,9 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.tangem.blockchain.common.Blockchain
-import com.tangem.blockchain.common.Token
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Portfolio
 import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
@@ -20,25 +20,15 @@ import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.ItemCurrencyWalletBinding
 
-class WalletAdapter
-    : ListAdapter<WalletData, WalletAdapter.WalletsViewHolder>(DiffUtilCallback) {
+class WalletAdapter : ListAdapter<WalletData, WalletAdapter.WalletsViewHolder>(DiffUtilCallback) {
 
     override fun getItemId(position: Int): Long {
         return currentList[position].currencyData.currencySymbol?.hashCode()?.toLong() ?: 0
     }
 
-    fun submitList(
-        list: List<WalletData>,
-        primaryBlockchain: Blockchain?,
-        primaryToken: Token? = null
-    ) {
-        // We used this method to sort the list of currencies. Sorting is disabled for now.
-        super.submitList(list)
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WalletsViewHolder {
         val layout = ItemCurrencyWalletBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
+            LayoutInflater.from(parent.context), parent, false,
         )
         return WalletsViewHolder(layout)
     }
@@ -49,11 +39,11 @@ class WalletAdapter
 
     object DiffUtilCallback : DiffUtil.ItemCallback<WalletData>() {
         override fun areContentsTheSame(
-            oldItem: WalletData, newItem: WalletData
+            oldItem: WalletData, newItem: WalletData,
         ) = oldItem == newItem
 
         override fun areItemsTheSame(
-            oldItem: WalletData, newItem: WalletData
+            oldItem: WalletData, newItem: WalletData,
         ) = oldItem == newItem
     }
 
@@ -72,15 +62,10 @@ class WalletAdapter
                 BalanceStatus.Unreachable -> {
                     root.getString(R.string.wallet_balance_blockchain_unreachable)
                 }
-                BalanceStatus.NoAccount,
-                BalanceStatus.VerifiedOnline,
-                BalanceStatus.SameCurrencyTransactionInProgress,
-                BalanceStatus.EmptyCard,
-                BalanceStatus.UnknownBlockchain,
-                BalanceStatus.Loading,
-                BalanceStatus.Refreshing,
-                null,
-                -> null
+                BalanceStatus.MissedDerivation -> {
+                    root.getString(R.string.wallet_balance_missing_derivation)
+                }
+                else -> null
             }
 
             if (status == null || status == BalanceStatus.Loading) {
@@ -100,8 +85,8 @@ class WalletAdapter
             )
 
             lContent.tvCurrency.text = wallet.currencyData.currency
-            lContent.tvAmountFiat.text = wallet.currencyData.fiatAmountFormatted
-            lContent.tvAmount.text = wallet.currencyData.amountFormatted
+            lContent.tvAmountFiat.text = wallet.currencyData.fiatAmountFormatted ?: "—"
+            lContent.tvAmount.text = wallet.currencyData.amountFormatted ?: "—"
 
             lContent.tvStatus.isVisible = statusMessage != null
             lContent.tvStatus.text = statusMessage
@@ -112,7 +97,8 @@ class WalletAdapter
 
             if (wallet.walletAddresses != null) {
                 cardWallet.setOnClickListener {
-                    store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet))
+                    Analytics.send(Portfolio.TokenTapped())
+                    store.dispatch(WalletAction.MultiWallet.SelectWallet(wallet.currency))
                 }
             } else {
                 cardWallet.setOnClickListener(null)
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
index 57e8e81f77..dd3bcee91c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt
@@ -7,7 +7,9 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.play.core.review.ReviewManagerFactory
-import com.tangem.tap.common.analytics.AnalyticsEventAnOld
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.extensions.getActivity
 import com.tangem.tap.common.extensions.getColor
 import com.tangem.tap.common.extensions.getString
@@ -26,7 +28,7 @@ class WarningMessagesAdapter : ListAdapter<WarningMessage, WarningMessageVH>(Dif
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WarningMessageVH {
         val binding = LayoutWarningCardActionBinding.inflate(
-            LayoutInflater.from(parent.context), parent, false
+            LayoutInflater.from(parent.context), parent, false,
         )
         return WarningMessageVH(binding)
     }
@@ -60,7 +62,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
         tvMessage.text = getString(
             resId = warning.messageResId,
             default = warning.message,
-            formatArgs = warning.messageFormatArg
+            formatArgs = warning.messageFormatArg,
         )
     }
 
@@ -98,7 +100,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
                     }
                 }
             val buttonTitle = binding.root.getString(
-                warning.buttonTextId ?: R.string.how_to_got_it_button
+                warning.buttonTextId ?: R.string.how_to_got_it_button,
             )
             binding.btnGotIt.setOnClickListener(buttonAction)
             binding.btnGotIt.text = buttonTitle
@@ -107,14 +109,13 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
             binding.groupControlsTemporary.hide()
             binding.groupControlsRating.show()
             binding.btnClose.show()
-            val analyticsHandler = store.state.globalState.analyticsHandler
             binding.btnClose.setOnClickListener {
-                analyticsHandler?.handleAnalyticsEvent(AnalyticsEventAnOld.APP_RATING_DISMISS)
+                Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Closed))
                 store.dispatch(GlobalAction.HideWarningMessage(warning))
                 store.dispatch(WalletAction.Warnings.AppRating.RemindLater)
             }
             binding.btnCanBeBetter.setOnClickListener {
-                analyticsHandler?.handleAnalyticsEvent(AnalyticsEventAnOld.APP_RATING_NEGATIVE)
+                Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked))
                 store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow)
                 store.dispatch(GlobalAction.HideWarningMessage(warning))
                 store.dispatch(GlobalAction.SendEmail(RateCanBeBetterEmail()))
@@ -122,7 +123,7 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi
             binding.btnReallyCool.setOnClickListener {
                 val activity = binding.root.context.getActivity() ?: return@setOnClickListener
 
-                analyticsHandler?.handleAnalyticsEvent(AnalyticsEventAnOld.APP_RATING_POSITIVE)
+                Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Liked))
                 store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow)
                 val reviewManager = ReviewManagerFactory.create(activity)
                 val task = reviewManager.requestReviewFlow()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
index b634f76c68..b8022e2724 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
@@ -4,15 +4,21 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.events.Onboarding
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.wallet.redux.WalletAction
+import com.tangem.tap.features.wallet.redux.models.WalletDialog
 import com.tangem.tap.store
 import com.tangem.wallet.databinding.DialogRussiansCardholdersWarningBinding
 
 class RussianCardholdersWarningBottomSheetDialog(
-    context: Context, private val topUpUrl: String?,
+    context: Context,
+    private val dialogData: WalletDialog.RussianCardholdersWarningDialog.Data?,
 ) : BottomSheetDialog
     (context) {
 
@@ -20,6 +26,7 @@ class RussianCardholdersWarningBottomSheetDialog(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Analytics.send(Token.Topup.P2PScreenOpened())
         binding = DialogRussiansCardholdersWarningBinding
             .inflate(LayoutInflater.from(context))
             .also { setContentView(it.root) }
@@ -33,8 +40,10 @@ class RussianCardholdersWarningBottomSheetDialog(
         }
 
         binding?.btnYes?.setOnClickListener {
-            if (topUpUrl != null) {
-                store.dispatchOpenUrl(topUpUrl)
+            if (dialogData != null) {
+                val currencyType = AnalyticsParam.CurrencyType.Blockchain(dialogData.blockchain)
+                Analytics.send(Onboarding.Topup.ButtonBuyCrypto(currencyType))
+                store.dispatchOpenUrl(dialogData.topUpUrl)
             } else {
                 store.dispatch(WalletAction.TradeCryptoAction.Buy(checkUserLocation = false))
             }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
index 91afcc3819..cef955c28e 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/ScanFailsDialog.kt
@@ -2,6 +2,8 @@ package com.tangem.tap.features.wallet.ui.dialogs
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.feedback.ScanFailsEmail
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -19,9 +21,10 @@ class ScanFailsDialog {
                 setTitle(context.getString(R.string.common_warning))
                 setMessage(R.string.alert_troubleshooting_scan_card_title)
                 setPositiveButton(R.string.alert_button_request_support) { _, _ ->
+                    Analytics.send(IntroductionProcess.ButtonRequestSupport())
                     store.dispatch(GlobalAction.SendEmail(ScanFailsEmail()))
                 }
-                setNeutralButton(R.string.alert_troubleshooting_scan_card_ok) { _, _ -> }
+                setNeutralButton(R.string.common_cancel) { _, _ -> }
                 setOnDismissListener { store.dispatchDialogHide() }
             }.create()
         }
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
index 609537bbaf..c8db3c3d23 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt
@@ -14,7 +14,7 @@ class SignedHashesWarningDialog {
             return AlertDialog.Builder(context).apply {
                 setTitle(context.getString(R.string.warning_important_security_info))
                 setMessage(R.string.alert_signed_hashes_message)
-                setPositiveButton(R.string.alert_button_i_understand) { _, _ ->
+                setPositiveButton(R.string.common_understand) { _, _ ->
                     store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId)
                     store.dispatch(
                         GlobalAction.HideWarningMessage(
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt
index cd5241fb86..b6d34873df 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/images/CurrencyIconView.kt
@@ -70,5 +70,7 @@ fun CurrencyIconView.load(
             blockchain = currency.blockchain,
             getLocalImage = true,
         ).load()
+    } else {
+        isBlockchainBadgeVisible = false
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt
index 4f384d33f7..857cdd2631 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/test/TestWalletDetailsActions.kt
@@ -156,7 +156,7 @@ private class SolanaRentWarningActionEmitter {
     }
 
     private fun getBlockchainNetwork(): BlockchainNetwork {
-        val currency = store.state.walletState.getSelectedWalletData()!!.currency
+        val currency = store.state.walletState.selectedWalletData!!.currency
         return BlockchainNetwork(currency.blockchain, currency.derivationPath, listOf())
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
index 9d4fe68894..f7c8dc8a66 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/MultiWalletView.kt
@@ -3,9 +3,13 @@ package com.tangem.tap.features.wallet.ui.wallet
 import android.widget.Button
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.tangem.common.card.Card
+import com.badoo.mvicore.DiffStrategy
+import com.badoo.mvicore.modelWatcher
 import com.tangem.domain.common.TapWorkarounds.derivationStyle
 import com.tangem.domain.common.TapWorkarounds.isTestCard
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.MainScreen
+import com.tangem.tap.common.analytics.events.Portfolio
 import com.tangem.tap.common.extensions.animateVisibility
 import com.tangem.tap.common.extensions.formatAmountAsSpannedString
 import com.tangem.tap.common.extensions.getQuantityString
@@ -31,6 +35,45 @@ class MultiWalletView : WalletView() {
 
     private lateinit var walletsAdapter: WalletAdapter
 
+    private val watcher = modelWatcher<WalletState> {
+        val totalBalanceStrategy: DiffStrategy<WalletState> = { old, new ->
+            old.cardId != new.cardId ||
+                old.totalBalance != new.totalBalance ||
+                old.state != new.state ||
+                old.walletsStores.size != new.walletsStores.size
+        }
+
+        // !!! Workaround !!!
+        // Checking state properties instead of state params can reduce application performance,
+        // but here it is necessary because the WalletStore has an unsuitable equals method
+        WalletState::walletsDataFromStores {
+            walletsAdapter.submitList(it)
+        }
+        WalletState::loadingUserTokens {
+            binding?.pbLoadingUserTokens?.show(it)
+        }
+        WalletState::walletCardsCount { walletCardsCount ->
+            binding?.let {
+                setupWalletCardNumber(it, walletCardsCount)
+            }
+        }
+        WalletState::missingDerivations { missingDerivations ->
+            binding?.let {
+                handleRescanWarning(it, missingDerivations.isNotEmpty())
+            }
+        }
+        WalletState::showBackupWarning { showBackupWarnings ->
+            binding?.let {
+                handleBackupWarning(it, showBackupWarnings)
+            }
+        }
+        watch({ it }, totalBalanceStrategy) { walletState ->
+            binding?.let {
+                handleTotalBalance(it, walletState.totalBalance, walletState.state, walletState.walletsDataFromStores.size)
+            }
+        }
+    }
+
     override fun changeWalletView(fragment: WalletFragment, binding: FragmentWalletBinding) {
         setFragment(fragment, binding)
         onViewCreated()
@@ -38,26 +81,16 @@ class MultiWalletView : WalletView() {
     }
 
     private fun showMultiWalletView(binding: FragmentWalletBinding) = with(binding) {
+        watcher.clear()
         tvTwinCardNumber.hide()
         rvPendingTransaction.hide()
         lCardBalance.root.hide()
         lAddress.root.hide()
         rowButtons.hide()
         lSingleWalletBalance.root.hide()
+        lCardTotalBalance.root.show()
         rvMultiwallet.show()
         btnAddToken.show()
-        setupWalletCardNumber(binding)
-    }
-
-    private fun setupWalletCardNumber(binding: FragmentWalletBinding) = with(binding) {
-        val card = store.state.globalState.scanResponse?.card
-        if (card?.backupStatus is Card.BackupStatus.Active) {
-            val cardCount = (card.backupStatus as Card.BackupStatus.Active).cardCount + 1
-            tvTwinCardNumber.show()
-            tvTwinCardNumber.text = tvTwinCardNumber.getQuantityString(R.plurals.card_label_card_count, cardCount)
-        } else {
-            tvTwinCardNumber.hide()
-        }
     }
 
     override fun onViewCreated() {
@@ -70,21 +103,18 @@ class MultiWalletView : WalletView() {
         walletsAdapter.setHasStableIds(true)
         binding?.rvMultiwallet?.layoutManager = LinearLayoutManager(fragment.requireContext())
         binding?.rvMultiwallet?.adapter = walletsAdapter
+        binding?.rvMultiwallet?.itemAnimator = null
     }
 
     override fun onNewState(state: WalletState) {
         val fragment = fragment ?: return
         val binding = binding ?: return
 
-        handleTotalBalance(binding, state.totalBalance)
-        handleBackupWarning(binding, state.showBackupWarning)
-        handleRescanWarning(binding, state.missingDerivations.isNotEmpty())
-        walletsAdapter.submitList(state.walletsData, state.primaryBlockchain, state.primaryToken)
-
-        binding.pbLoadingUserTokens.show(state.loadingUserTokens)
+        watcher.invoke(state)
 
         binding.btnAddToken.setOnClickListener {
             val card = store.state.globalState.scanResponse!!.card
+            Analytics.send(Portfolio.ButtonManageTokens())
             store.dispatch(
                 TokensAction.LoadCurrencies(
                     supportedBlockchains = CurrenciesRepository.getBlockchains(
@@ -97,7 +127,7 @@ class MultiWalletView : WalletView() {
             store.dispatch(TokensAction.AllowToAddTokens(true))
             store.dispatch(
                 TokensAction.SetAddedCurrencies(
-                    wallets = state.walletsData,
+                    wallets = state.walletsDataFromStores,
                     derivationStyle = card.derivationStyle,
                 ),
             )
@@ -106,12 +136,23 @@ class MultiWalletView : WalletView() {
         handleErrorStates(state = state, binding = binding, fragment = fragment)
     }
 
+    private fun setupWalletCardNumber(binding: FragmentWalletBinding, walletCardsCount: Int?) = with(binding) {
+        if (walletCardsCount != null) {
+            tvTwinCardNumber.show()
+            tvTwinCardNumber.text =
+                tvTwinCardNumber.getQuantityString(R.plurals.card_label_card_count, walletCardsCount)
+        } else {
+            tvTwinCardNumber.hide()
+        }
+    }
+
     private fun handleBackupWarning(
         binding: FragmentWalletBinding,
         showBackupWarning: Boolean,
     ) = with(binding.lWalletBackupWarning) {
         root.isVisible = showBackupWarning
         root.setOnClickListener {
+            Analytics.send(MainScreen.NoticeBackupYourWalletTapped())
             store.dispatch(WalletAction.MultiWallet.BackupWallet)
         }
     }
@@ -122,6 +163,7 @@ class MultiWalletView : WalletView() {
     ) = with(binding.lWalletRescanWarning) {
         root.isVisible = showRescanWarning
         root.setOnClickListener {
+            Analytics.send(MainScreen.NoticeScanYourCardTapped())
             store.dispatch(WalletAction.MultiWallet.ScanToGetDerivations)
         }
     }
@@ -129,28 +171,40 @@ class MultiWalletView : WalletView() {
     private fun handleTotalBalance(
         binding: FragmentWalletBinding,
         totalBalance: TotalBalance?,
+        progressState: ProgressState,
+        walletsCount: Int,
     ) = with(binding.lCardTotalBalance) {
-        root.isVisible = totalBalance != null
-        if (totalBalance != null) {
-            // Skip changes when on refreshing state
-            if (totalBalance.state == ProgressState.Refreshing) return@with
-
-            if (totalBalance.state == ProgressState.Loading) {
-                veilBalance.veil()
-            } else {
-                veilBalance.unVeil()
+        if (walletsCount == 0) {
+            if (progressState != ProgressState.Loading) {
+                root.isVisible = false
             }
-            tvProcessing.animateVisibility(
-                show = totalBalance.state == ProgressState.Error,
-            )
+        } else {
+            if (totalBalance == null) {
+                if (progressState != ProgressState.Loading) {
+                    root.isVisible = false
+                }
+            } else {
+                root.isVisible = true
+                // Skip changes when on refreshing state
+                if (totalBalance.state == ProgressState.Refreshing || progressState == ProgressState.Refreshing) {
+                    return@with
+                }
 
-            tvBalance.text = totalBalance.fiatAmount.formatAmountAsSpannedString(
-                currencySymbol = totalBalance.fiatCurrency.symbol,
-            )
-            tvCurrencyName.text = totalBalance.fiatCurrency.code
+                if (totalBalance.state == ProgressState.Loading) {
+                    veilBalance.veil()
+                } else {
+                    veilBalance.unVeil()
+                }
+                tvProcessing.animateVisibility(show = totalBalance.state == ProgressState.Error)
 
-            tvCurrencyName.setOnClickListener {
-                store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency)
+                tvBalance.text = totalBalance.fiatAmount.formatAmountAsSpannedString(
+                    currencySymbol = totalBalance.fiatCurrency.symbol,
+                )
+                tvCurrencyName.text = totalBalance.fiatCurrency.code
+
+                tvCurrencyName.setOnClickListener {
+                    store.dispatch(WalletAction.AppCurrencyAction.ChooseAppCurrency)
+                }
             }
         }
     }
@@ -205,6 +259,11 @@ class MultiWalletView : WalletView() {
             rowButtons.btnSend.text = fragment?.getText(R.string.wallet_button_create_wallet)
             rowButtons.onSendClick = { store.dispatch(WalletAction.CreateWallet) }
         }
+
+    override fun onDestroyFragment() {
+        super.onDestroyFragment()
+        watcher.clear()
+    }
 }
 
 private val WalletDetailsButtonsRow.btnBuy: Button
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPaySingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPaySingleWalletView.kt
index e765e738e8..44ff7329fc 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPaySingleWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SaltPaySingleWalletView.kt
@@ -52,4 +52,4 @@ class SaltPaySingleWalletView : WalletView() {
             ),
         ).setup()
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
index a0126391a3..18ebc3dd4b 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
@@ -3,10 +3,10 @@ package com.tangem.tap.features.wallet.ui.wallet
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.tangem.domain.common.TwinCardNumber
 import com.tangem.tap.common.extensions.beginDelayedTransition
 import com.tangem.tap.common.extensions.fitChipsByGroupWidth
 import com.tangem.tap.common.extensions.getQuantityString
+import com.tangem.tap.common.extensions.getString
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
 import com.tangem.tap.features.onboarding.products.twins.redux.TwinCardsState
@@ -34,13 +34,18 @@ class SingleWalletView : WalletView() {
     }
 
     private fun showSingleWalletView(binding: FragmentWalletBinding) = with(binding) {
+        tvTwinCardNumber.hide()
         rvMultiwallet.hide()
         btnAddToken.hide()
         rvPendingTransaction.hide()
         pbLoadingUserTokens.hide()
+        lCardTotalBalance.root.hide()
+        lSingleWalletBalance.root.hide()
+        lWalletRescanWarning.root.hide()
+        lWalletBackupWarning.root.hide()
         lCardBalance.root.show()
         lAddress.root.show()
-        lSingleWalletBalance.root.hide()
+        rowButtons.show()
     }
 
     override fun onViewCreated() {
@@ -61,7 +66,7 @@ class SingleWalletView : WalletView() {
 
         setupTwinCards(state.twinCardsState, binding)
         setupButtons(state.primaryWallet, binding, state.isExchangeServiceFeatureOn)
-        setupAddressCard(state.primaryWallet, binding)
+        setupAddressCard(state, binding)
         showPendingTransactionsIfPresent(state.primaryWallet.pendingTransactions)
         setupBalance(state, state.primaryWallet)
     }
@@ -142,37 +147,50 @@ class SingleWalletView : WalletView() {
         }
     }
 
-    private fun setupAddressCard(state: WalletData, binding: FragmentWalletBinding) = with(binding.lAddress) {
-        if (state.walletAddresses != null && state.currency is Currency.Blockchain) {
+    private fun setupAddressCard(state: WalletState, binding: FragmentWalletBinding) = with(binding.lAddress) {
+        val primaryWallet = state.primaryWallet
+        if (primaryWallet?.walletAddresses != null && primaryWallet.currency is Currency.Blockchain) {
             binding.lAddress.root.show()
-            if (state.shouldShowMultipleAddress()) {
+            if (primaryWallet.shouldShowMultipleAddress()) {
                 (binding.lAddress.root as? ViewGroup)?.beginDelayedTransition()
                 chipGroupAddressType.show()
                 chipGroupAddressType.fitChipsByGroupWidth()
-                val checkedId =
-                    MultipleAddressUiHelper.typeToId(state.walletAddresses.selectedAddress.type)
+                val checkedId = MultipleAddressUiHelper.typeToId(primaryWallet.walletAddresses.selectedAddress.type)
                 if (checkedId != View.NO_ID) chipGroupAddressType.check(checkedId)
 
                 chipGroupAddressType.setOnCheckedChangeListener { group, checkedId ->
                     if (checkedId == -1) return@setOnCheckedChangeListener
-                    val type =
-                        MultipleAddressUiHelper.idToType(checkedId, state.currency.blockchain)
+                    val type = MultipleAddressUiHelper.idToType(checkedId, primaryWallet.currency.blockchain)
                     type?.let { store.dispatch(WalletAction.ChangeSelectedAddress(type)) }
                 }
             } else {
                 chipGroupAddressType.hide()
             }
-            tvAddress.text = state.walletAddresses.selectedAddress.address
+            tvAddress.text = primaryWallet.walletAddresses.selectedAddress.address
             tvExplore.setOnClickListener {
                 store.dispatch(
                     WalletAction.ExploreAddress(
-                        state.walletAddresses.selectedAddress.exploreUrl,
+                        primaryWallet.walletAddresses.selectedAddress.exploreUrl,
                         fragment!!.requireContext(),
                     ),
                 )
             }
+            setupCardInfo(state)
         } else {
             binding.lAddress.root.hide()
         }
     }
+
+    private fun setupCardInfo(state: WalletState) {
+        val textView = binding?.lAddress?.tvInfo
+        val blockchain = state.primaryWallet?.currency?.blockchain
+        if (textView != null && blockchain != null) {
+            textView.text = textView.getString(
+                id = R.string.address_qr_code_message_format,
+                blockchain.fullName,
+                blockchain.currency,
+                blockchain.fullName,
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/WalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/WalletView.kt
index a3b09aab12..d7d7cbb405 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/WalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/WalletView.kt
@@ -17,6 +17,8 @@ abstract class WalletView {
         binding = null
     }
 
+    open fun onDestroyFragment() {}
+
     abstract fun changeWalletView(fragment: WalletFragment, binding: FragmentWalletBinding)
     abstract fun onViewCreated()
     abstract fun onNewState(state: WalletState)
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt
new file mode 100644
index 0000000000..b381b423c3
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/UserWalletModel.kt
@@ -0,0 +1,24 @@
+package com.tangem.tap.features.walletSelector.redux
+
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.domain.model.TotalFiatBalance
+
+data class UserWalletModel(
+    val id: UserWalletId,
+    val name: String,
+    val artworkUrl: String,
+    val type: Type,
+    val fiatBalance: TotalFiatBalance,
+    val isLocked: Boolean,
+) {
+    sealed interface Type {
+        data class SingleCurrency(
+            val blockchainName: String,
+        ) : Type
+
+        data class MultiCurrency(
+            val cardsInWallet: Int,
+            val tokensCount: Int,
+        ) : Type
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorAction.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorAction.kt
new file mode 100644
index 0000000000..0985f4b68c
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorAction.kt
@@ -0,0 +1,61 @@
+package com.tangem.tap.features.walletSelector.redux
+
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import org.rekotlin.Action
+
+internal sealed interface WalletSelectorAction : Action {
+    data class UserWalletsLoaded(
+        val userWallets: List<UserWallet>,
+    ) : WalletSelectorAction
+
+    data class SelectedWalletChanged(
+        val selectedWallet: UserWallet,
+    ) : WalletSelectorAction
+
+    data class IsLockedChanged(
+        val isLocked: Boolean,
+    ) : WalletSelectorAction
+
+    data class WalletStoresChanged(
+        val walletsStores: Map<UserWalletId, List<WalletStoreModel>>,
+    ) : WalletSelectorAction
+
+    data class BalanceLoaded(
+        val userWalletModel: UserWalletModel,
+    ) : WalletSelectorAction
+
+    object UnlockWithBiometry : WalletSelectorAction {
+        object Success : WalletSelectorAction
+        data class Error(val error: TangemError) : WalletSelectorAction
+    }
+
+    data class SelectWallet(
+        val userWalletId: UserWalletId,
+    ) : WalletSelectorAction
+
+    data class RenameWallet(
+        val userWalletId: UserWalletId,
+        val newName: String,
+    ) : WalletSelectorAction
+
+    data class RemoveWallets(
+        val userWalletsIds: List<UserWalletId>,
+    ) : WalletSelectorAction
+
+    object AddWallet : WalletSelectorAction {
+        object Success : WalletSelectorAction
+        data class Error(val error: TangemError) : WalletSelectorAction
+    }
+
+    data class ChangeAppCurrency(
+        val fiatCurrency: FiatCurrency,
+    ) : WalletSelectorAction
+
+    data class HandleError(val error: TangemError) : WalletSelectorAction
+
+    object CloseError : WalletSelectorAction
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
new file mode 100644
index 0000000000..4772b501d7
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt
@@ -0,0 +1,325 @@
+package com.tangem.tap.features.walletSelector.redux
+
+import com.tangem.common.CompletionResult
+import com.tangem.common.core.TangemSdkError
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.common.flatMap
+import com.tangem.common.map
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.MyWallets
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.onUserWalletSelected
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.UserWallet
+import com.tangem.tap.domain.model.WalletStoreModel
+import com.tangem.tap.domain.model.builders.UserWalletBuilder
+import com.tangem.tap.domain.scanCard.ScanCardProcessor
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.totalFiatBalanceCalculator
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletStoresManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import org.rekotlin.Middleware
+import timber.log.Timber
+import java.math.BigDecimal
+
+internal class WalletSelectorMiddleware {
+    val middleware: Middleware<AppState> = { _, appStateProvider ->
+        { next ->
+            { action ->
+                val appState = appStateProvider()
+                if (action is WalletSelectorAction && appState != null) {
+                    handleAction(action, appState.walletSelectorState)
+                }
+                next(action)
+            }
+        }
+    }
+
+    private fun handleAction(action: WalletSelectorAction, state: WalletSelectorState) {
+        when (action) {
+            is WalletSelectorAction.UserWalletsLoaded -> {
+                fetchWalletStores(action.userWallets)
+            }
+            is WalletSelectorAction.WalletStoresChanged -> {
+                updateBalances(action.walletsStores, state)
+            }
+            is WalletSelectorAction.UnlockWithBiometry -> {
+                unlockWalletsWithBiometry()
+            }
+            is WalletSelectorAction.AddWallet -> {
+                addWallet()
+            }
+            is WalletSelectorAction.SelectWallet -> {
+                selectWallet(action.userWalletId)
+            }
+            is WalletSelectorAction.RemoveWallets -> {
+                deleteWallets(action.userWalletsIds, state)
+            }
+            is WalletSelectorAction.RenameWallet -> {
+                renameWallet(action.userWalletId, action.newName)
+            }
+            is WalletSelectorAction.ChangeAppCurrency -> {
+                refreshUserWalletsAmounts()
+            }
+            is WalletSelectorAction.AddWallet.Success,
+            is WalletSelectorAction.AddWallet.Error,
+            is WalletSelectorAction.SelectedWalletChanged,
+            is WalletSelectorAction.UnlockWithBiometry.Error,
+            is WalletSelectorAction.UnlockWithBiometry.Success,
+            is WalletSelectorAction.BalanceLoaded,
+            is WalletSelectorAction.IsLockedChanged,
+            is WalletSelectorAction.HandleError,
+            is WalletSelectorAction.CloseError,
+            -> Unit
+        }
+    }
+
+    private fun fetchWalletStores(userWallets: List<UserWallet>) {
+        scope.launch {
+            walletStoresManager.fetch(userWallets)
+                .doOnFailure { error ->
+                    Timber.e(error, "Unable to fetch wallet stores")
+                    store.dispatchOnMain(WalletSelectorAction.HandleError(error))
+                }
+        }
+    }
+
+    private fun updateBalances(walletStores: Map<UserWalletId, List<WalletStoreModel>>, state: WalletSelectorState) {
+        walletStores.forEach { (walletId, walletStores) ->
+            scope.launch(Dispatchers.Default) {
+                val foundWallet = state.wallets
+                    .find { it.id == walletId }
+
+                if (foundWallet != null) {
+                    val updatedWallet = foundWallet
+                        .updateWalletStoresAndCalculateFiatBalance(walletStores)
+
+                    if (foundWallet != updatedWallet) {
+                        store.dispatchOnMain(WalletSelectorAction.BalanceLoaded(updatedWallet))
+                    }
+                }
+            }
+        }
+    }
+
+    private fun unlockWalletsWithBiometry() {
+        Analytics.send(MyWallets.Button.UnlockWithBiometrics)
+
+        scope.launch {
+            userWalletsListManager.unlockWithBiometry()
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WalletSelectorAction.UnlockWithBiometry.Error(error))
+                }
+                .doOnSuccess {
+                    store.dispatchOnMain(WalletSelectorAction.UnlockWithBiometry.Success)
+                }
+        }
+    }
+
+    private fun addWallet() = scope.launch {
+        Analytics.send(MyWallets.Button.ScanNewCard)
+
+        val prevUseBiometricsForAccessCode = tangemSdkManager.useBiometricsForAccessCode()
+
+        // Update access code policy for access code saving when a card was scanned
+        tangemSdkManager.setAccessCodeRequestPolicy(
+            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
+        )
+        ScanCardProcessor.scan(
+            onSuccess = { scanResponse ->
+                saveUserWalletAndPopBackToWalletScreen(scanResponse)
+                    .doOnFailure { error ->
+                        // Rollback policy if card saving was failed
+                        tangemSdkManager.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                        store.dispatchOnMain(WalletSelectorAction.AddWallet.Error(error))
+                    }
+            },
+            onFailure = { error ->
+                // Rollback policy if card scanning was failed
+                tangemSdkManager.setAccessCodeRequestPolicy(prevUseBiometricsForAccessCode)
+                store.dispatchOnMain(WalletSelectorAction.AddWallet.Error(error))
+            },
+            onWalletNotCreated = {
+                // No need to rollback policy, continue with the policy set before the card scan
+                store.dispatchOnMain(WalletSelectorAction.AddWallet.Success)
+                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+            },
+        )
+    }
+
+    private suspend fun saveUserWalletAndPopBackToWalletScreen(scanResponse: ScanResponse): CompletionResult<Unit> {
+        val userWallet = UserWalletBuilder(scanResponse).build()
+            ?: return CompletionResult.Failure(TangemSdkError.WalletIsNotCreated())
+
+        return userWalletsListManager.save(userWallet)
+            .doOnSuccess {
+                Analytics.send(MyWallets.CardWasScanned)
+
+                store.dispatchOnMain(WalletSelectorAction.AddWallet.Success)
+                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                store.onUserWalletSelected(userWallet)
+            }
+    }
+
+    private fun selectWallet(userWalletId: UserWalletId) {
+        scope.launch {
+            userWalletsListManager.get(userWalletId)
+                .flatMap { userWallet ->
+                    if (userWallet.isLocked) {
+                        unlockUserWalletWithScannedCard(userWallet)
+                    } else {
+                        userWalletsListManager.selectWallet(userWalletId)
+                    }
+                }
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WalletSelectorAction.HandleError(error))
+                }
+                .doOnSuccess {
+                    val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+                    if (selectedUserWallet != null) {
+                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                        store.onUserWalletSelected(selectedUserWallet)
+                    }
+                }
+        }
+    }
+
+    private suspend fun unlockUserWalletWithScannedCard(userWallet: UserWallet): CompletionResult<Unit> {
+        tangemSdkManager.changeDisplayedCardIdNumbersCount(userWallet.scanResponse)
+        return tangemSdkManager.scanCard(userWallet.cardId)
+            .map { scannedCard ->
+                userWallet.copy(
+                    scanResponse = userWallet.scanResponse.copy(
+                        card = scannedCard,
+                    ),
+                )
+            }
+            .flatMap { updatedUserWallet ->
+                userWalletsListManager.save(updatedUserWallet, canOverride = true)
+            }
+            .doOnFailure {
+                tangemSdkManager.changeDisplayedCardIdNumbersCount(
+                    scanResponse = userWalletsListManager.selectedUserWalletSync?.scanResponse,
+                )
+            }
+    }
+
+    private fun deleteWallets(userWalletsIds: List<UserWalletId>, state: WalletSelectorState) {
+        Analytics.send(MyWallets.Button.DeleteWalletTapped)
+
+        scope.launch {
+            when (userWalletsIds.size) {
+                state.wallets.size -> clearUserWallets()
+                else -> deleteUserWallets(
+                    userWalletsIds = userWalletsIds,
+                    currentSelectedWalletId = state.selectedWalletId,
+                )
+            }
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WalletSelectorAction.HandleError(error))
+                }
+        }
+    }
+
+    private fun renameWallet(userWalletId: UserWalletId, newName: String) {
+        Analytics.send(MyWallets.Button.EditWalletTapped)
+
+        scope.launch {
+            userWalletsListManager.update(userWalletId) { it.copy(name = newName) }
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WalletSelectorAction.HandleError(error))
+                }
+        }
+    }
+
+    private fun refreshUserWalletsAmounts() {
+        scope.launch {
+            walletStoresManager.updateAmounts(
+                userWallets = userWalletsListManager.userWallets.first(),
+            )
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WalletSelectorAction.HandleError(error))
+                }
+        }
+    }
+
+    private suspend fun clearUserWallets(): CompletionResult<Unit> {
+        return userWalletsListManager.clear()
+            .flatMap { walletStoresManager.clear() }
+            .flatMap { tangemSdkManager.clearSavedUserCodes() }
+            .doOnSuccess {
+                // !!! Workaround !!!
+                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
+                delay(timeMillis = 280)
+                store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Home))
+            }
+    }
+
+    private suspend fun deleteUserWallets(
+        userWalletsIds: List<UserWalletId>,
+        currentSelectedWalletId: UserWalletId?,
+    ): CompletionResult<Unit> {
+        return userWalletsListManager.delete(userWalletsIds)
+            .flatMap { walletStoresManager.delete(userWalletsIds) }
+            .flatMap { deleteAccessCodes(userWalletsIds) }
+            .doOnSuccess {
+                val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
+
+                when {
+                    selectedUserWallet == null -> {
+                        store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Welcome))
+                    }
+
+                    currentSelectedWalletId != selectedUserWallet.walletId -> {
+                        store.onUserWalletSelected(selectedUserWallet)
+                    }
+                }
+            }
+    }
+
+    private suspend fun deleteAccessCodes(userWalletsIds: List<UserWalletId>): CompletionResult<Unit> {
+        val cardsIds = userWalletsListManager.userWallets.firstOrNull()
+            ?.asSequence()
+            ?.filter { it.walletId in userWalletsIds }
+            ?.flatMap { it.cardsInWallet }
+            ?.toSet()
+
+        return if (cardsIds.isNullOrEmpty()) {
+            CompletionResult.Success(Unit)
+        } else {
+            tangemSdkManager.deleteSavedUserCodes(cardsIds.toSet())
+        }
+    }
+
+    private suspend fun UserWalletModel.updateWalletStoresAndCalculateFiatBalance(
+        walletStores: List<WalletStoreModel>,
+    ): UserWalletModel {
+        return this.copy(
+            type = when (type) {
+                is UserWalletModel.Type.MultiCurrency -> type.copy(
+                    tokensCount = walletStores.flatMap { it.walletsData }.size,
+                )
+                is UserWalletModel.Type.SingleCurrency -> type
+            },
+            fiatBalance = totalFiatBalanceCalculator.calculate(
+                prevAmount = fiatBalance.amount,
+                walletStores = walletStores,
+                initial = TotalFiatBalance.Loaded(BigDecimal.ZERO),
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt
new file mode 100644
index 0000000000..b64fe0a3ce
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorReducer.kt
@@ -0,0 +1,115 @@
+package com.tangem.tap.features.walletSelector.redux
+
+import com.tangem.domain.common.CardDTO
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.domain.model.UserWallet
+import org.rekotlin.Action
+
+internal object WalletSelectorReducer {
+    fun reduce(action: Action, state: AppState): WalletSelectorState {
+        return if (action is WalletSelectorAction) {
+            internalReduce(action, state.walletSelectorState)
+        } else state.walletSelectorState
+    }
+
+    private fun internalReduce(action: WalletSelectorAction, state: WalletSelectorState): WalletSelectorState {
+        return when (action) {
+            is WalletSelectorAction.UserWalletsLoaded -> state.copy(
+                wallets = action.userWallets.updateWalletsModels(state.wallets),
+            )
+            is WalletSelectorAction.SelectedWalletChanged -> state.copy(
+                selectedWalletId = action.selectedWallet.walletId,
+            )
+            is WalletSelectorAction.IsLockedChanged -> state.copy(
+                isLocked = action.isLocked,
+            )
+            is WalletSelectorAction.BalanceLoaded -> state.copy(
+                wallets = state.wallets.updateWithBalance(action.userWalletModel),
+            )
+            is WalletSelectorAction.HandleError -> state.copy(error = action.error)
+            is WalletSelectorAction.CloseError -> state.copy(error = null)
+            is WalletSelectorAction.UnlockWithBiometry -> state.copy(
+                isUnlockInProgress = true,
+            )
+            is WalletSelectorAction.UnlockWithBiometry.Error -> state.copy(
+                isUnlockInProgress = false,
+                error = action.error,
+            )
+            is WalletSelectorAction.UnlockWithBiometry.Success -> state.copy(
+                isUnlockInProgress = false,
+            )
+            is WalletSelectorAction.AddWallet -> state.copy(
+                isCardSavingInProgress = true,
+            )
+            is WalletSelectorAction.AddWallet.Error -> state.copy(
+                isCardSavingInProgress = false,
+                error = action.error,
+            )
+            is WalletSelectorAction.AddWallet.Success -> state.copy(
+                isCardSavingInProgress = false,
+            )
+            is WalletSelectorAction.ChangeAppCurrency -> state.copy(
+                fiatCurrency = action.fiatCurrency,
+            )
+            is WalletSelectorAction.WalletStoresChanged,
+            is WalletSelectorAction.SelectWallet,
+            is WalletSelectorAction.RemoveWallets,
+            is WalletSelectorAction.RenameWallet,
+            -> state
+        }
+    }
+
+    private fun List<UserWallet>.updateWalletsModels(prevWallets: List<UserWalletModel>): List<UserWalletModel> {
+        return this.map { userWallet ->
+            prevWallets
+                .find { it.id == userWallet.walletId }
+                ?.let {
+                    it.copy(
+                        name = userWallet.name,
+                        artworkUrl = userWallet.artworkUrl,
+                        isLocked = userWallet.isLocked,
+                        type = userWallet.getType(prevType = it.type),
+                    )
+                }
+                ?: with(userWallet) {
+                    UserWalletModel(
+                        id = walletId,
+                        name = name,
+                        artworkUrl = artworkUrl,
+                        type = getType(),
+                        fiatBalance = TotalFiatBalance.Loading,
+                        isLocked = isLocked,
+                    )
+                }
+        }
+    }
+
+    private fun List<UserWalletModel>.updateWithBalance(
+        userWalletModel: UserWalletModel,
+    ): List<UserWalletModel> {
+        return ArrayList(this).apply {
+            val index = indexOfFirst { it.id == userWalletModel.id }
+            if (index == -1) {
+                add(userWalletModel)
+            } else {
+                this[index] = userWalletModel
+            }
+        }
+    }
+
+    private fun UserWallet.getType(prevType: UserWalletModel.Type? = null): UserWalletModel.Type {
+        return if (isMultiCurrency) {
+            UserWalletModel.Type.MultiCurrency(
+                cardsInWallet = (scanResponse.card.backupStatus as? CardDTO.BackupStatus.Active)
+                    ?.cardCount?.inc()
+                    ?: 1,
+                tokensCount = (prevType as? UserWalletModel.Type.MultiCurrency)?.tokensCount ?: 0,
+            )
+        } else {
+            UserWalletModel.Type.SingleCurrency(
+                blockchainName = scanResponse.getBlockchain().fullName,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorState.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorState.kt
new file mode 100644
index 0000000000..797cc04593
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorState.kt
@@ -0,0 +1,16 @@
+package com.tangem.tap.features.walletSelector.redux
+
+import com.tangem.common.core.TangemError
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.entities.FiatCurrency
+import org.rekotlin.StateType
+
+data class WalletSelectorState(
+    val wallets: List<UserWalletModel> = emptyList(),
+    val selectedWalletId: UserWalletId? = null,
+    val isLocked: Boolean = false,
+    val fiatCurrency: FiatCurrency = FiatCurrency.Default,
+    val isCardSavingInProgress: Boolean = false,
+    val isUnlockInProgress: Boolean = false,
+    val error: TangemError? = null,
+) : StateType
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/Mapper.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/Mapper.kt
new file mode 100644
index 0000000000..e5dc088a55
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/Mapper.kt
@@ -0,0 +1,78 @@
+package com.tangem.tap.features.walletSelector.ui
+
+import com.tangem.tap.common.entities.FiatCurrency
+import com.tangem.tap.common.extensions.toFormattedFiatValue
+import com.tangem.tap.domain.model.TotalFiatBalance
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.walletSelector.redux.UserWalletModel
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorState
+import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.SingleCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.UserWalletItem
+
+internal fun WalletSelectorScreenState.updateWithNewState(
+    newState: WalletSelectorState,
+): WalletSelectorScreenState {
+    val walletsUi = newState.wallets.toUiModels(newState.fiatCurrency)
+    val walletsIds = walletsUi.map { it.id }
+    val multiCurrencyWallets = arrayListOf<MultiCurrencyUserWalletItem>()
+    val singleCurrencyWallets = arrayListOf<SingleCurrencyUserWalletItem>()
+    walletsUi.forEach { wallet ->
+        when (wallet) {
+            is MultiCurrencyUserWalletItem -> {
+                multiCurrencyWallets.add(wallet)
+            }
+            is SingleCurrencyUserWalletItem -> {
+                singleCurrencyWallets.add(wallet)
+            }
+        }
+    }
+
+    return this.copy(
+        multiCurrencyWallets = multiCurrencyWallets,
+        singleCurrencyWallets = singleCurrencyWallets,
+        selectedUserWalletId = newState.selectedWalletId,
+        editingUserWalletsIds = editingUserWalletsIds.filter { it in walletsIds },
+        isLocked = newState.isLocked,
+        showUnlockProgress = newState.isUnlockInProgress,
+        showAddCardProgress = newState.isCardSavingInProgress,
+        error = newState.error
+            ?.takeUnless { it.silent }
+            ?.let { error ->
+                error.messageResId?.let { TextReference.Res(it) }
+                    ?: TextReference.Str(error.customMessage)
+            },
+    )
+}
+
+private fun List<UserWalletModel>.toUiModels(
+    appCurrency: FiatCurrency,
+): Sequence<UserWalletItem> {
+    return this.asSequence().map { userWalletModel ->
+        with(userWalletModel) {
+            val balance = UserWalletItem.Balance(
+                amount = fiatBalance.amount.toFormattedFiatValue(appCurrency.symbol),
+                isLoading = fiatBalance is TotalFiatBalance.Loading,
+            )
+            when (type) {
+                is UserWalletModel.Type.MultiCurrency -> MultiCurrencyUserWalletItem(
+                    id = id,
+                    name = name,
+                    imageUrl = artworkUrl,
+                    balance = balance,
+                    isLocked = isLocked,
+                    cardsInWallet = type.cardsInWallet,
+                    tokensCount = type.tokensCount,
+                )
+                is UserWalletModel.Type.SingleCurrency -> SingleCurrencyUserWalletItem(
+                    id = id,
+                    name = name,
+                    imageUrl = artworkUrl,
+                    balance = balance,
+                    isLocked = isLocked,
+                    tokenName = type.blockchainName,
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorBottomSheetFragment.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorBottomSheetFragment.kt
new file mode 100644
index 0000000000..4db33980de
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorBottomSheetFragment.kt
@@ -0,0 +1,89 @@
+package com.tangem.tap.features.walletSelector.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.SnackbarHost
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
+import androidx.fragment.app.viewModels
+import com.tangem.core.ui.fragments.ComposeBottomSheetFragment
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.MyWallets
+import com.tangem.tap.features.details.ui.cardsettings.resolveReference
+import com.tangem.tap.features.walletSelector.ui.components.RenameWalletDialogContent
+import com.tangem.tap.features.walletSelector.ui.components.WalletSelectorScreenContent
+import com.tangem.tap.features.walletSelector.ui.model.RenameWalletDialog
+
+internal class WalletSelectorBottomSheetFragment : ComposeBottomSheetFragment<WalletSelectorScreenState>() {
+    private val viewModel by viewModels<WalletSelectorViewModel>()
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        Analytics.send(MyWallets.MyWalletsScreenOpened)
+
+        return super.onCreateDialog(savedInstanceState)
+    }
+
+    @Composable
+    override fun provideState(): State<WalletSelectorScreenState> {
+        return viewModel.state.collectAsState()
+    }
+
+    @OptIn(ExperimentalComposeUiApi::class)
+    @Composable
+    override fun ScreenContent(modifier: Modifier, state: WalletSelectorScreenState) {
+        val snackbarHostState = remember { SnackbarHostState() }
+        val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
+        val renameWalletDialog by rememberUpdatedState(newValue = state.renameWalletDialog)
+
+        Box(modifier = modifier.nestedScroll(rememberNestedScrollInteropConnection())) {
+            WalletSelectorScreenContent(
+                state = state,
+                onWalletClick = viewModel::walletClicked,
+                onWalletLongClick = viewModel::walletLongClicked,
+                onUnlockClick = viewModel::unlock,
+                onAddCardClick = viewModel::addWallet,
+                onClearSelectedClick = viewModel::cancelWalletsEditing,
+                onEditSelectedWalletClick = viewModel::renameWallet,
+                onDeleteSelectedWalletsClick = viewModel::deleteWallets,
+            )
+
+            SnackbarHost(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(vertical = TangemTheme.dimens.spacing16)
+                    .fillMaxWidth(),
+                hostState = snackbarHostState,
+            )
+        }
+
+        RenameWalletDialog(dialog = renameWalletDialog)
+
+        LaunchedEffect(key1 = errorMessage) {
+            errorMessage?.let {
+                snackbarHostState.showSnackbar(it)
+                viewModel.closeError()
+            }
+        }
+    }
+
+    @Composable
+    private fun RenameWalletDialog(modifier: Modifier = Modifier, dialog: RenameWalletDialog?) {
+        if (dialog == null) return
+        RenameWalletDialogContent(modifier, dialog)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorScreenState.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorScreenState.kt
new file mode 100644
index 0000000000..1831d16240
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorScreenState.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.features.walletSelector.ui
+
+import androidx.compose.runtime.Immutable
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.RenameWalletDialog
+import com.tangem.tap.features.walletSelector.ui.model.SingleCurrencyUserWalletItem
+
+@Immutable
+internal data class WalletSelectorScreenState(
+    val multiCurrencyWallets: List<MultiCurrencyUserWalletItem> = emptyList(),
+    val singleCurrencyWallets: List<SingleCurrencyUserWalletItem> = emptyList(),
+    val selectedUserWalletId: UserWalletId? = null,
+    val isLocked: Boolean = false,
+    val editingUserWalletsIds: List<UserWalletId> = listOf(),
+    val renameWalletDialog: RenameWalletDialog? = null,
+    val showAddCardProgress: Boolean = false,
+    val showUnlockProgress: Boolean = false,
+    val error: TextReference? = null,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorViewModel.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorViewModel.kt
new file mode 100644
index 0000000000..52a99013e3
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/WalletSelectorViewModel.kt
@@ -0,0 +1,181 @@
+package com.tangem.tap.features.walletSelector.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorAction
+import com.tangem.tap.features.walletSelector.redux.WalletSelectorState
+import com.tangem.tap.features.walletSelector.ui.model.RenameWalletDialog
+import com.tangem.tap.store
+import com.tangem.tap.userWalletsListManager
+import com.tangem.tap.walletStoresManager
+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 org.rekotlin.StoreSubscriber
+
+internal class WalletSelectorViewModel : ViewModel(), StoreSubscriber<WalletSelectorState> {
+    private val stateInternal = MutableStateFlow(WalletSelectorScreenState())
+    val state: StateFlow<WalletSelectorScreenState> = stateInternal
+
+    init {
+        subscribeToStoreChanges()
+        bootstrapWalletListChanges()
+        bootstrapWalletsStoresChanges()
+        bootstrapAppFiatCurrency()
+    }
+
+    fun unlock() {
+        store.dispatch(WalletSelectorAction.UnlockWithBiometry)
+    }
+
+    fun addWallet() {
+        store.dispatch(WalletSelectorAction.AddWallet)
+    }
+
+    fun walletClicked(userWalletId: UserWalletId) = with(state.value) {
+        when {
+            editingUserWalletsIds.isNotEmpty() && !editingUserWalletsIds.contains(userWalletId) -> {
+                editWallet(userWalletId)
+            }
+            editingUserWalletsIds.isNotEmpty() && editingUserWalletsIds.contains(userWalletId) -> {
+                cancelWalletEditing(userWalletId)
+            }
+            selectedUserWalletId != userWalletId -> {
+                store.dispatch(WalletSelectorAction.SelectWallet(userWalletId))
+            }
+        }
+    }
+
+    fun walletLongClicked(userWalletId: UserWalletId) = with(state.value) {
+        if (editingUserWalletsIds.isEmpty()) {
+            editWallet(userWalletId)
+        }
+    }
+
+    fun cancelWalletsEditing() {
+        stateInternal.update { prevState ->
+            prevState.copy(
+                editingUserWalletsIds = emptyList(),
+            )
+        }
+    }
+
+    fun renameWallet() = with(state.value) {
+        if (editingUserWalletsIds.isNotEmpty() && renameWalletDialog == null) {
+            val editedUserWalletId = editingUserWalletsIds.first()
+            val editedUserWallet = (multiCurrencyWallets + singleCurrencyWallets)
+                .find { it.id == editedUserWalletId }
+
+            if (editedUserWallet != null) {
+                val dialog = RenameWalletDialog(
+                    currentName = editedUserWallet.name,
+                    onApply = { newName ->
+                        store.dispatch(WalletSelectorAction.RenameWallet(editedUserWalletId, newName))
+                        stateInternal.update { prevState ->
+                            prevState.copy(
+                                renameWalletDialog = null,
+                                editingUserWalletsIds = emptyList(),
+                            )
+                        }
+                    },
+                    onCancel = {
+                        stateInternal.update { prevState ->
+                            prevState.copy(
+                                renameWalletDialog = null,
+                            )
+                        }
+                    },
+                )
+
+                stateInternal.update { prevState ->
+                    prevState.copy(
+                        renameWalletDialog = dialog,
+                    )
+                }
+            }
+        }
+    }
+
+    fun deleteWallets() = with(state.value) {
+        if (editingUserWalletsIds.isNotEmpty()) {
+            store.dispatch(WalletSelectorAction.RemoveWallets(userWalletsIds = editingUserWalletsIds))
+        }
+    }
+
+    fun closeError() {
+        store.dispatch(WalletSelectorAction.CloseError)
+    }
+
+    override fun newState(state: WalletSelectorState) {
+        stateInternal.update { prevState ->
+            prevState.updateWithNewState(state)
+        }
+    }
+
+    override fun onCleared() {
+        store.unsubscribe(this)
+    }
+
+    private fun editWallet(userWalletId: UserWalletId) {
+        stateInternal.update { prevState ->
+            prevState.copy(
+                editingUserWalletsIds = prevState.editingUserWalletsIds + userWalletId,
+            )
+        }
+    }
+
+    private fun cancelWalletEditing(userWalletId: UserWalletId) {
+        stateInternal.update { prevState ->
+            prevState.copy(
+                editingUserWalletsIds = prevState.editingUserWalletsIds - userWalletId,
+            )
+        }
+    }
+
+    private fun subscribeToStoreChanges() {
+        store.subscribe(this) { appState ->
+            appState.skip { old, new -> old.walletSelectorState == new.walletSelectorState }
+                .select { it.walletSelectorState }
+        }
+    }
+
+    private fun bootstrapWalletListChanges() {
+        userWalletsListManager.userWallets
+            .onEach {
+                store.dispatchOnMain(WalletSelectorAction.UserWalletsLoaded(userWallets = it))
+            }
+            .launchIn(viewModelScope)
+
+        userWalletsListManager.selectedUserWallet
+            .onEach {
+                store.dispatchOnMain(WalletSelectorAction.SelectedWalletChanged(selectedWallet = it))
+            }
+            .launchIn(viewModelScope)
+
+        userWalletsListManager.isLocked
+            .onEach {
+                store.dispatchOnMain(WalletSelectorAction.IsLockedChanged(isLocked = it))
+            }
+            .launchIn(viewModelScope)
+    }
+
+    private fun bootstrapWalletsStoresChanges() {
+        walletStoresManager.getAll()
+            .onEach { walletStores ->
+                store.dispatchOnMain(WalletSelectorAction.WalletStoresChanged(walletStores))
+            }
+            .launchIn(viewModelScope)
+    }
+
+    private fun bootstrapAppFiatCurrency() {
+        store.dispatch(
+            WalletSelectorAction.ChangeAppCurrency(
+                fiatCurrency = store.state.globalState.appCurrency,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/MockData.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/MockData.kt
new file mode 100644
index 0000000000..65349386dc
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/MockData.kt
@@ -0,0 +1,45 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.features.walletSelector.ui.WalletSelectorScreenState
+import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.SingleCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.UserWalletItem
+
+internal object MockData {
+    private val multiCurrencyUserWallet = MultiCurrencyUserWalletItem(
+        id = UserWalletId("wallet_1"),
+        balance = UserWalletItem.Balance(
+            amount = "6781.05 $",
+            isLoading = false,
+        ),
+        name = "Wallet",
+        imageUrl = "https://app.tangem.com/cards/card_default.png",
+        isLocked = false,
+        tokensCount = 12,
+        cardsInWallet = 3,
+    )
+
+    private val singleCurrencyUserWallet = SingleCurrencyUserWalletItem(
+        id = UserWalletId("wallet_4"),
+        balance = UserWalletItem.Balance(
+            amount = "6781.05 $",
+            isLoading = false,
+        ),
+        name = "Wallet",
+        imageUrl = "https://app.tangem.com/cards/card_default.png",
+        isLocked = false,
+        tokenName = "Ethereum",
+    )
+
+    val state = WalletSelectorScreenState(
+        multiCurrencyWallets = listOf(
+            multiCurrencyUserWallet,
+            multiCurrencyUserWallet.copy(id = UserWalletId("wallet_2")),
+            multiCurrencyUserWallet.copy(id = UserWalletId("wallet_3"), tokensCount = 2, cardsInWallet = 1),
+        ),
+        singleCurrencyWallets = listOf(singleCurrencyUserWallet),
+        selectedUserWalletId = multiCurrencyUserWallet.id,
+        isLocked = false,
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RenameWalletDialogContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RenameWalletDialogContent.kt
new file mode 100644
index 0000000000..f6aa55d7a0
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/RenameWalletDialogContent.kt
@@ -0,0 +1,111 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Dialog
+import com.tangem.core.ui.components.OutlineTextField
+import com.tangem.core.ui.components.SpacerH16
+import com.tangem.core.ui.components.SpacerH24
+import com.tangem.core.ui.components.SpacerW8
+import com.tangem.core.ui.components.TextButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.walletSelector.ui.model.RenameWalletDialog
+import com.tangem.wallet.R
+
+@Composable
+internal fun RenameWalletDialogContent(
+    modifier: Modifier = Modifier,
+    dialog: RenameWalletDialog,
+) {
+    Dialog(onDismissRequest = dialog.onCancel) {
+        Column(
+            modifier = modifier
+                .background(
+                    shape = TangemTheme.shapes.roundedCornersLarge,
+                    color = TangemTheme.colors.background.plain,
+                )
+                .padding(all = TangemTheme.dimens.spacing24),
+        ) {
+            var value by remember {
+                mutableStateOf(TextFieldValue(text = dialog.currentName))
+            }
+
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(R.string.user_wallet_list_rename_popup_title),
+                style = TangemTheme.typography.h3,
+                color = TangemTheme.colors.text.primary1,
+            )
+            SpacerH16()
+            OutlineTextField(
+                value = value,
+                label = stringResource(R.string.user_wallet_list_rename_popup_placeholder),
+                onValueChange = { newValue ->
+                    value = newValue
+                },
+            )
+            SpacerH24()
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.End,
+            ) {
+                TextButton(
+                    text = stringResource(id = R.string.common_cancel),
+                    onClick = dialog.onCancel,
+                )
+                SpacerW8()
+                TextButton(
+                    text = stringResource(id = R.string.common_save),
+                    enabled = value.text.isNotEmpty() && value.text != dialog.currentName,
+                    onClick = {
+                        dialog.onApply(value.text)
+                    },
+                )
+            }
+        }
+    }
+}
+
+// region Preview
+@Composable
+private fun RenameWalletDialogContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        RenameWalletDialogContent(dialog = RenameWalletDialog("", {}, {}))
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun RenameWalletDialogContentPreview_Light() {
+    TangemTheme {
+        RenameWalletDialogContentSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun RenameWalletDialogContentPreview_Dark() {
+    TangemTheme(isDark = true) {
+        RenameWalletDialogContentSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
new file mode 100644
index 0000000000..7897e34ae6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt
@@ -0,0 +1,345 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.ExperimentalFoundationApi
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.PrimaryButton
+import com.tangem.core.ui.components.SecondaryButtonIconRight
+import com.tangem.core.ui.components.SpacerWMax
+import com.tangem.core.ui.components.atoms.Hand
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.features.walletSelector.ui.WalletSelectorScreenState
+import com.tangem.wallet.R
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun WalletSelectorScreenContent(
+    state: WalletSelectorScreenState,
+    onWalletClick: (UserWalletId) -> Unit,
+    onWalletLongClick: (UserWalletId) -> Unit,
+    onUnlockClick: () -> Unit,
+    onAddCardClick: () -> Unit,
+    onClearSelectedClick: () -> Unit,
+    onEditSelectedWalletClick: () -> Unit,
+    onDeleteSelectedWalletsClick: () -> Unit,
+) {
+    LazyColumn {
+        stickyHeader {
+            Header(
+                editingWalletsIds = state.editingUserWalletsIds,
+                onClearSelectedClick = onClearSelectedClick,
+                onEditSelectedWalletClick = onEditSelectedWalletClick,
+                onDeleteSelectedWalletsClick = onDeleteSelectedWalletsClick,
+            )
+        }
+
+        item {
+            WalletsTitle(textResId = R.string.user_wallet_list_multi_header, wallets = state.multiCurrencyWallets)
+        }
+
+        itemsIndexed(
+            items = state.multiCurrencyWallets,
+            key = { _, wallet -> wallet.id.stringValue },
+        ) { _, wallet ->
+
+            WalletItem(
+                wallet = wallet,
+                isSelected = remember(state.selectedUserWalletId) { wallet.id == state.selectedUserWalletId },
+                isChecked = remember(state.editingUserWalletsIds) { wallet.id in state.editingUserWalletsIds },
+                onWalletClick = onWalletClick,
+                onWalletLongClick = onWalletLongClick,
+            )
+        }
+
+        item {
+            WalletsTitle(textResId = R.string.user_wallet_list_single_header, wallets = state.singleCurrencyWallets)
+        }
+
+        itemsIndexed(
+            items = state.singleCurrencyWallets,
+            key = { _, wallet -> wallet.id.stringValue },
+        ) { _, wallet ->
+            WalletItem(
+                wallet = wallet,
+                isSelected = remember(state.selectedUserWalletId) { wallet.id == state.selectedUserWalletId },
+                isChecked = remember(state.editingUserWalletsIds) { wallet.id in state.editingUserWalletsIds },
+                onWalletClick = onWalletClick,
+                onWalletLongClick = onWalletLongClick,
+            )
+        }
+
+        item {
+            Footer(
+                modifier = Modifier
+                    .padding(
+                        top = dimensionResource(id = R.dimen.spacing24),
+                        bottom = dimensionResource(id = R.dimen.spacing16),
+                    )
+                    .padding(horizontal = TangemTheme.dimens.spacing16)
+                    .fillMaxWidth(),
+                isLocked = state.isLocked,
+                showUnlockProgress = state.showUnlockProgress,
+                showAddCardProgress = state.showAddCardProgress,
+                onUnlockClick = onUnlockClick,
+                onAddCardClick = onAddCardClick,
+            )
+        }
+    }
+}
+
+@Composable
+private fun Header(
+    editingWalletsIds: List<UserWalletId>,
+    onClearSelectedClick: () -> Unit,
+    onEditSelectedWalletClick: () -> Unit,
+    onDeleteSelectedWalletsClick: () -> Unit,
+) {
+    val editingWalletsSize by rememberUpdatedState(newValue = editingWalletsIds.size)
+    val hasEditingWallets by remember { derivedStateOf { editingWalletsSize > 0 } }
+
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(
+                color = TangemTheme.colors.background.plain,
+                shape = TangemTheme.shapes.bottomSheet,
+            ),
+    ) {
+        Hand()
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(TangemTheme.dimens.size44),
+            contentAlignment = Alignment.Center,
+        ) {
+            if (hasEditingWallets) {
+                EditWalletsBar(
+                    modifier = Modifier
+                        .padding(horizontal = TangemTheme.dimens.spacing16)
+                        .fillMaxWidth(),
+                    editingWalletsSize = editingWalletsSize,
+                    onClearSelectedClick = onClearSelectedClick,
+                    onEditSelectedWalletClick = onEditSelectedWalletClick,
+                    onDeleteSelectedWalletsClick = onDeleteSelectedWalletsClick,
+                )
+            } else {
+                Text(
+                    text = stringResource(R.string.user_wallet_list_title),
+                    style = TangemTheme.typography.subtitle1,
+                    color = TangemTheme.colors.text.primary1,
+                    textAlign = TextAlign.Center,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun WalletsTitle(@StringRes textResId: Int, wallets: List<*>) {
+    if (wallets.isNotEmpty()) {
+        Text(
+            modifier = Modifier.padding(start = TangemTheme.dimens.spacing16),
+            text = stringResource(id = textResId),
+            style = TangemTheme.typography.subtitle2,
+            color = TangemTheme.colors.text.tertiary,
+        )
+    }
+}
+
+@Composable
+private fun Footer(
+    modifier: Modifier = Modifier,
+    isLocked: Boolean,
+    showUnlockProgress: Boolean,
+    showAddCardProgress: Boolean,
+    onUnlockClick: () -> Unit,
+    onAddCardClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
+    ) {
+        if (isLocked) {
+            PrimaryButton(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(
+                    id = R.string.user_wallet_list_unlock_all,
+                    stringResource(id = R.string.common_biometrics),
+                ),
+                showProgress = showUnlockProgress,
+                onClick = onUnlockClick,
+            )
+        }
+        SecondaryButtonIconRight(
+            modifier = Modifier.fillMaxWidth(),
+            text = stringResource(R.string.user_wallet_list_add_button),
+            showProgress = showAddCardProgress,
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = onAddCardClick,
+        )
+    }
+}
+
+@Composable
+private fun EditWalletsBar(
+    modifier: Modifier = Modifier,
+    editingWalletsSize: Int,
+    onClearSelectedClick: () -> Unit,
+    onEditSelectedWalletClick: () -> Unit,
+    onDeleteSelectedWalletsClick: () -> Unit,
+) {
+    val showEditAction by remember(editingWalletsSize) {
+        derivedStateOf { editingWalletsSize in 1 until 2 }
+    }
+
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
+    ) {
+        IconButton(
+            modifier = Modifier.size(TangemTheme.dimens.size32),
+            onClick = onClearSelectedClick,
+        ) {
+            Icon(
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                painter = painterResource(id = R.drawable.ic_close),
+                tint = TangemTheme.colors.icon.primary1,
+                contentDescription = "Unselect wallets",
+            )
+        }
+        Text(
+            text = stringResource(id = R.string.user_wallet_list_editing_count, editingWalletsSize),
+            style = TangemTheme.typography.subtitle1,
+            color = TangemTheme.colors.text.primary1,
+        )
+        SpacerWMax()
+        if (showEditAction) {
+            IconButton(
+                modifier = Modifier.size(TangemTheme.dimens.size32),
+                onClick = onEditSelectedWalletClick,
+            ) {
+                Icon(
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    painter = painterResource(id = R.drawable.ic_pencil_outline_24),
+                    tint = TangemTheme.colors.icon.primary1,
+                    contentDescription = "Change wallet name",
+                )
+            }
+        }
+        IconButton(
+            modifier = Modifier.size(TangemTheme.dimens.size32),
+            onClick = onDeleteSelectedWalletsClick,
+        ) {
+            Icon(
+                modifier = Modifier.size(TangemTheme.dimens.size24),
+                painter = painterResource(id = R.drawable.ic_trash),
+                tint = TangemTheme.colors.icon.warning,
+                contentDescription = "Delete selected wallets",
+            )
+        }
+    }
+}
+
+// region Preview
+@Composable
+private fun WalletSelectorScreenContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(color = TangemTheme.colors.background.primary),
+    ) {
+        WalletSelectorScreenContent(
+            state = MockData.state.copy(isLocked = true),
+            onWalletClick = { /* no-op */ },
+            onWalletLongClick = { /* no-op */ },
+            onUnlockClick = { /* no-op */ },
+            onAddCardClick = { /* no-op */ },
+            onEditSelectedWalletClick = { /* no-op */ },
+            onClearSelectedClick = { /* no-op */ },
+            onDeleteSelectedWalletsClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WalletSelectorScreenContentPreview_Light() {
+    TangemTheme {
+        WalletSelectorScreenContentSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WalletSelectorScreenContentPreview_Dark() {
+    TangemTheme(isDark = true) {
+        WalletSelectorScreenContentSample()
+    }
+}
+
+@Composable
+private fun WalletSelectorScreenContent_EditWallets_Sample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        WalletSelectorScreenContent(
+            state = MockData.state
+                .copy(editingUserWalletsIds = listOf(MockData.state.multiCurrencyWallets[2].id)),
+            onWalletClick = { /* no-op */ },
+            onWalletLongClick = { /* no-op */ },
+            onUnlockClick = { /* no-op */ },
+            onAddCardClick = { /* no-op */ },
+            onEditSelectedWalletClick = { /* no-op */ },
+            onClearSelectedClick = { /* no-op */ },
+            onDeleteSelectedWalletsClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WalletSelectorScreenContent_EditWallets_Preview_Light() {
+    TangemTheme {
+        WalletSelectorScreenContent_EditWallets_Sample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WalletSelectorScreenContent_EditWallets_Preview_Dark() {
+    TangemTheme(isDark = true) {
+        WalletSelectorScreenContent_EditWallets_Sample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
new file mode 100644
index 0000000000..3b6f021dba
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WalletItem.kt
@@ -0,0 +1,352 @@
+package com.tangem.tap.features.walletSelector.ui.components
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import coil.compose.SubcomposeAsyncImage
+import coil.request.ImageRequest
+import com.tangem.core.ui.components.SpacerH2
+import com.tangem.core.ui.components.SpacerW6
+import com.tangem.core.ui.components.SpacerW8
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.domain.common.util.UserWalletId
+import com.tangem.tap.common.compose.TangemTypography
+import com.tangem.tap.features.walletSelector.ui.model.MultiCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.SingleCurrencyUserWalletItem
+import com.tangem.tap.features.walletSelector.ui.model.UserWalletItem
+import com.tangem.wallet.R
+import com.valentinilk.shimmer.shimmer
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+internal fun WalletItem(
+    wallet: UserWalletItem,
+    isSelected: Boolean,
+    isChecked: Boolean,
+    onWalletClick: (UserWalletId) -> Unit,
+    onWalletLongClick: (UserWalletId) -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .combinedClickable(
+                onClick = { onWalletClick(wallet.id) },
+                onLongClick = { onWalletLongClick(wallet.id) },
+            )
+            .height(72.dp)
+            .padding(all = TangemTheme.dimens.spacing16),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        WalletCardImage(
+            cardImageUrl = wallet.imageUrl,
+            isChecked = isChecked,
+            isSelected = isSelected,
+        )
+        SpacerW8()
+        WalletInfo(
+            modifier = Modifier.weight(weight = .6f),
+            wallet = wallet,
+            isSelected = isSelected,
+        )
+        SpacerW6()
+        TokensInfo(
+            modifier = Modifier.weight(weight = .4f),
+            isLocked = wallet.isLocked,
+            balance = wallet.balance,
+            tokensCount = (wallet as? MultiCurrencyUserWalletItem)?.tokensCount,
+        )
+    }
+}
+
+@Composable
+private fun WalletCardImage(
+    modifier: Modifier = Modifier,
+    cardImageUrl: String,
+    isChecked: Boolean,
+    isSelected: Boolean,
+) {
+    Box(
+        modifier = modifier
+            .width(TangemTheme.dimens.size62)
+            .height(TangemTheme.dimens.size42),
+    ) {
+        val cardImageModifier = Modifier
+            .align(Alignment.Center)
+            .width(TangemTheme.dimens.size56)
+            .height(TangemTheme.dimens.size32)
+            .clip(TangemTheme.shapes.roundedCornersSmall2)
+
+        val tintColor = TangemTheme.colors.icon.accent.copy(alpha = .6f)
+        val checkedColorFilter = remember(isChecked) {
+            if (isChecked) {
+                ColorFilter.tint(
+                    color = tintColor,
+                    blendMode = BlendMode.SrcOver,
+                )
+            } else null
+        }
+
+        SubcomposeAsyncImage(
+            modifier = cardImageModifier,
+            model = ImageRequest.Builder(LocalContext.current)
+                .data(cardImageUrl)
+                .crossfade(true)
+                .build(),
+            loading = { CardImageShimmer(modifier = cardImageModifier) },
+            error = { CardImagePlaceholder(modifier = cardImageModifier) },
+            colorFilter = checkedColorFilter,
+            contentDescription = null,
+        )
+
+        when {
+            isChecked -> {
+                CheckedWalletMark(
+                    modifier = Modifier.matchParentSize(),
+                )
+            }
+            isSelected -> {
+                SelectedWalletBadge(
+                    modifier = Modifier.align(Alignment.TopEnd),
+                )
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun WalletInfo(
+    modifier: Modifier = Modifier,
+    wallet: UserWalletItem,
+    isSelected: Boolean,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.SpaceAround,
+    ) {
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            text = wallet.name,
+            color = if (isSelected) TangemTheme.colors.text.accent else TangemTheme.colors.text.primary1,
+            style = TangemTypography.subtitle1,
+        )
+        SpacerH2()
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            text = when (wallet) {
+                is MultiCurrencyUserWalletItem -> pluralStringResource(
+                    id = R.plurals.card_label_card_count,
+                    count = wallet.cardsInWallet,
+                    wallet.cardsInWallet,
+                )
+                is SingleCurrencyUserWalletItem -> wallet.tokenName
+            },
+            style = TangemTheme.typography.caption,
+            color = TangemTheme.colors.text.tertiary,
+        )
+    }
+}
+
+@Composable
+private fun TokensInfo(
+    modifier: Modifier = Modifier,
+    isLocked: Boolean,
+    balance: UserWalletItem.Balance,
+    tokensCount: Int?,
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.SpaceAround,
+        horizontalAlignment = Alignment.End,
+    ) {
+        if (isLocked) {
+            LockedPlaceholder()
+        } else {
+            if (balance.isLoading) {
+                LoadingTokensInfo(
+                    isMultiCurrencyWallet = tokensCount != null,
+                )
+            } else {
+                LoadedTokensInfo(
+                    balanceAmount = balance.amount,
+                    tokensCount = tokensCount,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun LoadingTokensInfo(
+    modifier: Modifier = Modifier,
+    isMultiCurrencyWallet: Boolean,
+) {
+    Column(
+        modifier = modifier.shimmer(),
+        horizontalAlignment = Alignment.End,
+        verticalArrangement = Arrangement.SpaceAround,
+    ) {
+        Box(
+            modifier = Modifier
+                .width(TangemTheme.dimens.size62)
+                .height(TangemTheme.dimens.size16)
+                .background(
+                    color = TangemTheme.colors.button.secondary,
+                    shape = TangemTheme.shapes.roundedCornersSmall2,
+                ),
+        )
+        if (isMultiCurrencyWallet) {
+            SpacerH2()
+            Box(
+                modifier = Modifier
+                    .width(TangemTheme.dimens.size48)
+                    .height(TangemTheme.dimens.size12)
+                    .background(
+                        color = TangemTheme.colors.button.secondary,
+                        shape = TangemTheme.shapes.roundedCornersSmall2,
+                    ),
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun LoadedTokensInfo(
+    modifier: Modifier = Modifier,
+    balanceAmount: String,
+    tokensCount: Int?,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.End,
+    ) {
+        Text(
+            text = balanceAmount,
+            style = TangemTheme.typography.subtitle1,
+            color = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.End,
+        )
+        if (tokensCount != null) {
+            SpacerH2()
+            Text(
+                text = pluralStringResource(
+                    id = R.plurals.tokens_count,
+                    count = tokensCount,
+                    tokensCount,
+                ),
+                style = TangemTheme.typography.caption,
+                color = TangemTheme.colors.text.tertiary,
+                textAlign = TextAlign.End,
+            )
+        }
+    }
+}
+
+@Composable
+private fun LockedPlaceholder(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .padding(vertical = TangemTheme.dimens.spacing2)
+            .background(
+                color = TangemTheme.colors.button.secondary,
+                shape = TangemTheme.shapes.roundedCornersMedium,
+            ),
+    ) {
+        Icon(
+            modifier = Modifier
+                .padding(
+                    vertical = TangemTheme.dimens.spacing8,
+                    horizontal = TangemTheme.dimens.spacing12,
+                )
+                .size(TangemTheme.dimens.size20),
+            painter = painterResource(id = R.drawable.ic_locked_24),
+            tint = TangemTheme.colors.icon.primary1,
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun CardImagePlaceholder(
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier) {
+        Image(
+            modifier = Modifier.matchParentSize(),
+            painter = painterResource(id = R.drawable.card_placeholder_black),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun CardImageShimmer(
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier.shimmer()) {
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .background(TangemTheme.colors.button.secondary),
+        )
+    }
+}
+
+@Composable
+private fun SelectedWalletBadge(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .size(TangemTheme.dimens.size18)
+            .background(
+                color = Color.White,
+                shape = CircleShape,
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            modifier = Modifier.padding(all = (0.5).dp),
+            painter = painterResource(id = R.drawable.ic_check_circle_18),
+            tint = TangemTheme.colors.icon.accent,
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun CheckedWalletMark(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier,
+        contentAlignment = Alignment.Center,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_check_24),
+            tint = TangemTheme.colors.icon.primary2,
+            contentDescription = null,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/RenameWalletDialog.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/RenameWalletDialog.kt
new file mode 100644
index 0000000000..e3969634ce
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/RenameWalletDialog.kt
@@ -0,0 +1,10 @@
+package com.tangem.tap.features.walletSelector.ui.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+internal data class RenameWalletDialog(
+    val currentName: String,
+    val onApply: (newName: String) -> Unit,
+    val onCancel: () -> Unit,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/UserWalletItem.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/UserWalletItem.kt
new file mode 100644
index 0000000000..ddd7518ca6
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/model/UserWalletItem.kt
@@ -0,0 +1,35 @@
+package com.tangem.tap.features.walletSelector.ui.model
+
+import com.tangem.domain.common.util.UserWalletId
+
+internal sealed interface UserWalletItem {
+    val id: UserWalletId
+    val name: String
+    val imageUrl: String
+    val balance: Balance
+    val isLocked: Boolean
+
+    data class Balance(
+        val amount: String,
+        val isLoading: Boolean,
+    )
+}
+
+internal data class MultiCurrencyUserWalletItem(
+    override val id: UserWalletId,
+    override val name: String,
+    override val imageUrl: String,
+    override val balance: UserWalletItem.Balance,
+    override val isLocked: Boolean,
+    val tokensCount: Int,
+    val cardsInWallet: Int,
+) : UserWalletItem
+
+internal data class SingleCurrencyUserWalletItem(
+    override val id: UserWalletId,
+    override val name: String,
+    override val imageUrl: String,
+    override val balance: UserWalletItem.Balance,
+    override val isLocked: Boolean,
+    val tokenName: String,
+) : UserWalletItem
\ No newline at end of file
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
new file mode 100644
index 0000000000..681a3cea77
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.features.welcome.redux
+
+import android.content.Intent
+import com.tangem.common.core.TangemError
+import org.rekotlin.Action
+
+internal sealed interface WelcomeAction : Action {
+    object ProceedWithBiometrics : WelcomeAction {
+        object Success : WelcomeAction
+        data class Error(val error: TangemError) : WelcomeAction
+    }
+
+    object ProceedWithCard : WelcomeAction {
+        object Success : WelcomeAction
+        data class Error(val error: TangemError) : WelcomeAction
+    }
+
+    data class HandleDeepLink(val intent: Intent?) : WelcomeAction
+
+    object CloseError : WelcomeAction
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..e7cb2e01e7
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -0,0 +1,112 @@
+package com.tangem.tap.features.welcome.redux
+
+import android.content.Intent
+import com.tangem.common.doOnFailure
+import com.tangem.common.doOnSuccess
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.onUserWalletSelected
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.common.redux.navigation.AppScreen
+import com.tangem.tap.common.redux.navigation.NavigationAction
+import com.tangem.tap.domain.model.builders.UserWalletBuilder
+import com.tangem.tap.domain.scanCard.ScanCardProcessor
+import com.tangem.tap.intentHandler
+import com.tangem.tap.preferencesStorage
+import com.tangem.tap.scope
+import com.tangem.tap.store
+import com.tangem.tap.tangemSdkManager
+import com.tangem.tap.userWalletsListManager
+import kotlinx.coroutines.launch
+import org.rekotlin.Middleware
+
+internal class WelcomeMiddleware {
+    val middleware: Middleware<AppState> = { _, appStateProvider ->
+        { next ->
+            { action ->
+                val appState = appStateProvider()
+                if (action is WelcomeAction && appState != null) {
+                    handleAction(action, appState.welcomeState)
+                }
+                next(action)
+            }
+        }
+    }
+
+    private fun handleAction(action: WelcomeAction, state: WelcomeState) {
+        when (action) {
+            is WelcomeAction.ProceedWithBiometrics -> {
+                proceedWithBiometry(state)
+            }
+            is WelcomeAction.ProceedWithCard -> {
+                proceedWithCard(state)
+            }
+            is WelcomeAction.ProceedWithBiometrics.Error,
+            is WelcomeAction.ProceedWithCard.Error,
+            is WelcomeAction.ProceedWithBiometrics.Success,
+            is WelcomeAction.ProceedWithCard.Success,
+            is WelcomeAction.CloseError,
+            is WelcomeAction.HandleDeepLink,
+            -> Unit
+        }
+    }
+
+    private fun proceedWithBiometry(state: WelcomeState) {
+        scope.launch {
+            userWalletsListManager.unlockWithBiometry()
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics.Error(error))
+                }
+                .doOnSuccess { selectedUserWallet ->
+                    if (selectedUserWallet != null) {
+                        store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                        store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics.Success)
+                        store.onUserWalletSelected(selectedUserWallet)
+
+                        handleDeepLinkIfNeeded(state.deepLinkIntent)
+                    }
+                }
+        }
+    }
+
+    private fun proceedWithCard(state: WelcomeState) = scope.launch {
+        scanCardInternal { scanResponse ->
+            val userWallet = UserWalletBuilder(scanResponse).build() ?: return@scanCardInternal
+
+            userWalletsListManager.save(userWallet, canOverride = true)
+                .doOnFailure { error ->
+                    store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(error))
+                }
+                .doOnSuccess {
+                    store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
+                    store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
+                    store.onUserWalletSelected(userWallet)
+
+                    handleDeepLinkIfNeeded(state.deepLinkIntent)
+                }
+        }
+    }
+
+    private fun handleDeepLinkIfNeeded(intent: Intent?) {
+        intentHandler.handleWalletConnectLink(intent)
+    }
+
+    private suspend inline fun scanCardInternal(
+        crossinline onCardScanned: suspend (ScanResponse) -> Unit,
+    ) {
+        tangemSdkManager.setAccessCodeRequestPolicy(
+            useBiometricsForAccessCode = preferencesStorage.shouldSaveAccessCodes,
+        )
+        ScanCardProcessor.scan(
+            onSuccess = { scanResponse ->
+                scope.launch { onCardScanned(scanResponse) }
+            },
+            onFailure = {
+                store.dispatchOnMain(WelcomeAction.ProceedWithCard.Error(it))
+            },
+            onWalletNotCreated = {
+                store.dispatchOnMain(WelcomeAction.ProceedWithCard.Success)
+            },
+        )
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..42a6d4d0e1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt
@@ -0,0 +1,31 @@
+package com.tangem.tap.features.welcome.redux
+
+import com.tangem.tap.common.redux.AppState
+import org.rekotlin.Action
+
+internal object WelcomeReducer {
+    fun reduce(action: Action, state: AppState): WelcomeState {
+        return if (action is WelcomeAction) {
+            internalReduce(action, state.welcomeState)
+        } else state.welcomeState
+    }
+
+    private fun internalReduce(action: WelcomeAction, state: WelcomeState): WelcomeState {
+        return when (action) {
+            is WelcomeAction.HandleDeepLink -> state.copy(deepLinkIntent = action.intent)
+            is WelcomeAction.ProceedWithBiometrics -> state.copy(isUnlockWithBiometricsInProgress = true)
+            is WelcomeAction.ProceedWithCard -> state.copy(isUnlockWithCardInProgress = true)
+            is WelcomeAction.ProceedWithBiometrics.Error -> state.copy(
+                error = action.error,
+                isUnlockWithBiometricsInProgress = false,
+            )
+            is WelcomeAction.ProceedWithCard.Error -> state.copy(
+                error = action.error,
+                isUnlockWithCardInProgress = false,
+            )
+            is WelcomeAction.ProceedWithBiometrics.Success -> state.copy(isUnlockWithBiometricsInProgress = false)
+            is WelcomeAction.ProceedWithCard.Success -> state.copy(isUnlockWithCardInProgress = false)
+            is WelcomeAction.CloseError -> state.copy(error = null)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt
new file mode 100644
index 0000000000..f40046600d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeState.kt
@@ -0,0 +1,12 @@
+package com.tangem.tap.features.welcome.redux
+
+import android.content.Intent
+import com.tangem.common.core.TangemError
+import org.rekotlin.StateType
+
+data class WelcomeState(
+    val isUnlockWithBiometricsInProgress: Boolean = false,
+    val isUnlockWithCardInProgress: Boolean = false,
+    val deepLinkIntent: Intent? = null,
+    val error: TangemError? = null,
+) : StateType
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
new file mode 100644
index 0000000000..9ff1ad727f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt
@@ -0,0 +1,80 @@
+package com.tangem.tap.features.welcome.ui
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.material.SnackbarHost
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.colorResource
+import androidx.fragment.app.viewModels
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.fragments.ComposeFragment
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.tap.features.details.ui.cardsettings.resolveReference
+import com.tangem.tap.features.welcome.ui.components.WelcomeScreenContent
+import com.tangem.wallet.R
+
+internal class WelcomeFragment : ComposeFragment<WelcomeScreenState>() {
+    private val viewModel by viewModels<WelcomeViewModel>()
+
+    @Composable
+    override fun provideState(): State<WelcomeScreenState> {
+        return viewModel.state.collectAsState()
+    }
+
+    @Composable
+    override fun ScreenContent(
+        modifier: Modifier,
+        state: WelcomeScreenState,
+    ) {
+        val snackbarHostState = remember { SnackbarHostState() }
+        val errorMessage by rememberUpdatedState(newValue = state.error?.resolveReference())
+
+        val backgroundColor = colorResource(id = R.color.background_primary)
+        SystemBarsEffect {
+            setSystemBarsColor(color = backgroundColor)
+        }
+
+        BackHandler {
+            requireActivity().finish()
+        }
+
+        Box(
+            modifier = modifier
+                .systemBarsPadding(),
+        ) {
+            WelcomeScreenContent(
+                showUnlockProgress = state.showUnlockWithBiometricsProgress,
+                showScanCardProgress = state.showUnlockWithCardProgress,
+                onUnlockClick = viewModel::unlockWallets,
+                onScanCardClick = viewModel::scanCard,
+            )
+
+            SnackbarHost(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .padding(vertical = TangemTheme.dimens.spacing16)
+                    .fillMaxWidth(),
+                hostState = snackbarHostState,
+            )
+        }
+
+        LaunchedEffect(key1 = errorMessage) {
+            errorMessage?.let {
+                snackbarHostState.showSnackbar(it)
+                viewModel.closeError()
+            }
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..d0d883148a
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeScreenState.kt
@@ -0,0 +1,11 @@
+package com.tangem.tap.features.welcome.ui
+
+import androidx.compose.runtime.Immutable
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+
+@Immutable
+internal data class WelcomeScreenState(
+    val showUnlockWithBiometricsProgress: Boolean = false,
+    val showUnlockWithCardProgress: Boolean = false,
+    val error: TextReference? = null,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
new file mode 100644
index 0000000000..a047d8518e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeViewModel.kt
@@ -0,0 +1,66 @@
+package com.tangem.tap.features.welcome.ui
+
+import androidx.lifecycle.ViewModel
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.features.details.ui.cardsettings.TextReference
+import com.tangem.tap.features.welcome.redux.WelcomeAction
+import com.tangem.tap.features.welcome.redux.WelcomeState
+import com.tangem.tap.store
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import org.rekotlin.StoreSubscriber
+
+internal class WelcomeViewModel : ViewModel(), StoreSubscriber<WelcomeState> {
+    private val stateInternal = MutableStateFlow(WelcomeScreenState())
+    val state: StateFlow<WelcomeScreenState> = stateInternal
+
+    init {
+        subscribeToStoreChanges()
+        initGlobalState()
+    }
+
+    fun unlockWallets() {
+        store.dispatch(WelcomeAction.ProceedWithBiometrics)
+    }
+
+    fun scanCard() {
+        store.dispatch(WelcomeAction.ProceedWithCard)
+    }
+
+    fun closeError() {
+        store.dispatch(WelcomeAction.CloseError)
+    }
+
+    override fun newState(state: WelcomeState) {
+        stateInternal.update { prevState ->
+            prevState.copy(
+                showUnlockWithBiometricsProgress = state.isUnlockWithBiometricsInProgress,
+                showUnlockWithCardProgress = state.isUnlockWithCardInProgress,
+                error = state.error
+                    ?.takeUnless { it.silent }
+                    ?.let { error ->
+                        error.messageResId?.let { TextReference.Res(it) }
+                            ?: TextReference.Str(error.customMessage)
+                    },
+            )
+        }
+    }
+
+    override fun onCleared() {
+        store.unsubscribe(this)
+    }
+
+    private fun subscribeToStoreChanges() {
+        store.subscribe(this) { appState ->
+            appState.skip { old, new -> old.welcomeState == new.welcomeState }
+                .select { it.welcomeState }
+        }
+    }
+
+    private fun initGlobalState() {
+        store.dispatch(GlobalAction.RestoreAppCurrency)
+        store.dispatch(GlobalAction.ExchangeManager.Init)
+        store.dispatch(GlobalAction.FetchUserCountry)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt
new file mode 100644
index 0000000000..c0a780226b
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt
@@ -0,0 +1,128 @@
+package com.tangem.tap.features.welcome.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.PrimaryButtonIconRight
+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.SpacerH32
+import com.tangem.core.ui.components.SpacerHMax
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.wallet.R
+
+@Composable
+internal fun WelcomeScreenContent(
+    modifier: Modifier = Modifier,
+    showUnlockProgress: Boolean,
+    showScanCardProgress: Boolean,
+    onUnlockClick: () -> Unit,
+    onScanCardClick: () -> Unit,
+) {
+    Column(
+        modifier = modifier,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        SpacerHMax()
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size96),
+            painter = painterResource(id = R.drawable.img_tangem_logo_96),
+            tint = TangemTheme.colors.icon.primary1,
+            contentDescription = null,
+        )
+        SpacerH32()
+        Text(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .fillMaxWidth(),
+            text = stringResource(R.string.welcome_unlock_title),
+            style = TangemTheme.typography.h2,
+            color = TangemTheme.colors.text.primary1,
+            textAlign = TextAlign.Center,
+        )
+        SpacerH12()
+        Text(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing44)
+                .fillMaxWidth(),
+            text = stringResource(
+                id = R.string.welcome_unlock_description,
+                stringResource(id = R.string.common_biometric_authentication),
+            ),
+            style = TangemTheme.typography.body1,
+            color = TangemTheme.colors.text.secondary,
+            textAlign = TextAlign.Center,
+        )
+        SpacerHMax()
+        SecondaryButton(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .fillMaxWidth(),
+            text = stringResource(
+                id = R.string.welcome_unlock,
+                stringResource(id = R.string.common_biometrics),
+            ),
+            showProgress = showUnlockProgress,
+            onClick = onUnlockClick,
+        )
+        SpacerH12()
+        PrimaryButtonIconRight(
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing16)
+                .fillMaxWidth(),
+            text = stringResource(R.string.welcome_unlock_card),
+            showProgress = showScanCardProgress,
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = onScanCardClick,
+        )
+        SpacerH16()
+    }
+}
+
+// region Preview
+@Composable
+private fun WelcomeScreenContentSample(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        WelcomeScreenContent(
+            showUnlockProgress = false,
+            showScanCardProgress = false,
+            onUnlockClick = { /* no-op */ },
+            onScanCardClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WelcomeScreenContentPreview_Light() {
+    TangemTheme {
+        WelcomeScreenContentSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun WelcomeScreenContentPreview_Dark() {
+    TangemTheme(isDark = true) {
+        WelcomeScreenContentSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/auth/AuthProviderImpl.kt b/app/src/main/java/com/tangem/tap/network/auth/AuthProviderImpl.kt
new file mode 100644
index 0000000000..d4bbdd61bd
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/network/auth/AuthProviderImpl.kt
@@ -0,0 +1,16 @@
+package com.tangem.tap.network.auth
+
+import com.tangem.common.extensions.toHexString
+import com.tangem.lib.auth.AuthProvider
+import com.tangem.tap.proxy.AppStateHolder
+
+class AuthProviderImpl(private val appStateHolder: AppStateHolder) : AuthProvider {
+
+    override fun getCardPublicKey(): String {
+        return appStateHolder.scanResponse?.card?.cardPublicKey?.toHexString() ?: ""
+    }
+
+    override fun getCardId(): String {
+        return appStateHolder.scanResponse?.card?.cardId ?: ""
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..6e9eabd1f1
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt
@@ -0,0 +1,21 @@
+package com.tangem.tap.network.auth.di
+
+import com.tangem.lib.auth.AuthProvider
+import com.tangem.tap.network.auth.AuthProviderImpl
+import com.tangem.tap.proxy.AppStateHolder
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AuthModule {
+
+    @Provides
+    @Singleton
+    fun provideAuthProvider(appStateHolder: AppStateHolder): AuthProvider {
+        return AuthProviderImpl(appStateHolder)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CardExchangeRules.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CardExchangeRules.kt
index a7f7b9aec2..939121bda7 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CardExchangeRules.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CardExchangeRules.kt
@@ -1,6 +1,6 @@
 package com.tangem.tap.network.exchangeServices
 
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.models.Currency
@@ -9,7 +9,7 @@ import com.tangem.tap.features.wallet.models.Currency
 [REDACTED_AUTHOR]
  */
 class CardExchangeRules(
-    val cardProvider: () -> Card?,
+    val cardProvider: () -> CardDTO?,
 ) : ExchangeRules {
 
     override fun featureIsSwitchedOn(): Boolean {
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
index 04c92fc542..3f61d82801 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt
@@ -7,7 +7,7 @@ import com.tangem.blockchain.common.AmountType
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.blockchain.extensions.Result
-import com.tangem.common.card.Card
+import com.tangem.domain.common.CardDTO
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -86,8 +86,9 @@ class CurrencyExchangeManager(
     }
 }
 
+@Suppress("unused")
 suspend fun CurrencyExchangeManager.buyErc20TestnetTokens(
-    card: Card,
+    card: CardDTO,
     walletManager: EthereumWalletManager,
     token: Token,
 ) {
diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
index 35cc636808..9dd2b9746f 100644
--- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
+++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt
@@ -6,7 +6,7 @@ import com.tangem.common.extensions.calculateSha512
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
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 5e52716d98..645d5182ed 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
@@ -6,7 +6,7 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
 import com.tangem.domain.common.extensions.withIOContext
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import com.tangem.tap.common.extensions.urlEncode
 import com.tangem.tap.common.redux.global.CryptoCurrencyName
 import com.tangem.tap.features.wallet.models.Currency
diff --git a/app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt b/app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt
index f4612643d3..d9cc63b72a 100644
--- a/app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt
+++ b/app/src/main/java/com/tangem/tap/network/payid/PayIdService.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.network.payid
 import com.squareup.moshi.JsonClass
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 import retrofit2.Retrofit
 
 class PayIdService {
diff --git a/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyService.kt b/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyService.kt
index f5e7ed1f96..05d16f8724 100644
--- a/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyService.kt
+++ b/app/src/main/java/com/tangem/tap/network/payid/PayIdVerifyService.kt
@@ -2,7 +2,7 @@ package com.tangem.tap.network.payid
 
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.createRetrofitInstance
 
 /**
 [REDACTED_AUTHOR]
diff --git a/app/src/main/java/com/tangem/tap/persistence/FiatCurrenciesPrefStorage.kt b/app/src/main/java/com/tangem/tap/persistence/FiatCurrenciesPrefStorage.kt
index 50a8859516..59c500f9a7 100644
--- a/app/src/main/java/com/tangem/tap/persistence/FiatCurrenciesPrefStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/FiatCurrenciesPrefStorage.kt
@@ -3,7 +3,7 @@ package com.tangem.tap.persistence
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.network.api.tangemTech.CurrenciesResponse
+import com.tangem.datasource.api.tangemTech.CurrenciesResponse
 import com.tangem.tap.common.entities.FiatCurrency
 
 /**
diff --git a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
index fad5cd8acd..d419aafffc 100644
--- a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.datasource.api.common.MoshiConverter
 import java.util.*
 
 class PreferencesStorage(applicationContext: Application) {
@@ -16,27 +16,54 @@ class PreferencesStorage(applicationContext: Application) {
     val usedCardsPrefStorage: UsedCardsPrefStorage
     val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage
     val disclaimerPrefStorage: DisclaimerPrefStorage
+    val toppedUpWalletStorage: ToppedUpWalletStorage
 
     init {
         incrementLaunchCounter()
         appRatingLaunchObserver = AppRatingLaunchObserver(preferences, getCountOfLaunches())
-        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, MoshiJsonConverter.INSTANCE)
+        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, MoshiConverter.INSTANCE)
         usedCardsPrefStorage.migrate()
-        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, MoshiJsonConverter.INSTANCE)
+        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, MoshiConverter.INSTANCE)
         fiatCurrenciesPrefStorage.migrate()
         disclaimerPrefStorage = DisclaimerPrefStorage(preferences)
+        toppedUpWalletStorage = ToppedUpWalletStorage(preferences, MoshiConverter.INSTANCE)
     }
 
     var chatFirstLaunchTime: Long?
         get() = preferences.getLong(CHAT_FIRST_LAUNCH_KEY, 0).takeIf { it != 0L }
         set(value) = preferences.edit { putLong(CHAT_FIRST_LAUNCH_KEY, value ?: 0) }
 
-    fun getCountOfLaunches(): Int = preferences.getInt(APP_LAUNCH_COUNT_KEY, 1)
+    var shouldShowSaveUserWalletScreen: Boolean
+        get() = preferences.getBoolean(SAVE_WALLET_DIALOG_SHOWN_KEY, true)
+        set(value) = preferences.edit {
+            putBoolean(SAVE_WALLET_DIALOG_SHOWN_KEY, value)
+        }
 
-    @Deprecated("Use UsedCardsPrefStorage instead")
-    fun wasCardScannedBefore(cardId: String): Boolean {
-        return usedCardsPrefStorage.wasScanned(cardId)
-    }
+    var shouldSaveUserWallets: Boolean
+        get() = preferences.getBoolean(SAVE_USER_WALLETS_KEY, false)
+        set(value) = preferences.edit {
+            putBoolean(SAVE_USER_WALLETS_KEY, value)
+        }
+
+    var shouldSaveAccessCodes: Boolean
+        get() = preferences.getBoolean(SAVE_ACCESS_CODES_KEY, false)
+        set(value) = preferences.edit {
+            putBoolean(SAVE_ACCESS_CODES_KEY, value)
+        }
+
+    var wasApplicationStopped: Boolean
+        get() = preferences.getBoolean(APPLICATION_STOPPED_KEY, false)
+        set(value) = preferences.edit {
+            putBoolean(APPLICATION_STOPPED_KEY, value)
+        }
+
+    var shouldOpenWelcomeScreenOnResume: Boolean
+        get() = preferences.getBoolean(OPEN_WELCOME_ON_RESUME_KEY, false)
+        set(value) = preferences.edit {
+            putBoolean(OPEN_WELCOME_ON_RESUME_KEY, value)
+        }
+
+    fun getCountOfLaunches(): Int = preferences.getInt(APP_LAUNCH_COUNT_KEY, 1)
 
     fun saveTwinsOnboardingShown() {
         preferences.edit { putBoolean(TWINS_ONBOARDING_SHOWN_KEY, true) }
@@ -56,6 +83,11 @@ class PreferencesStorage(applicationContext: Application) {
         private const val TWINS_ONBOARDING_SHOWN_KEY = "twinsOnboardingShown"
         private const val APP_LAUNCH_COUNT_KEY = "launchCount"
         private const val CHAT_FIRST_LAUNCH_KEY = "chatFirstLaunchKey"
+        private const val SAVE_WALLET_DIALOG_SHOWN_KEY = "saveUserWalletShown"
+        private const val SAVE_USER_WALLETS_KEY = "saveUserWallets"
+        private const val SAVE_ACCESS_CODES_KEY = "saveAccessCodes"
+        private const val APPLICATION_STOPPED_KEY = "applicationStopped"
+        private const val OPEN_WELCOME_ON_RESUME_KEY = "openWelcomeOnResume"
     }
 }
 
diff --git a/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt b/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt
new file mode 100644
index 0000000000..e270b2b820
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt
@@ -0,0 +1,76 @@
+package com.tangem.tap.persistence
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.tap.common.analytics.filters.BasicTopUpFilter
+import timber.log.Timber
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ToppedUpWalletStorage(
+    private val preferences: SharedPreferences,
+    private val jsonConverter: MoshiJsonConverter,
+) {
+
+    private val walletList: MutableSet<BasicTopUpFilter.Data> = mutableSetOf()
+
+    init {
+        walletList.addAll(restore())
+    }
+
+    fun save(userWalletInfo: BasicTopUpFilter.Data): Boolean {
+        walletList.removeAll { it.walletId == userWalletInfo.walletId }
+        walletList.add(userWalletInfo)
+        return save(walletList)
+    }
+
+    fun restore(walletId: String): BasicTopUpFilter.Data? {
+        return walletList.firstOrNull { it.walletId == walletId }
+    }
+
+    private fun save(userWallets: MutableSet<BasicTopUpFilter.Data>): Boolean {
+        return try {
+            val json = jsonConverter.toJson(userWallets)
+            preferences.edit(true) { putString(KEY, json) }
+            true
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            false
+        }
+    }
+
+    private fun restore(): MutableSet<BasicTopUpFilter.Data> {
+        val json = preferences.getString(KEY, null) ?: return mutableSetOf()
+        return try {
+            val typedList = jsonConverter.typedList(BasicTopUpFilter.Data::class.java)
+            val listData = jsonConverter.fromJson<List<BasicTopUpFilter.Data>>(json, typedList)!!
+            listData.toMutableSet()
+        } catch (ex: Exception) {
+            preferences.edit(true) { remove(KEY) }
+            mutableSetOf()
+        }
+    }
+
+    companion object {
+        private const val KEY = "userWalletsInfo"
+    }
+}
+
+class CardBalanceStateAdapter {
+    @ToJson
+    fun toJson(src: AnalyticsParam.CardBalanceState): String = src.value
+
+    @FromJson
+    fun fromJson(json: String): AnalyticsParam.CardBalanceState {
+        return when (json) {
+            AnalyticsParam.CardBalanceState.Empty.value -> AnalyticsParam.CardBalanceState.Empty
+            AnalyticsParam.CardBalanceState.Full.value -> AnalyticsParam.CardBalanceState.Full
+            else -> throw IllegalArgumentException()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/persistence/UsedCardsPrefStorage.kt b/app/src/main/java/com/tangem/tap/persistence/UsedCardsPrefStorage.kt
index 5d7f241fb8..f814eb7e16 100644
--- a/app/src/main/java/com/tangem/tap/persistence/UsedCardsPrefStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/UsedCardsPrefStorage.kt
@@ -11,16 +11,16 @@ import timber.log.Timber
  */
 class UsedCardsPrefStorage(
     private val preferences: SharedPreferences,
-    private val jsonConverter: MoshiJsonConverter
+    private val jsonConverter: MoshiJsonConverter,
 ) {
 
-    internal fun migrate() {
-        val scannedIds = preferences.getString(SCANNED_CARDS_IDS_KEY, null) ?: return
+    private val migrationList = mutableListOf(
+        UserCardInfoToV2(this),
+    )
 
-        val usedCardsInfo = scannedIds.split(",").map { UsedCardInfo(it.trim(), true) }
-        if (save(usedCardsInfo.toMutableList())) {
-            preferences.edit { this.remove(SCANNED_CARDS_IDS_KEY) }
-        }
+    internal fun migrate() {
+        migrationList.forEach { it.migrate() }
+        migrationList.clear()
     }
 
     fun scanned(cardId: String) {
@@ -43,20 +43,28 @@ class UsedCardsPrefStorage(
         save(foundItem, restoredList)
     }
 
-    fun isActivationFinished(cardId: String): Boolean {
-        return !(findCardInfo(cardId)?.isActivationStarted ?: true)
+    fun activationFinished(cardId: String) {
+        val restoredList = restore()
+        var foundItem = findCardInfo(cardId, restoredList) ?: UsedCardInfo(cardId)
+        foundItem = foundItem.copy(
+            isActivationStarted = true,
+            isActivationFinished = true,
+        )
+
+        save(foundItem, restoredList)
     }
 
-    fun activationIsStarted(cardId: String): Boolean {
+    fun isActivationStarted(cardId: String): Boolean {
         return findCardInfo(cardId)?.isActivationStarted ?: false
     }
 
-    fun activationFinished(cardId: String) {
-        val restoredList = restore()
-        val foundItem = findCardInfo(cardId, restoredList)?.copy(isActivationStarted = false)
-            ?: UsedCardInfo(cardId, isActivationStarted = false)
+    fun isActivationFinished(cardId: String): Boolean {
+        return findCardInfo(cardId)?.isActivationFinished ?: false
+    }
 
-        save(foundItem, restoredList)
+    fun isActivationInProgress(cardId: String): Boolean {
+        val cardInfo = findCardInfo(cardId) ?: return false
+        return cardInfo.isActivationStarted && !cardInfo.isActivationFinished
     }
 
     private fun findCardInfo(cardId: String, list: MutableList<UsedCardInfo>? = null): UsedCardInfo? {
@@ -74,7 +82,7 @@ class UsedCardsPrefStorage(
     private fun save(list: MutableList<UsedCardInfo>): Boolean {
         return try {
             val json = jsonConverter.toJson(list)
-            preferences.edit { putString(USED_CARDS_INFO, json) }
+            preferences.edit { putString(USED_CARDS_INFO_V2, json) }
             true
         } catch (ex: Exception) {
             Timber.e(ex)
@@ -83,23 +91,64 @@ class UsedCardsPrefStorage(
     }
 
     private fun restore(): MutableList<UsedCardInfo> {
-        val json = preferences.getString(USED_CARDS_INFO, null) ?: return mutableListOf()
+        val json = preferences.getString(USED_CARDS_INFO_V2, null) ?: return mutableListOf()
         return try {
             jsonConverter.fromJson(json, jsonConverter.typedList(UsedCardInfo::class.java))!!
         } catch (ex: Exception) {
-            preferences.edit(true) { remove(USED_CARDS_INFO) }
+            preferences.edit(true) { remove(USED_CARDS_INFO_V2) }
             mutableListOf()
         }
     }
 
     companion object {
+        private const val USED_CARDS_INFO_V2 = "usedCardsInfo_v2"
         private const val USED_CARDS_INFO = "usedCardsInfo"
-        private const val SCANNED_CARDS_IDS_KEY = "scannedCardIds"
     }
+
+    private class UserCardInfoToV2(
+        private val storage: UsedCardsPrefStorage,
+    ) : Migration {
+        override fun migrate() {
+            val restoredCardsInfo = restore()
+            if (restoredCardsInfo.isEmpty()) return
+
+            val newCardsInfo = restoredCardsInfo.map { cardInfo ->
+                UsedCardInfo(
+                    cardId = cardInfo.cardId,
+                    isScanned = cardInfo.isScanned,
+                    isActivationStarted = true,
+                    isActivationFinished = !cardInfo.isActivationStarted,
+                )
+            }.toMutableList()
+            storage.save(newCardsInfo)
+        }
+
+        private fun restore(): MutableList<UsedCardInfoOld> {
+            val json = storage.preferences.getString(USED_CARDS_INFO, null) ?: return mutableListOf()
+            return try {
+                storage.jsonConverter.fromJson(json, storage.jsonConverter.typedList(UsedCardInfoOld::class.java))!!
+            } catch (ex: Exception) {
+                mutableListOf()
+            } finally {
+                storage.preferences.edit(true) { remove(USED_CARDS_INFO) }
+            }
+        }
+    }
+
+    private data class UsedCardInfo(
+        val cardId: String,
+        val isScanned: Boolean = false,
+        val isActivationStarted: Boolean = false,
+        val isActivationFinished: Boolean = false,
+    )
+
+    private data class UsedCardInfoOld(
+        val cardId: String,
+        val isScanned: Boolean = false,
+        val isActivationStarted: Boolean = false,
+    )
 }
 
-private data class UsedCardInfo(
-    val cardId: String,
-    val isScanned: Boolean = false,
-    val isActivationStarted: Boolean = false,
-)
\ No newline at end of file
+private interface Migration {
+    fun migrate()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
new file mode 100644
index 0000000000..11cfdee61f
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/AppStateHolder.kt
@@ -0,0 +1,26 @@
+package com.tangem.tap.proxy
+
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.ScanResponse
+import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.domain.TangemSdkManager
+import com.tangem.tap.domain.tokens.UserTokensRepository
+import com.tangem.tap.features.wallet.redux.WalletState
+import org.rekotlin.Store
+
+/**
+ * Holds objects from old modules, that missing in DI graph
+ * Object sets manually to use in new modules and [AppStateHolder] proxies its to DI
+ */
+class AppStateHolder {
+
+    var scanResponse: ScanResponse? = null
+    var walletState: WalletState? = null
+    var userTokensRepository: UserTokensRepository? = null
+    var mainStore: Store<AppState>? = null
+    var tangemSdkManager: TangemSdkManager? = null
+
+    fun getActualCard(): CardDTO? {
+        return scanResponse?.card
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
new file mode 100644
index 0000000000..7be322fc1e
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/DerivationManagerImpl.kt
@@ -0,0 +1,170 @@
+package com.tangem.tap.proxy
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.Token
+import com.tangem.common.CompletionResult
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.extensions.ByteArrayKey
+import com.tangem.common.extensions.toMapKey
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.domain.common.ScanResponse
+import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.NonNativeToken
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+import com.tangem.tap.DELAY_SDK_DIALOG_CLOSE
+import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
+import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.redux.global.GlobalAction
+import com.tangem.tap.domain.TapError
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.scope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlin.coroutines.suspendCoroutine
+
+class DerivationManagerImpl(
+    private val appStateHolder: AppStateHolder,
+) : DerivationManager {
+
+    override suspend fun deriveMissingBlockchains(currency: Currency) = suspendCoroutine<Boolean> { continuation ->
+        val blockchain = Blockchain.fromNetworkId(currency.networkId)
+        val card = appStateHolder.getActualCard()
+        if (blockchain != null && card != null) {
+            val appToken = if (currency is NonNativeToken) {
+                Token(
+                    symbol = currency.symbol,
+                    contractAddress = currency.contractAddress,
+                    decimals = currency.decimalCount,
+                )
+            } else null
+            val blockchainNetwork = BlockchainNetwork(blockchain, card)
+            val appCurrency = com.tangem.tap.features.wallet.models.Currency.fromBlockchainNetwork(
+                blockchainNetwork,
+                appToken,
+            )
+            val scanResponse = appStateHolder.scanResponse
+            if (scanResponse != null) {
+                deriveMissingBlockchains(
+                    scanResponse = scanResponse,
+                    listOf(appCurrency),
+                ) {
+                    continuation.resumeWith(Result.success(true))
+                }
+            }
+        } else {
+            continuation.resumeWith(Result.failure(IllegalStateException("no blockchain or card found")))
+        }
+    }
+
+    override fun hasDerivation(networkId: String): Boolean {
+        val scanResponse = appStateHolder.scanResponse
+        val blockchain = Blockchain.fromNetworkId(networkId)
+        if (scanResponse != null && blockchain != null) {
+            val derivationPath = blockchain.derivationPath(appStateHolder.getActualCard()?.derivationStyle)?.rawPath
+            if (derivationPath.isNullOrEmpty()) return false
+            return scanResponse.hasDerivation(
+                blockchain,
+                derivationPath,
+            )
+        }
+        return false
+    }
+
+    private fun deriveMissingBlockchains(
+        scanResponse: ScanResponse,
+        currencyList: List<com.tangem.tap.features.wallet.models.Currency>,
+        onSuccess: (ScanResponse) -> Unit,
+    ) {
+        val derivationDataList = listOfNotNull(
+            getDerivations(EllipticCurve.Secp256k1, scanResponse, currencyList),
+            getDerivations(EllipticCurve.Ed25519, scanResponse, currencyList),
+        )
+        val derivations = derivationDataList.associate { it.derivations }
+        if (derivations.isEmpty()) {
+            onSuccess(scanResponse)
+            return
+        }
+
+        scope.launch {
+            val result = appStateHolder.tangemSdkManager?.derivePublicKeys(
+                scanResponse.card.cardId,
+                derivations,
+            )
+            when (result) {
+                is CompletionResult.Success -> {
+                    val newDerivedKeys = result.data.entries
+                    val oldDerivedKeys = scanResponse.derivedKeys
+
+                    val walletKeys = (newDerivedKeys.keys + oldDerivedKeys.keys).toSet()
+
+                    val updatedDerivedKeys = walletKeys.associateWith { walletKey ->
+                        val oldDerivations = ExtendedPublicKeysMap(oldDerivedKeys[walletKey] ?: emptyMap())
+                        val newDerivations = newDerivedKeys[walletKey] ?: ExtendedPublicKeysMap(emptyMap())
+                        ExtendedPublicKeysMap(oldDerivations + newDerivations)
+                    }
+                    val updatedScanResponse = scanResponse.copy(
+                        derivedKeys = updatedDerivedKeys,
+                    )
+                    appStateHolder.mainStore?.dispatchOnMain(GlobalAction.SaveScanResponse(updatedScanResponse))
+                    delay(DELAY_SDK_DIALOG_CLOSE)
+                    onSuccess(updatedScanResponse)
+                }
+                is CompletionResult.Failure -> {
+                    appStateHolder.mainStore?.dispatchDebugErrorNotification(
+                        TapError.CustomError(
+                            "Error adding " +
+                                "tokens",
+                        ),
+                    )
+                }
+                else -> {
+                    error("result result is null")
+                }
+            }
+        }
+    }
+
+    private fun getDerivations(
+        curve: EllipticCurve,
+        scanResponse: ScanResponse,
+        currencyList: List<com.tangem.tap.features.wallet.models.Currency>,
+    ): DerivationData? {
+        val wallet = scanResponse.card.wallets.firstOrNull { it.curve == curve } ?: return null
+
+        val manageTokensCandidates = currencyList.map { it.blockchain }.distinct().filter {
+            it.getSupportedCurves().contains(curve)
+        }.mapNotNull {
+            it.derivationPath(scanResponse.card.derivationStyle)
+        }
+
+        val customTokensCandidates = currencyList.filter {
+            it.blockchain.getSupportedCurves().contains(curve)
+        }.mapNotNull { it.derivationPath }.map { DerivationPath(it) }
+
+        val bothCandidates = (manageTokensCandidates + customTokensCandidates).distinct()
+        if (bothCandidates.isEmpty()) return null
+
+        val mapKeyOfWalletPublicKey = wallet.publicKey.toMapKey()
+        val alreadyDerivedKeys: ExtendedPublicKeysMap =
+            scanResponse.derivedKeys[mapKeyOfWalletPublicKey] ?: ExtendedPublicKeysMap(emptyMap())
+        val alreadyDerivedPaths = alreadyDerivedKeys.keys.toList()
+
+        val toDerive = bothCandidates.filterNot { alreadyDerivedPaths.contains(it) }
+        if (toDerive.isEmpty()) return null
+
+        return DerivationData(
+            derivations = mapKeyOfWalletPublicKey to toDerive,
+            alreadyDerivedKeys = alreadyDerivedKeys,
+            mapKeyOfWalletPublicKey = mapKeyOfWalletPublicKey,
+        )
+    }
+
+    private class DerivationData(
+        val derivations: Pair<ByteArrayKey, List<DerivationPath>>,
+        val alreadyDerivedKeys: ExtendedPublicKeysMap,
+        val mapKeyOfWalletPublicKey: ByteArrayKey,
+    )
+}
\ 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
new file mode 100644
index 0000000000..e12ca9b9be
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
@@ -0,0 +1,157 @@
+package com.tangem.tap.proxy
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.DerivationParams
+import com.tangem.blockchain.common.DerivationStyle
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.domain.common.CardDTO
+import com.tangem.domain.common.TapWorkarounds.derivationStyle
+import com.tangem.domain.common.extensions.fromNetworkId
+import com.tangem.domain.common.extensions.toNetworkId
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.NativeToken
+import com.tangem.lib.crypto.models.NonNativeToken
+import com.tangem.tap.domain.extensions.makeWalletManagerForApp
+import com.tangem.tap.domain.model.builders.UserWalletIdBuilder
+import com.tangem.tap.domain.tokens.models.BlockchainNetwork
+import com.tangem.tap.features.wallet.redux.WalletAction
+import org.rekotlin.Action
+
+class UserWalletManagerImpl(
+    private val appStateHolder: AppStateHolder,
+    private val walletManagerFactory: WalletManagerFactory,
+) : UserWalletManager {
+
+    override suspend fun getUserTokens(): List<Currency> {
+        val card = appStateHolder.getActualCard()
+        val userTokensRepository =
+            requireNotNull(appStateHolder.userTokensRepository) { "userTokensRepository is null" }
+        if (card != null) {
+            userTokensRepository.getUserTokens(card)
+                .filter { it.isToken() }
+                .map {
+                    if (it is com.tangem.tap.features.wallet.models.Currency.Token) {
+                        NonNativeToken(
+                            id = it.coinId ?: "",
+                            name = it.currencyName,
+                            symbol = it.currencySymbol,
+                            networkId = it.blockchain.toNetworkId(),
+                            contractAddress = it.token.contractAddress,
+                            decimalCount = it.token.decimals,
+                        )
+                    } else {
+                        NativeToken(
+                            id = it.coinId ?: "",
+                            name = it.currencyName,
+                            symbol = it.currencySymbol,
+                            networkId = it.blockchain.toNetworkId(),
+                        )
+                    }
+                }
+        }
+        return emptyList()
+    }
+
+    override fun getWalletId(): String {
+        return appStateHolder.getActualCard()?.let {
+            UserWalletIdBuilder.card(it)
+                .build()
+                ?.stringValue
+        }
+            ?: ""
+    }
+
+    override suspend fun isTokenAdded(currency: Currency): Boolean {
+        val card = appStateHolder.getActualCard()
+        val userTokensRepository =
+            requireNotNull(appStateHolder.userTokensRepository) { "userTokensRepository is null" }
+        if (card != null) {
+            return userTokensRepository.getUserTokens(card)
+                .any { it.coinId.equals(currency.id) } //todo ensure that its the same ids
+        }
+        return false
+    }
+
+    //todo check is it sync operation
+    override fun addToken(currency: Currency) {
+        val action = if (currency is NativeToken) {
+            val card = appStateHolder.getActualCard()
+            if (card != null) {
+                addNativeTokenToWalletAction(currency, card)
+            } else {
+                throw  IllegalStateException("card not found")
+            }
+        } else {
+            addNonNativeTokenToWalletAction(currency as NonNativeToken)
+        }
+        val mainStore = requireNotNull(appStateHolder.mainStore) { "mainStore is null" }
+        mainStore.dispatch(action)
+    }
+
+    override fun getWalletAddress(currency: Currency): String {
+        val blockchain = Blockchain.fromNetworkId(currency.networkId)
+        val card = appStateHolder.getActualCard()
+        if (blockchain != null && card != null) {
+            val blockchainNetwork = BlockchainNetwork(blockchain, card)
+            val walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+            if (walletManager != null) {
+                return walletManager.wallet.address
+            } else {
+                error("no wallet manager found")
+            }
+        } else {
+            error("no blockchain or card found")
+        }
+    }
+
+    private fun addNativeTokenToWalletAction(token: NativeToken, card: CardDTO): Action {
+        val blockchain = Blockchain.fromNetworkId(token.networkId)
+        val scanResponse = appStateHolder.scanResponse
+        if (blockchain != null && scanResponse != null) {
+            val blockchainNetwork = BlockchainNetwork(blockchain, card)
+            var walletManager = appStateHolder.walletState?.getWalletManager(blockchainNetwork)
+            if (walletManager == null) {
+                walletManager = walletManagerFactory.makeWalletManagerForApp(
+                    scanResponse = scanResponse,
+                    blockchain = blockchain,
+                    derivationParams = createDerivationParams(card.derivationStyle),
+                )
+            }
+            return WalletAction.MultiWallet.AddBlockchain(
+                blockchain = blockchainNetwork,
+                walletManager = walletManager,
+                save = true,
+            )
+        } else {
+            error("blockchain is not supported")
+        }
+    }
+
+    private fun addNonNativeTokenToWalletAction(token: NonNativeToken): Action {
+        val card = appStateHolder.getActualCard()
+        val blockchain = Blockchain.fromNetworkId(token.networkId)
+        if (card != null && blockchain != null) {
+            return WalletAction.MultiWallet.AddToken(
+                token = com.tangem.blockchain.common.Token(
+                    id = token.id,
+                    name = token.name,
+                    symbol = token.symbol,
+                    contractAddress = token.contractAddress,
+                    decimals = token.decimalCount,
+                ),
+                blockchain = BlockchainNetwork(
+                    blockchain,
+                    card,
+                ),
+                save = true,
+            )
+        } else {
+            error("no card or blockchain found")
+        }
+    }
+
+    private fun createDerivationParams(derivationStyle: DerivationStyle?): DerivationParams? {
+        return derivationStyle?.let { DerivationParams.Default(derivationStyle) } //todo clarify if its need to add Custom
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
new file mode 100644
index 0000000000..07d3fb1e8d
--- /dev/null
+++ b/app/src/main/java/com/tangem/tap/proxy/di/ProxyModule.kt
@@ -0,0 +1,41 @@
+package com.tangem.tap.proxy.di
+
+import com.tangem.blockchain.common.WalletManagerFactory
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.proxy.DerivationManagerImpl
+import com.tangem.tap.proxy.UserWalletManagerImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class ProxyModule {
+
+    @Provides
+    @Singleton
+    fun provideAppStateHolder(): AppStateHolder {
+        return AppStateHolder()
+    }
+
+    @Provides
+    @Singleton
+    fun provideUserWalletManager(appStateHolder: AppStateHolder): UserWalletManager {
+        return UserWalletManagerImpl(
+            appStateHolder = appStateHolder,
+            walletManagerFactory = WalletManagerFactory(),
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideDerivationManager(appStateHolder: AppStateHolder): DerivationManager {
+        return DerivationManagerImpl(
+            appStateHolder = appStateHolder,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_friends.xml b/app/src/main/res/drawable/ic_add_friends.xml
new file mode 100644
index 0000000000..d1457f8210
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_friends.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M15,4C13.939,4 12.922,4.421 12.172,5.172C11.421,5.922 11,6.939 11,8C11,9.061 11.421,10.078 12.172,10.828C12.922,11.579 13.939,12 15,12C16.061,12 17.078,11.579 17.828,10.828C18.579,10.078 19,9.061 19,8C19,6.939 18.579,5.922 17.828,5.172C17.078,4.421 16.061,4 15,4ZM15,5.9C16.16,5.9 17.1,6.84 17.1,8C17.1,9.16 16.16,10.1 15,10.1C14.443,10.1 13.909,9.879 13.515,9.485C13.121,9.091 12.9,8.557 12.9,8C12.9,7.443 13.121,6.909 13.515,6.515C13.909,6.121 14.443,5.9 15,5.9ZM4,7V10H1V12H4V15H6V12H9V10H6V7H4ZM15,13C12.33,13 7,14.33 7,17V20H23V17C23,14.33 17.67,13 15,13ZM15,14.9C17.97,14.9 21.1,16.36 21.1,17V18.1H8.9V17C8.9,16.36 12,14.9 15,14.9Z"
+        android:fillColor="#000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml
new file mode 100644
index 0000000000..4291149aff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_check_circle_18.xml b/app/src/main/res/drawable/ic_check_circle_18.xml
new file mode 100644
index 0000000000..2c3e494f73
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_circle_18.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+    <path
+        android:fillColor="#000"
+        android:pathData="M9,1.5C4.9,1.5 1.5,4.9 1.5,9C1.5,13.1 4.9,16.5 9,16.5C13.1,16.5 16.5,13.1 16.5,9C16.5,4.9 13.1,1.5 9,1.5ZM7.5,12.8L3.8,9L4.8,7.9L7.5,10.6L13.2,4.9L14.3,6L7.5,12.8Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_fingerprint_24.xml b/app/src/main/res/drawable/ic_fingerprint_24.xml
new file mode 100644
index 0000000000..df5bdf4868
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fingerprint_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M17.8,4.5C17.7,4.5 17.7,4.5 17.6,4.4C15.7,3.4 14,3 12,3C10,3 8.2,3.5 6.4,4.4C6.2,4.5 5.9,4.5 5.8,4.2C5.6,4 5.7,3.7 6,3.5C7.8,2.5 9.9,2 12,2C14.1,2 16,2.5 18,3.5C18.3,3.7 18.4,4 18.3,4.2C18.2,4.4 18,4.5 17.8,4.5ZM3.5,9.7C3.4,9.7 3.3,9.7 3.2,9.6C3,9.5 2.9,9.2 3.1,8.9C4.1,7.5 5.3,6.4 6.8,5.7C10,4 14,4 17.2,5.7C18.7,6.4 19.9,7.5 20.9,8.9C21.1,9.1 21,9.4 20.8,9.6C20.6,9.8 20.2,9.7 20.1,9.5C19.2,8.2 18,7.2 16.7,6.5C13.8,5.1 10.2,5.1 7.3,6.6C5.9,7.3 4.8,8.3 3.9,9.5C3.8,9.7 3.7,9.7 3.5,9.7ZM9.8,21.8C9.6,21.8 9.5,21.7 9.4,21.6C8.5,20.8 8.1,20.2 7.4,19C6.7,17.8 6.3,16.3 6.3,14.7C6.3,11.7 8.9,9.3 12,9.3C15.1,9.3 17.7,11.7 17.7,14.7C17.7,14.8 17.6,14.9 17.5,15C17.4,15.1 17.3,15.2 17.2,15.2C17,15.2 16.9,15.1 16.8,15C16.7,14.9 16.7,14.8 16.7,14.7C16.7,12.2 14.6,10.3 12,10.3C9.4,10.3 7.3,12.2 7.3,14.7C7.3,16.1 7.7,17.4 8.3,18.5C8.9,19.7 9.4,20.2 10.1,20.9C10.3,21.1 10.3,21.4 10.1,21.6C10,21.7 9.9,21.8 9.8,21.8ZM16.9,19.9C15.7,19.9 14.7,19.6 13.8,19.1C12.3,18 11.4,16.4 11.4,14.7C11.4,14.5 11.5,14.4 11.6,14.3C11.7,14.2 11.8,14.2 11.9,14.2C12.1,14.2 12.2,14.2 12.3,14.3C12.4,14.4 12.4,14.5 12.4,14.7C12.4,16.1 13.2,17.4 14.4,18.2C15.1,18.7 15.9,18.9 16.9,18.9C17.2,18.9 17.6,18.9 18,18.8C18.2,18.8 18.5,19 18.5,19.2C18.6,19.5 18.4,19.8 18.1,19.8C17.6,19.9 17.1,19.9 16.9,19.9ZM14.9,22C14.9,22 14.8,22 14.8,22C13.2,21.5 12.2,21 11.1,19.9C9.7,18.5 8.9,16.6 8.9,14.7C8.9,13 10.3,11.7 12,11.7C13.7,11.7 15.1,13 15.1,14.7C15.1,15.7 16,16.6 17.1,16.6C18.3,16.6 19.2,15.7 19.2,14.7C19.2,10.9 16,7.8 12,7.8C9.1,7.8 6.5,9.4 5.4,11.9C5,12.7 4.8,13.6 4.8,14.7C4.8,15.4 4.8,16.7 5.4,18.3C5.5,18.5 5.4,18.8 5.1,18.9C4.9,19 4.6,18.9 4.5,18.6C4,17.3 3.8,16 3.8,14.7C3.8,13.5 4,12.4 4.5,11.4C5.8,8.6 8.7,6.8 12,6.8C16.5,6.8 20.2,10.3 20.2,14.7C20.2,16.3 18.8,17.6 17.1,17.6C15.4,17.6 14.1,16.3 14.1,14.7C14.1,13.6 13.1,12.7 12,12.7C10.8,12.7 9.9,13.6 9.9,14.7C9.9,16.4 10.6,18 11.8,19.2C12.7,20.1 13.6,20.6 15,21C15.3,21.1 15.5,21.4 15.4,21.6C15.3,21.9 15.1,22 14.9,22Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_locked_24.xml b/app/src/main/res/drawable/ic_locked_24.xml
new file mode 100644
index 0000000000..2afb4d8a14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_locked_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,17C12.53,17 13.039,16.789 13.414,16.414C13.789,16.039 14,15.53 14,15C14,13.89 13.1,13 12,13C11.47,13 10.961,13.211 10.586,13.586C10.211,13.961 10,14.47 10,15C10,15.53 10.211,16.039 10.586,16.414C10.961,16.789 11.47,17 12,17ZM18,8C18.53,8 19.039,8.211 19.414,8.586C19.789,8.961 20,9.47 20,10V20C20,20.53 19.789,21.039 19.414,21.414C19.039,21.789 18.53,22 18,22H6C5.47,22 4.961,21.789 4.586,21.414C4.211,21.039 4,20.53 4,20V10C4,8.89 4.9,8 6,8H7V6C7,4.674 7.527,3.402 8.464,2.464C9.402,1.527 10.674,1 12,1C12.657,1 13.307,1.129 13.913,1.381C14.52,1.632 15.071,2 15.535,2.464C16,2.929 16.368,3.48 16.619,4.087C16.871,4.693 17,5.343 17,6V8H18ZM12,3C11.204,3 10.441,3.316 9.879,3.879C9.316,4.441 9,5.204 9,6V8H15V6C15,5.204 14.684,4.441 14.121,3.879C13.559,3.316 12.796,3 12,3Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_vertical_24.xml b/app/src/main/res/drawable/ic_more_vertical_24.xml
deleted file mode 100644
index fd51d1fbf2..0000000000
--- a/app/src/main/res/drawable/ic_more_vertical_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-            android:pathData="M12,8C13.1,8 14,7.1 14,6C14,4.9 13.1,4 12,4C10.9,4 10,4.9 10,6C10,7.1 10.9,8 12,8ZM12,10C10.9,10 10,10.9 10,12C10,13.1 10.9,14 12,14C13.1,14 14,13.1 14,12C14,10.9 13.1,10 12,10ZM12,16C10.9,16 10,16.9 10,18C10,19.1 10.9,20 12,20C13.1,20 14,19.1 14,18C14,16.9 13.1,16 12,16Z"
-            android:fillColor="#000"
-            android:fillType="evenOdd" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_pencil_outline_24.xml b/app/src/main/res/drawable/ic_pencil_outline_24.xml
new file mode 100644
index 0000000000..039a5d5463
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pencil_outline_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M14.1,9L15,9.9L5.9,19H5V18.1L14.1,9ZM17.7,3C17.4,3 17.2,3.1 17,3.3L15.1,5.1L18.9,8.9L20.7,7C21.1,6.7 21.1,6 20.7,5.6L18.4,3.3C18.2,3.1 17.9,3 17.7,3ZM14.1,6.2L3,17.3V21H6.8L17.8,9.9L14.1,6.2Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_tap_card_24.xml b/app/src/main/res/drawable/ic_tap_card_24.xml
new file mode 100644
index 0000000000..dba54e1396
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tap_card_24.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M12,7m-1.25,0a1.25,1.25 0,1 1,2.5 0a1.25,1.25 0,1 1,-2.5 0" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M14.5,9.5C15.881,8.119 15.881,5.881 14.5,4.5M9.5,9.5C8.119,8.119 8.119,5.881 9.5,4.5"
+            android:strokeWidth="2"
+            android:strokeColor="#000000" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M17,12C19.761,9.239 19.761,4.761 17,2M7,12C4.239,9.239 4.239,4.761 7,2"
+            android:strokeWidth="2"
+            android:strokeColor="#000000" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M12.485,12.121L22.577,22.213A1,1 51.198,0 1,22.577 23.627L17.627,28.577A1,1 128.802,0 1,16.213 28.577L6.121,18.485A1,1 0,0 1,6.121 17.071L11.071,12.121A1,1 77.649,0 1,12.485 12.121z"
+            android:strokeWidth="2"
+            android:strokeColor="#000000" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/img_tangem_logo_96.xml b/app/src/main/res/drawable/img_tangem_logo_96.xml
new file mode 100644
index 0000000000..93fe8d9c0f
--- /dev/null
+++ b/app/src/main/res/drawable/img_tangem_logo_96.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="96dp"
+    android:height="96dp"
+    android:viewportWidth="96"
+    android:viewportHeight="96">
+    <path
+        android:fillColor="#1E1E1E"
+        android:pathData="M56.27,47.27V78H69.56C70.07,78 70.57,77.8 70.93,77.43C71.3,77.07 71.5,76.57 71.5,76.06V47.27H56.27Z" />
+    <path
+        android:fillColor="#1E1E1E"
+        android:pathData="M25.5,76.06C25.5,76.57 25.71,77.07 26.07,77.43C26.43,77.8 26.93,78 27.44,78H40.73V47.27H25.5V76.06Z" />
+    <path
+        android:fillColor="#1E1E1E"
+        android:pathData="M71.5,32.2V18.94C71.5,18.43 71.29,17.93 70.93,17.57C70.56,17.2 70.07,17 69.55,17H27.45C26.94,17 26.44,17.2 26.07,17.57C25.71,17.93 25.5,18.43 25.5,18.94V32.2H71.5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/shape_rectangle_rounded_100.xml b/app/src/main/res/drawable/shape_rectangle_rounded_100.xml
index 7f26fb8be5..23424858db 100644
--- a/app/src/main/res/drawable/shape_rectangle_rounded_100.xml
+++ b/app/src/main/res/drawable/shape_rectangle_rounded_100.xml
@@ -5,4 +5,4 @@
 
     <corners android:radius="100dp" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
index b14f8571de..d3cd156604 100644
--- a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml
@@ -51,7 +51,7 @@
         android:id="@+id/chb_understand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/alert_button_i_understand"
+        android:text="@string/common_understand"
         android:textStyle="bold"
         android:visibility="gone"
         app:buttonTint="@color/accent"
@@ -75,7 +75,7 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
             style="@style/OnboardingButton"
-            tools:text="@string/home_button_scan" />
+            tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
             android:id="@+id/progress"
diff --git a/app/src/main/res/layout/card_total_balance_shimmer.xml b/app/src/main/res/layout/card_total_balance_shimmer.xml
index 5bacc23c4c..76dfc5e5a3 100644
--- a/app/src/main/res/layout/card_total_balance_shimmer.xml
+++ b/app/src/main/res/layout/card_total_balance_shimmer.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <View
-            android:layout_width="124dp"
-            android:layout_height="22dp"
-            android:layout_marginTop="12dp" />
+        android:layout_width="124dp"
+        android:layout_height="22dp"
+        android:layout_marginTop="8dp"
+        tools:background="@color/background_secondary" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/dialog_onboarding_address_info.xml b/app/src/main/res/layout/dialog_onboarding_address_info.xml
index ca04440067..eadb8f7f36 100644
--- a/app/src/main/res/layout/dialog_onboarding_address_info.xml
+++ b/app/src/main/res/layout/dialog_onboarding_address_info.xml
@@ -36,7 +36,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imv_qr_code"
-        tools:text="@string/address_qr_code_message_token_format" />
+        tools:text="Send only Ethereum (ETH) from Ethereum network to this address. Using other tokens and networks may result in loss of funds." />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline3"
diff --git a/app/src/main/res/layout/dialog_wallet_trade.xml b/app/src/main/res/layout/dialog_wallet_trade.xml
index 062d0286d1..cb4e47fecd 100644
--- a/app/src/main/res/layout/dialog_wallet_trade.xml
+++ b/app/src/main/res/layout/dialog_wallet_trade.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:padding="16dp"
-        android:text="@string/wallet_dialog_choose_trade_action"
+        android:text="@string/wallet_choose_trade_action"
         android:textColor="@color/darkGray2"
         android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/fragment_add_tokens.xml b/app/src/main/res/layout/fragment_add_tokens.xml
index f7a8fa24dc..0b5881f415 100644
--- a/app/src/main/res/layout/fragment_add_tokens.xml
+++ b/app/src/main/res/layout/fragment_add_tokens.xml
@@ -21,7 +21,7 @@
             android:layout_height="?attr/actionBarSize"
             app:menu="@menu/menu_popular_tokens"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/add_tokens_title" />
+            app:title="@string/main_manage_tokens" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -30,7 +30,7 @@
         android:id="@+id/cv_currencies"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_details_confirm.xml b/app/src/main/res/layout/fragment_details_confirm.xml
index 83bbae68c9..8a56bf635b 100644
--- a/app/src/main/res/layout/fragment_details_confirm.xml
+++ b/app/src/main/res/layout/fragment_details_confirm.xml
@@ -52,7 +52,7 @@
             android:textColor="@color/warning"
             app:layout_constraintTop_toBottomOf="@id/iv_warning"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -66,7 +66,7 @@
             android:textAlignment="center"
             app:layout_constraintTop_toBottomOf="@id/tv_warning"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline"
@@ -84,7 +84,7 @@
             android:layout_marginStart="7dp"
             android:layout_marginTop="30dp"
             android:layout_marginEnd="16dp"
-            tools:text="@string/details_row_title_reset_factory_settings"
+            tools:text="@string/card_settings_reset_card_to_factory"
             tools:icon="@drawable/ic_send"
             app:layout_constraintStart_toEndOf="@+id/guideline"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index ab388fa0cd..b3d1b54730 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_wallet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -13,7 +13,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/toolbarColor"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
diff --git a/app/src/main/res/layout/fragment_wallet_details.xml b/app/src/main/res/layout/fragment_wallet_details.xml
index 1467361b47..f1cdf9a73a 100644
--- a/app/src/main/res/layout/fragment_wallet_details.xml
+++ b/app/src/main/res/layout/fragment_wallet_details.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_wallet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/backgroundLightGray"
+    android:background="@color/background_secondary"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -13,7 +13,7 @@
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/backgroundLightGray"
+        android:background="@color/background_secondary"
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
@@ -105,27 +105,27 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/l_wallet_details" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/l_wallet_details" />
 
                 <androidx.constraintlayout.widget.Barrier
-                        android:id="@+id/barrier"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:barrierDirection="bottom"
-                        app:constraint_referenced_ids="l_wallet_details" />
+                    android:id="@+id/barrier"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="l_wallet_details" />
 
                 <com.tangem.tap.features.wallet.ui.view.WalletDetailsButtonsRow
-                        android:id="@+id/row_buttons"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="28dp"
-                        android:layout_marginBottom="32dp"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        app:layout_constraintVertical_bias="1"
-                        app:layout_constraintTop_toBottomOf="@id/rv_warning_messages"
-                        app:layout_constraintBottom_toBottomOf="parent" />
+                    android:id="@+id/row_buttons"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="28dp"
+                    android:layout_marginBottom="32dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintVertical_bias="1"
+                    app:layout_constraintTop_toBottomOf="@id/rv_warning_messages"
+                    app:layout_constraintBottom_toBottomOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_currency_wallet_content.xml b/app/src/main/res/layout/item_currency_wallet_content.xml
index 18249f4c63..aa767d069c 100644
--- a/app/src/main/res/layout/item_currency_wallet_content.xml
+++ b/app/src/main/res/layout/item_currency_wallet_content.xml
@@ -14,77 +14,77 @@
             app:layout_constraintGuide_percent="0.5" />
 
     <TextView
-            android:id="@+id/tv_currency"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/darkGray6"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            app:lineHeight="24dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tv_amount_fiat"
-            tools:text="Binance Smart Chain Optimal" />
+        android:id="@+id/tv_currency"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/text_primary_1"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
+        app:layout_constraintEnd_toStartOf="@+id/tv_amount_fiat"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lineHeight="24dp"
+        tools:text="Binance Smart Chain Optimal" />
 
 
     <TextView
-            android:id="@+id/tv_amount_fiat"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textColor="@color/darkGray6"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:textAlignment="viewEnd"
-            app:lineHeight="24dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:text="1230.43 $" />
+        android:id="@+id/tv_amount_fiat"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/text_primary_1"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/guideline_horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lineHeight="24dp"
+        tools:text="1230.43 $" />
 
     <TextView
-            android:id="@+id/tv_amount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textColor="@color/darkGray2"
-            android:textSize="12sp"
-            android:textAlignment="viewEnd"
-            app:lineHeight="20dp"
-            app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:text="2.002134 BTC" />
+        android:id="@+id/tv_amount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textAlignment="viewEnd"
+        android:textColor="@color/text_tertiary"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
+        app:lineHeight="20dp"
+        tools:text="2.002134 BTC" />
 
     <TextView
-            android:id="@+id/tv_status"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textColor="@color/warning"
-            android:textSize="12sp"
-            app:lineHeight="20dp"
-            app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="Unreachable..." />
+        android:id="@+id/tv_status"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/text_tertiary"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
+        app:lineHeight="20dp"
+        tools:text="Unreachable..." />
 
     <TextView
-            android:id="@+id/tv_exchange_rate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:textColor="@color/darkGray2"
-            android:textSize="12sp"
-            app:lineHeight="20dp"
-            app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:text="46 908 $" />
+        android:id="@+id/tv_exchange_rate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:textColor="@color/text_secondary"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/guideline_horizontal"
+        app:lineHeight="20dp"
+        tools:text="46 908 $" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_popular_token.xml b/app/src/main/res/layout/item_popular_token.xml
index c3904baa73..4bda6a1b28 100644
--- a/app/src/main/res/layout/item_popular_token.xml
+++ b/app/src/main/res/layout/item_popular_token.xml
@@ -14,7 +14,6 @@
         android:layout_height="40dp"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:contentDescription="@string/token_icon"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml
index abf039bab7..ae0481aa8c 100644
--- a/app/src/main/res/layout/layout_address.xml
+++ b/app/src/main/res/layout/layout_address.xml
@@ -43,14 +43,14 @@
                     style="@style/TapChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/wallet_address_chip_default" />
+                    android:text="@string/address_type_default" />
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/chip_legacy"
                     style="@style/TapChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/wallet_address_chip_legacy" />
+                    android:text="@string/address_type_legacy" />
 
             </com.google.android.material.chip.ChipGroup>
 
@@ -137,6 +137,17 @@
 
             </FrameLayout>
 
+            <TextView
+                android:id="@+id/tv_info"
+                style="@style/TextViewOnboarding.Body"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/spacing16"
+                android:textAlignment="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_explore"
+                tools:text="Send only Ethereum (ETH) from Ethereum network to this address. Using other tokens and networks may result in loss of funds." />
+
             <View
                 android:id="@+id/v_payid_divider"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_card_total_balance.xml b/app/src/main/res/layout/layout_card_total_balance.xml
index fe3484f373..ed26db5407 100644
--- a/app/src/main/res/layout/layout_card_total_balance.xml
+++ b/app/src/main/res/layout/layout_card_total_balance.xml
@@ -1,86 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/card_balance"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card_balance"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="18dp"
-            android:layout_marginBottom="18dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:animateLayoutChanges="true">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="18dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="18dp">
 
         <TextView
-                android:id="@+id/tv_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:textColor="@color/iconGray"
-                android:textSize="14sp"
-                android:text="@string/main_page_balance"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/tv_currency_name" />
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:text="@string/main_page_balance"
+            android:textColor="@color/text_tertiary"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toStartOf="@id/tv_currency_name"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.skydoves.androidveil.VeilLayout
-                android:id="@+id/veil_balance"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                app:veilLayout_layout="@layout/card_total_balance_shimmer"
-                app:veilLayout_baseColor="@color/lightGray0"
-                app:veilLayout_highlightColor="@color/lightGray1"
-                app:veilLayout_shimmerEnable="true"
-                app:veilLayout_veiled="true"
-                app:veilLayout_radius="4dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_title"
-                app:layout_constraintBottom_toTopOf="@id/tv_processing"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                tools:veilLayout_veiled="false">
+            android:id="@+id/veil_balance"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:visibility="visible"
+            app:layout_constraintBottom_toTopOf="@id/tv_processing"
+            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:veilLayout_baseColor="@color/lightGray0"
+            app:veilLayout_highlightColor="@color/lightGray1"
+            app:veilLayout_layout="@layout/card_total_balance_shimmer"
+            app:veilLayout_radius="4dp"
+            app:veilLayout_shimmerEnable="true"
+            app:veilLayout_veiled="true">
 
             <TextView
-                    android:id="@+id/tv_balance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:minWidth="152dp"
-                    android:maxLines="1"
-                    android:textColor="@color/darkGray6"
-                    android:textSize="26sp"
-                    android:textStyle="bold"
-                    tools:text="22 325.40 $" />
-
+                android:id="@+id/tv_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:minWidth="152dp"
+                android:textColor="@color/text_primary_1"
+                android:textSize="26sp"
+                android:textStyle="bold"
+                android:visibility="visible"
+                tools:text="22 325.40 $"
+                tools:visibility="visible" />
         </com.skydoves.androidveil.VeilLayout>
 
         <TextView
-                android:id="@+id/tv_processing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:visibility="gone"
-                android:textColor="@color/warning"
-                android:textSize="12sp"
-                android:text="@string/main_processing_full_amount"
-                app:layout_constraintTop_toBottomOf="@id/veil_balance"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:visibility="visible" />
+            android:id="@+id/tv_processing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="@string/main_processing_full_amount"
+            android:textColor="@color/text_secondary"
+            android:textSize="12sp"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/veil_balance"
+            tools:visibility="visible" />
 
         <TextView
-                android:id="@+id/tv_currency_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/darkGray1"
-                android:textSize="16sp"
-                app:drawableEndCompat="@drawable/ic_arrow_angle_down"
-                app:drawableTint="@color/darkGray1"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                tools:text="USD" />
+            android:id="@+id/tv_currency_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_tertiary"
+            android:textSize="16sp"
+            app:drawableEndCompat="@drawable/ic_arrow_angle_down"
+            app:drawableTint="@color/icon_informative"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="USD" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/layout_onboarding_container_bottom.xml b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
index 9ee7ea6489..f737c473c0 100644
--- a/app/src/main/res/layout/layout_onboarding_container_bottom.xml
+++ b/app/src/main/res/layout/layout_onboarding_container_bottom.xml
@@ -51,7 +51,7 @@
         android:id="@+id/chb_understand"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/alert_button_i_understand"
+        android:text="@string/common_understand"
         android:textStyle="bold"
         android:visibility="gone"
         app:buttonTint="@color/accent"
@@ -75,7 +75,7 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_main_action"
             style="@style/OnboardingButton"
-            tools:text="@string/home_button_scan" />
+            tools:text="@string/welcome_unlock_card" />
 
         <ProgressBar
             android:id="@+id/progress"
diff --git a/app/src/main/res/layout/layout_token.xml b/app/src/main/res/layout/layout_token.xml
index fc9486f79c..07baf720d5 100644
--- a/app/src/main/res/layout/layout_token.xml
+++ b/app/src/main/res/layout/layout_token.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="2dp"
-        android:text="@string/wallet_balance_tokens_title"
+        android:text="@string/main_tokens"
         android:textColor="@color/darkGray1"
         android:textSize="14sp"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,7 +22,7 @@
         android:layout_height="0dp"
         android:background="@color/backgroundLightGray"
         app:layout_constraintTop_toBottomOf="@id/tv_token_title"
-        app:layout_constraintBottom_toBottomOf="@id/tv_token_fiat_amount"/>
+        app:layout_constraintBottom_toBottomOf="@id/tv_token_fiat_amount" />
 
     <TextView
         android:id="@+id/tv_token_symbol"
diff --git a/app/src/main/res/layout/layout_wallet_details.xml b/app/src/main/res/layout/layout_wallet_details.xml
index 8e33a5cead..afff5b42e5 100644
--- a/app/src/main/res/layout/layout_wallet_details.xml
+++ b/app/src/main/res/layout/layout_wallet_details.xml
@@ -60,14 +60,14 @@
                     style="@style/TapChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/wallet_address_chip_default" />
+                    android:text="@string/address_type_default" />
 
                 <com.google.android.material.chip.Chip
                     android:id="@+id/chip_legacy"
                     style="@style/TapChip"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/wallet_address_chip_legacy" />
+                    android:text="@string/address_type_legacy" />
 
             </com.google.android.material.chip.ChipGroup>
 
@@ -127,7 +127,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="4dp"
                 android:src="@drawable/ic_inactive"
-                android:text="@string/wallet_address_button_copy"
+                android:text="@string/common_copy"
                 android:textAlignment="center"
                 android:textColor="@color/colorSecondary"
                 app:chipBackgroundColor="@color/blue_pale"
@@ -148,7 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
                 android:src="@drawable/ic_inactive"
-                android:text="@string/wallet_address_button_share"
+                android:text="@string/common_share"
                 android:textAlignment="center"
                 android:textColor="@color/colorSecondary"
                 app:chipBackgroundColor="@color/blue_pale"
@@ -174,7 +174,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/btn_copy"
-                tools:text="@string/address_qr_code_message_token_format" />
+                tools:text="Send only Ethereum (ETH) from Ethereum network to this address. Using other tokens and networks may result in loss of funds." />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/menu/menu_wallet.xml b/app/src/main/res/menu/menu_wallet.xml
index edd88afb93..c5848ecb6a 100644
--- a/app/src/main/res/menu/menu_wallet.xml
+++ b/app/src/main/res/menu/menu_wallet.xml
@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-            android:id="@+id/details_menu"
-            android:title="@string/details_title"
-            android:icon="@drawable/ic_more_vertical_24"
-            app:iconTint="@color/darkGray6"
-            app:showAsAction="ifRoom" />
+        android:id="@+id/details_menu"
+        android:title="@string/details_title"
+        android:icon="@drawable/ic_more_vertical"
+        app:iconTint="@color/darkGray6"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
deleted file mode 100644
index cf8a46c64c..0000000000
--- a/app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="common_save_changes">Änderungen speichern</string>
-    <string name="common_warning">Warnung</string>
-    <string name="common_retry">Erneut versuchen</string>
-    <string name="common_done">Erledigt</string>
-    <string name="common_cancel">Abbrechen</string>
-    <string name="common_accept">Akzeptieren</string>
-    <string name="common_delete">Entfernen</string>
-
-    <string name="common_camera_denied_alert_title">Der Kamerazugriff wurde verweigert </string>
-    <string name="common_camera_denied_alert_message">Sie haben keinen Zugang zur Kamera erteilt, bitte passen Sie Ihre Datenschutzeinstellungen an</string>
-    <string name="common_camera_alert_button_settings">Einstellungen</string>
-    <string name="home_welcome">Willkommen bei Tangem. Haben Sie eine dieser Karten?</string>
-    <string name="home_welcome_back">Willkommen bei Tangem. Scannen Sie Ihre Karten um zu starten.</string>
-    <string name="home_button_yes">Ja! Bitte scannen</string>
-    <string name="home_button_shop">Einkaufen</string>
-    <string name="home_ready_title">Halten Sie die \ncard hinter dem \nphone bereit und scannen Sie sie.</string>
-    <string name="home_button_tapin">Eintippen</string>
-    <string name="home_button_scan">Karte scannen</string>
-    <string name="wallet_button_scan">Scannen</string>
-    <string name="wallet_button_send">Absenden</string>
-    <string name="wallet_button_create_wallet">ein Wallet erstellen</string>
-    <string name="wallet_title">Tangem</string>
-    <string name="wallet_choice_wallet_option_title">eine Walletoption wählen</string>
-    <string name="wallet_balance_token_title">Token</string>
-    <string name="wallet_balance_tokens_title">Tokens</string>
-    <string name="wallet_balance_verified">Verifizierte Bilanz</string>
-    <string name="wallet_balance_loading">Die Bilanz wird aufgeladen…</string>
-    <string name="wallet_balance_blockchain_unreachable">Blockchain ist nicht erreichbar</string>
-    <string name="wallet_error_no_account">Das Konto ist nicht erstellt</string>
-    <string name="wallet_error_no_account_subtitle_format">%s+ %s aufladen um ein Konto zu erstellen</string>
-    <string name="wallet_error_empty_card">Leere Karte</string>
-    <string name="wallet_error_empty_card_subtitle">Erstellen Sie ein Wallet um die Tangem-Karte verwenden zu können</string>
-    <string name="wallet_error_unsupported_blockchain">Diese Karte wird nicht unterstützt</string>
-    <string name="wallet_error_unsupported_blockchain_subtitle">Ihre Tangem-Karte wurde für die Arbeit mit einer anderen App ausgestellt. Bitte sehen Sie sich den Namen und die Anleitung auf Ihrer Karte an und installieren Sie eine korrekte App</string>
-    <string name="wallet_balance_tx_in_progress">Die Transaktion läuft…</string>
-    <string name="wallet_pending_tx_sending">Senden</string>
-    <string name="wallet_pending_tx_sending_address_format">an %s</string>
-    <string name="wallet_pending_tx_receiving">Erhalten</string>
-    <string name="wallet_pending_tx_receiving_address_format">von %s</string>
-    <string name="wallet_address_button_explore">Adresse erkunden</string>
-    <string name="wallet_address_button_create_payid">PayString erstellen</string>
-    <string name="wallet_qr_title_format">%s Wallet</string>
-    <string name="wallet_create_payid">PayString erstellen</string>
-    <string name="wallet_create_payid_card_format">Karte: %s</string>
-    <string name="wallet_create_payid_hint">PayString Name</string>
-    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
-    <string name="wallet_create_payid_button_title">Erstellen</string>
-    <string name="wallet_create_payid_info">PayString sind Ihre einzigartigen Identifikationsdaten wie Telefonnummer, E-Mail-Adresse oder ABN.</string>
-    <string name="wallet_create_payid_success_message">Ihre PayString wurde erfolgreich erstellt und zum Clipboard kopiert</string>
-    <string name="wallet_create_payid_error_message">Fehlerantwort beim Erstellen der PayString</string>
-    <string name="wallet_create_payid_error_already_created">Diese PayString existiert bereits. Versuchen Sie mit einer anderen erneut.</string>
-    <string name="send_destination_hint_address_payid">Adresse oder PayString</string>
-    <string name="send_destination_hint_address">Adresse</string>
-    <string name="send_title">Absenden</string>
-    <string name="send_network_fee_title">Netzgebühr</string>
-    <string name="send_amount_label">Betrag</string>
-    <string name="send_fee_label">Gebühr</string>
-    <string name="send_total_label">Gesamt</string>
-    <string name="send_max_amount_label">Höchstbetrag</string>
-    <string name="send_fee_picker_low">Niedrig</string>
-    <string name="send_fee_picker_normal">Normal</string>
-    <string name="send_fee_picker_priority">Priorität</string>
-    <string name="send_fee_include_description">inkl. Gebühr</string>
-    <string name="send_total_subtitle_format">%s %s wird gesendet</string>
-    <string name="send_total_subtitle_fiat_format">≈ %s (inkl. Gebühr: %s)</string>
-    <string name="send_total_subtitle_asset_format">%s %s und %s %s werden gesendet</string>
-    <string name="send_balance_subtitle_format">Bilanz: %s %s</string>
-    <string name="send_transaction_success">Die Transaktion wurde erfolgreich signiert und an den Blockchain-Knoten gesendet. Die Walletbilanz wird aktualisiert</string>
-    <string name="details_title">Details</string>
-    <string name="details_row_title_cid">KartenID</string>
-    <string name="details_row_title_issuer">Emittent</string>
-    <string name="details_row_title_signed_hashes">Signiert</string>
-    <string name="details_row_subtitle_signed_hashes_format">%s Hasch</string>
-    <string name="details_row_title_currency">App Währung</string>
-    <string name="details_section_title_settings">Einstellungen</string>
-    <string name="details_section_title_card">Karte</string>
-    <string name="details_row_title_validate">Karte validieren</string>
-    <string name="details_row_title_manage_security">Sicherheit verwalteny</string>
-    <string name="details_row_title_erase_wallet">Wallet löschen</string>
-    <string name="details_erase_wallet_warning">Dieser Vorgang ist irriversibel. Wenn jemand nach dem Löschen des Wallets Geld überweist, können Sie es nicht mehr abheben.</string>
-    <string name="details_security_management_warning">Sollten Sie den Code verloren haben, haben Sie keinen Zugriff auf die Karte. Sie können Ihren Code nicht wiederherstellen und nicht ändern, wenn Sie ihn verlieren.</string>
-    <string name="details_manage_security_title">Sicherheit verwalten</string>
-    <string name="details_manage_security_long_tap">Langes Tippen</string>
-    <string name="details_manage_security_long_tap_description">Dieser Mechanismus schützt vor Annäherungsangriffen auf eine Karte. Es wird eine Verzögerung zwischen dem Empfang und der Ausführung eines Befehls erzwungen. Nach der ersten signierten Transaktion wird dieses Telefon mit der Karte verknüpft und die Transaktionen werden sofort signiert</string>
-    <string name="details_manage_security_passcode">Passcode</string>
-    <string name="details_manage_security_passcode_description">Bevor Sie einen Befehl ausführen, der eine Änderung des Kartenstatus zur Folge hat, müssen Sie den Passcode eingeben.</string>
-    <string name="details_manage_security_access_code">Zugangscode</string>
-    <string name="details_manage_security_access_code_description">Sie müssen den richtigen Zugangscode eingeben, bevor Sie die Karte scannen.</string>
-    <string name="alert_old_device_this_card">Sie können NFC-Probleme mit einigen iPhone 7/7+ während der Extraktion haben</string>
-    <string name="alert_card_signed_transactions">Diese Karte wurde früher bereits aufgeladen und Transaktionen wurden damit signiert. Ziehen Sie eine sofortige Auszahlung aller Beträge in Betracht, wenn Sie diese Karte von einer nicht vertrauenswürdigen Quelle erhalten haben.</string>
-    <string name="alert_title">Warnung</string>
-
-    <string name="alert_unsupported_card">Diese Karte ist für die Zusammenarbeit mit Tangem nicht geeignet</string>
-    <string name="alert_developer_card">Die von Ihnen gescannte Karte ist eine Entwicklungskarte. Akzeptieren Sie sie nicht als Zahlungsmittel</string>
-    <string name="alert_old_card">Die vor September 2019 ausgestellten Karten können mit iPhone momentan nicht extrahiert werden. Wir arbeiten eng mit Apple zusammen, damit es in den nächsten Versionen von iOS möglich wäre.</string>
-    <string name="initial_message_sign_header">Tippen um zu signieren</string>
-    <string name="initial_message_sign_body">Scannen Sie die Karte mit Ihrem Handy wie oben gezeigt</string>
-    <string name="initial_message_purge_wallet_body">Tippen Sie um das Wallet zu löschen</string>
-    <string name="initial_message_create_wallet_body">Tippen Sie um ein Wallet zu erstellen</string>
-    <string name="initial_message_change_access_code_body">Tippen Sie um den Zugangscode zu ändern</string>
-    <string name="initial_message_change_passcode_body">Tippen Sie um den Passcode zu ändern</string>
-    <string name="payid_service_error_loading">Ungültige PayString</string>
-
-
-    <string name="disclaimer_text">
-RECHTLICHER HAFTUNGSAUSSCHLUSS
-\n\n1.Tangem App (Software)
- 
-\n\nDie Software ist nur für die Verwendung mit Tangem hardware Wallets (Karten) über NFC-Schnittstelle geeignet. Die Software:
- 
-\n\na.	generieret, speichert, überträgt KEINE privaten (geheimen) kryptografischen Schlüssel für Blockchain- Wallets mit digitalen Assets, einschließlich Kryptowährung, und hat KEINEN Zugriff darauf.
-\n\nb.	generieret, speichert, überträgt KEINE geheimen Schlüssel, Passwörter, Passphrasen, Wiederherstellungssätze, die verwendet werden können, um private (geheime) Schlüssel in Blockchain- Wallets, die digitale Assets enthalten, wiederherzustellen oder zu kopieren, einschließlich Kryptowährung, und hat KEINEN Zugriff darauf.
-\n\nc.	erbringt KEINE Wechsel-, Handels- und Investitionsdienstleistungen im Auftrag der Tangem AG.
- 
- 
-\n\n2.	Risiken im Zusammenhang mit der Verwendung von Software
- 
-\n\nTangem haftet nicht für Verluste, Schäden oder Ansprüche aus den Ereignissen, die in den Geltungsbereich von folgenden fünf Kategorien fallen:
- 
-\n\na.	Fehler, die der Benutzer einer kryptowährungsbezogenen Software oder eines kryptowährungsbezogenen Services macht, z.B. vergessene Passwörter, an falsche Adressen gesendete Zahlungen und zufälliges Löschen von Blockchain-Wallets auf Karten.
-\n\nb.	Probleme mit Software und/oder blockchain- oder kryptowährungsbezogener Software oder Services, z.B. beschädigte Dateien, falsch konstruierte Transaktionen, unsichere kryptografische Bibliotheken, Schadsoftware.
-\n\nc.	Technische Ausfälle in der Hardware des Benutzers, einschließlich Karten, jeglicher kryptowährungsbezogener Software oder Services, z.B. Datenverlust infolge eines fehlerhaften oder beschädigten Speichers.
-\n\nd.	Sicherheitsprobleme, die der Benutzer einer kryptowährungsbezogenen Software oder eines kryptowährungsbezogenen Services hat, z.B. unbefugter Zugriff auf Benutzer-Wallets und/oder -Konten.
-\n\ne.	Handlungen oder Untätigkeit Dritter und/oder Vorkommnisse bei den Dritten, z.B. Insolvenz von Dienstleistungserbringern, Informationssicherheitsattacken bei den Dienstleistungserbringern und Betrug durch Dritte.
- 
-
-\n\n3.  Tradings- und Investitionsrisiken
- 
-\n\nBei jeder Kryptowährung oder einer anderen digitalen Assetwechsel-Transaktion besteht ein hohes Risiko. Jede Transaktion mit Währungen birgt Risiken, einschließlich, aber nicht beschränkt auf das Potenzial für sich ändernde wirtschaftliche Bedingungen, die den Preis oder die Liquidität einer Währung erheblich beeinflussen können. Investitionen in Kryptowährungsspekulationen können auch anfällig für starke Anstiege und Rückgänge sein, wenn die relevanten Marktwerte schwanken. Aus diesem Grund ist es bei Spekulationen auf solchen Märkten ratsam, nur das Risikokapital zu verwenden.
- 
-
-\n\n4. Risiken im Zusammenhang mit elektronischem Trading
- 
-\n\nBevor Sie Transaktionen über ein elektronisches System tätigen, sollten Sie die Regeln und Vorschriften der Börsen, die das System anbieten, und/oder die Instrumente, mit denen Sie handeln möchten, sorgfältig überprüfen. Der Online-Handel birgt ein dazugehörendes Risiko aufgrund der Systemreaktion und der Zugriffszeiten, die aufgrund der Marktbedingungen, der Systemleistung und anderer Faktoren variieren können. Sie sollten diese und andere Risiken vor dem Tradingsbeginn berücksichtigen.
- 
-
-\n\n5. Einhaltung der Steuerpflichten
- 
-\n\nDie Benutzer der Software müssen allein bestimmen, welche Steuern, wenn überhaupt, für Ihre Kryptowährungstransaktionen gelten. Die Eigentümer oder die Mitwirkenden an der Software sind für die Ermittlung der Steuern, die für Kryptowährungstransaktionen gelten, NICHT verantwortlich.
- 
-
-\n\n6. Garantieausschluss
-
-\n\nDie Software wird „wie gesehen“ bereitgestellt, ohne jegliche Gewährleistung in Bezug auf die Software und/oder Inhalte, Daten, Materialien und/oder Services, die zur Software gehören.
- 
-
-\n\n7. Haftungsbeschränkung
- 
-\n\nSofern gesetzlich nichts anderes vorgesehen ist, haften die Eigentümer oder die Mitwirkenden an der Software in keinem Fall für Schäden jeglicher Art, einschließlich, aber nicht beschränkt auf Nutzungsausfall, entgangenen Gewinn oder Datenverlust, die aus der Verwendung der Software oder in Zusammenhang mit der jeglichen Verwendung der Software entstehen. Auf keine Weise sind die Eigentümer oder die Mitwirkenden an der Software für die von Ihnen im Vertrauen auf die Software vorgenommenen oder unterlassenen Handlungen, Entscheidungen oder sonstigen Verhaltensweisen verantwortlich.
- 
- 
-\n\n8. Letzte Änderung
- 
-\n\nDieser Haftungsausschuss wurde am 1. Oktober 2020 zum letzten Mal geändert.
-
-    </string>
-    <string name="disclaimer_title">Nutzungsbedingungen</string>
-
-    <string name="wallet_notification_no_internet">Keine Internetverbindung</string>
-    <string name="send_error_payid_verification_failed">Verifikation der PayString ist fehlgeschlagen</string>
-    <string name="send_error_payid_unsupported_by_blockchain">PayString wird von der Blockchain nicht unterstützt</string>
-    <string name="send_error_payid_not_registered">PayString ist nicht registriert</string>
-    <string name="send_error_payid_request_failed">PayString-Anfrage ist fehlgeschlagen</string>
-
-    <string name="send_error_address_same_as_wallet">Die Adresse stimmt mit der Adresse Ihrer Brieftasche überein</string>
-
-    <string name="wallet_notification_address_copied">Die Adresse wurde erfolgreich kopiert</string>
-
-
-    <string name="wallet_create_payid_empty">Zuerst geben Sie die gewünschte PayString ein</string>
-
-    <string name="initial_message_scan_header">Legen Sie die Karte zum Scannen an</string>
-    <string name="initial_message_tap_header">Legen Sie die Karte an</string>
-
-    <string name="details_notification_erase_wallet_not_possible">Ihr Kontostand in dieser Brieftasche ist nicht Null, oder Sie haben unbestätigte Transaktionen. Es ist unmöglich die Funktion der Brieftasche zu löschen.</string>
-    <string name="details_notification_security_option_already_active">Dies ist die derzeit aktive Wahl</string>
-
-</resources>
diff --git a/app/src/main/res/values-de/strings_final.xml b/app/src/main/res/values-de/strings_final.xml
deleted file mode 100644
index b7e64d53df..0000000000
--- a/app/src/main/res/values-de/strings_final.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="shop_one_wallet">Tangem Wallet</string>
-    <string name="shop_3_cards">3 cards</string>
-    <string name="shop_2_cards">2 cards</string>
-    <string name="shop_shipping">Shipping</string>
-    <string name="shop_free">Free</string>
-    <string name="shop_i_have_a_promo_code">I have a promo code...</string>
-    <string name="shop_total">Total</string>
-    <string name="shop_other_payment_methods">Other payment methods</string>
-    <string name="shop_buy_now">Buy now</string>
-    <string name="shop_placing_order">Placing your order</string>
-    <string name="shop_web_checkout_title">Your order</string>
-    <string name="story_meet_title">Meet\nTangem</string>
-    <string name="story_meet_buy">Buy</string>
-    <string name="story_meet_store">Store</string>
-    <string name="story_meet_send">Send</string>
-    <string name="story_meet_pay">Pay</string>
-    <string name="story_meet_exchange">Exchange</string>
-    <string name="story_meet_lend">Lend</string>
-    <string name="story_meet_borrow">Borrow</string>
-    <string name="story_meet_stake">Stake</string>
-    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
-    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
-    <string name="story_backup_title">Ultra Secure Backup</string>
-    <string name="story_backup_description_1">Up to</string>
-    <string name="story_backup_description_2_bold">3 physical cards</string>
-    <string name="story_backup_description_3">to one wallet</string>
-    <string name="story_currencies_title">Thousands of Currencies</string>
-    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
-    <string name="story_web3_title">DeFi Compatible</string>
-    <string name="story_web3_description">Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services</string>
-    <string name="story_finish_title">The Wallet for Everyone</string>
-    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
-    <string name="home_button_order">Order</string>
-    <string name="home_button_search_tokens">Search tokens</string>
-    <string name="search_tokens_title">Search tokens</string>
-    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
-    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
-    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
-    <string name="currency_subtitle_expanded">Available networks</string>
-    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
-    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
-    <string name="warning_token_send_unsupported_message">Do not transfer your funds to tokens in this blockchain, otherwise it may lead to their irretrievable loss.</string>
-    <string name="contract_address_copied_message">Contract address copied!</string>
-    <string name="alert_funds_restoration_message">If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds</string>
-    <string name="common_custom">Custom</string>
-    <string name="common_notice">Notice</string>
-    <string name="common_attention">Attention</string>
-    <string name="common_server_unavailable">The server is not available, please try again later</string>
-    <string name="main_page_balance">Total balance</string>
-    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
-    <string name="main_manage_tokens">Manage tokens</string>
-    <string name="token_item_no_rate">No rate</string>
-    <string name="token_details_hide_token">Hide token</string>
-    <string name="token_details_hide_alert_title">Hide %s</string>
-    <string name="token_details_hide_alert_hide">Hide</string>
-    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
-    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
-    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
-    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
-    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
-    <string name="wallet_currency_subtitle">%s network</string>
-    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
-    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
-    <string name="wallet_hide_token" translatable="false">Remove token</string>
-    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
-    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
-    <string name="common_yes">Yes</string>
-    <string name="common_no">No</string>
-    <string name="details_ask_a_question">Chat</string>
-    <string name="chat_bot_name">Tangem Bot</string>
-    <string name="card_settings_title">Card Settings</string>
-    <string name="card_settings_security_mode">Security Mode</string>
-    <string name="card_settings_security_mode_footer">Selected application protection method</string>
-    <string name="card_settings_change_access_code">Change access code</string>
-    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
-    <string name="scan_card_settings_title">Get your card ready!</string>
-    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you’ve scanned and will not affect other cards tied to your wallet.</string>
-    <string name="scan_card_settings_button">Scan Card</string>
-    <string name="app_settings_title">App settings</string>
-    <string name="app_settings_warning_title">Enable biometric authentication</string>
-    <string name="app_settings_warning_subtitle">Go to settings to enable biometric authentication in the Tangem app</string>
-    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
-    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
-    <string name="app_settings_saved_access_codes">Save Access Code</string>
-    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
-    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
-    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
-    <string name="wallet_connect_title">WalletConnect</string>
-    <string name="wallet_connect_subtitle">Connect to Dapps</string>
-    <string name="details_row_title_create_backup">Link More Cards</string>
-    <string name="details_row_title_create_backup_footer">You can synchronize up to three cards into one wallet. It can only be done once.</string>
-    <string name="details_row_privacy_policy">Privacy policy</string>
-    <string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
-    <string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
-    <string name="reset_card_to_factory_button_title">Reset the card</string>
-    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
-    <string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="wallet_connect_select_network">Select network</string>
-    <string name="main_scan_card_warning_view_title">Scan your card</string>
-    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
-    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session</string>
-    <string name="send_extras_hint_memo">Memo</string>
-    <string name="send_extras_hint_destination_tag">Tag</string>
-    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
-    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
-    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
-    <string name="saltpay_backup_warning" translatable="false">To start working with the card scan the first card and make a backup</string>
-    <string name="saltpay_error_empty_backup_title">Attention</string>
-    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
-    <string name="saltpay_error_no_gas_title">No funds for activation</string>
-    <string name="saltpay_error_no_gas_message">Please contact support</string>
-    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
-    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
-    <string name="onboarding_navbar_pin">Pin code</string>
-    <string name="onboarding_navbar_register_wallet">Connect</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
-    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
-    <string name="onboarding_navbar_kyc_waiting">In progress</string>
-    <string name="onboarding_button_pin">Set PIN code</string>
-    <string name="onboarding_button_register_wallet">Register</string>
-    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
-    <string name="onboarding_button_kyc_waiting">Refresh</string>
-    <string name="onboarding_title_register_wallet">Connect your card</string>
-    <string name="onboarding_title_kyc_start">Verify your identity</string>
-    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
-    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
-    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
-    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. Usually it takes up to 1 hour. You can close the app and come back later.</string>
-    <string name="onboarding_title_pin">PIN Code</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
-    <string name="error_saltpay_wrong_backup_card">This card is not designed to SaltPay backup</string>
-    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
-    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
-    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
-    <string name="onboarding_chat_button_title">Support</string>
-    <string name="onboarding_navbar_claim">Getting started</string>
-    <string name="onboarding_title_claim">Claim %s</string>
-    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
-    <string name="onboarding_button_claim">Claim</string>
-    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
-    <string name="onboarding_title_claim_progress">Claiming</string>
-    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
-    <string name="onboarding_title_kyc_retry">Something went wrong</string>
-    <string name="onboarding_subtitle_kyc_retry">Please check you email for further instructions</string>
-    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
-    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
-    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings_plurals_final.xml b/app/src/main/res/values-de/strings_plurals_final.xml
deleted file mode 100644
index fa02d656a3..0000000000
--- a/app/src/main/res/values-de/strings_plurals_final.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <plurals name="card_label_card_count">
-        <item quantity="one">%d card</item>
-        <item quantity="other">%d cards</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
deleted file mode 100644
index d39650f3b7..0000000000
--- a/app/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="common_save_changes">Sauvegarder les modifications</string>
-    <string name="common_warning">Alerte</string>
-    <string name="common_retry">Réessayer</string>
-    <string name="common_done">Exécuté</string>
-    <string name="common_cancel">Annuler</string>
-    <string name="common_accept">J\'accepte</string>
-    <string name="common_delete">Supprimer</string>
-
-    <string name="common_camera_denied_alert_title">L\'accès à la caméra est refusé</string>
-    <string name="common_camera_denied_alert_message">Vous n\'avez pas octroyé l\'accès à votre caméra, veuillez modifier vos paramètres de confidentialité</string>
-    <string name="common_camera_alert_button_settings">Paramètres</string>
-    <string name="home_welcome">Bienvenue à Tangem. Avez-vous une de nos cartes</string>
-    <string name="home_welcome_back">Encore une fois, bienvenue dans Tangem. \nScannez votre carte pour commencer.</string>
-    <string name="home_button_yes">Oui! Scannez-la.</string>
-    <string name="home_button_shop">Magasin</string>
-    <string name="home_ready_title">Préparez-vous à appuyer votre carte au dos de votre téléphone.</string>
-    <string name="home_button_tapin">Appuyez</string>
-    <string name="home_button_scan">Scannez la carte</string>
-    <string name="wallet_button_scan">Scanner</string>
-    <string name="wallet_button_send">Envoyer</string>
-    <string name="wallet_button_create_wallet">Créer un portefeuille</string>
-    <string name="wallet_title">Tangem</string>
-    <string name="wallet_choice_wallet_option_title">Choisir une variante de portefeuille</string>
-    <string name="wallet_balance_token_title">Jeton d\'authentification</string>
-    <string name="wallet_balance_tokens_title">Jetons d\'authentification</string>
-    <string name="wallet_balance_verified">Solde confirmé</string>
-    <string name="wallet_balance_loading">Solde est en cours de téléchargement …</string>
-    <string name="wallet_balance_blockchain_unreachable">Blockchain est inaccessible</string>
-    <string name="wallet_error_no_account">Compte n\'est pas créé</string>
-    <string name="wallet_error_no_account_subtitle_format">Téléchargez %s +%s pour créer un compte</string>
-    <string name="wallet_error_empty_card">Carte vide</string>
-    <string name="wallet_error_empty_card_subtitle">Créez un portefeuille pour commencer à utiliser votre carte Tangem</string>
-    <string name="wallet_error_unsupported_blockchain">Cette carte n\'est pas prise en charge</string>
-    <string name="wallet_error_unsupported_blockchain_subtitle">Votre carte Tangem a été créée pour fonctionner avec une autre application. Regardez le nom et les instructions sur votre carte et installez l\'application pertinente</string>
-    <string name="wallet_balance_tx_in_progress">Transaction en cours…</string>
-    <string name="wallet_pending_tx_sending">Envoi</string>
-    <string name="wallet_pending_tx_sending_address_format">jusqu\'à %s</string>
-    <string name="wallet_pending_tx_receiving">Réception</string>
-    <string name="wallet_pending_tx_receiving_address_format">de %s</string>
-    <string name="wallet_address_button_explore">Explorer l\'adresse</string>
-    <string name="wallet_address_button_create_payid">Créer PayString</string>
-    <string name="wallet_qr_title_format">Portefeuille %s</string>
-    <string name="wallet_create_payid">Créer PayString</string>
-    <string name="wallet_create_payid_card_format">Carte: %s</string>
-    <string name="wallet_create_payid_hint">Dénomination PayString</string>
-    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
-    <string name="wallet_create_payid_button_title">Créer</string>
-    <string name="wallet_create_payid_info">Votre PayString est une information qui vous est propre, comme un numéro de téléphone, une adresse du courrier électronique ou un ABN.</string>
-    <string name="wallet_create_payid_success_message">PayString a été créé avec succès et copié dans le presse-papiers</string>
-    <string name="wallet_create_payid_error_message">Mauvaise réponse lors de la création de PayString</string>
-    <string name="wallet_create_payid_error_already_created">Ce PayString existe déjà. Essayez une autre variante.</string>
-    <string name="send_destination_hint_address_payid">Adresse ou PayString</string>
-    <string name="send_destination_hint_address">Adresse</string>
-    <string name="send_title">Envoyer</string>
-    <string name="send_network_fee_title">Commissions du réseau</string>
-    <string name="send_amount_label">Somme</string>
-    <string name="send_fee_label">Commissions</string>
-    <string name="send_total_label">Total</string>
-    <string name="send_max_amount_label">Somme maximale</string>
-    <string name="send_fee_picker_low">Bas</string>
-    <string name="send_fee_picker_normal">Normal</string>
-    <string name="send_fee_picker_priority">Priorité</string>
-    <string name="send_fee_include_description">Inclure les commissions</string>
-    <string name="send_total_subtitle_format">Sera envoyé %s %s</string>
-    <string name="send_total_subtitle_fiat_format">≈ %s (incl. les commissions : %s)</string>
-    <string name="send_total_subtitle_asset_format">Sera envoyé %s %s et %s %s</string>
-    <string name="send_balance_subtitle_format">Solde : %s %s</string>
-    <string name="send_transaction_success">La transaction a été signée avec succès et envoyée au nœud de blockchain. Le solde du portefeuille sera mis à jour après un certain temps</string>
-    <string name="details_title">Référénces</string>
-    <string name="details_row_title_cid">ID de la carte</string>
-    <string name="details_row_title_issuer">Emetteur</string>
-    <string name="details_row_title_signed_hashes">Signé</string>
-    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
-    <string name="details_row_title_currency">Monnaie de l\'application</string>
-    <string name="details_section_title_settings">Paramètres</string>
-    <string name="details_section_title_card">Carte</string>
-    <string name="details_row_title_validate">Valider la carte</string>
-    <string name="details_row_title_manage_security">Gestion de la sécurité</string>
-    <string name="details_row_title_erase_wallet">Annuler le portefeuille</string>
-    <string name="details_erase_wallet_warning">Cette action est irréversible. Si, après avoir annulé le portefeuille, quelqu\'un lui envoie des fonds, vous ne pourrez pas les retirer.</string>
-    <string name="details_security_management_warning">Si vous oubliez le code, vous perdrez la possibilité d\'utiliser la carte. Si vous perdez le code, il sera impossible de le restaurer ou modifier.</string>
-    <string name="details_manage_security_title">Gestion de la sécurité</string>
-    <string name="details_manage_security_long_tap">Tenez la carte fermement</string>
-    <string name="details_manage_security_long_tap_description">Ce mécanisme protège contre les attaques sans contact sur la carte. Il y a un délai entre la réception et l\'exécution de la commande. Après la première transaction signée, ce téléphone sera associé à la carte et les transactions seront signées immédiatement.</string>
-    <string name="details_manage_security_passcode">Mot de passe</string>
-    <string name="details_manage_security_passcode_description">Avant d\'exécuter une commande qui modifie l\'état de la carte, vous devrez entrer un mot de passe.</string>
-    <string name="details_manage_security_access_code">Code d\'accès</string>
-    <string name="details_manage_security_access_code_description">Vous devrez entrer le mot de passe correct avant de scanner la carte</string>
-    <string name="alert_old_device_this_card">Vous pouvez rencontrer des problèmes NFC avec certains iPhone 7/7 + lors de l\'extraction</string>
-    <string name="alert_card_signed_transactions">Cette carte a déjà été rechargée et a signé des transactions avant. Envisagez la possibilité de retirer tous les fonds immédiatement si vous avez reçu cette carte d\'une source non fiable.</string>
-    <string name="alert_title">Attention</string>
-    <string name="alert_unsupported_card">Cette carte n\'est pas conçue pour fonctionner avec Tangem</string>
-    <string name="alert_developer_card">La carte que vous avez scannée est une carte de développement. Ne l\'acceptez pas comme paiement</string>
-    <string name="alert_old_card">Les cartes Tangem émises avant septembre 2019 ne peuvent actuellement pas être extraites à l\'aide de l\'iPhone. Nous travaillons activement avec Apple pour rendre cela possible dans les futures versions d\'iOS.</string>
-    <string name="initial_message_sign_header">Touchez pour signer</string>
-    <string name="initial_message_sign_body">Appuyez votre carte au téléphone comme indiqué ci-dessus</string>
-    <string name="initial_message_purge_wallet_body">Touchez, pour annuler un portefeuille </string>
-    <string name="initial_message_create_wallet_body">Touchez, pour créer un portefeuille</string>
-    <string name="initial_message_change_access_code_body">Touchez, pour modifier le code d\'accès</string>
-    <string name="initial_message_change_passcode_body">Touchez, pour modifier le mot de passe</string>
-    <string name="payid_service_error_loading">PayString incorrect</string>
-
-    <string name="disclaimer_text">
-
-Avertissement
- 
-\n\n1.Application Tangem (Logiciel)
- 
-\n\nLe logiciel est destiné à l\'utilisation exclusivement avec les e-portefeuilles Tangem (Cartes) à l\'aide de l\'interface NFC. Le logiciel NE réalise pas ce qui suit :
- 
-\n\na.	Génération, stockage, transmission ou octroi d\'accès aux clés privées (confidentiels) de chiffrement des blockchain-portefeuilles, qui contiennent les avoirs numériques, y compris la crypto-monnaie.
-\n\nb.	Génération, stockage, transmission ou octroi d\'accès aux clés confidentielles, aux mots de passe, phrases secrètes, phrases de restitution, qui pourront être utilisées pour la restitution ou pour le clonage des clés privées (confidentiels) de chiffrement des blockchain-portefeuilles, contenant les avoirs numériques, y compris la crypto-monnaie.
-\n\nc.	Prestation des services de bourse, de commerce, d\'investissement du nom de Tangem AG.
- 
- 
-\n\n2.	Risques, liés avec l\'utilisation du logiciel
- 
-\n\nTangem n\'assume aucune responsabilité pour tous les dommages, préjudice ou prétentions, qui peuvent survenir comme résultat des évènements, se rapportant à une de cinq catégories suivantes :
- 
- 
-\n\na.	Les erreurs, commises par l\'utilisateur de tout logiciel ou service liés avec la crypto-monnaie, par exemple, les mots de passe oubliés, les paiements envoyés aux adresses incorrectes, et élimination occasionnelle des blockchain-portefeuilles sur les Cartes.
-\n\nb.	Les problèmes du Logiciel et/ou de tout progiciel ou service liés avec blockchain ou avec la crypto-monnaie, par exemple, les fichiers endommagés, les transaction créées d\'une manière incorrecte, les bibliothèques cryptographiques non sécurisées, les logiciels malveillants.
-\n\nc.	Les défaillances techniques du hardware de l\'utilisateur, y compris les Cartes, de tout logiciel ou service liés avec la crypto-monnaie, par exemple, la perte des données à cause des périphériques défectives ou endommagées de stockage.
-\n\nd.	Les problèmes de la sécurité, subis par l\'utilisateur de tout logiciel ou service liés avec la crypto-monnaie, par exemple, l\'accès non autorisé aux portefeuilles et/ou comptes des utilisateurs.
-\n\ne.	Les actions ou l\'inaction des tierces personnes et/ou les évènements subis par les tierces personnes, par exemple, la faillite du prestataire de services, les attaques sur la sécurité informatique des prestataires de services et la fraude commise par des tierces personnes.
- 
-\n\n3.  Risques commerciales et d\'investissement
- 
-\n\nToute échange de crypto-monnaie ou d\'autres avoirs numériques implique les risques importants. Toute transaction liée avec la monnaie implique les risques, qui incluent, entre autres, la possibilité de modification des conditions économiques, qui peuvent influencer d\'une manière significative le prix ou la disponibilité de la monnaie. Les investissements dans les spéculations boursières avec les crypto-monnaies peuvent aussi être exposés aux montées et chutes en flèche lors des fluctuations des valeurs marchandes correspondants. C\'est pour cette raison, que lors de la spéculation sur tels marchés, il est conseillé d\'utiliser seulement le capital-risque.
- 
-
-\n\n4. Risques de commerce électronique
- 
-\n\nAvant de passer aux transactions en utilisant le système électronique, Vous devez prendre connaissance, d\'une manière bien attentive, des règles et des dispositions stipulées par les bourses qui offrent ce système, et/ou les listes des titres de placement que vous voulez négocier. Le commerce en ligne possède le risque inaliénable lié avec la vitesse de réponse du système et avec le temps d\'accès qui peuvent varier en fonction des conditions de marché, du rendement du système et d\'autres facteurs. Avant de commencer les négoces, vous devez comprendre ces risques aussi que les risques supplémentaires.
- 
-\n\n5. Respect des obligations fiscales
- 
-\n\nLes utilisateurs du Logiciel assument toute la responsabilité pour définir, quels impôts sont appliqués à leurs transactions avec la crypto-monnaie, au cas où il y a de tels impôts. Les propriétaires et les participants à l\'élaboration du Logiciel n\'assument pas la responsabilité pour la définition des impôts qui sont appliqués aux transactions avec la crypto-monnaie.
- 
-\n\n6. Absence de garanties
-

-\n\nLe logiciel est concédé sous les conditions « tel quel », sans aucune garantie à l\'égard du Logiciel et/ou de tout le contenu, données, matériaux et/ou services, présentes dans ce Logiciel.
- 
-\n\n7. Restriction de la responsabilité
- 
-\n\nSauf disposition contraire prévue par la législation, les propriétaires et les participants à l\'élaboration du Logiciel n\'assument pas la responsabilité pour aucun dommage, y compris l\'indisponibilité, la perte de profit ou la perte des données, qui surviennent comme résultat de l\'utilisation ou bien qui sont liés d\'une certaine manière avec l\'utilisation du Logiciel. Les propriétaires et les participants à l\'élaboration du Logiciel n\'assument pas la responsabilité pour les actions, les résolutions ou pour une autre conduite que vous manifestez ou pas par l\'intermédiaire du Logiciel.
- 
- 
-\n\n8. Dernière modification
- 
-\n\nCette avertissement a été modifié, pour la dernière fois, le 1 octobre 2020.
-
-    </string>
-    <string name="disclaimer_title">Conditions d\'utilisation</string>
-
-    <string name="wallet_notification_no_internet">Pas de connexion internet</string>
-    <string name="send_error_payid_verification_failed">La vérification de PayString a échoué</string>
-    <string name="send_error_payid_unsupported_by_blockchain">PayString non pris en charge par la blockchain</string>
-    <string name="send_error_payid_not_registered">PayString non enregistré</string>
-    <string name="send_error_payid_request_failed">La demande de PayString a échoué</string>
-    <string name="send_error_address_same_as_wallet">L\'adresse est la même que celle de votre portefeuille</string>
-    <string name="wallet_notification_address_copied">L\'adresse a été copiée avec succès</string>
-    <string name="wallet_create_payid_empty">Saisissez d\'abord le PayString requis</string>
-    <string name="initial_message_scan_header">Posez pour scanner</string>
-    <string name="initial_message_tap_header">Posez la carte</string>
-    <string name="details_notification_erase_wallet_not_possible">Votre solde sur ce portefeuille n\'est pas nul, ou vous avez des transactions non confirmées. Impossible de supprimer la fonction du portefeuille</string>
-    <string name="details_notification_security_option_already_active">Cette option est déjà active</string>
-
-
-</resources>
diff --git a/app/src/main/res/values-fr/strings_final.xml b/app/src/main/res/values-fr/strings_final.xml
deleted file mode 100644
index b7e64d53df..0000000000
--- a/app/src/main/res/values-fr/strings_final.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="shop_one_wallet">Tangem Wallet</string>
-    <string name="shop_3_cards">3 cards</string>
-    <string name="shop_2_cards">2 cards</string>
-    <string name="shop_shipping">Shipping</string>
-    <string name="shop_free">Free</string>
-    <string name="shop_i_have_a_promo_code">I have a promo code...</string>
-    <string name="shop_total">Total</string>
-    <string name="shop_other_payment_methods">Other payment methods</string>
-    <string name="shop_buy_now">Buy now</string>
-    <string name="shop_placing_order">Placing your order</string>
-    <string name="shop_web_checkout_title">Your order</string>
-    <string name="story_meet_title">Meet\nTangem</string>
-    <string name="story_meet_buy">Buy</string>
-    <string name="story_meet_store">Store</string>
-    <string name="story_meet_send">Send</string>
-    <string name="story_meet_pay">Pay</string>
-    <string name="story_meet_exchange">Exchange</string>
-    <string name="story_meet_lend">Lend</string>
-    <string name="story_meet_borrow">Borrow</string>
-    <string name="story_meet_stake">Stake</string>
-    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
-    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
-    <string name="story_backup_title">Ultra Secure Backup</string>
-    <string name="story_backup_description_1">Up to</string>
-    <string name="story_backup_description_2_bold">3 physical cards</string>
-    <string name="story_backup_description_3">to one wallet</string>
-    <string name="story_currencies_title">Thousands of Currencies</string>
-    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
-    <string name="story_web3_title">DeFi Compatible</string>
-    <string name="story_web3_description">Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services</string>
-    <string name="story_finish_title">The Wallet for Everyone</string>
-    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
-    <string name="home_button_order">Order</string>
-    <string name="home_button_search_tokens">Search tokens</string>
-    <string name="search_tokens_title">Search tokens</string>
-    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
-    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
-    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
-    <string name="currency_subtitle_expanded">Available networks</string>
-    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
-    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
-    <string name="warning_token_send_unsupported_message">Do not transfer your funds to tokens in this blockchain, otherwise it may lead to their irretrievable loss.</string>
-    <string name="contract_address_copied_message">Contract address copied!</string>
-    <string name="alert_funds_restoration_message">If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds</string>
-    <string name="common_custom">Custom</string>
-    <string name="common_notice">Notice</string>
-    <string name="common_attention">Attention</string>
-    <string name="common_server_unavailable">The server is not available, please try again later</string>
-    <string name="main_page_balance">Total balance</string>
-    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
-    <string name="main_manage_tokens">Manage tokens</string>
-    <string name="token_item_no_rate">No rate</string>
-    <string name="token_details_hide_token">Hide token</string>
-    <string name="token_details_hide_alert_title">Hide %s</string>
-    <string name="token_details_hide_alert_hide">Hide</string>
-    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
-    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
-    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
-    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
-    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
-    <string name="wallet_currency_subtitle">%s network</string>
-    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
-    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
-    <string name="wallet_hide_token" translatable="false">Remove token</string>
-    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
-    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
-    <string name="common_yes">Yes</string>
-    <string name="common_no">No</string>
-    <string name="details_ask_a_question">Chat</string>
-    <string name="chat_bot_name">Tangem Bot</string>
-    <string name="card_settings_title">Card Settings</string>
-    <string name="card_settings_security_mode">Security Mode</string>
-    <string name="card_settings_security_mode_footer">Selected application protection method</string>
-    <string name="card_settings_change_access_code">Change access code</string>
-    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
-    <string name="scan_card_settings_title">Get your card ready!</string>
-    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you’ve scanned and will not affect other cards tied to your wallet.</string>
-    <string name="scan_card_settings_button">Scan Card</string>
-    <string name="app_settings_title">App settings</string>
-    <string name="app_settings_warning_title">Enable biometric authentication</string>
-    <string name="app_settings_warning_subtitle">Go to settings to enable biometric authentication in the Tangem app</string>
-    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
-    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
-    <string name="app_settings_saved_access_codes">Save Access Code</string>
-    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
-    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
-    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
-    <string name="wallet_connect_title">WalletConnect</string>
-    <string name="wallet_connect_subtitle">Connect to Dapps</string>
-    <string name="details_row_title_create_backup">Link More Cards</string>
-    <string name="details_row_title_create_backup_footer">You can synchronize up to three cards into one wallet. It can only be done once.</string>
-    <string name="details_row_privacy_policy">Privacy policy</string>
-    <string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
-    <string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
-    <string name="reset_card_to_factory_button_title">Reset the card</string>
-    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
-    <string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="wallet_connect_select_network">Select network</string>
-    <string name="main_scan_card_warning_view_title">Scan your card</string>
-    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
-    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session</string>
-    <string name="send_extras_hint_memo">Memo</string>
-    <string name="send_extras_hint_destination_tag">Tag</string>
-    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
-    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
-    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
-    <string name="saltpay_backup_warning" translatable="false">To start working with the card scan the first card and make a backup</string>
-    <string name="saltpay_error_empty_backup_title">Attention</string>
-    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
-    <string name="saltpay_error_no_gas_title">No funds for activation</string>
-    <string name="saltpay_error_no_gas_message">Please contact support</string>
-    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
-    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
-    <string name="onboarding_navbar_pin">Pin code</string>
-    <string name="onboarding_navbar_register_wallet">Connect</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
-    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
-    <string name="onboarding_navbar_kyc_waiting">In progress</string>
-    <string name="onboarding_button_pin">Set PIN code</string>
-    <string name="onboarding_button_register_wallet">Register</string>
-    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
-    <string name="onboarding_button_kyc_waiting">Refresh</string>
-    <string name="onboarding_title_register_wallet">Connect your card</string>
-    <string name="onboarding_title_kyc_start">Verify your identity</string>
-    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
-    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
-    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
-    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. Usually it takes up to 1 hour. You can close the app and come back later.</string>
-    <string name="onboarding_title_pin">PIN Code</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
-    <string name="error_saltpay_wrong_backup_card">This card is not designed to SaltPay backup</string>
-    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
-    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
-    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
-    <string name="onboarding_chat_button_title">Support</string>
-    <string name="onboarding_navbar_claim">Getting started</string>
-    <string name="onboarding_title_claim">Claim %s</string>
-    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
-    <string name="onboarding_button_claim">Claim</string>
-    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
-    <string name="onboarding_title_claim_progress">Claiming</string>
-    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
-    <string name="onboarding_title_kyc_retry">Something went wrong</string>
-    <string name="onboarding_subtitle_kyc_retry">Please check you email for further instructions</string>
-    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
-    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
-    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings_plurals_final.xml b/app/src/main/res/values-fr/strings_plurals_final.xml
deleted file mode 100644
index f7ce3f895b..0000000000
--- a/app/src/main/res/values-fr/strings_plurals_final.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <plurals name="card_label_card_count">
-        <item quantity="one">%d card</item>
-        <item quantity="many">%d cards</item>
-        <item quantity="other">%d cards</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
deleted file mode 100644
index 7eba948ed7..0000000000
--- a/app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="common_save_changes">Mantieni le modifiche</string>
-    <string name="common_warning">Avviso</string>
-    <string name="common_retry">Riprova</string>
-    <string name="common_done">Fatto</string>
-    <string name="common_cancel">Annulla</string>
-    <string name="common_delete">Rimuovere</string>
-    <string name="common_camera_denied_alert_title">Accesso alla videocamera negato</string>
-    <string name="common_camera_denied_alert_message">Non hai fornito l\'accesso alla tua videocamera, modifica le tue impostazioni sulla privacy</string>
-    <string name="common_camera_alert_button_settings">Impostazioni</string>
-    <string name="home_welcome">Benvenuti in Tangem. Hai una delle nostre schede?</string>>
-    <string name="home_welcome_back">Benevenuti di nuovo su Tangem. Scansiona la tua carta per iniziare.</string>
-    <string name="home_button_yes">Si! Scansiona carta.</string>
-    <string name="home_button_shop">Shop</string>
-    <string name="home_ready_title">Preparati ad avvicinare la tua carta sul retro del telefono.</string>
-    <string name="home_button_tapin">Avvicina</string>
-    <string name="home_button_scan">Scansiona carta</string>
-    <string name="wallet_button_scan">Scansiona</string>
-    <string name="wallet_button_send">Invia</string>
-    <string name="wallet_button_create_wallet">Crea portafoglio</string>
-    <string name="wallet_title">Tangem</string>
-    <string name="wallet_choice_wallet_option_title">Scegli l\'opzione del portafoglio</string>
-    <string name="wallet_balance_token_title">Token</string>
-    <string name="wallet_balance_tokens_title">Token</string>
-    <string name="wallet_balance_verified">Saldo verificato</string>
-    <string name="wallet_balance_loading">Il saldo sta per essere caricato…</string>
-    <string name="wallet_balance_blockchain_unreachable">Blockchain non raggiungibile</string>
-    <string name="wallet_error_no_account">Conto non creato</string>
-    <string name="wallet_error_no_account_subtitle_format">Carica %1$s+ %2$s per creare un conto</string>
-    <string name="wallet_error_empty_card">Carta vuota</string>
-    <string name="wallet_error_empty_card_subtitle">Crea un portafoglio per iniziare ad utilizzare la tua carta Tangem </string>
-    <string name="wallet_error_unsupported_blockchain">Questa carta non è supportata</string>
-    <string name="wallet_error_unsupported_blockchain_subtitle"> La tua carta Tangem è stata creata per funzionare con un\'altra applicazione. Leggere il nome e le istruzioni sulla carta e installare l\'applicazione corretta</string>
-    <string name="wallet_balance_tx_in_progress">Transazione in corso&#8230;</string>
-    <string name="wallet_pending_tx_sending">Invia</string>
-    <string name="wallet_pending_tx_sending_address_format">su %s</string>
-    <string name="wallet_pending_tx_receiving">Ricevi</string>
-    <string name="wallet_pending_tx_receiving_address_format">da %s</string>
-    <string name="wallet_address_button_explore">Cerca indirizzo</string>
-    <string name="wallet_address_button_create_payid">Crea PayString</string>
-    <string name="wallet_qr_title_format">portafoglio %s</string>
-    <string name="wallet_create_payid">Crea PayString</string>
-    <string name="wallet_create_payid_card_format">Carta: %s</string>
-    <string name="wallet_create_payid_hint">Nome PayString</string>
-    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
-    <string name="wallet_create_payid_button_title">Crea</string>
-    <string name="wallet_create_payid_info">Il tuo PayString – informazioni per te uniche, come il tuo numero di telefono, indirizzo email o ABN.</string>
-    <string name="wallet_create_payid_success_message">PayString creato con successo e copiato negli appunti</string>
-    <string name="wallet_create_payid_error_message">Errore di risposta durante la creazione del PayString</string>
-    <string name="wallet_create_payid_error_already_created">Questo PayString esiste già. Scegline un altro.</string>
-    <string name="send_destination_hint_address_payid">Indirizzo o PayString</string>
-    <string name="send_destination_hint_address">Indirizzo</string>
-    <string name="send_title">Invia</string>
-    <string name="send_network_fee_title">Costi della rete</string>
-    <string name="send_amount_label">Importo</string>
-    <string name="send_fee_label">Commissione</string>
-    <string name="send_total_label">Totale</string>
-    <string name="send_max_amount_label">Importo totale</string>
-
-    <string name="send_fee_picker_low">Insufficiente</string>
-    <string name="send_fee_picker_normal">Normale</string>
-    <string name="send_fee_picker_priority">Prioritario</string>
-    <string name="send_fee_include_description">Includi commissione</string>
-    <string name="send_total_subtitle_format">Sarà inviato %1$s %2$s</string>
-    <string name="send_total_subtitle_fiat_format">≈ %1$s (inc. commissione: %2$s)</string>
-    <string name="send_total_subtitle_asset_format">Sarà inviato %1$s %2$s e %1$s %2$s</string>
-    <string name="send_balance_subtitle_format">Saldo: %1$s %2$s</string>
-    <string name="send_transaction_success">La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo </string>
-    <string name="details_title">Requisiti</string>
-    <string name="details_row_title_cid">ID carta</string>
-    <string name="details_row_title_issuer">Emittente</string>
-    <string name="details_row_title_signed_hashes">Firmato</string>
-    <string name="details_row_subtitle_signed_hashes_format">Hash %s</string>
-    <string name="details_row_title_currency">Valuta dell\'applicazione</string>
-    <string name="details_section_title_settings">Impostazioni</string>
-    <string name="details_section_title_card">Carta</string>
-    <string name="details_row_title_validate">Convalidare la carta</string>
-    <string name="details_row_title_manage_security">Gestione del portafoglio</string>
-    <string name="details_row_title_erase_wallet">Cancella il portafoglio</string>
-    <string name="details_erase_wallet_warning">Questa azione è irreversibile. Se dopo aver eliminato il portafoglio qualcuno invia dei fondi, non potrai ritirarli.</string>
-    <string name="details_security_management_warning">Se dimentichi il codice, perderai la possibilità di utilizzare la carta. Non è possibile in alcun modo ripristinare o modificare il codice se lo perdi.</string>
-    <string name="details_manage_security_title">Gestione della sicurezza</string>
-    <string name="details_manage_security_long_tap">Mantenimento della carta</string>
-    <string name="details_manage_security_long_tap_description">Questo meccanismo protegge dagli avvicinamenti senza contatto sulla carta. Attiva un ritardo tra la ricezione e l\'esecuzione di un comando. Dopo la prima transazione firmata, questo telefono verrà associato alla carta e le transazioni verranno firmate immediatamente.</string>
-    <string name="details_manage_security_passcode">Password</string>
-    <string name="details_manage_security_passcode_description">Dovrai inserire una password prima di eseguire qualsiasi comando che modifichi lo stato della carta.</string>
-    <string name="details_manage_security_access_code">Codice di accesso</string>
-    <string name="details_manage_security_access_code_description">Prima di scansionare la carta sarà necessario inserire il codice di accesso corretto</string>
-    <string name="alert_old_device_this_card">Potresti riscontrare problemi con l\'NFC su alcuni iPhone 7/7 + durante la rimozione</string>
-    <string name="alert_card_signed_transactions">Questa carta è già stata ricaricata e ha firmato transazioni in passato. Valuta la possibilità di prelevare immediatamente tutti i fondi se hai ricevuto questa carta da una fonte inaffidabile.</string>
-    <string name="alert_title">Attenzione</string>
-    <string name="alert_unsupported_card">Questa carta non è progettata per funzionare con Tangem</string>
-    <string name="alert_developer_card">La carta che hai scansionato è una carta di sviluppo. Non utilizzarla come strumento di pagamento</string>
-    <string name="alert_old_card">Le schede emesse prima di settembre 2019 non possono attualmente essere utilizzate con un iPhone. Stiamo lavorando a stretto contatto con Apple per renderle disponibili nelle future versioni di iOS. </string>
-    <string name="initial_message_sign_header">Avvicina per firmare</string>
-    <string name="initial_message_sign_body">Avvicina la carta al telefono come mostrato sopra </string>
-    <string name="initial_message_purge_wallet_body">Avvicina per cancellare il portafoglio</string>
-    <string name="initial_message_create_wallet_body">Avvicina per creare il portafoglio</string>
-    <string name="initial_message_change_access_code_body">Avvicina per modificare il codice di accesso</string>
-    <string name="initial_message_change_passcode_body">Avvicina per modificare la password</string>
-    <string name="payid_service_error_loading">PayString non valido</string>
-
-    <string name="disclaimer_text">
-
-        NOTA LEGALE\n
-\n
-App Tangem (software)\n
-\n
-1. Il software può essere utilizzato solo con i portafogli hardware Tangem (schede) tramite l\'interfaccia NFC. Il software NON esegue le seguenti operazioni:\n
-\n
-a) Generazione, archiviazione, trasferimento o accesso a chiavi crittografiche private (segrete) di portafogli blockchain contenenti risorse digitali, inclusa la criptovaluta.\n
-\n
-b) Generazione, archiviazione, trasferimento o accesso a chiavi segrete, password, passphrase, frasi di ripristino che possono essere utilizzate per recuperare o copiare chiavi private (segrete) su portafogli blockchain contenenti risorse digitali, inclusa la criptovaluta.\n
-\n
-c) Fornitura di servizi di scambio, negoziazione e investimento per conto di Tandem AG.\n
-\n
-2. Rischi associati al funzionamento del Software\n
-\n
-Tandem non sarà ritenuta responsabile per eventuali perdite, danni o reclami derivanti da eventi che rientrano nelle seguenti cinque categorie:\n
-\n
-a) Errori commessi dall\'utente di qualsiasi software o servizio relativo alla criptovaluta, ad esempio password dimenticate, pagamenti inviati a indirizzi errati e cancellazione accidentale di portafogli blockchain su Schede.\n
-\n
-b) Problemi con il software e/o qualsiasi software o servizio correlato a blockchain o criptovaluta, come file danneggiati, transazioni generate in modo improprio, librerie crittografiche non sicure, malware.\n
-\n
-c) Malfunzionamenti tecnici nell\'hardware dell\'utente, incluse le Schede, qualsiasi software o servizio relativo alla criptovaluta, ad esempio, perdita di dati a causa di un dispositivo di archiviazione difettoso o danneggiato.\n
-\n
-d) Problemi di sicurezza affrontati dall\'utente di qualsiasi software o servizio relativo alla criptovaluta, ad esempio l\'accesso non autorizzato a portafogli e/o account utente.\n
-\n
-e) Azioni o inattività di terze parti e/o eventi con cui si sono scontrate terze parti, come la bancarotta di fornitori di servizi, attacchi alla sicurezza delle informazioni relative ai fornitori di servizi e frodi perpetrate da terzi.\n
-\n
-3. Rischi commerciali e di investimento\n
-\n
-Qualsiasi transazione che coinvolge lo scambio di criptovalute o altre risorse digitali comporta rischi significativi. Qualsiasi transazione che include una valuta comporta dei rischi, inclusa ma non limitata alla possibilità di cambiamenti nelle condizioni economiche che potrebbero influenzare materialmente il valore o la liquidità della valuta. L\'investimento nella speculazione sui cambi di criptovaluta può anche essere soggetto a forti alti e bassi poiché i rispettivi prezzi di mercato fluttuano. È per questo motivo che è consigliabile utilizzare solo capitale di rischio quando si fanno affari in questi mercati.\n
-\n
-4. Rischi dell\'e-commerce\n
-\n
-Prima di effettuare transazioni utilizzando un sistema elettronico, è necessario leggere attentamente le norme e i regolamenti delle borse che offrono questo sistema e/o elencano i titoli che si intende negoziare. Il trading online presenta un rischio intrinseco dovuto alla risposta del sistema e ai tempi di accesso, che possono variare a seconda delle condizioni di mercato, delle prestazioni del sistema ed altri fattori. È necessario comprendere questi e altri rischi prima di fare trading.\n
-\n
-5. Rispetto degli obblighi fiscali\n
-\n
-Gli utenti del Software sono gli unici responsabili del determinare le eventuali tasse applicate alle loro transazioni in criptovaluta.  I proprietari o i contributori del Software NON sono responsabili della determinazione delle tasse che si applicano alle transazioni in criptovaluta.\n
-\n
-6. Assenza di garanzie\n
-\n
-Il Software viene fornito &quot;così com\'è&quot; senza garanzia di alcun tipo riguardo al Software e/o a qualsiasi contenuto, dato, materiale e/o servizio fornito con il Software.\n
-\n
-7. Limitazione di responsabilità\n
-\n
-Salvo quanto diversamente previsto dalla legge, i proprietari o i contributori del Software non saranno in nessun caso responsabili per eventuali danni di qualsiasi tipo, inclusi, ma non limitati a, perdita di utilizzo, perdita di profitti o perdita di dati derivanti o in qualsiasi modo correlati all\'uso del Software.  In nessun modo i proprietari o i contributori del Software sono responsabili delle azioni, decisioni o altri comportamenti presi o non presi da voi in relazione al Software.\n
-\n
-8. Ultima modifica\n
-\n
-Questa nota legale è stata modificata l\'ultima volta 01.10.2020.
-
-    </string>
-    <string name="common_accept">Accetta</string>
-    <string name="disclaimer_title">Termini del servizio</string>
-    <string name="wallet_notification_no_internet">Nessuna connessione a Internet</string>
-
-    <string name="send_error_payid_verification_failed">Verifica del PayString fallita</string>
-    <string name="send_error_payid_unsupported_by_blockchain">PayString non supportato dalla blockchain</string>
-    <string name="send_error_payid_not_registered">PayString non registrato</string>
-    <string name="send_error_payid_request_failed">Richiesta PayString fallita</string>
-
-    <string name="send_error_address_same_as_wallet">L\'indirizzo corrisponde all\'indirizzo del tuo portafoglio</string>
-
-    <string name="wallet_notification_address_copied">L\'indirizzo è stato copiato con successo</string>
-
-
-    <string name="wallet_create_payid_empty">Inserire prima il PayString desiderato</string>
-
-    <string name="initial_message_scan_header">Avvicina per scansionare</string>
-    <string name="initial_message_tap_header">Avvicina la carta</string>
-
-    <string name="details_notification_erase_wallet_not_possible">Il tuo saldo su questo portafoglio non è pari a zero o hai transazioni non confermate. Non è possibile eliminare la funzione portafoglio.</string>
-    <string name="details_notification_security_option_already_active">E\' l\'opzione attualmente attiva</string>
-
-</resources>
diff --git a/app/src/main/res/values-it/strings_final.xml b/app/src/main/res/values-it/strings_final.xml
deleted file mode 100644
index b7e64d53df..0000000000
--- a/app/src/main/res/values-it/strings_final.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="shop_one_wallet">Tangem Wallet</string>
-    <string name="shop_3_cards">3 cards</string>
-    <string name="shop_2_cards">2 cards</string>
-    <string name="shop_shipping">Shipping</string>
-    <string name="shop_free">Free</string>
-    <string name="shop_i_have_a_promo_code">I have a promo code...</string>
-    <string name="shop_total">Total</string>
-    <string name="shop_other_payment_methods">Other payment methods</string>
-    <string name="shop_buy_now">Buy now</string>
-    <string name="shop_placing_order">Placing your order</string>
-    <string name="shop_web_checkout_title">Your order</string>
-    <string name="story_meet_title">Meet\nTangem</string>
-    <string name="story_meet_buy">Buy</string>
-    <string name="story_meet_store">Store</string>
-    <string name="story_meet_send">Send</string>
-    <string name="story_meet_pay">Pay</string>
-    <string name="story_meet_exchange">Exchange</string>
-    <string name="story_meet_lend">Lend</string>
-    <string name="story_meet_borrow">Borrow</string>
-    <string name="story_meet_stake">Stake</string>
-    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
-    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
-    <string name="story_backup_title">Ultra Secure Backup</string>
-    <string name="story_backup_description_1">Up to</string>
-    <string name="story_backup_description_2_bold">3 physical cards</string>
-    <string name="story_backup_description_3">to one wallet</string>
-    <string name="story_currencies_title">Thousands of Currencies</string>
-    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
-    <string name="story_web3_title">DeFi Compatible</string>
-    <string name="story_web3_description">Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services</string>
-    <string name="story_finish_title">The Wallet for Everyone</string>
-    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
-    <string name="home_button_order">Order</string>
-    <string name="home_button_search_tokens">Search tokens</string>
-    <string name="search_tokens_title">Search tokens</string>
-    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
-    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
-    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
-    <string name="currency_subtitle_expanded">Available networks</string>
-    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
-    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
-    <string name="warning_token_send_unsupported_message">Do not transfer your funds to tokens in this blockchain, otherwise it may lead to their irretrievable loss.</string>
-    <string name="contract_address_copied_message">Contract address copied!</string>
-    <string name="alert_funds_restoration_message">If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds</string>
-    <string name="common_custom">Custom</string>
-    <string name="common_notice">Notice</string>
-    <string name="common_attention">Attention</string>
-    <string name="common_server_unavailable">The server is not available, please try again later</string>
-    <string name="main_page_balance">Total balance</string>
-    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
-    <string name="main_manage_tokens">Manage tokens</string>
-    <string name="token_item_no_rate">No rate</string>
-    <string name="token_details_hide_token">Hide token</string>
-    <string name="token_details_hide_alert_title">Hide %s</string>
-    <string name="token_details_hide_alert_hide">Hide</string>
-    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
-    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
-    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
-    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
-    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
-    <string name="wallet_currency_subtitle">%s network</string>
-    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
-    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
-    <string name="wallet_hide_token" translatable="false">Remove token</string>
-    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
-    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
-    <string name="common_yes">Yes</string>
-    <string name="common_no">No</string>
-    <string name="details_ask_a_question">Chat</string>
-    <string name="chat_bot_name">Tangem Bot</string>
-    <string name="card_settings_title">Card Settings</string>
-    <string name="card_settings_security_mode">Security Mode</string>
-    <string name="card_settings_security_mode_footer">Selected application protection method</string>
-    <string name="card_settings_change_access_code">Change access code</string>
-    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
-    <string name="scan_card_settings_title">Get your card ready!</string>
-    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you’ve scanned and will not affect other cards tied to your wallet.</string>
-    <string name="scan_card_settings_button">Scan Card</string>
-    <string name="app_settings_title">App settings</string>
-    <string name="app_settings_warning_title">Enable biometric authentication</string>
-    <string name="app_settings_warning_subtitle">Go to settings to enable biometric authentication in the Tangem app</string>
-    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
-    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
-    <string name="app_settings_saved_access_codes">Save Access Code</string>
-    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
-    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
-    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
-    <string name="wallet_connect_title">WalletConnect</string>
-    <string name="wallet_connect_subtitle">Connect to Dapps</string>
-    <string name="details_row_title_create_backup">Link More Cards</string>
-    <string name="details_row_title_create_backup_footer">You can synchronize up to three cards into one wallet. It can only be done once.</string>
-    <string name="details_row_privacy_policy">Privacy policy</string>
-    <string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
-    <string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
-    <string name="reset_card_to_factory_button_title">Reset the card</string>
-    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
-    <string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="wallet_connect_select_network">Select network</string>
-    <string name="main_scan_card_warning_view_title">Scan your card</string>
-    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
-    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session</string>
-    <string name="send_extras_hint_memo">Memo</string>
-    <string name="send_extras_hint_destination_tag">Tag</string>
-    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
-    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
-    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
-    <string name="saltpay_backup_warning" translatable="false">To start working with the card scan the first card and make a backup</string>
-    <string name="saltpay_error_empty_backup_title">Attention</string>
-    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
-    <string name="saltpay_error_no_gas_title">No funds for activation</string>
-    <string name="saltpay_error_no_gas_message">Please contact support</string>
-    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
-    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
-    <string name="onboarding_navbar_pin">Pin code</string>
-    <string name="onboarding_navbar_register_wallet">Connect</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
-    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
-    <string name="onboarding_navbar_kyc_waiting">In progress</string>
-    <string name="onboarding_button_pin">Set PIN code</string>
-    <string name="onboarding_button_register_wallet">Register</string>
-    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
-    <string name="onboarding_button_kyc_waiting">Refresh</string>
-    <string name="onboarding_title_register_wallet">Connect your card</string>
-    <string name="onboarding_title_kyc_start">Verify your identity</string>
-    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
-    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
-    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
-    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. Usually it takes up to 1 hour. You can close the app and come back later.</string>
-    <string name="onboarding_title_pin">PIN Code</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
-    <string name="error_saltpay_wrong_backup_card">This card is not designed to SaltPay backup</string>
-    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
-    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
-    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
-    <string name="onboarding_chat_button_title">Support</string>
-    <string name="onboarding_navbar_claim">Getting started</string>
-    <string name="onboarding_title_claim">Claim %s</string>
-    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
-    <string name="onboarding_button_claim">Claim</string>
-    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
-    <string name="onboarding_title_claim_progress">Claiming</string>
-    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
-    <string name="onboarding_title_kyc_retry">Something went wrong</string>
-    <string name="onboarding_subtitle_kyc_retry">Please check you email for further instructions</string>
-    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
-    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
-    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings_plurals_final.xml b/app/src/main/res/values-it/strings_plurals_final.xml
deleted file mode 100644
index fa02d656a3..0000000000
--- a/app/src/main/res/values-it/strings_plurals_final.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <plurals name="card_label_card_count">
-        <item quantity="one">%d card</item>
-        <item quantity="other">%d cards</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 41ae2c46a7..0000000000
--- a/app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="app_name">Tangem</string>
-    <string name="common_save_changes">Сохранить изменения</string>
-    <string name="common_warning">Предупреждение</string>
-    <string name="common_retry">Повторить попытку</string>
-    <string name="common_done">Готово</string>
-    <string name="common_cancel">Отмена</string>
-    <string name="common_accept">Принять</string>
-    <string name="common_delete">Удалить</string>
-    <string name="common_custom_string">%s</string>
-    <string name="common_camera_denied_alert_title">Доступ к камере запрещен</string>
-    <string name="common_camera_denied_alert_message">Вы не предоставили доступ к своей камере, измените настройки конфиденциальности</string>
-    <string name="common_camera_alert_button_settings">Настройки</string>
-    <string name="home_welcome">Добро пожаловать в Tangem.\nУ Вас есть одна из наших карт?</string>
-    <string name="home_welcome_back">Добро пожаловать обратно в Тангем. \nОтсканируйте карту, чтобы начать.</string>
-    <string name="home_button_shop">Магазин</string>
-    <string name="home_ready_title">Приготовьтесь приложить свою\nкарту к задней панели\nтелефона</string>
-    <string name="home_button_tapin">Нажмите на</string>
-    <string name="home_button_scan">Сканировать карту</string>
-    <string name="home_button_yes">Да! Отсканировать.</string>
-    <string name="wallet_button_scan">Сканировать</string>
-    <string name="wallet_button_send">Отправить</string>
-    <string name="wallet_button_create_wallet">Создать кошелек</string>
-    <string name="wallet_title">Tangem</string>
-    <string name="wallet_choice_wallet_option_title">Выбрите опцию</string>
-    <string name="wallet_balance_token_title">Токен</string>
-    <string name="wallet_balance_tokens_title">Токены</string>
-    <string name="wallet_balance_verified">Подтвержденный баланс</string>
-    <string name="wallet_balance_loading">Загрузка баланса…</string>
-    <string name="wallet_balance_blockchain_unreachable">Блокчейн недоступен</string>
-    <string name="wallet_error_no_account">Аккаунт не создан</string>
-    <string name="wallet_error_no_account_subtitle_format">Загрузите %1$s+ %2$s для создания учетной записи</string>
-    <string name="wallet_error_empty_card">Карта пуста</string>
-    <string name="wallet_error_empty_card_subtitle">Создайте кошелек, чтобы начать пользоваться картой Tangem</string>
-    <string name="wallet_error_unsupported_blockchain">Эта карта не поддерживается</string>
-    <string name="wallet_error_unsupported_blockchain_subtitle">Ваша карта Tangem предназначена для работы с другим приложением. Пожалуйста, ознакомьтесь с названием и инструкциями на вашей карте и установите правильное приложение.</string>
-    <string name="wallet_balance_tx_in_progress">Транзакция в процессе…</string>
-    <string name="wallet_pending_tx_sending_address_format">до %s</string>
-    <string name="wallet_pending_tx_receiving_address_format">от %s</string>
-    <string name="wallet_pending_tx_receiving">Получение</string>
-    <string name="wallet_pending_tx_sending">Отправка</string>
-    <string name="wallet_address_button_explore">Проверить адрес</string>
-    <string name="wallet_address_button_create_payid">Создать PayString</string>
-    <string name="wallet_qr_title_format">%s кошелек</string>
-    <string name="wallet_create_payid">Создать PayString</string>
-    <string name="wallet_create_payid_card_format">Карта: %s</string>
-    <string name="wallet_create_payid_hint">PayString имя</string>
-    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
-    <string name="wallet_create_payid_button_title">Создать</string>
-    <string name="wallet_create_payid_info">Ваша PayString — это уникальная для вас информация, такая как номер телефона, электронная почта или ABN</string>
-    <string name="wallet_create_payid_success_message">PayString успешно создан и скопирован в буфер обмена</string>
-    <string name="wallet_create_payid_error_message">Ошибка при создании PayString</string>
-    <string name="wallet_create_payid_error_already_created">Такой PayString уже существует. Попробуйте другой.</string>
-    <string name="send_destination_hint_address_payid">Адрес или PayString</string>
-    <string name="send_destination_hint_address">Адрес</string>
-    <string name="send_title">Отправить</string>
-    <string name="send_network_fee_title">Комиссия сети</string>
-    <string name="send_amount_label">Сумма</string>
-    <string name="send_fee_label">Комиссия</string>
-    <string name="send_total_label">Всего</string>
-    <string name="send_max_amount_label">Максимальная сумма</string>
-    <string name="send_fee_picker_low">Низкий</string>
-    <string name="send_fee_picker_normal">Нормальный</string>
-    <string name="send_fee_picker_priority">Приоритетный</string>
-    <string name="send_fee_include_description">Включить коммисию</string>
-    <string name="send_total_subtitle_format">%1$s %2$s будет отправлено</string>
-    <string name="send_total_subtitle_fiat_format">≈ %1$s (включая комиссию: %2$s)</string>
-    <string name="send_total_subtitle_asset_format">%1$s %2$s и %3$s %4$s будут отправлены</string>
-    <string name="send_balance_subtitle_format">Баланс: %1$s %2$s</string>
-    <string name="send_transaction_success">Транзакция успешно подписана и отправлена в блокчейн. Баланс кошелька будет обновлен через некоторое время.</string>
-    <string name="details_title">Подробности</string>
-    <string name="details_row_title_cid">ID карты</string>
-    <string name="details_row_title_issuer">Эмитент</string>
-    <string name="details_row_title_signed_hashes">Подписано</string>
-    <string name="details_row_subtitle_signed_hashes_format">%s хэшей</string>
-    <string name="details_row_title_currency">Валюта приложения</string>
-    <string name="details_section_title_settings">Настройки</string>
-    <string name="details_section_title_card">Карта</string>
-    <string name="details_row_title_validate">Подтвердить карту</string>
-    <string name="details_row_title_manage_security">Управление безопасностью</string>
-    <string name="details_row_title_erase_wallet">Удалить кошелек</string>
-    <string name="details_erase_wallet_warning">Это действие необратимо. Если после удаления кошелька кто-то отправит на него средства, то Вы не сможете их вывести.</string>
-    <string name="details_security_management_warning">Если вы забудете код, Вы потеряете возможность использовать карту. Невозможно восстановить или изменить код, если вы его потеряете.</string>
-    <string name="details_manage_security_title">Управление безопасностью</string>
-    <string name="details_manage_security_long_tap">Длительное удержание</string>
-    <string name="details_manage_security_long_tap_description">Этот механизм защищает карту от бесконтактной атаки. Это обеспечит задержку между приемом и выполнением команды. После первой подписанной транзакции этот телефон будет привязан к карте, и транзакции будут подписаны без задержки.</string>
-    <string name="details_manage_security_passcode">Пароль</string>
-    <string name="details_manage_security_passcode_description">Перед выполнением любой команды, влекущей за собой изменение состояния карты, вам необходимо будет ввести пароль</string>
-    <string name="details_manage_security_access_code">Код доступа</string>
-    <string name="details_manage_security_access_code_description">Перед сканированием карты вам нужно будет ввести правильный код доступа</string>
-    <string name="alert_old_device_this_card">У Вас могут возникнуть проблемы с NFC на некоторых iPhone 7/7+ во время извлечения</string>
-    <string name="alert_card_signed_transactions">Эта карта уже пополнялась и подписывала транзакции в прошлом. Рассмотрите возможность немедленного снятия всех средств, если Вы получили эту карту из ненадежного источника.</string>
-    <string name="alert_title">Предупреждение</string>
-    <string name="alert_unsupported_card">Эта карта не предназначена для работы с этим приложением</string>
-    <string name="alert_developer_card">Карта, которую Вы отсканировали, является картой для разработчиков. Не принимайте ее в качестве оплаты.</string>
-    <string name="alert_old_card">Карты Tangem, выпущенные до сентября 2019 года, в настоящее время не могут быть извлечены с помощью iPhone. Мы усердно работаем с Apple, чтобы сделать это возможным в будущих версиях iOS.</string>
-    <string name="initial_message_sign_header">Нажмите, чтобы подписать</string>
-    <string name="initial_message_sign_body">Приложите карту к телефону, как показано выше</string>
-    <string name="initial_message_purge_wallet_body">Приложите, чтобы удалить кошелек</string>
-    <string name="initial_message_create_wallet_body">Приложите, чтобы создать кошелек</string>
-    <string name="initial_message_change_access_code_body">Приложите, чтобы изменить код доступа</string>
-    <string name="initial_message_change_passcode_body">Приложите, чтобы изменить пароль</string>
-    <string name="payid_service_error_loading">Неверный PayString</string>
-    <string name="disclaimer_title">Условия использования</string>
-    <string name="wallet_notification_no_internet">Нет соединения с интернетом</string>
-    <string name="send_error_payid_verification_failed">Ошибка проверки PayString</string>
-    <string name="send_error_payid_unsupported_by_blockchain">PayString не поддерживается блокчейном</string>
-    <string name="send_error_payid_not_registered">PayString не зарегистрирован</string>
-    <string name="send_error_payid_request_failed">Не удалось выполнить запрос PayString</string>
-    <string name="send_error_address_same_as_wallet">Адрес совпадает с адресом кошелька</string>
-
-    <string name="wallet_notification_address_copied">Адрес скопирован в буфер обмена</string>
-    <string name="wallet_create_payid_empty">Сначала введите желаемую PayString</string>
-    <string name="initial_message_scan_header">Приложите, чтобы отсканировать</string>
-    <string name="initial_message_tap_header">Приложите карту</string>
-    <string name="details_notification_erase_wallet_not_possible">Ваш баланс на этом кошельке не равен нулю, или у Вас есть неподтвержденные транзакции</string>
-    <string name="details_notification_security_option_already_active">Это текущая активная опция</string>
-    <string name="scan_card_error">Ошибка сканирования карты. Попробуй снова.</string>
-    <string name="wallet_button_buy">Купить</string>
-    <string name="wallet_button_sell">Продать</string>
-    <string name="wallet_button_trade">Торговать</string>
-    <string name="wallet_address_chip_default">По умолчанию</string>
-    <string name="wallet_address_chip_compatibility">Совместимость</string>
-    <string name="wallet_address_chip_legacy">Устаревший</string>
-    <string name="wallet_button_create_twin_wallet">Создать кошелек</string>
-    <string name="wallet_error_empty_twin_card">Создать кошелек</string>
-    <string name="wallet_error_empty_twin_card_subtitle">Сгенерируйте ключи кошелька на обеих картах, чтобы начать использовать свои Twin карты</string>
-    <string name="twins_onboarding_title">Tangem Twin</string>
-    <string name="twins_onboarding_subtitle">Один кошелек. Две карты.</string>
-    <string name="twins_onboarding_description_format">Одна, которую Вы держите в руках, и вторая карта с номером #%s</string>
-    <string name="details_row_title_twins_recreate">Пересоздать Twin кошелек</string>
-    <string name="details_row_title_card_tou">Условия использования карты</string>
-    <string name="twins_recreate_toolbar">Tangem Twin</string>
-    <string name="twins_recreate_warning">Это действие необратимо. У Вас не будет доступа к старому кошельку.</string>
-    <string name="twins_recreate_title_format">Приложите Twin карту #%s</string>
-    <string name="twins_recreate_title_preparing">Подготовка карты</string>
-    <string name="twins_recreate_title_creating_wallet">Создание кошелька</string>
-    <string name="twins_recreate_subtitle">Процедура создания кошелька состоит из трех шагов. Вы должны пройти его до конца, иначе вам придется начинать сначала.</string>
-    <string name="twins_recreate_button_format">Сканировать карту #%s</string>
-    <string name="twins_recreate_alert">Вы уже начали процесс пересоздания кошелька. Если Вы прервете его, вы не сможете использовать свои карты, пока не запустите его снова и не завершите пересоздание кошелька.</string>
-    <string name="twins_wrong_card_error">Вы приложили ту же карту. Чтобы создать кошелек, вам нужно приложить другу Twin карту.</string>
-    <string name="notification_twins_recreate_success">Адрес кошелька успешно создан</string>
-    <string name="common_start">Начать</string>
-    <string name="common_back">Назад</string>
-    <string name="common_add">Добавить</string>
-    <string name="common_remove">Удалить</string>
-    <string name="common_search">Поиск</string>
-    <string name="details_section_title_app">Приложение</string>
-    <string name="details_row_title_send_feedback">Отправить отзыв</string>
-    <string name="alert_app_feedback_sent_title">Успешно отправлено</string>
-    <string name="alert_app_feedback_sent_message">Спасибо за ваш отзыв</string>
-    <string name="alert_negative_app_rate_sent_title">Ваши предложения отправлены</string>
-    <string name="alert_negative_app_rate_sent_message">Спасибо за ваш отзыв. Мы ответим как можно скорее.</string>
-    <string name="alert_failed_to_send_email_title">Не удалось отправить электронное письмо</string>
-    <string name="alert_failed_to_send_email_message">Причина: %s</string>
-    <string name="alert_failed_to_send_transaction_title">Не могу отправить транзакцию</string>
-    <string name="alert_failed_to_send_transaction_message">Причина: %s</string>
-    <string name="alert_troubleshooting_scan_card_title">У Вас возникли трудности со сканированием вашей карты?</string>
-    <string name="alert_troubleshooting_scan_card_message">Пожалуйста, попробуйте приложить карту точно так, как показано на анимации, или обратитесь в поддержку</string>
-    <string name="alert_troubleshooting_scan_card_ok">Отмена</string>
-    <string name="alert_button_try_again">Попробуйте снова</string>
-    <string name="alert_button_request_support">Обратиться в поддержку</string>
-    <string name="alert_button_send_feedback">Отправить отзыв</string>
-    <string name="warning_button_really_cool">Очень круто!</string>
-    <string name="warning_button_can_be_better">Может быть лучше</string>
-    <string name="warning_rate_app_title">Один вопрос</string>
-    <string name="warning_rate_app_message">Вам нравится приложение Tangem?</string>
-    <string name="manage_tokens_no_tokens">Токенов пока нет</string>
-    <string name="manage_tokens_section_title_added_tokens">Добавленные токены</string>
-    <string name="manage_tokens_alert_remove_token_title">Удалить токен %s</string>
-    <string name="manage_tokens_alert_remove_token_message">Вы уверены, что хотите удалить этот токен?</string>
-    <string name="add_tokens_title">Добавить токены</string>
-    <string name="add_token_button">Добавить токен</string>
-    <string name="add_token_search_hint">Начните поиск</string>
-    <string name="manage_tokens_title">Управление токенами</string>
-    <string name="add_custom">Добавить пользовательский</string>
-    <string name="add_token_section_title_popular_tokens">Популярные токены</string>
-    <string name="add_token_added">Добавлен</string>
-    <string name="token_icon">Значок токена</string>
-    <string name="add_custom_token_title" translatable="false">Добавить токен</string>
-    <string name="custom_token_contract_address_input_title">Адрес контракта</string>
-    <string name="custom_token_creation_error_required_field">Обязательное поле</string>
-    <string name="custom_token_creation_error_network_not_selected">Пожалуйста, выберите сеть</string>
-    <string name="custom_token_creation_error_empty_fields">Пожалуйста, заполните все поля</string>
-    <string name="custom_token_creation_error_wrong_decimals">Количество знаков после запятой должно быть корректным числом не больше %d</string>
-    <string name="custom_token_creation_error_invalid_contract_address">Адрес контракта некорректен</string>
-    <string name="custom_token_creation_error_invalid_derivation_path">Путь деривации некорректен</string>
-    <string name="custom_token_validation_error_not_found">Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить</string>
-    <string name="custom_token_validation_error_already_added">Этот токен/сеть уже находится в вашем списке</string>
-    <string name="custom_token_type_network">Сеть</string>
-    <string name="custom_token_type_token">Токен</string>
-    <string name="custom_token_decimals_input_title">Знаков после запятой</string>
-    <string name="custom_token_network_input_title">Сеть</string>
-    <string name="custom_token_network_input_not_selected">Не выбрано</string>
-    <string name="custom_token_name_input_placeholder">Например, USD Coin</string>
-    <string name="custom_token_name_input_title">Название токена</string>
-    <string name="custom_token_token_symbol_input_placeholder">Например, USDC</string>
-    <string name="custom_token_token_symbol_input_title">Символ токена</string>
-    <string name="custom_token_derivation_path_input_title">Деривация по BIP44</string>
-    <string name="custom_token_derivation_path_default">По-умолчанию</string>
-    <string name="custom_token_add_token">Добавить токен</string>
-    <string name="details_section_title_blockchain">Блокчейн</string>
-    <string name="details_row_title_manage_tokens">Управление токенами</string>
-    <string name="add_tokens_subtitle_blockchains">Блокчейны</string>
-    <string name="wallet_address_button_copy">Копировать</string>
-    <string name="wallet_address_button_share">Поделиться</string>
-    <string name="wallet_button_add_tokens">+ Добавить токены</string>
-    <string name="wallet_pending_transaction_warning">Пожалуйста, дождитесь завершения транзакции, чтобы иметь возможность отправить средства</string>
-    <string name="warning_failed_to_verify_card_title">Проверка подлинности не удалась</string>
-    <string name="warning_failed_to_verify_card_message">Эта карта может быть производственным образцом или подделкой</string>
-    <string name="warning_important_security_info">Важная информация о безопасности \u26A0</string>
-    <string name="warning_signed_tx_previously">Эта карта ранее подписывала транзакции</string>
-    <string name="warning_button_learn_more">Узнать подробнее</string>
-    <string name="alert_button_i_understand">Я понял</string>
-    <string name="warning_low_signatures_format">На этой карте доступно только %s подписей. Вы должны вывести все свои средства.</string>
-    <string name="common_disconnect">Отключить</string>
-    <string name="common_sign">Подписать</string>
-    <string name="common_sign_and_send">Подписать и отправить</string>
-    <string name="common_reject">Отклонить</string>
-    <string name="warning_testnet_card_message">Это тестовая карта. Не принимайте ее в качестве оплаты. Она должна использоваться только в целях тестирования и разработки.</string>
-    <string name="wallet_dialog_choose_trade_action">Вы хотите купить или продать криптовалюту?</string>
-    <string name="error_update_app">К сожалению, текущая версия приложения не готова к работе с этой картой, проверьте наличие обновлений</string>
-    <string name="home_welcome_header">Добро пожаловать в Tangem</string>
-    <string name="home_welcome_body">Самый безопасный способ покупать, использовать и\n хранить криптовалюту</string>
-    <string name="home_button_get_new_card">Получить новую карту</string>
-    <string name="onboarding_title">Активация карты</string>
-    <string name="onboarding_button_what_does_it_mean">Как это работает?</string>
-    <string name="onboarding_button_receive_crypto">Получить криптовалюту</string>
-    <string name="onboarding_create_wallet_header">Создать кошелек</string>
-    <string name="onboarding_create_wallet_body">Давайте сгенерируем все ключи на вашей карте и создадим безопасный кошелек</string>
-    <string name="onboarding_create_wallet_button_create_wallet">Создать кошелек</string>
-    <string name="onboarding_top_up_header">Пополните свой кошелек</string>
-    <string name="onboarding_top_up_body">Чтобы начать, просто пополните карту на любую сумму</string>
-    <string name="onboarding_top_up_body_no_account_error">Чтобы начать, просто пополните кошелек более чем на %s %s</string>
-    <string name="onboarding_top_up_button_but_crypto">Купить криптовалюту</string>
-    <string name="onboarding_top_up_button_show_wallet_address">Показать адрес кошелька</string>
-    <string name="onboarding_dialog_wallet_address">Отсканируйте адрес, чтобы пополнить кошелек</string>
-    <string name="onboarding_done_header">Успешно!</string>
-    <string name="onboarding_done_body">Ваша криптокарта активирована и готова к использованию</string>
-    <string name="onboarding_done_button_continue">Продолжить</string>
-    <string name="onboarding_balance_title">Баланс</string>
-    <string name="address_qr_code_message_format">Отправляйте только %s (%s) на этот адрес. Иначе это может привести к утрате средств.</string>
-    <string name="address_qr_code_message_token_format">Отправляйте только %s (%s) из сети %s на этот адрес. Иначе это может привести к утрате средств.</string>
-    <string name="onboarding_twins_interrupt_warning">Если процесс создания кошелька каким-либо образом прервется, вам придется начать все сначала.</string>
-    <string name="onboarding_twin_exit_warning">Процесс связывания карт частично завершен. Вы не можете выйти из него сейчас.</string>
-    <string name="onboarding_error_create_primary_wallet">Внутренняя ошибка: не удается создать менеджер кошельков</string>
-    <string name="wallet_balance_blockchain_unreachable_try_later">Блокчейн недоступен. Попробуй позже.</string>
-    <string name="warning_button_ok">Хорошо, понял!</string>
-    <string name="onboarding_success">Успешно!</string>
-    <string name="onboarding_getting_started">Начнем</string>
-    <string name="onboarding_button_backup_now">Выполнить резервное копирование</string>
-    <string name="onboarding_button_get_backup_card">Получить резервную карту</string>
-    <string name="onboarding_button_skip_backup">Оставить на потом</string>
-    <string name="onboarding_button_finalize_backup">Завершить процесс резервного копирования</string>
-    <string name="onboarding_button_add_backup_card">+ Добавить резервную карту</string>
-    <string name="onboarding_button_backup_card_format">Сканировать карту #%d</string>
-    <string name="onboarding_button_scan_origin_card">Сканировать основную карту</string>
-    <string name="onboarding_button_add_more_cards">Добавить больше карт</string>
-    <string name="onboarding_title_backup_card">Сделайте резервную копию вашего кошелька</string>
-    <string name="onboarding_title_no_backup_cards">Нет резервных карт</string>
-    <string name="onboarding_title_scan_origin_card">Подготовьте свою карту</string>
-    <string name="onboarding_title_one_backup_card">Добавлена одна резервная карта</string>
-    <string name="onboarding_title_two_backup_cards">Добавлены две резервные карты</string>
-    <string name="onboarding_title_backup_card_format">Резервная карта #%d</string>
-    <string name="onboarding_subtitle_backup_card">Вы можете привязать до трех карт к одному кошельку</string>
-    <string name="onboarding_subtitle_no_backup_cards">Чтобы начать процесс резервного копирования, добавьте еще максимум 2 карты</string>
-    <string name="onboarding_subtitle_scan_origin_card_format">Подготовьте основную карту с номером %s</string>
-    <string name="onboarding_subtitle_scan_origin_card">Подготовьте основную карту</string>
-    <string name="onboarding_subtitle_one_backup_card">Вы можете добавить еще одну карту или завершить процесс резервного копирования</string>
-    <string name="onboarding_subtitle_two_backup_cards">Добавлено максимальное количество карт</string>
-    <string name="onboarding_subtitle_backup_warning">Если процесс резервного копирования будет прерван каким-либо образом, вам придется начать все сначала</string>
-    <string name="onboarding_alert_message_not_max_backup_cards_added">Вы добавили одну резервную карту. После того, как процесс будет завершен, Вы больше не сможете добавить карт. Если у Вас есть еще одна карта, добавьте ее в резервную копию. Хотите продолжить?</string>
-    <string name="onboarding_access_code_intro_title">Создать код доступа</string>
-    <string name="onboarding_access_code_repeat_code_title">Введите код доступа повторно</string>
-    <string name="onboarding_access_code_feature_1_title">Защитить</string>
-    <string name="onboarding_access_code_feature_2_title">Персонализировать</string>
-    <string name="onboarding_access_code_feature_3_title">Восстановить</string>
-    <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших кошельков</string>
-    <string name="onboarding_access_code_feature_2_description">Позже Вы сможете установить индивидуальный код доступа для каждой карты</string>
-    <string name="onboarding_access_code_feature_3_description">Код доступа можно восстановить с помощью привязанной карты, не храните все карты в одном месте</string>
-    <string name="onboarding_access_code_hint">Выберите любое слово, фразу или номер в качестве кода доступа</string>
-    <string name="onboarding_access_code_too_short">Код доступа должен состоять не менее чем из 4 символов</string>
-    <string name="onboarding_access_codes_doesnt_match">Введенный код доступа не соответствует исходному коду доступа</string>
-    <string name="common_create">Создать</string>
-    <string name="common_submit">Подтвердить</string>
-    <string name="onboarding_subtitle_success_backup">Вы создали 2 резервные карты, и теперь эти карты готовы к использованию</string>
-    <string name="onboarding_navbar_title_creating_backup">Создание резервной копии</string>
-    <string name="onboarding_backup_exit_warning">Процесс резервного копирования частично завершен. Вы не можете выйти из него сейчас.</string>
-    <string name="onboarding_wallet_info_title_first">Резервный кошелек</string>
-    <string name="onboarding_wallet_info_title_second">Идентичные карты</string>
-    <string name="onboarding_wallet_info_title_third">Код доступа</string>
-    <string name="onboarding_wallet_info_title_fourth">Восстановление кода доступа</string>
-    <string name="onboarding_wallet_info_subtitle_first">Вы можете сделать до двух резервных копий карты Tangem Wallet</string>
-    <string name="onboarding_wallet_info_subtitle_second">Все резервные карты могут использоваться как полнофункциональные с одинаковыми ключами</string>
-    <string name="onboarding_wallet_info_subtitle_third">Вы сможете установить код доступа для защиты своих кошельков</string>
-    <string name="onboarding_wallet_info_subtitle_fourth">Код доступа можно восстановить с помощью одной из резервных карт</string>
-    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Ваша карта настроена и готова к использованию.</string>
-    <string name="onboarding_subtitle_success_backup_one_card">Вы создали 1 резервную карту, и теперь эта карта готова к использованию</string>
-    <string name="common_origin_card">Основная карта</string>
-    <string name="onboarding_alert_i_understand">Я понимаю</string>
-    <string name="details_row_title_backup_status">Статус резервного копирования</string>
-    <string name="details_backup_status_format_active">Активный. Количество резервных карт: %d</string>
-    <string name="details_backup_status_format_linked">Связано. Количество резервных карт: %d</string>
-    <string name="details_backup_status_no_backup">Нет резервной копии</string>
-    <string name="welcome_interrupted_backup_alert_message">У Вас есть прерванное резервное копирование. Хотите возобновить?</string>
-    <string name="welcome_interrupted_backup_alert_resume">Да, возобновить</string>
-    <string name="welcome_interrupted_backup_alert_discard">Отказаться</string>
-    <string name="welcome_interrupted_backup_discard_title">Это необратимое действие</string>
-    <string name="welcome_interrupted_backup_discard_message">Если сейчас отменить резервное копирование, то придется вернуть карты до заводских настроек, чтобы начать заново</string>
-    <string name="welcome_interrupted_backup_discard_resume">Возобновить резервное копирование</string>
-    <string name="welcome_interrupted_backup_discard_discard">Отказаться</string>
-    <string name="onboarding_title_prepare_origin">Основная карта</string>
-    <string name="onboarding_button_backup_origin">Сканировать основную карту</string>
-    <string name="onboarding_button_continue_wallet">Перейти к моему кошельку</string>
-    <string name="send_title_currency_format">Отправка %s</string>
-    <string name="onboarding_subtitle_scan_backup_card_format">Подготовьте резервную карту с номером %s</string>
-    <string name="onboarding_subtitle_scan_primary_card_format">Подготовьте основную карту с номером %s</string>
-    <string name="details_row_title_reset_factory_settings">Сброс до заводских настроек</string>
-    <string name="details_manage_security_access_code_disclaimer">Код доступа доступен только для карт с резервной копией</string>
-    <string name="solana_rent_warning">Сеть Solana взымает арендную плату в размере %s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %s, чтобы использовать его бесплатно.</string>
-    <string name="token_symbol_address_format">%1s (%2s)</string>
-    <string name="alert_signed_hashes_message">Эта карта не является векселем на предъявителя. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец скрывает автономную подпись, что является проблемой безопасности.\n\nНе принимайте эту карту в качестве физического платежа от кого-то, кому Вы не доверяете.\n\nВо всех остальных отношениях - это совершенно безопасно.\n\nTangem — единственный аппаратный кошелек, предлагающий защиту от подсчета подписей.</string>
-    <string name="wallet_connect">WalletConnect</string>
-    <string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %1s\n%2s\n\nСумма: %3s\nКомиссия: %4s\nВсего: %5s\nБаланс: %6s</string>
-    <string name="wallet_connect_request_session_start">Запрос на запуск сеанса для %1s\n\nURL: %2s</string>
-    <string name="wallet_connect_sessions_title">Сессии WalletConnect</string>
-    <string name="wallet_connect_session_opened">Сеанс WalletConnect открыт с %s</string>
-    <string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>
-    <string name="wallet_connect_no_sessions_message">Нет открытых сессий WalletConnect</string>
-    <string name="wallet_connect_open_session">Открытая сессия</string>
-    <string name="wallet_connect_card_number">Карта: %s</string>
-    <string name="wallet_connect_scan_card_message">Коснитесь карты, чтобы привязать ее WalletConnect</string>
-    <string name="wallet_connect_create_tx_not_enough_funds">Не удается отправить транзакцию. Недостаточно средств.</string>
-    <string name="wallet_connect_alert_sign_message">Просьба подписать сообщение\n</string>
-    <string name="wallet_connect_personal_sign_message">Сообщение для %s:\n%s</string>
-    <string name="wallet_connect_clipboard_alert">Буфер обмена содержит код WalletConnect. Использовать скопированное значение или отсканировать QR-код</string>
-    <string name="wallet_connect_paste_from_clipboard">Вставить из буфера обмена</string>
-    <string name="wallet_connect_scan_new_code">Сканировать новый код</string>
-    <string name="wallet_connect_scanner_error_no_ethereum_wallet">Эту карту нельзя использовать для установки сеанса WalletConnect.</string>
-    <string name="wallet_connect_could_not_complete">Операция не может быть завершена</string>
-    <string name="wallet_connect_same_wcuri">Операция не может быть завершена. \n\nВы уже установили сеанс WalletConnect с этими параметрами.</string>
-    <string name="wallet_connect_error_timeout">Не удалось установить сеанс WalletConnect: ошибка времени выполнения. Пожалуйста, повторите попытку позже.</string>
-    <string name="wallet_connect_bnb_transaction_signed">Транзакция BNB успешно подписана и отправлена в DApp</string>
-    <string name="wallet_connect_bnb_sign_message">DApp %s, запрашивает\nподпись транзакции BNB с\n%s</string>
-    <string name="wallet_connect_bnb_transaction_message">Сведения о транзакции:\nОт: %s\nКому: %s\nСумма: %s</string>
-    <string name="wallet_connect_bnb_trade_order_message">Торговый ордер на %s\nЦена: %s\nСумма к получению: %s\nСумма к оплате: %s</string>
-    <string name="feedback_subject_rate_negative">Мои предложения</string>
-    <string name="feedback_subject_scan_failed">Не могу отсканировать карту</string>
-    <string name="feedback_subject_tx_failed">Не могу отправить транзакцию</string>
-    <string name="feedback_subject_tx_push_failed">Не могу протолкнуть транзакцию</string>
-    <string name="feedback_subject_support_tangem">Обращение в поддержку Tangem</string>
-    <string name="feedback_subject_support">Обращение в поддержку</string>
-    <string name="feedback_preface_rate_negative">Расскажите, каких функций Вам не хватает, и мы постараемся Вам помочь</string>
-    <string name="feedback_preface_scan_failed">Скажите, пожалуйста, какая у Вас карта?</string>
-    <string name="feedback_preface_tx_failed">Пожалуйста, расскажите нам больше о Вашей проблеме. Каждая маленькая деталь может помочь.</string>
-    <string name="feedback_preface_support">Привет, команда поддержки,</string>
-    <string name="feedback_preface_tx_push_failed">Пожалуйста, расскажите нам больше о Вашей проблеме. Каждая деталь может быть полезной.</string>
-    <string name="feedback_data_collection_message">Информация ниже не является обязательной. Вы можете стереть её, если хотите.</string>
-    <string name="common_no">Нет</string>
-</resources>
diff --git a/app/src/main/res/values-ru/strings_final.xml b/app/src/main/res/values-ru/strings_final.xml
deleted file mode 100644
index ad4f23ca35..0000000000
--- a/app/src/main/res/values-ru/strings_final.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="shop_one_wallet">Tangem Wallet</string>
-    <string name="shop_3_cards">3 карты</string>
-    <string name="shop_2_cards">2 карты</string>
-    <string name="shop_shipping">Доставка</string>
-    <string name="shop_free">Бесплатно</string>
-    <string name="shop_i_have_a_promo_code">У меня есть промо-код...</string>
-    <string name="shop_total">Итого</string>
-    <string name="shop_other_payment_methods">Другие способы оплаты</string>
-    <string name="shop_buy_now">Купить сейчас</string>
-    <string name="shop_placing_order">Оформление заказа</string>
-    <string name="shop_web_checkout_title">Ваш заказ</string>
-    <string name="story_meet_title">Встречайте\nTangem</string>
-    <string name="story_meet_buy">Покупайте</string>
-    <string name="story_meet_store">Храните</string>
-    <string name="story_meet_send">Отправляйте</string>
-    <string name="story_meet_pay">Расплачивайтесь</string>
-    <string name="story_meet_exchange">Обменивайте</string>
-    <string name="story_meet_lend">Вкладывайте</string>
-    <string name="story_meet_borrow">Занимайте</string>
-    <string name="story_meet_stake">Стейкайте</string>
-    <string name="story_awe_title">Революционный аппаратный кошелек</string>
-    <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
-    <string name="story_backup_title">Все ключи в безопасности</string>
-    <string name="story_backup_description_1">До</string>
-    <string name="story_backup_description_2_bold">трех карт</string>
-    <string name="story_backup_description_3">с одним кошельком</string>
-    <string name="story_currencies_title">Тысячи криптовалют</string>
-    <string name="story_currencies_description">Аппаратный кошелек для ваших биткоинов, эфира и многих других валют одновременно — все в одной карте</string>
-    <string name="story_web3_title">Поддержка DeFi</string>
-    <string name="story_web3_description">Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах</string>
-    <string name="story_finish_title">Кошелек для каждого</string>
-    <string name="story_finish_description">Используйте его на ходу, в любом месте, в любое время. Без проводов и батареек. Как только понадобится крипта, просто приложите карту к телефону.</string>
-    <string name="home_button_order">Купить</string>
-    <string name="home_button_search_tokens">Поиск токенов</string>
-    <string name="search_tokens_title">Поиск токенов</string>
-    <string name="alert_demo_message">Приложение работает в демонстрационном режиме. Средства на всех счетах ненастоящие.</string>
-    <string name="alert_demo_feature_disabled">Эта функция недоступна в демонстрационном режиме</string>
-    <string name="token_details_send_blocked_fee_format">Недостаточно средств для комиссии на вашем %s кошельке для отправки транзакции. Сначала пополните свой %s кошелек.</string>
-    <string name="currency_subtitle_expanded">Доступные сети</string>
-    <string name="alert_manage_tokens_addresses_message">Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства.</string>
-    <string name="alert_manage_tokens_unsupported_message">Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки.</string>
-    <string name="warning_token_send_unsupported_message">Не осуществляйте перевод на токены в данной сети, иначе это может привести к их безвозвратной утере.</string>
-    <string name="contract_address_copied_message">Адрес контракта скопирован!</string>
-    <string name="alert_funds_restoration_message">Если вы совершили ошибку с выбором сети при переводе средств с биржи, эта инструкция поможет вам восстановить средства</string>
-    <string name="common_custom">Пользовательский</string>
-    <string name="common_notice">Уведомление</string>
-    <string name="common_attention">Внимание</string>
-    <string name="common_server_unavailable">Сервер недоступен, повторите попытку позднее</string>
-    <string name="main_page_balance">Баланс</string>
-    <string name="main_processing_full_amount">В сумме учтены не все монеты</string>
-    <string name="main_manage_tokens">Управление токенами</string>
-    <string name="token_item_no_rate">Нет цены</string>
-    <string name="token_details_hide_token">Скрыть токен</string>
-    <string name="token_details_hide_alert_title">Скрыть %s</string>
-    <string name="token_details_hide_alert_hide">Скрыть</string>
-    <string name="token_details_hide_alert_message">Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами.</string>
-    <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
-    <string name="token_details_unable_hide_alert_message">Токен %s является основной валютой в сети %s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
-    <string name="wallet_connect_network_not_found_format">Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново.</string>
-    <string name="wallet_connect_scanner_error_unsupported_network">Сеть не поддерживается. Пожалуйста, выберите другую сеть.</string>
-    <string name="wallet_currency_subtitle">Сеть %s</string>
-    <string name="main_no_backup_warning_title">Бэкап кошелька не был произведен</string>
-    <string name="main_no_backup_warning_subtitle">Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру</string>
-    <string name="russian_bank_card_warning_title">Карты банков РФ в данный момент не принимаются</string>
-    <string name="russian_bank_card_warning_subtitle">У вас есть карта банка другой страны или платежной системы UnionPay?</string>
-    <string name="common_yes">Да</string>
-    <string name="details_ask_a_question">Чат</string>
-    <string name="chat_bot_name">Tangem Bot</string>
-    <string name="card_settings_title">Настройки карты</string>
-    <string name="card_settings_security_mode">Тип безопасности</string>
-    <string name="card_settings_security_mode_footer">Выбранный способ защиты приложения</string>
-    <string name="card_settings_change_access_code">Смена кода доступа</string>
-    <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
-    <string name="scan_card_settings_title">Приготовьте свою карту</string>
-    <string name="scan_card_settings_message">Отсканируйте карту, чтобы изменить ее настройки. Изменения затронут только ту карту, которую вы отсканировали, и не повлияют на другие карты, привязанные к вашему кошельку.</string>
-    <string name="scan_card_settings_button">Сканировать</string>
-    <string name="app_settings_title">Настройки приложения</string>
-    <string name="app_settings_warning_title">Включите биометрическую аутентификацию</string>
-    <string name="app_settings_warning_subtitle">Перейдите в настройки, чтобы включить биометрическую аутентификацию в приложении Tangem</string>
-    <string name="app_settings_saved_wallet">Cохранение кошелька</string>
-    <string name="app_settings_saved_wallet_footer">Если эта опция включена, кошельки всех отсканированных карт будут привязываться к приложению и при открытии приложения будет необходимо пройти биометрическую аутентификацию. Подпись транзакций все так же потребует карту.</string>
-    <string name="app_settings_saved_access_codes">Сохранение кода доступа</string>
-    <string name="app_settings_saved_access_codes_footer">Если эта опция включена, пароли от карты будут хранится на телефоне в зашифрованном виде и при работе с картой вместо пароля будет запрашиваться биометрическая аутентификация</string>
-    <string name="app_settings_off_saved_wallet_alert_message">При отключении функции сохранения кошелька все ранее сохраненные кошельки будут удалены.</string>
-    <string name="app_settings_off_saved_access_code_alert_message">Все сохраненные коды доступа будут удалены. Вам потребуется вводить код доступа при работе с кошельком.</string>
-    <string name="wallet_connect_title">WalletConnect</string>
-    <string name="wallet_connect_subtitle">Подключение к Dapps</string>
-    <string name="details_row_title_create_backup">Добавить еще карты</string>
-    <string name="details_row_title_create_backup_footer">Вы можете объединить до трех карт в одном кошельке. Это можно сделать только один раз.</string>
-    <string name="details_row_privacy_policy">Privacy policy</string>
-    <string name="reset_card_to_factory_navigation_title">Сброс к заводским настройкам</string>
-    <string name="reset_card_to_factory_message">Это действие приведет к полному удалению кошелька на этой карте. Кошелек невозможно будет восстановить или использовать данную карту для восстановления кода доступа</string>
-    <string name="reset_card_to_factory_warning_message">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
-    <string name="reset_card_to_factory_button_title">Сбросить карту</string>
-    <string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
-    <string name="card_settings_reset_card_to_factory_footer">Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать эту карту для восстановления кода доступа.</string>
-    <string name="wallet_connect_select_network">Выберите сеть</string>
-    <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
-    <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
-    <string name="send_extras_hint_memo">Memo</string>
-    <string name="send_extras_hint_destination_tag">Tag</string>
-    <string name="send_extras_error_invalid_memo">Недопустимый Memo. Он не будет добавлен в транзакцию.</string>
-    <string name="send_extras_error_invalid_destination_tag">Недопустимый Tag. Он не будет добавлен в транзакцию.</string>
-    <string name="wallet_connect_error_failed_to_connect">Не удалось установить сессию WalletConnect</string>
-    <string name="wallet_connect_error_unsupported_dapp">Cоединение с этим Dapp сервисом не может быть установлено из-за его технической реализации.</string>
-    <string name="saltpay_backup_warning" translatable="false">Для начала работы с картой сначала отсканируйте первую карту и сделайте бэкап</string>
-    <string name="saltpay_error_empty_backup_title">Внимание</string>
-    <string name="saltpay_error_empty_backup_message">Приложите карту с логотипом Visa</string>
-    <string name="saltpay_error_no_gas_title">Недостаточно средств для активации</string>
-    <string name="saltpay_error_no_gas_message">Пожалуйста обратитесь в службу поддержки</string>
-    <string name="saltpay_error_pin_weak_title">Ввод одинаковых цифр является не безопасным</string>
-    <string name="saltpay_error_pin_weak_message">Данный Код доступа может быть легко взломан</string>
-    <string name="onboarding_navbar_pin">Код доступа</string>
-    <string name="onboarding_navbar_register_wallet">Подключиться</string>
-    <string name="onboarding_navbar_kyc_start">Верификация клиента</string>
-    <string name="onboarding_navbar_kyc_progress">Подтвердите свою личность</string>
-    <string name="onboarding_navbar_kyc_waiting">В обработке</string>
-    <string name="onboarding_button_pin">Установить Код доступа</string>
-    <string name="onboarding_button_register_wallet">Зарегистрироваться</string>
-    <string name="onboarding_button_kyc_start">Верифицировать (Utorg)</string>
-    <string name="onboarding_button_kyc_waiting">Обновить</string>
-    <string name="onboarding_title_register_wallet">Подключите свою карту</string>
-    <string name="onboarding_title_kyc_start">Подтвердите свою личность</string>
-    <string name="onboarding_title_kyc_waiting">Подтверждение личности в процессе</string>
-    <string name="onboarding_subtitle_register_wallet">Подключите вашу карту к децентрализованной платежной системе</string>
-    <string name="onboarding_subtitle_kyc_start">Для начала работы с картой вам необходимо завершить процесс подтверждения личности</string>
-    <string name="onboarding_subtitle_kyc_waiting">Пожалуйста дождитесь завершения процесса подтверждения вашей личности. Как правило, это занимает меньше часа. Вы можете закрыть приложение и вернуться позже.</string>
-    <string name="onboarding_title_pin">Код доступа</string>
-    <string name="onboarding_subtitle_pin">Установите Код доступа для вашей SaltPay карты</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Чат поддержки</string>
-    <string name="error_saltpay_wrong_backup_card">Данная карта не подходит для бэкапа SaltPay</string>
-    <string name="registration_task_alert_message">Пожалуйста, удерживайте карту до завершения операции</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">Для начала процесса бэкапа вам необходимо добавить Tangem карту</string>
-    <string name="onboarding_saltpay_title_no_backup_card">Бэкап карта не добавлена</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Бэкап карта создана</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Завершите процесс бэкапа создав код доступа</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Приготовьте SaltPay карту</string>
-    <string name="onboarding_saltpay_button_backup_origin">Приложите SaltPay карту</string>
-    <string name="onboarding_saltpay_title_backup_card">Приложите Tangem карту</string>
-    <string name="onboarding_chat_button_title">Чат</string>
-    <string name="onboarding_navbar_claim">Начало работы</string>
-    <string name="onboarding_title_claim">Запросить %s</string>
-    <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDai на свой кошелек</string>
-    <string name="onboarding_button_claim">Запросить</string>
-    <string name="onboarding_subtitle_success_claim">Поздравляем! Ваша платежная крипто карта теперь активирована!</string>
-    <string name="onboarding_title_claim_progress">Запрашивается</string>
-    <string name="onboarding_subtitle_claim_progress">Это займет несколько секунд</string>
-    <string name="onboarding_title_kyc_retry">Что-то пошло не так</string>
-    <string name="onboarding_subtitle_kyc_retry">Более подробная информация отправлена на ваш адрес электронной почты.</string>
-    <string name="onboarding_exit_alert_title">Вы хотите выйти из процесса активации?</string>
-    <string name="onboarding_exit_alert_message">В этом случае вам будет необходимо начать процесс заново.</string>
-    <string name="error_wrong_wallet_tapped">Вы использовали карту от другого кошелька. Приложите карту, связанную с этим кошельком.</string>
-    <string name="internal_error_wallet_manager_not_found">Внутренняя ошибка: не удается найти менеджер кошельков</string>
-</resources>
diff --git a/app/src/main/res/values-ru/strings_plurals_final.xml b/app/src/main/res/values-ru/strings_plurals_final.xml
deleted file mode 100644
index 53720a4bb6..0000000000
--- a/app/src/main/res/values-ru/strings_plurals_final.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-    <plurals name="card_label_card_count">
-        <item quantity="one">%d карта</item>
-        <item quantity="few">%d карты</item>
-        <item quantity="many">%d карт</item>
-        <item quantity="other">%d карт</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index 2c1ebffd92..0000000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<resources>
-
-    <string name="app_name" translatable="false">Tangem</string>
-
-    <string name="common_save_changes">Save changes</string>
-    <string name="common_warning">Warning</string>
-    <string name="common_retry">Retry</string>
-    <string name="common_done">Done</string>
-    <string name="common_cancel">Cancel</string>
-    <string name="common_accept">Accept</string>
-    <string name="common_delete">Delete</string>
-    <string name="common_custom_string" translatable="false">%s</string>
-
-    <string name="common_camera_denied_alert_title">Camera access denied</string>
-    <string name="common_camera_denied_alert_message">You have not given access to your camera, please adjust your privacy settings</string>
-    <string name="common_camera_alert_button_settings">Settings</string>
-
-    <string name="home_welcome">Welcome to Tangem.\nDo you have one of our cards?</string>
-    <string name="home_welcome_back">Welcome back to Tangem. \nScan your card to start.</string>
-    <string name="home_button_shop">Shop</string>
-    <string name="home_ready_title">Get ready to tap your \ncard to the back of the \nphone.</string>
-    <string name="home_button_tapin">Tap in</string>
-    <string name="home_button_scan">Scan card</string>
-    <string name="home_button_yes">Yes! Scan it.</string>
-
-    <string name="wallet_button_scan">Scan</string>
-    <string name="wallet_button_send">Send</string>
-    <string name="wallet_button_create_wallet">Create wallet</string>
-    <string name="wallet_title">Tangem</string>
-    <string name="wallet_choice_wallet_option_title">Choice wallet option</string>
-
-    <string name="wallet_balance_token_title">Token</string>
-    <string name="wallet_balance_tokens_title">Tokens</string>
-    <string name="wallet_balance_verified">Verified Balance</string>
-    <string name="wallet_balance_loading">Balance is loading…</string>
-    <string name="wallet_balance_blockchain_unreachable">Blockchain is unreachable</string>
-
-    <string name="wallet_error_no_account">Account is not created</string>
-    <string name="wallet_error_no_account_subtitle_format">Load %1$s+ %2$s to create account</string>
-    <string name="wallet_error_empty_card">Empty card</string>
-    <string name="wallet_error_empty_card_subtitle">Create wallet to start using Tangem card</string>
-    <string name="wallet_error_unsupported_blockchain">This card is not supported</string>
-    <string name="wallet_error_unsupported_blockchain_subtitle">Your Tangem card was made to work with a different application. Please see the name and instructions on your card, and install the correct app</string>
-
-    <string name="wallet_balance_tx_in_progress">Transaction is in progress…</string>
-    <string name="wallet_pending_tx_sending_address_format">to %s</string>
-    <string name="wallet_pending_tx_receiving_address_format">from %s</string>
-    <string name="wallet_pending_tx_receiving">Receiving</string>
-    <string name="wallet_pending_tx_sending">Sending</string>
-
-    <string name="wallet_address_button_explore">Explore address</string>
-    <string name="wallet_address_button_create_payid">Create PayString</string>
-    <string name="wallet_qr_title_format">%s wallet</string>
-
-    <string name="wallet_create_payid">Create PayString</string>
-    <string name="wallet_create_payid_card_format">Card: %s</string>
-    <string name="wallet_create_payid_hint">PayString name</string>
-    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
-    <string name="wallet_create_payid_button_title">Create</string>
-    <string name="wallet_create_payid_info">Your PayString is information unique to you, like your phone number, email or ABN.</string>
-    <string name="wallet_create_payid_success_message">PayString created successfully and copied to clipboard</string>
-    <string name="wallet_create_payid_error_message">Error response while creating PayString</string>
-    <string name="wallet_create_payid_error_already_created">This PayString already exists. Try a different one.</string>
-
-    <string name="send_destination_hint_address_payid">Address or PayString</string>
-    <string name="send_destination_hint_address">Address</string>
-    <string name="send_title">Send</string>
-    <string name="send_network_fee_title">Network fee</string>
-    <string name="send_amount_label">Amount</string>
-    <string name="send_fee_label">Fee</string>
-    <string name="send_total_label">Total</string>
-    <string name="send_max_amount_label">Maximum amount</string>
-    <string name="send_fee_picker_low">Low</string>
-    <string name="send_fee_picker_normal">Normal</string>
-    <string name="send_fee_picker_priority">Priority</string>
-    <string name="send_fee_include_description">Include fee</string>
-    <string name="send_total_subtitle_format">%1$s %2$s will be sent</string>
-    <string name="send_total_subtitle_fiat_format">≈ %1$s (inc. fee: %2$s)</string>
-    <string name="send_total_subtitle_asset_format">%1$s %2$s and %3$s %4$s will be sent</string>
-    <string name="send_balance_subtitle_format">Balance: %1$s %2$s</string>
-    <string name="send_transaction_success">Transaction has been successfully signed and sent to blockchain node. Wallet balance will be updated in a while</string>
-
-    <string name="details_title">Details</string>
-    <string name="details_row_title_cid">Card ID</string>
-    <string name="details_row_title_issuer">Issuer</string>
-    <string name="details_row_title_signed_hashes">Signed</string>
-    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
-    <string name="details_row_title_currency">App currency</string>
-    <string name="details_section_title_settings">Settings</string>
-    <string name="details_section_title_card">Card</string>
-    <string name="details_row_title_validate">Validate card</string>
-    <string name="details_row_title_manage_security">Manage Security</string>
-    <string name="details_row_title_erase_wallet">Erase wallet</string>
-    <string name="details_erase_wallet_warning">This action is irreversible. If, after deleting the wallet, someone sends funds to it, then you will not be able to withdraw them.</string>
-    <string name="details_security_management_warning">If you forget the code, you will lose the ability to use the card. There is no way to recover or change your code if you lose it.</string>
-    <string name="details_manage_security_title">Manage Security</string>
-    <string name="details_manage_security_long_tap">Long Tap</string>
-    <string name="details_manage_security_long_tap_description">This mechanism protects against proximity attack on a card. It will enforce a delay between reception and execution of a command. After the first signed transaction this phone will be linked with the card and transactions will be signed immediately.</string>
-    <string name="details_manage_security_passcode">Passcode</string>
-    <string name="details_manage_security_passcode_description">Before execution any command entailing a change of the card state you will have to enter the passcode.</string>
-    <string name="details_manage_security_access_code">Access code</string>
-    <string name="details_manage_security_access_code_description">You will have to submit the correct access code before scanning the card</string>
-
-    <string name="alert_old_device_this_card">You may experience NFC problems with some iPhone 7/7+ during the extraction</string>
-    <string name="alert_card_signed_transactions">This card has been already topped up and signed transactions in the past. Consider immediate withdrawal of all funds if you have received this card from an untrusted source.</string>
-    <string name="alert_title">Warning</string>
-    <string name="alert_unsupported_card">This card is not designed to work with this app</string>
-    <string name="alert_developer_card">The card you scanned is a development card. Don\'t accept it as a payment</string>
-    <string name="alert_old_card">Tangem cards manufactured before September 2019 cannot currently be extracted with an iPhone. We\'re working hard with Apple to make it possible in future versions of iOS.</string>
-
-    <string name="initial_message_sign_header">Tap to sign</string>
-    <string name="initial_message_sign_body">Tap the card to your phone as shown above</string>
-    <string name="initial_message_purge_wallet_body">Tap to erase wallet</string>
-    <string name="initial_message_create_wallet_body">Tap to create wallet</string>
-    <string name="initial_message_change_access_code_body">Tap to change the access code</string>
-    <string name="initial_message_change_passcode_body">Tap to change the passcode</string>
-
-    <string name="payid_service_error_loading">Invalid PayString</string>
-
-    <string name="disclaimer_text" translatable="false">Legal Disclaimer
-    \n
-    \n1. Tangem application (Software)
-    \n
-    \nThe Software is intended for usage only with Tangem hardware wallets (Cards) via NFC interface. The Software DOES NOT:
-    \n
-    \na) Generate, store, transmit, or have access to private (secret) cryptographic keys to blockchain wallets holding digital assets, including crypto-currency.
-    \n
-    \nb) Generate, store, transmit, or have access to secret keys, passwords, passphrases, recovery phrases that can be used to restore or to copy private (secret) keys to blockchain wallets holding digital assets, including crypto-currency.
-    \n
-    \nc) Provide exchange, trading, investment services on behalf of Tangem AG.
-    \n
-    \n2. Risks related to the use of Software
-    \n
-    \nTangem will not be responsible for any losses, damages or claims arising from events falling within the scope of the following five categories:
-    \n
-    \na) Mistakes made by the user of any cryptocurrency-related software or service, e.g., forgotten passwords, payments sent to wrong addresses, and accidental deletion of blockchain wallets on Cards.
-    \n
-    \nb) Problems of Software and/or any blockchain- or cryptocurrency- related software or service, e.g., corrupted files, incorrectly constructed transactions, unsafe cryptographic libraries, malware.
-    \n
-    \nc) Technical failures in the hardware of the user, including Cards, of any cryptocurrency-related software or service, e.g., data loss due to a faulty or damaged storage device.
-    \n
-    \nd) Security problems experienced by the user of any cryptocurrency-related software or service, e.g., unauthorized access to users\' wallets and/or accounts.
-    \n
-    \ne) Actions or inactions of third parties and/or events experienced by third parties, e.g., bankruptcy of service providers, information security attacks on service providers, and fraud conducted by third parties.
-    \n
-    \n3. Trading and Investment risks
-    \n
-    \nThere is considerable exposure to risk in any crypto-currency or other digital asset exchange transaction. Any transaction involving currencies involves risks including, but not limited to, the potential for changing economic conditions that may substantially affect the price or liquidity of a currency. Investments in crypto-currency exchange speculation may also be susceptible to sharp rises and falls as the relevant market values fluctuate. It is for this reason that when speculating in such markets it is advisable to use only risk capital.
-    \n
-    \n4. Electronic Trading Risks
-    \n
-    \nBefore you engage in transactions using an electronic system, you should carefully review the rules and regulations of the exchanges offering the system and/or listing the instruments you intend to trade. Online trading has inherent risk due to system response and access times that may vary due to market conditions, system performance, and other factors. You should understand these and additional risks before trading.
-    \n
-    \n5. Compliance with tax obligations
-    \n
-    \nThe users of the Software are solely responsible to determinate what, if any, taxes apply to their crypto-currency transactions. The owners of, or contributors to, the Software are NOT responsible for determining the taxes that apply to crypto-currency transactions.
-    \n
-    \n6. No warranties
-    \n
-    \nThe Software is provided on an \“as is\” basis without any warranties of any kind regarding the Software and/or any content, data, materials and/or services provided on the Software.
-    \n
-    \n7. Limitation of liability
-    \n
-    \nUnless otherwise required by law, in no event shall the owners of, or contributors to, the Software be liable for any damages of any kind, including, but not limited to, loss of use, loss of profits, or loss of data arising out of or in any way connected with the use of the Software. In no way are the owners of, or contributors to, the Software responsible for the actions, decisions, or other behavior taken or not taken by you in reliance upon the Software.
-    \n
-    \n8. Last amendment
-    \n
-    \nThis disclaimer was amended for the last time on October 1st, 2020.</string>
-    <string name="disclaimer_title">Terms of service</string>
-
-  <string name="wallet_notification_no_internet">No internet connection</string>
-
-    <string name="send_error_payid_verification_failed">PayString verification failed</string>
-    <string name="send_error_payid_unsupported_by_blockchain">PayString unsupported by blockchain</string>
-    <string name="send_error_payid_not_registered">PayString not registered</string>
-    <string name="send_error_payid_request_failed">PayString request failed</string>
-
-    <string name="send_error_address_same_as_wallet">Address is the same as wallet address</string>
-
-    <string name="wallet_notification_address_copied">Address was copied to clipboard</string>
-
-
-    <string name="wallet_create_payid_empty">Enter desired PayString first</string>
-
-    <string name="initial_message_scan_header">Tap to scan</string>
-    <string name="initial_message_tap_header">Tap the card</string>
-
-    <string name="details_notification_erase_wallet_not_possible">Your balance on this wallet is not zero, or you have unconfirmed transactions</string>
-    <string name="details_notification_security_option_already_active">This is the currently active option</string>
-</resources>
diff --git a/app/src/main/res/values/strings_final.xml b/app/src/main/res/values/strings_final.xml
deleted file mode 100644
index 70e85346c6..0000000000
--- a/app/src/main/res/values/strings_final.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="shop_one_wallet">Tangem Wallet</string>
-    <string name="shop_3_cards">3 cards</string>
-    <string name="shop_2_cards">2 cards</string>
-    <string name="shop_shipping">Shipping</string>
-    <string name="shop_free">Free</string>
-    <string name="shop_i_have_a_promo_code">I have a promo code...</string>
-    <string name="shop_total">Total</string>
-    <string name="shop_other_payment_methods">Other payment methods</string>
-    <string name="shop_buy_now">Buy now</string>
-    <string name="shop_placing_order">Placing your order</string>
-    <string name="shop_web_checkout_title">Your order</string>
-    <string name="story_meet_title">Meet\nTangem</string>
-    <string name="story_meet_buy">Buy</string>
-    <string name="story_meet_store">Store</string>
-    <string name="story_meet_send">Send</string>
-    <string name="story_meet_pay">Pay</string>
-    <string name="story_meet_exchange">Exchange</string>
-    <string name="story_meet_lend">Lend</string>
-    <string name="story_meet_borrow">Borrow</string>
-    <string name="story_meet_stake">Stake</string>
-    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
-    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
-    <string name="story_backup_title">Ultra Secure Backup</string>
-    <string name="story_backup_description_1">Up to</string>
-    <string name="story_backup_description_2_bold">3 physical cards</string>
-    <string name="story_backup_description_3">to one wallet</string>
-    <string name="story_currencies_title">Thousands of Currencies</string>
-    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
-    <string name="story_web3_title">DeFi Compatible</string>
-    <string name="story_web3_description">Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services</string>
-    <string name="story_finish_title">The Wallet for Everyone</string>
-    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
-    <string name="home_button_order">Order</string>
-    <string name="home_button_search_tokens">Search tokens</string>
-    <string name="search_tokens_title">Search tokens</string>
-    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
-    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
-    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
-    <string name="currency_subtitle_expanded">Available networks</string>
-    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
-    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
-    <string name="warning_token_send_unsupported_message">Do not transfer your funds to tokens in this blockchain, otherwise it may lead to their irretrievable loss.</string>
-    <string name="contract_address_copied_message">Contract address copied!</string>
-    <string name="alert_funds_restoration_message">If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds</string>
-    <string name="common_custom">Custom</string>
-    <string name="common_notice">Notice</string>
-    <string name="common_attention">Attention</string>
-    <string name="common_server_unavailable">The server is not available, please try again later</string>
-    <string name="main_page_balance">Total balance</string>
-    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
-    <string name="main_manage_tokens">Manage tokens</string>
-    <string name="token_item_no_rate">No rate</string>
-    <string name="token_details_hide_token">Hide token</string>
-    <string name="token_details_hide_alert_title">Hide %s</string>
-    <string name="token_details_hide_alert_hide">Hide</string>
-    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
-    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
-    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
-    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
-    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
-    <string name="wallet_currency_subtitle">%s network</string>
-    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
-    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
-    <string name="wallet_hide_token" translatable="false">Remove token</string>
-    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
-    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
-    <string name="common_yes">Yes</string>
-    <string name="common_no">No</string>
-    <string name="details_ask_a_question">Chat</string>
-    <string name="chat_bot_name">Tangem Bot</string>
-    <string name="card_settings_title">Card Settings</string>
-    <string name="card_settings_security_mode">Security Mode</string>
-    <string name="card_settings_security_mode_footer">Selected application protection method</string>
-    <string name="card_settings_change_access_code">Change access code</string>
-    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
-    <string name="scan_card_settings_title">Get your card ready!</string>
-    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you’ve scanned and will not affect other cards tied to your wallet.</string>
-    <string name="scan_card_settings_button">Scan Card</string>
-    <string name="app_settings_title">App settings</string>
-    <string name="app_settings_warning_title">Enable biometric authentication</string>
-    <string name="app_settings_warning_subtitle">Go to settings to enable biometric authentication in the Tangem app</string>
-    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
-    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
-    <string name="app_settings_saved_access_codes">Save Access Code</string>
-    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
-    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
-    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
-    <string name="wallet_connect_title">WalletConnect</string>
-    <string name="wallet_connect_subtitle">Connect to Dapps</string>
-    <string name="details_row_title_create_backup">Link More Cards</string>
-    <string name="details_row_title_create_backup_footer">You can synchronize up to three cards into one wallet. It can only be done once.</string>
-    <string name="details_row_privacy_policy">Privacy policy</string>
-    <string name="reset_card_to_factory_navigation_title">Reset to factory settings</string>
-    <string name="reset_card_to_factory_message">This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
-    <string name="reset_card_to_factory_button_title">Reset the card</string>
-    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
-    <string name="card_settings_reset_card_to_factory_footer">Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code.</string>
-    <string name="wallet_connect_select_network">Select network</string>
-    <string name="main_scan_card_warning_view_title">Scan your card</string>
-    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
-    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session</string>
-    <string name="send_extras_hint_memo">Memo</string>
-    <string name="send_extras_hint_destination_tag">Tag</string>
-    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
-    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
-    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
-    <string name="saltpay_backup_warning" translatable="false">To start working with the card scan the first card and make a backup</string>
-    <string name="saltpay_error_empty_backup_title">Attention</string>
-    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
-    <string name="saltpay_error_no_gas_title">No funds for activation</string>
-    <string name="saltpay_error_no_gas_message">Please contact support</string>
-    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
-    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
-    <string name="onboarding_navbar_pin">Pin code</string>
-    <string name="onboarding_navbar_register_wallet">Connect</string>
-    <string name="onboarding_navbar_kyc_start">KYC</string>
-    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
-    <string name="onboarding_navbar_kyc_waiting">In progress</string>
-    <string name="onboarding_button_pin">Set PIN code</string>
-    <string name="onboarding_button_register_wallet">Register</string>
-    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
-    <string name="onboarding_button_kyc_waiting">Refresh</string>
-    <string name="onboarding_title_register_wallet">Connect your card</string>
-    <string name="onboarding_title_kyc_start">Verify your identity</string>
-    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
-    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
-    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
-    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. Usually it takes up to 1 hour. You can close the app and come back later.</string>
-    <string name="onboarding_title_pin">PIN Code</string>
-    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
-    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
-    <string name="error_saltpay_wrong_backup_card">This card is not designed to SaltPay backup</string>
-    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
-    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
-    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
-    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
-    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
-    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
-    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
-    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
-    <string name="onboarding_chat_button_title">Support</string>
-    <string name="onboarding_navbar_claim">Getting started</string>
-    <string name="onboarding_title_claim">Claim %s</string>
-    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
-    <string name="onboarding_button_claim">Claim</string>
-    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
-    <string name="onboarding_title_claim_progress">Claiming</string>
-    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
-    <string name="onboarding_title_kyc_retry">Something went wrong</string>
-    <string name="onboarding_subtitle_kyc_retry">Please check you email for further instructions</string>
-    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
-    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
-    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
-    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
-</resources>
diff --git a/app/src/main/res/values/strings_plurals_final.xml b/app/src/main/res/values/strings_plurals_final.xml
deleted file mode 100644
index 530ada144e..0000000000
--- a/app/src/main/res/values/strings_plurals_final.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-    <plurals name="card_label_card_count">
-        <item quantity="zero">%d card</item>
-        <item quantity="one">%d card</item>
-        <item quantity="two">%d cards</item>
-        <item quantity="other">%d cards</item>
-    </plurals>
-</resources>
diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml
deleted file mode 100644
index 153f80c666..0000000000
--- a/app/src/main/res/values/strings_untranslated.xml
+++ /dev/null
@@ -1,328 +0,0 @@
-<resources>
-    <string name="scan_card_error" translatable="false">Scan card failed. Try again</string>
-
-    <string name="wallet_button_buy" translatable="false">Buy</string>
-    <string name="wallet_button_sell" translatable="false">Sell</string>
-    <string name="wallet_button_trade" translatable="false">Trade</string>
-    <string name="wallet_address_chip_default" translatable="false">Default</string>
-    <string name="wallet_address_chip_compatibility" translatable="false">Compatibility</string>
-    <string name="wallet_address_chip_legacy" translatable="false">Legacy</string>
-
-    <string name="wallet_button_create_twin_wallet" translatable="false">Create twin wallet</string>
-    <string name="wallet_error_empty_twin_card" translatable="false">Create twin wallet</string>
-    <string name="wallet_error_empty_twin_card_subtitle" translatable="false"> Generate wallet keys on both cards to start using your Twins</string>
-
-    <string name="twins_onboarding_title" translatable="false">Tangem Twin</string>
-    <string name="twins_onboarding_subtitle" translatable="false">One wallet. Two cards.</string>
-    <string name="twins_onboarding_description_format" translatable="false">This one that you are holding in your hands and the other one with number #%s.</string>
-
-    <string name="details_row_title_twins_recreate" translatable="false">Re-create twin wallet</string>
-    <string name="details_row_title_card_tou" translatable="false">Card terms of use</string>
-
-    <string name="twins_recreate_toolbar" translatable="false">Tangem Twin</string>
-    <string name="twins_recreate_warning" translatable="false">This action is irreversible. You will not have access to the old wallet.</string>
-    <string name="twins_recreate_title_format" translatable="false">Tap the #%s twin card</string>
-    <string name="twins_recreate_title_preparing" translatable="false">Preparing card</string>
-    <string name="twins_recreate_title_creating_wallet" translatable="false">Creating wallet</string>
-    <string name="twins_recreate_subtitle" translatable="false">The wallet creation procedure consists of three steps. You must complete it to the end, otherwise you will have to start from the beginning.</string>
-    <string name="twins_recreate_button_format" translatable="false">Scan the card #%s</string>
-    <string name="twins_recreate_alert" translatable="false">You have already started the process of recreating twin wallet. If you interrupt it, you won\'t be able to use your twin cards until you start it again and complete recreating the wallet.</string>
-    <string name="twins_wrong_card_error" translatable="false">You\'ve tapped the same card. To create twin wallet you need to tap a second twin card.</string>
-
-    <string name="notification_twins_recreate_success" translatable="false">The twin address was successfully created</string>
-
-    //Common
-    <string name="common_start" translatable="false">Start</string>
-    <string name="common_back" translatable="false">Back</string>
-    <string name="common_add" translatable="false">Add</string>
-    <string name="common_remove" translatable="false">Remove</string>
-    <string name="common_search" translatable="false">Search</string>
-
-    <string name="details_section_title_app" translatable="false">App</string>
-    <string name="details_row_title_send_feedback" translatable="false">Send feedback</string>
-    <string name="alert_app_feedback_sent_title" translatable="false">Sent successfully</string>
-    <string name="alert_app_feedback_sent_message" translatable="false">Thank you for your feedback</string>
-    <string name="alert_negative_app_rate_sent_title" translatable="false">Your suggestions were sent</string>
-    <string name="alert_negative_app_rate_sent_message" translatable="false">Thank your for your feedback. We will response as soon as possible</string>
-    <string name="alert_failed_to_send_email_title" translatable="false">Failed to send email</string>
-    <string name="alert_failed_to_send_email_message" translatable="false">Reason: %s</string>
-    <string name="alert_failed_to_send_transaction_title" translatable="false">Can\'t send a transaction</string>
-    <string name="alert_failed_to_send_transaction_message" translatable="false">Reason: %s</string>
-    <string name="alert_troubleshooting_scan_card_title" translatable="false">Are you having difficulty scanning your card?</string>
-    <string name="alert_troubleshooting_scan_card_message" translatable="false">Please try to tap the card exactly as shown in the animation or request support.</string>
-    <string name="alert_troubleshooting_scan_card_ok" translatable="false">I\'m okay</string>
-    <string name="alert_button_try_again" translatable="false">Try again</string>
-    <string name="alert_button_request_support" translatable="false">Request support</string>
-    <string name="alert_button_send_feedback" translatable="false">Send feedback</string>
-    <string name="warning_button_really_cool" translatable="false">Really cool!</string>
-    <string name="warning_button_can_be_better" translatable="false">Can be better</string>
-    <string name="warning_rate_app_title" translatable="false">One question</string>
-    <string name="warning_rate_app_message" translatable="false">How do you like Tangem?</string>
-
-    //Manage tokens
-    <string name="manage_tokens_no_tokens" translatable="false">No tokens yet</string>
-    <string name="manage_tokens_section_title_added_tokens" translatable="false">Added tokens</string>
-    <string name="manage_tokens_alert_remove_token_title" translatable="false">Remove %s token</string>
-    <string name="manage_tokens_alert_remove_token_message" translatable="false">Are you sure you want to remove this token?</string>
-    <string name="add_tokens_title" translatable="false">Add Tokens</string>
-    <string name="add_token_button" translatable="false">Add Token</string>
-    <string name="manage_tokens_title" translatable="false">Manage Tokens</string>
-    <string name="add_custom" translatable="false">Add Custom</string>
-    <string name="add_token_section_title_custom_tokens" translatable="false">Custom tokens</string>
-    <string name="add_token_section_title_popular_tokens" translatable="false">Popular tokens</string>
-    <string name="add_token_added" translatable="false">Added</string>
-    <string name="token_icon" translatable="false">Token icon</string>
-
-    <string name="add_custom_token_title" translatable="false">Add Token</string>
-    <string name="custom_token_contract_address_input_title" translatable="false">Contract address</string>
-    <string name="custom_token_creation_error_required_field" translatable="false">Required field</string>
-    <string name="custom_token_creation_error_network_not_selected" translatable="false">Please select the network</string>
-    <string name="custom_token_creation_error_empty_fields" translatable="false">Please fill in all the fields</string>
-    <string name="custom_token_creation_error_wrong_decimals" translatable="false">Decimal number must be a valid integer, no higher than %d</string>
-    <string name="custom_token_creation_error_invalid_contract_address" translatable="false">Contract address is invalid</string>
-    <string name="custom_token_creation_error_invalid_derivation_path" translatable="false">Derivation path is invalid</string>
-    <string name="custom_token_validation_error_not_found" translatable="false">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
-    <string name="custom_token_validation_error_already_added" translatable="false">This token/network has already been added to your list</string>
-    <string name="custom_token_type_network" translatable="false">Network</string>
-    <string name="custom_token_type_token" translatable="false">Token</string>
-    <string name="custom_token_decimals_input_title" translatable="false">Decimals</string>
-    <string name="custom_token_network_input_title" translatable="false">Network</string>
-    <string name="custom_token_network_input_not_selected" translatable="false">Not selected</string>
-    <string name="custom_token_name_input_placeholder" translatable="false">E.g. USD Coin</string>
-    <string name="custom_token_name_input_title" translatable="false">Name</string>
-    <string name="custom_token_token_symbol_input_placeholder" translatable="false">E.g. USDC</string>
-    <string name="custom_token_token_symbol_input_title" translatable="false">Token symbol</string>
-    <string name="custom_token_derivation_path_input_title" translatable="false">BIP44 coin type</string>
-    <string name="custom_token_derivation_path_default" translatable="false">Default</string>
-    <string name="custom_token_add_token" translatable="false">Add token</string>
-
-    //Details
-    <string name="details_section_title_blockchain" translatable="false">Blockchain</string>
-    <string name="details_row_title_manage_tokens" translatable="false">Manage tokens</string>
-
-    <string name="add_tokens_subtitle_blockchains" translatable="false">Blockchains</string>
-    <string name="add_tokens_subtitle_format" translatable="false">%s tokens</string>
-    <string name="wallet_address_button_copy" translatable="false">Copy</string>
-    <string name="wallet_address_button_share" translatable="false">Share</string>
-    <string name="wallet_button_add_tokens" translatable="false">+ Add tokens</string>
-    <string name="wallet_pending_transaction_warning" translatable="false">Please wait for the transaction to complete to be able to send funds</string>
-
-    <string name="warning_failed_to_verify_card_title" translatable="false">Authenticity check failed</string>
-    <string name="warning_failed_to_verify_card_message" translatable="false">This card might be a production sample or counterfeit</string>
-
-
-    <string name="warning_important_security_info" translatable="false">Important security information \u26A0</string>
-    <string name="warning_signed_tx_previously" translatable="false">This card has signed transactions in the past</string>
-    <string name="warning_button_learn_more" translatable="false">Learn more</string>
-    <string name="alert_signed_hashes_message" translatable="false">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.
-    \n\nDo not accept this card as physical payment from someone you don\'t trust.
-    \n\nIt\'s perfectly safe in all other respects.
-    \n\nTangem is the only hardware wallet to offer signature count protection.</string>
-    <string name="alert_button_i_understand" translatable="false">I understand</string>
-
-    <string name="warning_low_signatures_format" translatable="false">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
-
-    //Wallet Connect
-    <string name="wallet_connect" translatable="false">WalletConnect</string>
-    <string name="wallet_connect_sessions_title" translatable="false">Wallet Connect Sessions</string>
-    <string name="wallet_connect_session_opened" translatable="false">WalletConnect session opened with %s</string>
-    <string name="wallet_connect_no_sessions_title" translatable="false">Ooops. No Sessions.</string>
-    <string name="wallet_connect_no_sessions_message" translatable="false">No opened WalletConnect sessions</string>
-    <string name="wallet_connect_open_session" translatable="false">Open session</string>
-    <string name="wallet_connect_card_number" translatable="false">Card: %s</string>
-    <string name="wallet_connect_scan_card_message" translatable="false">Tap card to bind to wallet connect</string>
-
-    <string name="wallet_connect_create_tx_message" translatable="false">
-    Request to create transaction for %1s
-    \n%2s
-
-    \n\nAmount: %3s
-    \nFee: %4s
-    \nTotal: %5s
-    \nBalance: %6s</string>
-
-    <string name="wallet_connect_create_tx_not_enough_funds" translatable="false">Can\'t send transaction. Not enough funds.</string>
-
-    <string name="wallet_connect_request_session_start" translatable="false">Request to start a session for %1s\n\n
-
-    URL: %2s</string>
-
-
-    <string name="wallet_connect_alert_sign_message" translatable="false">Requesting to sign a message\n</string>
-    <string name="wallet_connect_personal_sign_message" translatable="false">Message for %s:\n%s</string>
-
-
-    <string name="common_disconnect" translatable="false">Disconnect</string>
-    <string name="common_sign" translatable="false">Sign</string>
-    <string name="common_sign_and_send" translatable="false">Sign and send</string>
-    <string name="common_reject" translatable="false">Reject</string>
-
-    <string name="wallet_connect_clipboard_alert" translatable="false">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
-    <string name="wallet_connect_paste_from_clipboard" translatable="false">Paste from clipboard</string>
-    <string name="wallet_connect_scan_new_code" translatable="false">Scan new code</string>
-    <string name="wallet_connect_scanner_error_no_ethereum_wallet" translatable="false">This card can\'t be used to establish WalletConnect session</string>
-    <string name="wallet_connect_could_not_complete" translatable="false">The operation couldn\'t be completed</string>
-    <string name="wallet_connect_same_wcuri" translatable="false">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
-    <string name="wallet_connect_error_timeout" translatable="false">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
-
-    <string name="warning_testnet_card_message" translatable="false">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
-
-
-    <string name="wallet_dialog_choose_trade_action" translatable="false">Do you want to buy or sell crypto?</string>
-
-    <string name="error_update_app" translatable="false">Oops, the current version of the application is not ready to work with this card, please check for updates.</string>
-
-    <!--  Onboarding  -->
-    <string name="home_welcome_header" translatable="false">Welcome to Tangem</string>
-    <string name="home_welcome_body" translatable="false">The safest way to buy, use and\n store cryptocurrency</string>
-    <string name="home_button_get_new_card" translatable="false">Get a new card</string>
-
-    <string name="onboarding_title" translatable="false">Activating card</string>
-    <string name="onboarding_button_what_does_it_mean" translatable="false">How it works?</string>
-    <string name="onboarding_button_receive_crypto" translatable="false">Receive crypto</string>
-
-    <string name="onboarding_create_wallet_header" translatable="false">Create a wallet</string>
-    <string name="onboarding_create_wallet_body" translatable="false">Let\'s generate all the keys on your card and create a secure wallet</string>
-    <string name="onboarding_create_wallet_button_create_wallet" translatable="false">Create wallet</string>
-
-    <string name="onboarding_top_up_header" translatable="false">Top up your wallet</string>
-    <string name="onboarding_top_up_body" translatable="false">To get started, simply top up the card with any amount</string>
-    <string name="onboarding_top_up_body_no_account_error" translatable="false">To get started, simply top up the wallet with more than %s %s.</string>
-    <string name="onboarding_top_up_button_but_crypto" translatable="false">Buy crypto</string>
-    <string name="onboarding_top_up_button_show_wallet_address" translatable="false">Show the wallet\'s address</string>
-    <string name="onboarding_dialog_wallet_address" translatable="false">Scan the address to top up your wallet</string>
-
-    <string name="onboarding_done_header" translatable="false">Success!</string>
-    <string name="onboarding_done_body" translatable="false">Your crypto card is activated and ready to be used</string>
-    <string name="onboarding_done_button_continue" translatable="false">Continue</string>
-    <string name="onboarding_balance_title" translatable="false">Balance</string>
-    <string name="address_qr_code_message_format" translatable="false">Send only %s (%s) to this address. Using other tokens and networks may result in loss of funds.</string>
-    <string name="address_qr_code_message_token_format" translatable="false">Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds.</string>
-
-    <string name="onboarding_twins_interrupt_warning" translatable="false">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
-    <string name="onboarding_twin_exit_warning" translatable="false">The twinning process is partly complete. You can\'t exit it now.</string>
-
-    <string name="onboarding_error_create_primary_wallet" translatable="false">Internal error: can\'t create wallet manager</string>
-
-    <string name="wallet_balance_blockchain_unreachable_try_later" translatable="false">Blockchain is unreachable. Try later</string>
-
-    <string name="warning_button_ok" translatable="false">Ok, Got it!</string>
-
-    <string name="onboarding_success" translatable="false">Success!</string>
-    <string name="onboarding_getting_started" translatable="false">Getting started</string>
-
-    <string name="onboarding_button_backup_now" translatable="false">Backup now</string>
-    <string name="onboarding_button_get_backup_card" translatable="false">Get a backup card</string>
-    <string name="onboarding_button_skip_backup" translatable="false">Skip for later</string>
-    <string name="onboarding_button_finalize_backup" translatable="false">Finalize the backup process</string>
-    <string name="onboarding_button_add_backup_card" translatable="false">+ Add backup card</string>
-    <string name="onboarding_button_backup_card_format" translatable="false">Scan the card #%d</string>
-    <string name="onboarding_button_scan_origin_card" translatable="false">Scan primary card</string>
-    <string name="onboarding_button_add_more_cards" translatable="false">Add more cards</string>
-
-    <string name="onboarding_title_backup_card" translatable="false">Backup your wallet</string>
-    <string name="onboarding_title_no_backup_cards" translatable="false">No backup cards</string>
-    <string name="onboarding_title_scan_origin_card" translatable="false">Prepare your card</string>
-    <string name="onboarding_title_one_backup_card" translatable="false">One backup card added</string>
-    <string name="onboarding_title_two_backup_cards" translatable="false">Two backup cards added</string>
-    <string name="onboarding_title_backup_card_format" translatable="false">Backup card #%d</string>
-
-    <string name="onboarding_subtitle_backup_card" translatable="false">You can backup your keys up to two other blank wallet cards</string>
-    <string name="onboarding_subtitle_no_backup_cards" translatable="false">To start the backup process add up to two cards</string>
-    <string name="onboarding_subtitle_scan_origin_card_format" translatable="false">Prepare the primary card with number %s</string>
-    <string name="onboarding_subtitle_scan_origin_card" translatable="false">Prepare the primary card</string>
-    <string name="onboarding_subtitle_one_backup_card" translatable="false">You can add one more card or finalize the backup process</string>
-    <string name="onboarding_subtitle_two_backup_cards" translatable="false">Max number of cards added. Finalize the backup process</string>
-    <string name="onboarding_subtitle_backup_warning" translatable="false">If the process of backup gets interrupted in any way you\'ll have to start over</string>
-
-    <string name="onboarding_alert_message_not_max_backup_cards_added" translatable="false">You\'ve added one backup card. When backup process is finished you can\'t add more backup cards. If you have one more card, add it in backup, otherwise you can buy it in shop. Do you like to continue backup process?</string>
-
-    <string name="onboarding_access_code_intro_title" translatable="false">Create Access Code</string>
-    <string name="onboarding_access_code_repeat_code_title" translatable="false">Re-enter your Access Code</string>
-    <string name="onboarding_access_code_feature_1_title" translatable="false">Protect</string>
-    <string name="onboarding_access_code_feature_2_title" translatable="false">Personalize</string>
-    <string name="onboarding_access_code_feature_3_title" translatable="false">Restore</string>
-    <string name="onboarding_access_code_feature_1_description" translatable="false">You have to setup a single access code to protect all yor wallets.</string>
-    <string name="onboarding_access_code_feature_2_description" translatable="false">You can set an individual access code on each card later.</string>
-    <string name="onboarding_access_code_feature_3_description" translatable="false">The access code can be restored with a linked card, don\'t keep all cards at one place.</string>
-    <string name="onboarding_access_code_hint" translatable="false">Choose any word, phrase, or number you want as your access code.</string>
-    <string name="onboarding_access_code_too_short" translatable="false">Access code must be at least 4 characters long</string>
-    <string name="onboarding_access_codes_doesnt_match" translatable="false">Entered access code didn\'t match initial access code</string>
-
-    <string name="common_create" translatable="false">Create</string>
-    <string name="common_submit" translatable="false">Submit</string>
-    <string name="onboarding_subtitle_success_backup" translatable="false">You have created 2 backup cards, and now these cards are ready for use.</string>
-    <string name="onboarding_navbar_title_creating_backup" translatable="false">Creating a backup</string>
-    <string name="onboarding_backup_exit_warning" translatable="false">The backup process is partly complete. You can\'t exit it now.</string>
-
-    <string name="onboarding_wallet_info_title_first" translatable="false">Backup wallet</string>
-    <string name="onboarding_wallet_info_title_second" translatable="false">Identical cards</string>
-    <string name="onboarding_wallet_info_title_third" translatable="false">Access code</string>
-    <string name="onboarding_wallet_info_title_fourth" translatable="false">Access code restore</string>
-
-    <string name="onboarding_wallet_info_subtitle_first" translatable="false">You can backup your keys up to two other blank Tangem Wallet cards.</string>
-    <string name="onboarding_wallet_info_subtitle_second" translatable="false">All the backup cards can be used as full-functoinal with the identical keys.</string>
-    <string name="onboarding_wallet_info_subtitle_third" translatable="false">You will be able to set an access code to protect your wallets.</string>
-    <string name="onboarding_wallet_info_subtitle_fourth" translatable="false">Access code can be restored with one of backup cards.</string>
-
-    <string name="onboarding_subtitle_success_tangem_wallet_onboarding" translatable="false">Your wallet card is configured and ready for use.</string>
-    <string name="onboarding_subtitle_success_backup_one_card" translatable="false">You have created 1 backup card, and now this card are ready for use.</string>
-    <string name="common_origin_card" translatable="false">Primary Card</string>
-    <string name="onboarding_alert_i_understand" translatable="false">I understand</string>
-
-    <string name="details_row_title_backup_status" translatable="false">Backup status</string>
-    <string name="details_backup_status_format_active" translatable="false">Active. Backup cards count: %d</string>
-    <string name="details_backup_status_format_linked" translatable="false">Linked. Backup cards count: %d</string>
-    <string name="details_backup_status_no_backup" translatable="false">No backup</string>
-    <string name="welcome_interrupted_backup_alert_message" translatable="false">You have an interrupted backup. Do you want to resume?</string>
-    <string name="welcome_interrupted_backup_alert_resume" translatable="false">Yes, resume</string>
-    <string name="welcome_interrupted_backup_alert_discard" translatable="false">Discard</string>
-    <string name="welcome_interrupted_backup_discard_title" translatable="false">This is an irreversible action</string>
-    <string name="welcome_interrupted_backup_discard_message" translatable="false">If you will discard the backup now, then you will have to reset the cards to factory settings to start over again</string>
-    <string name="welcome_interrupted_backup_discard_resume" translatable="false">Resume backup</string>
-    <string name="welcome_interrupted_backup_discard_discard" translatable="false">Discard</string>
-    <string name="onboarding_title_prepare_origin" translatable="false">Primary card</string>
-    <string name="onboarding_button_backup_origin" translatable="false">Scan the primary card</string>
-    <string name="onboarding_button_continue_wallet" translatable="false">Continue to my wallet</string>
-    <string name="send_title_currency_format" translatable="false">Sending %s</string>
-    <string name="onboarding_subtitle_scan_backup_card_format" translatable="false">Prepare the backup card with number %s</string>
-    <string name="onboarding_subtitle_scan_primary_card_format" translatable="false">Prepare the primary card with number %s</string>
-    <string name="details_row_title_reset_factory_settings" translatable="false">Reset to factory settings</string>
-
-    <string name="details_manage_security_access_code_disclaimer" translatable="false">Access code is available only for cards with a backup.</string>
-
-
-
-    <string name="wallet_connect_bnb_transaction_signed" translatable="false">The BNB transaction has been successfully signed and sent to the Dapp</string>
-    <string name="wallet_connect_bnb_sign_message" translatable="false">Dapp %s, requesting to\n
-sign BNB transaction
-\n
-%s</string>
-    <string name="wallet_connect_bnb_transaction_message" translatable="false">Transaction details:\n
-From: %s\n
-To: %s\n
-Amount: %s</string>
-    <string name="wallet_connect_bnb_trade_order_message" translatable="false">Trade order for %s\n
-Price: %s\n
-Amount to receive: %s\n
-Amount to pay: %s</string>
-
-    <string name="solana_rent_warning" translatable="false">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
-
-    <string name="token_symbol_address_format" translatable="false">%1s (%2s)</string>
-    <string name="add_token_search_hint" translatable="false">Type here to search</string>
-
-    <string name="feedback_subject_rate_negative" translatable="false">My suggestions</string>
-    <string name="feedback_subject_scan_failed" translatable="false">Can\'t scan a card</string>
-    <string name="feedback_subject_tx_failed" translatable="false">Can\'t send a transaction</string>
-    <string name="feedback_subject_tx_push_failed" translatable="false">Can\'t push a transaction</string>
-    <string name="feedback_subject_support_tangem" translatable="false">Tangem feedback</string>
-    <string name="feedback_subject_support" translatable="false">Feedback</string>
-    <string name="feedback_preface_rate_negative" translatable="false">Tell us what functions you are missing, and we will try to help you.</string>
-    <string name="feedback_preface_scan_failed" translatable="false">Please tell us what card do you have?</string>
-    <string name="feedback_preface_tx_failed" translatable="false">Please tell us more about your issue. Every small detail can help.</string>
-    <string name="feedback_preface_support" translatable="false">Hi support team,</string>
-    <string name="feedback_preface_tx_push_failed" translatable="false">Please tell us more about your issue. Every small detail can help.</string>
-    <string name="feedback_data_collection_message" translatable="false">Following information is optional. You can erase it if you don’t want to share it.</string>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dad17e5962..2bd13d5482 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -171,6 +171,15 @@
     <style name="Widget.AppTheme.CardView" parent="Widget.MaterialComponents.CardView">
         <item name="cardCornerRadius">8dp</item>
     </style>
+
+    <style name="AppTheme.TransparentBottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/TransparentBottomSheetDialog</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+    </style>
+
+    <style name="TransparentBottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet">
+        <item name="backgroundTint">@android:color/transparent</item>
+    </style>
 </resources>
 
     <!--    android:fontFamily="sans-serif"           // roboto regular  -->
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 64f57c2248..0000000000
--- a/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-buildscript {
-    apply from: 'dependencies.gradle'
-
-    repositories {
-        google()
-        jcenter()
-        maven { url 'https://maven.fabric.io/public' }
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:${versions.build_gradle}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        mavenLocal()
-        maven { url "https://nexus.tangem-tech.com/repository/maven-releases/" }
-        maven { url 'https://jitpack.io' }
-        maven { url 'https://zendesk.jfrog.io/zendesk/repo' }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000..75b1a4e453
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,34 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://maven.fabric.io/public")
+    }
+
+    dependencies {
+        classpath(ClasspathDependency.AndroidGradlePlugin)
+        classpath(ClasspathDependency.KotlinGradlePlugin)
+        classpath(ClasspathDependency.AndroidMavenGradlePlugin)
+        classpath(ClasspathDependency.GoogleServices)
+        classpath(ClasspathDependency.GoogleFirebaseCrashlytics)
+    }
+}
+
+plugins {
+    id("com.google.dagger.hilt.android") version "2.44" apply false
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter() // unable to replace with mavenCentral() due to rekotlin and com.otaliastudios:cameraview
+        mavenLocal()
+        maven("https://nexus.tangem-tech.com/repository/maven-releases/")
+        maven("https://jitpack.io")
+        maven("https://zendesk.jfrog.io/zendesk/repo")
+    }
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
+}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000000..b22ed732fd
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
new file mode 100644
index 0000000000..9a7e91768d
--- /dev/null
+++ b/buildSrc/src/main/java/AppConfig.kt
@@ -0,0 +1,8 @@
+object AppConfig {
+    const val packageName = "com.tangem.wallet"
+    const val versionCode = 1
+    const val versionName = "1.0.0.-SNAPSHOT"
+    const val minSdkVersion = 21
+    const val targetSdkVersion = 33
+    const val compileSdkVersion = 33
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/ClasspathDependency.kt b/buildSrc/src/main/java/ClasspathDependency.kt
new file mode 100644
index 0000000000..23fcf71450
--- /dev/null
+++ b/buildSrc/src/main/java/ClasspathDependency.kt
@@ -0,0 +1,9 @@
+object ClasspathDependency {
+    const val AndroidGradlePlugin = "com.android.tools.build:gradle:" + Versions.androidGradlePlugin
+    const val AndroidMavenGradlePlugin = "com.github.dcendents:android-maven-gradle-plugin:" +
+        Versions.androidMavenGradlePlugin
+    const val GoogleFirebaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:" +
+        Versions.googleFirebaseCrashlytics
+    const val GoogleServices = "com.google.gms:google-services:" + Versions.googleServices
+    const val KotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:" + Versions.kotlin
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/ConfigFieldBuilder.kt b/buildSrc/src/main/java/ConfigFieldBuilder.kt
new file mode 100644
index 0000000000..42c1f16c56
--- /dev/null
+++ b/buildSrc/src/main/java/ConfigFieldBuilder.kt
@@ -0,0 +1,26 @@
+typealias ConfigFieldBuilder = (String, String, String) -> Unit
+
+class BuildConfigFieldFactory(
+    private val fields: List<Field>,
+    private val builder: ConfigFieldBuilder,
+) {
+    fun create() {
+        fields.forEach { field -> builder(field.type, field.name, field.value) }
+    }
+}
+
+/**
+ * Build config field
+ *
+ * @property type  field type
+ * @property name  field name
+ * @property value field value
+ */
+sealed class Field(val type: String, val name: String, val value: String) {
+
+    class Environment(value: String) : Field("String", "ENVIRONMENT", "\"$value\"")
+
+    class TestActionEnabled(isEnabled: Boolean) : Field("Boolean","TEST_ACTION_ENABLED", isEnabled.toString())
+
+    class LogEnabled(isEnabled: Boolean) : Field("Boolean","LOG_ENABLED", isEnabled.toString())
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Dependency.kt b/buildSrc/src/main/java/Dependency.kt
new file mode 100644
index 0000000000..54ee97cd6d
--- /dev/null
+++ b/buildSrc/src/main/java/Dependency.kt
@@ -0,0 +1,83 @@
+object AndroidX {
+    const val activityCompose = "androidx.activity:activity-compose:" + Versions.androidxActivityCompose
+    const val appCompat = "androidx.appcompat:appcompat:" + Versions.androidxAppCompat
+    const val browser = "androidx.browser:browser:" + Versions.androidxBrowser
+    const val constraintLayout = "androidx.constraintlayout:constraintlayout:" + Versions.androidxConstraintLayout
+    const val coreKtx = "androidx.core:core-ktx:" + Versions.androidxCore
+    const val fragmentKtx = "androidx.fragment:fragment-ktx:" + Versions.androidxFragment
+    const val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:" + Versions.androidxLifecycle
+    const val lifecycleLiveDataKtx = "androidx.lifecycle:lifecycle-livedata-ktx:" + Versions.androidxLifecycle
+    const val lifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:" + Versions.androidxLifecycle
+    const val lifecycleViewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:" + Versions.androidxLifecycle
+}
+
+object Compose {
+    const val animation = "androidx.compose.animation:animation:" + Versions.compose
+    const val coil = "io.coil-kt:coil-compose:" + Versions.coil
+    const val foundation = "androidx.compose.foundation:foundation:" + Versions.composeFoundation
+    const val material = "androidx.compose.material:material:" + Versions.compose
+    const val ui = "androidx.compose.ui:ui:" + Versions.compose
+    const val uiTooling = "androidx.compose.ui:ui-tooling:" + Versions.compose
+}
+
+object Firebase {
+    const val bom = "com.google.firebase:firebase-bom:" + Versions.firebase
+    const val firebaseAnalytics = "com.google.firebase:firebase-analytics-ktx"
+    const val firebaseCrashlytics = "com.google.firebase:firebase-crashlytics-ktx"
+}
+
+object Library {
+    const val accompanistAppCompatTheme = "com.google.accompanist:accompanist-appcompat-theme:" + Versions.accompanist
+    const val accompanistSystemUiController =
+        "com.google.accompanist:accompanist-systemuicontroller:" + Versions.accompanist
+    const val amplitude = "com.amplitude:android-sdk:" + Versions.amplitude
+    const val appsflyer = "com.appsflyer:af-android-sdk:" + Versions.appsflyer
+    const val armadillo = "at.favre.lib:armadillo:" + Versions.armadillo
+    const val coil = "io.coil-kt:coil:" + Versions.coil
+    const val composeShimmer = "com.valentinilk.shimmer:compose-shimmer:" + Versions.composeShimmer
+    const val coroutine = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" + Versions.coroutine
+    const val desugarJdkLibs = "com.android.tools:desugar_jdk_libs:" + Versions.desugarJdkLibs
+    const val googlePlayCore = "com.google.android.play:core:" + Versions.googlePlayCore
+    const val googlePlayCoreKtx = "com.google.android.play:core-ktx:" + Versions.googlePlayCoreKtx
+    const val googlePlayServicesWallet =
+        "com.google.android.gms:play-services-wallet:" + Versions.googlePlayServicesWallet
+    const val hilt = "com.google.dagger:hilt-android:" + Versions.hilt
+    const val hiltCore = "com.google.dagger:hilt-core:" + Versions.hilt
+    const val hiltKapt = "com.google.dagger:hilt-compiler:" + Versions.hilt
+    const val jodatime = "joda-time:joda-time:" + Versions.jodatime
+    const val kotsonGsonExt = "com.github.salomonbrys.kotson:kotson:" + Versions.kotsonGsonExt
+    const val lottie = "com.airbnb.android:lottie:" + Versions.lottie
+    const val materialComponent = "com.google.android.material:material:" + Versions.googleMaterialComponent
+    const val moshi = "com.squareup.moshi:moshi:" + Versions.moshi
+    const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:" + Versions.moshi
+    const val okHttp = "com.squareup.okhttp3:okhttp:" + Versions.okhttp
+    const val okHttpLogging = "com.squareup.okhttp3:logging-interceptor:" + Versions.okhttp
+    const val otaliastudiosCameraView = "com.otaliastudios:cameraview:" + Versions.otaliastudiosCameraView
+    const val shopifyBuySdk = "com.shopify.mobilebuysdk:buy3:" + Versions.shopifyBuySdk
+    const val spongecastleCryptoCore = "com.madgag.spongycastle:core:" + Versions.spongycastleCryptoCore
+    const val reKotlin = "org.rekotlin:rekotlin:" + Versions.rekotlin
+    const val retrofit = "com.squareup.retrofit2:retrofit:" + Versions.retrofit
+    const val retrofitMoshiConverter = "com.squareup.retrofit2:converter-moshi:" + Versions.retrofitMoshiConverter
+    const val timber = "com.jakewharton.timber:timber:" + Versions.timber
+    const val viewBindingDelegate =
+        "com.github.kirich1409:viewbindingpropertydelegate-noreflection:" + Versions.viewBindingDelegate
+    const val xmlShimmer = "com.github.skydoves:androidveil:" + Versions.xmlShimmer
+    const val zendeskChat = "com.zendesk:chat:" + Versions.zendeskChat
+    const val zendeskMessaging = "com.zendesk:messaging:" + Versions.zendeskMessaging
+    const val zxingQrBarcodeScanner = "me.dm7.barcodescanner:zxing:" + Versions.zxingQrBarcodeScanner
+    const val zxingQrCore = "com.google.zxing:core:" + Versions.zxingQrCode
+    const val mviCoreWatcher = "com.github.badoo.mvicore:mvicore-diff:" + Versions.mviCore
+}
+
+object Tangem {
+    const val blockchain = "com.tangem:blockchain:" + Versions.tangemBlockchainSdk
+    const val cardAndroid = "com.tangem.tangem-sdk-kotlin:android:" + Versions.tangemCardSgk
+    const val cardCore = "com.tangem.tangem-sdk-kotlin:core:" + Versions.tangemCardSgk
+}
+
+object Test {
+    const val espresso = "androidx.test.espresso:espresso-core:" + Versions.espresso
+    const val junit = "junit:junit:" + Versions.junit
+    const val junitAndroidExt = "androidx.test.ext:junit:" + Versions.junitAndroidExt
+    const val truth = "com.google.truth:truth:" + Versions.truth
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
new file mode 100644
index 0000000000..89471ec92c
--- /dev/null
+++ b/buildSrc/src/main/java/Versions.kt
@@ -0,0 +1,73 @@
+object Versions {
+    // region Classpath
+    const val androidGradlePlugin = "7.1.3"
+    const val androidMavenGradlePlugin = "2.1"
+    const val googleFirebaseCrashlytics = "2.7.1"
+    const val googleServices = "4.3.10"
+    const val kotlin = "1.6.10"
+    // endregion Classpath
+
+    // region AndroidX
+    const val androidxActivityCompose = "1.5.0"
+    const val androidxAppCompat = "1.5.1"
+    const val androidxBrowser = "1.4.0"
+    const val androidxConstraintLayout = "2.1.4"
+    const val androidxCore = "1.9.0"
+    const val androidxFragment = "1.5.3"
+    const val androidxLifecycle = "2.5.1"
+    // endregion AndroidX
+
+    // region Compose
+    const val compose = "1.1.0"
+    const val composeFoundation = "1.2.0-rc03"
+    // endregion Compose
+
+    // region Other libraries
+    const val accompanist = "0.23.0"
+    const val amplitude = "2.36.1"
+    const val appsflyer = "6.5.1"
+    const val armadillo = "0.9.0"
+    const val coil = "2.1.0"
+    const val composeShimmer = "1.0.3"
+    const val coroutine = "1.5.2"
+    const val desugarJdkLibs = "1.1.5"
+    const val firebase = "26.0.0"
+    const val googleMaterialComponent = "1.6.1"
+    const val googlePlayCore = "1.10.3"
+    const val googlePlayCoreKtx = "1.8.1"
+    const val googlePlayServicesWallet = "19.1.0"
+    const val hilt = "2.44"
+    const val jodatime = "2.12.1"
+    const val kotsonGsonExt = "2.5.0"
+    const val lottie = "3.4.0"
+    const val moshi = "1.12.0"
+    const val okhttp = "4.9.3"
+    const val otaliastudiosCameraView = "2.6.3"
+    const val rekotlin = "1.0.4"
+    const val retrofit = "2.8.1"
+    const val retrofitMoshiConverter = "2.6.0"
+    const val shopifyBuySdk = "12.0.0"
+    const val spongycastleCryptoCore = "1.58.0.0"
+    const val timber = "4.7.1"
+    const val viewBindingDelegate = "1.5.6"
+    const val xmlShimmer = "1.1.3"
+    const val zendeskChat = "3.3.5"
+    const val zendeskMessaging = "5.2.4"
+    const val zxingQrBarcodeScanner = "1.9.8"
+    const val zxingQrCode = "3.3.3"
+    const val mviCore = "1.3.1"
+    // endregion Other libraries
+
+    // region Tangem
+    const val tangemBlockchainSdk = "develop-141"
+
+    const val tangemCardSgk = "develop-179"
+    // endregion Tangem
+
+    // region Testing
+    const val espresso = "3.4.0"
+    const val junit = "4.13.2"
+    const val truth = "1.1.3"
+    const val junitAndroidExt = "1.1.3"
+    // endregion Testing
+}
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle.kts
similarity index 67%
rename from common/build.gradle
rename to common/build.gradle.kts
index 0412225730..e8259cee84 100644
--- a/common/build.gradle
+++ b/common/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id 'java-library'
-    id 'org.jetbrains.kotlin.jvm'
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
 }
 
 java {
diff --git a/network/.gitignore b/core/datasource/.gitignore
similarity index 100%
rename from network/.gitignore
rename to core/datasource/.gitignore
diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts
new file mode 100644
index 0000000000..082885c1d7
--- /dev/null
+++ b/core/datasource/build.gradle.kts
@@ -0,0 +1,68 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
+
+dependencies {
+
+    /** Project */
+    implementation(project(":libs:auth"))
+
+    /** Tangem libraries */
+    implementation(Tangem.cardCore)
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+
+    /** Coroutines */
+    implementation(Library.coroutine)
+
+    /** Logging */
+    implementation(Library.timber)
+
+    /** Network */
+    implementation(Library.retrofit)
+    implementation(Library.retrofitMoshiConverter)
+    implementation(Library.moshi)
+    implementation(Library.moshiKotlin)
+    implementation(Library.okHttp)
+    implementation(Library.okHttpLogging)
+
+    /** Time */
+    implementation(Library.jodatime)
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/AndroidManifest.xml b/core/datasource/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..d6401c6174
--- /dev/null
+++ b/core/datasource/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.datasource" />
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/AuthHeaderInterceptor.kt b/core/datasource/src/main/java/com/tangem/datasource/api/AuthHeaderInterceptor.kt
new file mode 100644
index 0000000000..5a50c5215e
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/AuthHeaderInterceptor.kt
@@ -0,0 +1,25 @@
+package com.tangem.datasource.api
+
+import com.tangem.lib.auth.AuthProvider
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class AuthHeaderInterceptor(
+    private val authProvider: AuthProvider,
+) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+            .newBuilder()
+            .addHeader(HEADER_CARD_KEY, authProvider.getCardPublicKey())
+            .addHeader(HEADER_CARD_ID, authProvider.getCardId())
+            .build()
+
+        return chain.proceed(request)
+    }
+
+    companion object {
+        const val HEADER_CARD_KEY = "card_public_key"
+        const val HEADER_CARD_ID = "card_id"
+    }
+}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/Interceptors.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/Interceptors.kt
similarity index 69%
rename from network/src/main/java/com/tangem/network/common/Interceptors.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/common/Interceptors.kt
index bc46e5a0a0..17b348b924 100644
--- a/network/src/main/java/com/tangem/network/common/Interceptors.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/Interceptors.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.common
+package com.tangem.datasource.api.common
 
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -7,7 +7,7 @@ import okhttp3.Response
 [REDACTED_AUTHOR]
  */
 open class AddHeaderInterceptor(
-    private val headers: Map<String, String>
+    private val headers: Map<String, String>,
 ) : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response {
@@ -21,10 +21,10 @@ open class AddHeaderInterceptor(
     }
 }
 
-class CacheControlHttpInterceptor(maxAgeSeconds: Int) : AddHeaderInterceptor(mapOf(
-    "Cache-Control" to "max-age=$maxAgeSeconds",
-))
+class CacheControlHttpInterceptor(maxAgeSeconds: Int) : AddHeaderInterceptor(
+    mapOf("Cache-Control" to "max-age=$maxAgeSeconds"),
+)
 
-class CardPublicKeyHttpInterceptor(cardPublicKeyHex: String) : AddHeaderInterceptor(mapOf(
-    "card_public_key" to cardPublicKeyHex,
-))
\ No newline at end of file
+class CardPublicKeyHttpInterceptor(cardPublicKeyHex: String) : AddHeaderInterceptor(
+    mapOf("card_public_key" to cardPublicKeyHex),
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/MoshiConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/MoshiConverter.kt
new file mode 100644
index 0000000000..054206db9d
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/MoshiConverter.kt
@@ -0,0 +1,33 @@
+package com.tangem.datasource.api.common
+
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.tangem.common.json.MoshiJsonConverter
+import retrofit2.Converter
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+/**
+[REDACTED_AUTHOR]
+ */
+//todo needs to be refactored
+object MoshiConverter {
+
+    //todo refactor: provide via DI
+    var INSTANCE = MoshiJsonConverter()
+        private set
+
+    fun reInitInstance(
+        adapters: List<Any> = listOf(),
+        typedAdapters: Map<Class<*>, JsonAdapter<*>> = mapOf(),
+    ) {
+        INSTANCE = MoshiJsonConverter(adapters, typedAdapters)
+    }
+
+    fun createFactory(moshi: Moshi = INSTANCE.moshi): Converter.Factory = MoshiConverterFactory.create(moshi)
+
+    //todo provide via DI using quealifiers
+    fun defaultMoshi(): Moshi = INSTANCE.moshi
+
+    //todo provide via DI using quealifiers
+    fun sdkMoshi(): Moshi = MoshiJsonConverter.INSTANCE.moshi
+}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/Retrofit.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/Retrofit.kt
similarity index 96%
rename from network/src/main/java/com/tangem/network/common/Retrofit.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/common/Retrofit.kt
index 70bb657bce..01e19dfada 100644
--- a/network/src/main/java/com/tangem/network/common/Retrofit.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/Retrofit.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.common
+package com.tangem.datasource.api.common
 
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApi.kt
new file mode 100644
index 0000000000..774d001e04
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/OneInchApi.kt
@@ -0,0 +1,200 @@
+package com.tangem.datasource.api.oneinch
+
+import com.tangem.datasource.api.oneinch.models.AllowanceResponse
+import com.tangem.datasource.api.oneinch.models.ApproveCalldataResponse
+import com.tangem.datasource.api.oneinch.models.ApproveSpenderResponse
+import com.tangem.datasource.api.oneinch.models.ProtocolsResponse
+import com.tangem.datasource.api.oneinch.models.QuoteResponse
+import com.tangem.datasource.api.oneinch.models.StatusResponse
+import com.tangem.datasource.api.oneinch.models.SwapResponse
+import com.tangem.datasource.api.oneinch.models.TokensResponse
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface OneInchApi {
+
+    /**
+     * Healthcheck return 200 if service is available
+     *
+     * @return [StatusResponse]
+     */
+    @GET("healthcheck")
+    suspend fun healthcheck(): StatusResponse
+
+    //region Approve
+    /**
+     * Address of the 1inch router that must be trusted to spend funds for the exchange
+     *
+     * @return [ApproveSpenderResponse]
+     */
+    @GET("approve/spender")
+    suspend fun approveSpender(): ApproveSpenderResponse
+
+    /**
+     * Generate data for calling the contract in order to allow the 1inch router to spend funds
+     *
+     * @param tokenAddress Token address you want to exchange
+     * @param amount The number of tokens that the 1inch router is allowed to spend.
+     * If not specified, it will be allowed to spend an infinite amount of tokens.
+     *
+     * @return [ApproveCalldataResponse] Transaction body to allow the exchange with the 1inch router
+     */
+    @GET("approve/transaction")
+    suspend fun approveTransaction(
+        @Query("tokenAddress") tokenAddress: String,
+        @Query("amount") amount: String? = null,
+    ): ApproveCalldataResponse
+
+    /**
+     * Get the number of tokens that the 1inch router is allowed to spend
+     *
+     * @param tokenAddress Token address you want to exchange
+     * @param walletAddress Wallet address for which you want to check
+     *
+     * @return [AllowanceResponse]
+     */
+    @GET("approve/allowance")
+    suspend fun approveAllowance(
+        @Query("tokenAddress") tokenAddress: String,
+        @Query("walletAddress") walletAddress: String,
+    ): AllowanceResponse
+    //endregion Approve
+
+    //region Info
+    /**
+     *  List of tokens that are available for swap in the 1inch Aggregation protocol
+     *
+     * @return [TokensResponse]
+     */
+    @GET("tokens")
+    suspend fun tokensAvailable(): TokensResponse
+
+    /**
+     * List of liquidity sources that are available for routing in the 1inch Aggregation protocol
+     *
+     * @return
+     */
+    @GET("liquidity-sources")
+    suspend fun liquiditySources(): ProtocolsResponse
+    //endregion Info
+
+    //region Swap
+    /**
+     * Find the best quote to exchange via 1inch router
+     *
+     * @param fromTokenAddress Example : 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE
+     * @param toTokenAddress Example : 0x111111111117dc0aa78b770fa6a738034120c302
+     * @param amount amount of a token to sell, set in minimal divisible units e.g.:
+     * 1.00 DAI set as 1000000000000000000
+     * 51.03 USDC set as 51030000
+     *
+     * @param protocols default: all
+     * @param fee this percentage of fromTokenAddress token amount will be sent to referrerAddress,
+     * the rest will be used as input for a swap
+     * Min: 0; max: 3; Max: 0; max: 3; default: 0; !should be the same for quote and swap!
+     *
+     * @param gasLimit maximum amount of gas for a swap;
+     * @param connectorTokens token-connectors can be specified via this parameter.
+     * The more is set — the longer route estimation will take.
+     * If not set, default token-connectors will be usedmax: 5; !should be the same for quote and swap!
+     *
+     * @param complexityLevel maximum number of token-connectors to be used in a transaction.
+     * The more is used — the longer route estimation will take
+     * min: 0; max: 3; default: 2; !should be the same for quote and swap!
+     *
+     * @param mainRouteParts default: 10; max: 50 !should be the same for quote and swap!
+     * @param parts limit maximum number of parts each main route parts can be split into;
+     * should be the same for a quote and swap
+     * default: 20; max: 100
+     *
+     * @param gasPrice 1inch takes in account gas expenses to determine exchange route.
+     * It is important to use the same gas price on the quote and swap methods.
+     * Gas price set in wei: 12.5 GWEI set as 12500000000
+     * default: fast from network
+     *
+     * @return [QuoteResponse]
+     */
+    suspend fun quote(
+        @Query("fromTokenAddress") fromTokenAddress: String,
+        @Query("toTokenAddress") toTokenAddress: String,
+        @Query("amount") amount: String,
+        @Query("protocols") protocols: String? = null,
+        @Query("fee") fee: String? = null,
+        @Query("gasLimit") gasLimit: String? = null,
+        @Query("connectorTokens") connectorTokens: String? = null,
+        @Query("complexityLevel") complexityLevel: String? = null,
+        @Query("mainRouteParts") mainRouteParts: String? = null,
+        @Query("parts") parts: String? = null,
+        @Query("gasPrice") gasPrice: String? = null,
+    ): QuoteResponse
+
+    /**
+     * Generate data for calling the 1inch router for exchange
+     *
+     * @param fromTokenAddress Example : 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE
+     * @param toTokenAddress Example : 0x111111111117dc0aa78b770fa6a738034120c302
+     * @param amount amount of a token to sell, set in minimal divisible units e.g.:
+     * 1.00 DAI set as 1000000000000000000
+     * 51.03 USDC set as 51030000
+     *
+     * @param fromAddress The address that calls the 1inch contract
+     * @param slippage limit of price slippage you are willing to accept in percentage, may be set with decimals.
+     * &slippage=0.5 means 0.5% slippage is acceptable. Low values increase chances that transaction will fail,
+     * high values increase chances of front running. min: 0; max: 50;
+     *
+     * @param protocols default: all
+     * @param destinationAddress Receiver of destination currency. default: fromAddress
+     * @param fee this percentage of fromTokenAddress token amount will be sent to referrerAddress,
+     * the rest will be used as input for a swap
+     * Min: 0; max: 3; Max: 0; max: 3; default: 0; !should be the same for quote and swap!
+     *
+     * @param permit https://eips.ethereum.org/EIPS/eip-2612
+     * @param compatibilityMode Allows to build calldata without optimized routers
+     * @param burnChi If true, CHI will be burned from fromAddress to compensate gas.
+     * Check CHI balance and allowance before turning that on. CHI should be approved for the spender address
+     *
+     * @param connectorTokens token-connectors can be specified via this parameter.
+     * The more is set — the longer route estimation will take.
+     * If not set, default token-connectors will be usedmax: 5; !should be the same for quote and swap!
+     *
+     * @param complexityLevel maximum number of token-connectors to be used in a transaction.
+     * The more is used — the longer route estimation will take
+     * min: 0; max: 3; default: 2; !should be the same for quote and swap!
+     *
+     * @param mainRouteParts default: 10; max: 50 !should be the same for quote and swap!
+     * @param parts limit maximum number of parts each main route parts can be split into;
+     * should be the same for a quote and swap
+     * default: 20; max: 100
+     *
+     * @param gasLimit maximum amount of gas for a swap;
+     * @param gasPrice 1inch takes in account gas expenses to determine exchange route.
+     * It is important to use the same gas price on the quote and swap methods.
+     * Gas price set in wei: 12.5 GWEI set as 12500000000
+     * default: fast from network
+     *
+     * @return [SwapResponse]
+     */
+    suspend fun swap(
+        @Query("fromTokenAddress") fromTokenAddress: String,
+        @Query("toTokenAddress") toTokenAddress: String,
+        @Query("amount") amount: String,
+        @Query("fromAddress") fromAddress: String,
+        @Query("slippage") slippage: Int,
+        @Query("protocols") protocols: String? = null,
+        @Query("destReceiver") destinationAddress: String? = null,
+        @Query("referrerAddress") referrerAddress: String? = null,
+        @Query("fee") fee: String? = null,
+        @Query("disableEstimate") disableEstimate: Boolean? = null,
+        @Query("permit") permit: String? = null,
+        @Query("compatibilityMode") compatibilityMode: Boolean? = null,
+        @Query("burnChi") burnChi: Boolean? = null,
+        @Query("allowPartialFill") allowPartialFill: Boolean? = null,
+        @Query("parts") parts: String? = null,
+        @Query("mainRouteParts") mainRouteParts: String? = null,
+        @Query("connectorTokens") connectorTokens: String? = null,
+        @Query("complexityLevel") complexityLevel: String? = null,
+        @Query("gasLimit") gasLimit: String? = null,
+        @Query("gasPrice") gasPrice: String? = null,
+    ): SwapResponse
+    //endregion Swap
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/AllowanceResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/AllowanceResponse.kt
new file mode 100644
index 0000000000..16956f907e
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/AllowanceResponse.kt
@@ -0,0 +1,7 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+data class AllowanceResponse(
+    @Json(name = "allowance") val allowance: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveCalldataResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveCalldataResponse.kt
new file mode 100644
index 0000000000..f57fab94fd
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveCalldataResponse.kt
@@ -0,0 +1,18 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Approve calldata response
+ *
+ * @property data The encoded data to call the approve method on the swapped token contract
+ * @property gasPrice Gas price for fast transaction processing
+ * @property toAddress Token address that will be allowed to exchange through 1inch router
+ * @property value Native token value in WEI (for approve is always 0)
+ */
+data class ApproveCalldataResponse(
+    @Json(name = "data") val data: String,
+    @Json(name = "gasPrice") val gasPrice: String,
+    @Json(name = "to") val toAddress: String,
+    @Json(name = "value") val value: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveSpenderResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveSpenderResponse.kt
new file mode 100644
index 0000000000..0ee9d5b2ac
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ApproveSpenderResponse.kt
@@ -0,0 +1,12 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Approve spender response
+ *
+ * @property address Address of the 1inch router that must be trusted to spend funds for the exchange
+ */
+data class ApproveSpenderResponse(
+    @Json(name = "address") val address: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/PathViewDto.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/PathViewDto.kt
new file mode 100644
index 0000000000..03c23155ff
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/PathViewDto.kt
@@ -0,0 +1,13 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Path view dto
+ */
+data class PathViewDto(
+    @Json(name = "name") val name: String,
+    @Json(name = "part") val part: Int,
+    @Json(name = "fromTokenAddress") val fromTokenAddress: String,
+    @Json(name = "toTokenAddress") val toTokenAddress: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ProtocolsResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ProtocolsResponse.kt
new file mode 100644
index 0000000000..b083cd1ce8
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/ProtocolsResponse.kt
@@ -0,0 +1,27 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Protocols response
+ *
+ * @property protocols List of protocols that are available for routing in the 1inch Aggregation protocol
+ */
+data class ProtocolsResponse(
+    @Json(name = "protocols") val protocols: List<ProtocolImageDto>,
+)
+
+/**
+ * Protocol image
+ *
+ * @property id Protocol id
+ * @property title Protocol title
+ * @property image Protocol logo image
+ * @property imageColor Protocol logo image in color
+ */
+data class ProtocolImageDto(
+    @Json(name = "id") val id: String,
+    @Json(name = "title") val title: String,
+    @Json(name = "img") val image: String,
+    @Json(name = "img_color") val imageColor: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/QuoteResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/QuoteResponse.kt
new file mode 100644
index 0000000000..dca5642f12
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/QuoteResponse.kt
@@ -0,0 +1,22 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Quote response
+ *
+ * @property fromToken Source token info
+ * @property toToken Destination token info
+ * @property toTokenAmount Expected amount of destination token
+ * @property fromTokenAmount Amount of source token
+ * @property protocols Selected protocols in a path
+ * @property estimatedGas gas fee
+ */
+data class QuoteResponse(
+    @Json(name = "fromToken") val fromToken: TokenOneInchDto,
+    @Json(name = "toToken") val toToken: TokenOneInchDto,
+    @Json(name = "toTokenAmount") val toTokenAmount: String,
+    @Json(name = "fromTokenAmount") val fromTokenAmount: String,
+    @Json(name = "protocols") val protocols: List<PathViewDto>,
+    @Json(name = "estimatedGas") val estimatedGas: Int,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/StatusResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/StatusResponse.kt
new file mode 100644
index 0000000000..576851a3b5
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/StatusResponse.kt
@@ -0,0 +1,8 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+data class StatusResponse(
+    @Json(name = "status") val status: String,
+    @Json(name = "provider") val provider: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapErrorDto.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapErrorDto.kt
new file mode 100644
index 0000000000..fe342de231
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapErrorDto.kt
@@ -0,0 +1,42 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Swap error dto
+ *
+ * One of the following errors:
+ *
+ * -Insufficient liquidity
+ * -Cannot estimate
+ * -You may not have enough ETH balance for gas fee
+ * -FromTokenAddress cannot be equals to toTokenAddress
+ * -Cannot estimate. Don't forget about miner fee. Try to leave the buffer of ETH for gas
+ * -Not enough balance
+ * -Not enough allowance
+ *
+ * @property statusCode HTTP code
+ * @property error Error code description
+ * @property description Error description (one of the following)
+ * @property requestId Request id
+ * @property meta Meta information
+ * @constructor Create empty Swap error dto
+ */
+data class SwapErrorDto(
+    @Json(name = "statusCode") val statusCode: Int,
+    @Json(name = "error") val error: String,
+    @Json(name = "description") val description: String,
+    @Json(name = "requestId") val requestId: String,
+    @Json(name = "meta") val meta: List<NestErrorMeta>,
+)
+
+/**
+ * Nest error meta
+ *
+ * @property type Type of field
+ * @property value Value of field
+ */
+data class NestErrorMeta(
+    @Json(name = "type") val type: String,
+    @Json(name = "value") val value: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapResponse.kt
new file mode 100644
index 0000000000..1f25a391e0
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/SwapResponse.kt
@@ -0,0 +1,12 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+data class SwapResponse(
+    @Json(name = "fromToken") val fromToken: TokenOneInchDto,
+    @Json(name = "toToken") val toToken: TokenOneInchDto,
+    @Json(name = "toTokenAmount") val toTokenAmount: String,
+    @Json(name = "fromTokenAmount") val fromTokenAmount: String,
+    @Json(name = "protocols") val protocols: List<PathViewDto>,
+    @Json(name = "transaction") val transaction: TransactionDto,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokenOneInchDto.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokenOneInchDto.kt
new file mode 100644
index 0000000000..0c06f15d84
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokenOneInchDto.kt
@@ -0,0 +1,20 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Token one inch
+ *
+ * @property symbol token symbol
+ * @property name token name
+ * @property address token address
+ * @property decimals token decimals
+ * @property logoURI token logo image url
+ */
+data class TokenOneInchDto(
+    @Json(name = "symbol") val symbol: String,
+    @Json(name = "name") val name: String,
+    @Json(name = "address") val address: String,
+    @Json(name = "decimals") val decimals: Int,
+    @Json(name = "logoURI") val logoURI: String,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokensResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokensResponse.kt
new file mode 100644
index 0000000000..ca1b369949
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TokensResponse.kt
@@ -0,0 +1,12 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Tokens response
+ *
+ * @property tokens List of supported tokens
+ */
+data class TokensResponse(
+    @Json(name = "tokens") val tokens: Map<String, TokenOneInchDto>,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TransactionDto.kt b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TransactionDto.kt
new file mode 100644
index 0000000000..a32e827601
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/oneinch/models/TransactionDto.kt
@@ -0,0 +1,23 @@
+package com.tangem.datasource.api.oneinch.models
+
+import com.squareup.moshi.Json
+
+/**
+ * Transaction dto
+ *
+ * @property fromAddress transactions will be sent from this address
+ * @property toAddress transactions will be sent to our(1inch) contract address
+ * @property data The encoded data to call the approve method on the swapped token contract
+ * @property value Native token value in WEI (for approve is always 0)
+ * @property gasPrice maximum amount of gas for a swap default: 11500000; max: 11500000
+ * @property gas estimated amount of the gas limit, increase this value by 25%
+ * @constructor Create empty Transaction dto
+ */
+data class TransactionDto(
+    @Json(name = "from") val fromAddress: String,
+    @Json(name = "to") val toAddress: String,
+    @Json(name = "data") val data: String,
+    @Json(name = "value") val value: String,
+    @Json(name = "gasPrice") val gasPrice: String,
+    @Json(name = "gas") val gas: String,
+)
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt
similarity index 95%
rename from network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApi.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt
index 058cd368dd..de7c678d3b 100644
--- a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApi.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.api.paymentology
+package com.tangem.datasource.api.paymentology
 
 import retrofit2.http.Body
 import retrofit2.http.Headers
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt
similarity index 91%
rename from network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt
index 8cd70891c3..f46a17b36d 100644
--- a/network/src/main/java/com/tangem/network/api/paymentology/PaymentologyApiService.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/PaymentologyApiService.kt
@@ -1,10 +1,10 @@
-package com.tangem.network.api.paymentology
+package com.tangem.datasource.api.paymentology
 
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.MoshiConverter
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.datasource.api.common.createRetrofitInstance
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/Requests.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Requests.kt
similarity index 98%
rename from network/src/main/java/com/tangem/network/api/paymentology/Requests.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Requests.kt
index 580e60bfa5..cb0206934e 100644
--- a/network/src/main/java/com/tangem/network/api/paymentology/Requests.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Requests.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.api.paymentology
+package com.tangem.datasource.api.paymentology
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/network/src/main/java/com/tangem/network/api/paymentology/Responses.kt b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Responses.kt
similarity index 98%
rename from network/src/main/java/com/tangem/network/api/paymentology/Responses.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Responses.kt
index b60324b42d..d62630b73e 100644
--- a/network/src/main/java/com/tangem/network/api/paymentology/Responses.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/paymentology/Responses.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.api.paymentology
+package com.tangem.datasource.api.paymentology
 
 import com.squareup.moshi.Json
 import com.tangem.common.extensions.calculateHashCode
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/referral/ReferralApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/referral/ReferralApi.kt
new file mode 100644
index 0000000000..c3b7ff2200
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/referral/ReferralApi.kt
@@ -0,0 +1,22 @@
+package com.tangem.datasource.api.referral
+
+import com.tangem.datasource.api.referral.models.ReferralResponse
+import com.tangem.datasource.api.referral.models.StartReferralBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+/**
+ * Api for referral feature
+ */
+interface ReferralApi {
+
+    /** Returns referral status by [walletId] */
+    @GET("referral/{walletId}")
+    suspend fun getReferralStatus(@Path("walletId") walletId: String): ReferralResponse
+
+    /** Make user referral, requires [StartReferralBody] */
+    @POST("referral")
+    suspend fun startReferral(@Body startReferralBody: StartReferralBody): ReferralResponse
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/ReferralResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/ReferralResponse.kt
new file mode 100644
index 0000000000..3066ab45a7
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/ReferralResponse.kt
@@ -0,0 +1,48 @@
+package com.tangem.datasource.api.referral.models
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.joda.time.DateTime
+
+/**
+ * Main response class for referral API
+ * contains all necessary info about users program status
+ */
+data class ReferralResponse(
+    @Json(name = "conditions") val conditions: Conditions,
+    @Json(name = "referral") val referral: Referral?,
+)
+
+data class Conditions(
+    @Json(name = "award") val award: Int,
+    @Json(name = "discount") val discount: Discount,
+    @Json(name = "awards") val awards: List<Award>,
+    @Json(name = "tosLink") val tosLink: String,
+)
+
+data class Discount(
+    @Json(name = "amount") val amount: Int,
+    @Json(name = "type") val discountType: String,
+)
+
+data class Award(
+    @Json(name = "amount") val amount: Int,
+    @Json(name = "token") val token: Token,
+)
+
+data class Token(
+    @Json(name = "id") val id: String,
+    @Json(name = "name") val name: String,
+    @Json(name = "symbol") val symbol: String,
+    @Json(name = "networkId") val networkId: String,
+    @Json(name = "contractAddress") val contractAddress: String?,
+    @Json(name = "decimalCount") val decimalCount: Int?,
+)
+
+data class Referral(
+    @Json(name = "shareLink") val shareLink: String,
+    @Json(name = "address") val address: String,
+    @Json(name = "promoCode") val promocode: String,
+    @Json(name = "walletsPurchased") val walletsPurchased: Int,
+    @Json(name = "termsAcceptedAt") val termsAcceptedAt: String?,
+)
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/StartReferralBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/StartReferralBody.kt
new file mode 100644
index 0000000000..98a0a8ab90
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/referral/models/StartReferralBody.kt
@@ -0,0 +1,11 @@
+package com.tangem.datasource.api.referral.models
+
+import com.squareup.moshi.Json
+
+/** Body for make user referral */
+data class StartReferralBody(
+    @Json(name = "walletId") val walletId: String,
+    @Json(name = "networkId") val networkId: String,
+    @Json(name = "tokenId") val tokenId: String,
+    @Json(name = "address") val address: String,
+)
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/Responses.kt
similarity index 90%
rename from network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/Responses.kt
index 4f88fca3b7..532a5debfb 100644
--- a/network/src/main/java/com/tangem/network/api/tangemTech/Responses.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/Responses.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.api.tangemTech
+package com.tangem.datasource.api.tangemTech
 
 import java.math.BigDecimal
 
@@ -11,7 +11,7 @@ sealed interface TangemTechResponse : HttpResponse
 data class CoinsResponse(
     val imageHost: String?,
     val coins: List<Coin>,
-    val total: Int
+    val total: Int,
 ) : TangemTechResponse {
 
     data class Coin(
@@ -19,13 +19,14 @@ data class CoinsResponse(
         val name: String,
         val symbol: String,
         val active: Boolean,
-        val networks: List<Network> = listOf()
+        val networks: List<Network> = listOf(),
     ) : TangemTechResponse {
 
         data class Network(
             val networkId: String,
             val contractAddress: String? = null,
             val decimalCount: BigDecimal? = null,
+            val exchangeable: Boolean? = false,
         ) : TangemTechResponse
     }
 }
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
similarity index 87%
rename from network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
index 518edd9fec..edfab6f5e2 100644
--- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechApi.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechApi.kt
@@ -1,4 +1,4 @@
-package com.tangem.network.api.tangemTech
+package com.tangem.datasource.api.tangemTech
 
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -14,11 +14,12 @@ interface TangemTechApi {
     @GET("coins")
     suspend fun coins(
         @Query("contractAddress") contractAddress: String? = null,
+        @Query("exchangeable") exchangeable: Boolean? = null,
         @Query("networkIds") networkIds: String? = null,
         @Query("active") active: Boolean? = null,
         @Query("searchText") searchText: String? = null,
         @Query("offset") offset: Int? = null,
-        @Query("limit") limit: Int? = null
+        @Query("limit") limit: Int? = null,
     ): CoinsResponse
 
     @GET("rates")
diff --git a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
similarity index 91%
rename from network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt
rename to core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
index 6137e8dfa0..50540a226e 100644
--- a/network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/tangemTech/TangemTechService.kt
@@ -1,10 +1,10 @@
-package com.tangem.network.api.tangemTech
+package com.tangem.datasource.api.tangemTech
 
 import com.tangem.common.services.Result
 import com.tangem.common.services.performRequest
-import com.tangem.network.common.AddHeaderInterceptor
-import com.tangem.network.common.CacheControlHttpInterceptor
-import com.tangem.network.common.createRetrofitInstance
+import com.tangem.datasource.api.common.AddHeaderInterceptor
+import com.tangem.datasource.api.common.CacheControlHttpInterceptor
+import com.tangem.datasource.api.common.createRetrofitInstance
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
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
new file mode 100644
index 0000000000..d662a98721
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt
@@ -0,0 +1,85 @@
+package com.tangem.datasource.di
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import com.tangem.datasource.api.AuthHeaderInterceptor
+import com.tangem.datasource.api.oneinch.OneInchApi
+import com.tangem.datasource.api.referral.ReferralApi
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.datasource.di.qualifiers.OneInchEthereum
+import com.tangem.lib.auth.AuthProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class NetworkModule {
+
+    @Provides
+    @Singleton
+    fun provideTangemTechApi(okHttpClient: OkHttpClient): TangemTechApi {
+        return Retrofit.Builder()
+            .addConverterFactory(
+                MoshiConverterFactory.create(),
+            )
+            .baseUrl(DEV_TANGEM_TECH_BASE_URL)
+            .client(okHttpClient)
+            .build()
+            .create(TangemTechApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    @OneInchEthereum
+    fun provideOneInchEthereumApi(): OneInchApi {
+        return Retrofit.Builder()
+            .addConverterFactory(
+                MoshiConverterFactory.create(),
+            )
+            .baseUrl(ONE_INCH_ETHER_BASE_URL)
+            .client(OkHttpClient())
+            .build()
+            .create(OneInchApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideReferralApi(okHttpClient: OkHttpClient): ReferralApi {
+        return Retrofit.Builder()
+            .addConverterFactory(
+                MoshiConverterFactory.create(
+                    Moshi.Builder()
+                        .addLast(KotlinJsonAdapterFactory())
+                        .build(),
+                ),
+            )
+            .baseUrl(DEV_TANGEM_TECH_BASE_URL)
+            .client(okHttpClient)
+            .build()
+            .create(ReferralApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(authProvider: AuthProvider): OkHttpClient {
+        return OkHttpClient.Builder()
+            .addInterceptor(AuthHeaderInterceptor(authProvider))
+            .addInterceptor(
+                HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY),
+            )
+            .build()
+    }
+
+    private companion object {
+        const val PROD_TANGEM_TECH_BASE_URL = "https://api.tangem-tech.com/v1/"
+        const val DEV_TANGEM_TECH_BASE_URL = "https://devapi.tangem-tech.com/v1/"
+        const val ONE_INCH_ETHER_BASE_URL = ""
+    }
+}
\ No newline at end of file
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/qualifiers/OneInchApiQualifiers.kt b/core/datasource/src/main/java/com/tangem/datasource/di/qualifiers/OneInchApiQualifiers.kt
new file mode 100644
index 0000000000..f312541fde
--- /dev/null
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/qualifiers/OneInchApiQualifiers.kt
@@ -0,0 +1,15 @@
+package com.tangem.datasource.di.qualifiers
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class OneInchEthereum
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class OneInchBinance
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class OneInchOptimism
\ No newline at end of file
diff --git a/core/res/.gitignore b/core/res/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/res/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/res/build.gradle.kts b/core/res/build.gradle.kts
new file mode 100644
index 0000000000..77151f2a46
--- /dev/null
+++ b/core/res/build.gradle.kts
@@ -0,0 +1,35 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+android {
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/res/src/main/AndroidManifest.xml b/core/res/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..1420909c0e
--- /dev/null
+++ b/core/res/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.core.res" />
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings_blockchain.xml b/core/res/src/main/res/values-de/strings-blockchain.xml
similarity index 76%
rename from app/src/main/res/values-de/strings_blockchain.xml
rename to core/res/src/main/res/values-de/strings-blockchain.xml
index 66998f875e..076b179fd2 100644
--- a/app/src/main/res/values-de/strings_blockchain.xml
+++ b/core/res/src/main/res/values-de/strings-blockchain.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Nicht genug Geld</string>
     <string name="send_error_blockchain_internal">Interner Fehler der Blockchain</string>
-    <string name="send_error_invalid_fee_value">Falsche Gebühr</string>
     <string name="send_error_dust_amount_format">Minimaler Betrag ist %s</string>
     <string name="send_error_dust_change">Restbestand zu klein</string>
+    <string name="common_fee_error">Erhalt der Gebühr fehlgeschlagen</string>
+    <string name="send_error_insufficient_balance">Nicht genug Geld</string>
+    <string name="send_error_invalid_fee_value">Falsche Gebühr</string>
     <string name="send_error_no_target_account">Das Zielkonto ist nicht erstellt. Der abzusendende Betrag soll %s + Gebühr oder mehr sein</string>
-    <string name="send_error_no_account_xlm">Um ein Konto zu erstellen, senden Sie 1+ XLM an diese Adresse</string>
-    <string name="send_error_fee_request_failed">Erhalt der Gebühr fehlgeschlagen</string>
     <string name="send_error_unknown">Unbekannter Fehler</string>
-    <string name="xtz_withdrawal_message_warning">Damit Sie beim nächsten Aufladen Ihrer Brieftasche keine erhöhte Provision zahlen, soll der Betrag um %s XTZ reduziert werden</string>
-    <string name="xtz_withdrawal_message_reduce">Um %s XTZ reduzieren</string>
-    <string name="xtz_withdrawal_message_ignore">Nein, alles senden</string>
-    <string name="send_validation_invalid_address">Ungültige Adresse</string>
+    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
     <string name="send_validation_invalid_amount">Ungültiger Betrag</string>
     <string name="send_validation_amount_exceeds_balance">Der Betrag geht über die Bilanz hinaus</string>
     <string name="send_validation_invalid_total">Der Gesamtbetrag geht über die Bilanz hinaus</string>
     <string name="send_validation_invalid_fee">Die Gebühr geht über die Bilanz hinaus</string>
-    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
-    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="xtz_withdrawal_message_warning">Damit Sie beim nächsten Aufladen Ihrer Brieftasche keine erhöhte Provision zahlen, soll der Betrag um %s XTZ reduziert werden</string>
+    <string name="xtz_withdrawal_message_reduce">Um %s XTZ reduzieren</string>
+    <string name="xtz_withdrawal_message_ignore">Nein, alles senden</string>
     <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</string>
+    <string name="no_account_generic">Laden Sie %s+ %s auf um ein Konto zu erstellen</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
 </resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-de/strings.xml b/core/res/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000000..0bee218f2b
--- /dev/null
+++ b/core/res/src/main/res/values-de/strings.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_3_cards">3 cards</string>
+    <string name="shop_2_cards">2 cards</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_total">Total</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="story_meet_title">Meet\nTangem</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_backup_title">Ultra Secure Backup</string>
+    <string name="story_backup_description_1">Up to</string>
+    <string name="story_backup_description_2_bold">3 physical cards</string>
+    <string name="story_backup_description_3">to one wallet</string>
+    <string name="story_currencies_title">Thousands of Currencies</string>
+    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
+    <string name="story_web3_title">DeFi Compatible</string>
+    <string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
+    <string name="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
+    <string name="home_button_order">Order</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
+    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
+    <string name="common_attention">Attention</string>
+    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
+    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="custom_token_contract_address_input_title">Contract address</string>
+    <string name="custom_token_creation_error_required_field">Required field</string>
+    <string name="custom_token_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_wrong_decimals">Decimal number must be a valid integer, no higher than %d</string>
+    <string name="custom_token_creation_error_invalid_contract_address">Contract address is invalid</string>
+    <string name="custom_token_creation_error_invalid_derivation_path">Derivation path is invalid</string>
+    <string name="custom_token_validation_error_not_found">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
+    <string name="custom_token_validation_error_already_added">This token/network has already been added to your list</string>
+    <string name="custom_token_decimals_input_title">Decimals</string>
+    <string name="custom_token_network_input_title">Network</string>
+    <string name="custom_token_network_input_not_selected">Not selected</string>
+    <string name="custom_token_name_input_placeholder">E.g. USD Coin</string>
+    <string name="custom_token_name_input_title">Name</string>
+    <string name="custom_token_token_symbol_input_placeholder">E.g. USDC</string>
+    <string name="custom_token_token_symbol_input_title">Token symbol</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="main_page_balance">Total balance</string>
+    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
+    <string name="main_tokens">Tokens</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="token_item_no_rate">No rate</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_alert_hide">Hide</string>
+    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="common_retry">Erneut versuchen</string>
+    <string name="details_chat">Chat</string>
+    <string name="wallet_currency_subtitle">%s network</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_yes">Yes</string>
+    <string name="common_no">No</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_change_access_code">Change Access Code</string>
+    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
+    <string name="common_continue">Continue</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="scan_card_settings_title">Get your card ready!</string>
+    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet.</string>
+    <string name="scan_card_settings_button">Scan Card</string>
+    <string name="app_settings_title">App Settings</string>
+    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
+    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
+    <string name="app_settings_saved_access_codes">Save Access Code</string>
+    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
+    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
+    <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet or use the card to recover the access code.</string>
+    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</string>
+    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Karte scannen</string>
+    <string name="save_user_wallet_agreement_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card</string>
+    <string name="save_user_wallet_agreement_code_title">Access code</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
+    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
+    <string name="send_extras_hint_destination_tag">Tag</string>
+    <string name="send_extras_hint_memo">Memo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_kyc_start">Verify your identity</string>
+    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
+    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
+    <string name="onboarding_chat_button_title">Support</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="details_referral_title">Referral program</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_currencies_description_prefix">Will get</string>
+    <string name="referral_point_currencies_description_suffix">for each wallet bought by your friend on your %s network address%s</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_friends_bought_title">Your friends bought</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_button_participate">Participate</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="common_balance">Bilanz: %s</string>
+    <string name="common_share">Share</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_success">Erfolg</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_swap_of_to">Swap of %s to</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="referral_error_failed_to_load_info">Failed to load the information about the referral program. Please try again later.</string>
+    <string name="referral_error_failed_to_load_info_with_reason">Failed to load the information about the referral program. Reason: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="send_validation_invalid_address">Ungültige Adresse</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="common_delete">Entfernen</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">It looks like you have biometric authentication disabled, it is necessary to save wallets</string>
+    <string name="common_enable">Enable</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</string>
+    <string name="app_name">Tangem</string>
+    <string name="common_save_changes">Änderungen speichern</string>
+    <string name="common_warning">Warnung</string>
+    <string name="common_done">Erledigt</string>
+    <string name="common_cancel">Abbrechen</string>
+    <string name="common_accept">Akzeptieren</string>
+    <string name="common_camera_denied_alert_message">Sie haben keinen Zugang zur Kamera erteilt, bitte passen Sie Ihre Datenschutzeinstellungen an</string>
+    <string name="wallet_button_send">Absenden</string>
+    <string name="wallet_button_create_wallet">ein Wallet erstellen</string>
+    <string name="wallet_title">Tangem</string>
+    <string name="wallet_balance_verified">Verifizierte Bilanz</string>
+    <string name="wallet_balance_loading">Die Bilanz wird aufgeladen…</string>
+    <string name="wallet_error_no_account">Das Konto ist nicht erstellt</string>
+    <string name="wallet_error_empty_card">Leere Karte</string>
+    <string name="wallet_error_empty_card_subtitle">Erstellen Sie ein Wallet um die Tangem-Karte verwenden zu können</string>
+    <string name="wallet_error_unsupported_blockchain">Diese Karte wird nicht unterstützt</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">Ihre Tangem-Karte wurde für die Arbeit mit einer anderen App ausgestellt. Bitte sehen Sie sich den Namen und die Anleitung auf Ihrer Karte an und installieren Sie eine korrekte App</string>
+    <string name="wallet_balance_tx_in_progress">Die Transaktion läuft…</string>
+    <string name="wallet_pending_tx_receiving">Erhalten</string>
+    <string name="wallet_pending_tx_receiving_address_format">von %s</string>
+    <string name="wallet_pending_tx_sending">Senden</string>
+    <string name="wallet_pending_tx_sending_address_format">an %s</string>
+    <string name="wallet_address_button_explore">Adresse erkunden</string>
+    <string name="wallet_address_button_create_payid">PayString erstellen</string>
+    <string name="wallet_create_payid">PayString erstellen</string>
+    <string name="wallet_create_payid_hint">PayString Name</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_info">PayString sind Ihre einzigartigen Identifikationsdaten wie Telefonnummer, E-Mail-Adresse oder ABN.</string>
+    <string name="wallet_create_payid_error_message">Fehlerantwort beim Erstellen der PayString</string>
+    <string name="wallet_create_payid_error_already_created">Diese PayString existiert bereits. Versuchen Sie mit einer anderen erneut.</string>
+    <string name="send_destination_hint_address_payid">Adresse oder PayString</string>
+    <string name="send_destination_hint_address">Adresse</string>
+    <string name="send_title">Absenden</string>
+    <string name="send_network_fee_title">Netzgebühr</string>
+    <string name="send_amount_label">Betrag</string>
+    <string name="send_fee_label">Gebühr</string>
+    <string name="send_total_label">Gesamt</string>
+    <string name="send_max_amount_label">Höchstbetrag</string>
+    <string name="send_fee_picker_low">Niedrig</string>
+    <string name="send_fee_picker_normal">Normal</string>
+    <string name="send_fee_picker_priority">Priorität</string>
+    <string name="send_fee_include_description">inkl. Gebühr</string>
+    <string name="send_total_subtitle_format">%s wird gesendet</string>
+    <string name="send_total_subtitle_asset_format">%s und %s werden gesendet</string>
+    <string name="send_transaction_success">Die Transaktion wurde erfolgreich signiert und an den Blockchain-Knoten gesendet. Die Walletbilanz wird aktualisiert</string>
+    <string name="details_title">Details</string>
+    <string name="details_row_title_cid">KartenID</string>
+    <string name="details_row_title_issuer">Emittent</string>
+    <string name="details_row_title_signed_hashes">Signiert</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s Hasch</string>
+    <string name="details_row_title_currency">App Währung</string>
+    <string name="details_manage_security_long_tap">Langes Tippen</string>
+    <string name="details_manage_security_long_tap_description">Dieser Mechanismus schützt vor Annäherungsangriffen auf eine Karte. Es wird eine Verzögerung zwischen dem Empfang und der Ausführung eines Befehls erzwungen. Nach der ersten signierten Transaktion wird dieses Telefon mit der Karte verknüpft und die Transaktionen werden sofort signiert</string>
+    <string name="details_manage_security_passcode">Passcode</string>
+    <string name="details_manage_security_passcode_description">Bevor Sie einen Befehl ausführen, der eine Änderung des Kartenstatus zur Folge hat, müssen Sie den Passcode eingeben.</string>
+    <string name="details_manage_security_access_code">Zugangscode</string>
+    <string name="details_manage_security_access_code_description">Sie müssen den richtigen Zugangscode eingeben, bevor Sie die Karte scannen.</string>
+    <string name="alert_card_signed_transactions">Diese Karte wurde früher bereits aufgeladen und Transaktionen wurden damit signiert. Ziehen Sie eine sofortige Auszahlung aller Beträge in Betracht, wenn Sie diese Karte von einer nicht vertrauenswürdigen Quelle erhalten haben.</string>
+    <string name="alert_unsupported_card">Diese Karte ist für die Zusammenarbeit mit Tangem nicht geeignet</string>
+    <string name="alert_developer_card">Die von Ihnen gescannte Karte ist eine Entwicklungskarte. Akzeptieren Sie sie nicht als Zahlungsmittel.</string>
+    <string name="initial_message_sign_header">Tippen um zu signieren</string>
+    <string name="initial_message_create_wallet_body">To create the wallet tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="initial_message_change_access_code_body">Tippen Sie um den Zugangscode zu ändern</string>
+    <string name="initial_message_change_passcode_body">Tippen Sie um den Passcode zu ändern</string>
+    <string name="disclaimer_title">Nutzungsbedingungen</string>
+    <string name="wallet_notification_no_internet">Keine Internetverbindung</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString wird von der Blockchain nicht unterstützt</string>
+    <string name="send_error_payid_not_registered">PayString ist nicht registriert</string>
+    <string name="send_error_payid_request_failed">PayString-Anfrage ist fehlgeschlagen</string>
+    <string name="send_error_address_same_as_wallet">Die Adresse stimmt mit der Adresse Ihrer Brieftasche überein</string>
+    <string name="wallet_notification_address_copied">Die Adresse wurde erfolgreich kopiert</string>
+    <string name="wallet_create_payid_empty">Zuerst geben Sie die gewünschte PayString ein</string>
+    <string name="initial_message_scan_header">Legen Sie die Karte zum Scannen an</string>
+    <string name="initial_message_tap_header">Legen Sie die Karte an</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_error_empty_twin_card">Create twin wallet</string>
+    <string name="wallet_error_empty_twin_card_subtitle"> Generate wallet keys on both cards to start using your Twins</string>
+    <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">This action is irreversible. You will not have access to the old wallet.</string>
+    <string name="twins_recreate_title_format">Scan the #%s twin card</string>
+    <string name="twins_recreate_title_preparing">Preparing card</string>
+    <string name="twins_recreate_title_creating_wallet">Creating wallet</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
+    <string name="common_start">Start</string>
+    <string name="common_add">Add</string>
+    <string name="common_search">Search</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
+    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_important_security_info">Important security information \u26A0</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_low_signatures_format">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_reject">Reject</string>
+    <string name="warning_testnet_card_message">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="error_update_app">Oops, the current version of the application is not ready to work with this card, please check for updates.</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
+    <string name="onboarding_top_up_header">Top up your wallet</string>
+    <string name="onboarding_top_up_body">To get started, simply top up the wallet with any amount</string>
+    <string name="onboarding_top_up_body_no_account_error">To get started, simply top up the wallet with more than %s %s</string>
+    <string name="onboarding_top_up_button_but_crypto">Buy crypto</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_balance_title">Balance</string>
+    <string name="address_qr_code_message_format">Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
+    <string name="warning_button_ok">OK, ich hab\'s!</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_button_backup_now">Backup now</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_add_backup_card">Add a backup card</string>
+    <string name="onboarding_button_backup_card_format">Scan the card #%d</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">You\'ve added one backup card. When backup process is finished you can\'t add more backup cards. If you have one more card, add it to backup. Do you like to continue the backup process?</string>
+    <string name="onboarding_access_code_intro_title">Create Access Code</string>
+    <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
+    <string name="onboarding_access_code_feature_1_title">Protect</string>
+    <string name="onboarding_access_code_feature_2_title">Personalize</string>
+    <string name="onboarding_access_code_feature_3_title">Restore</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
+    <string name="onboarding_access_codes_doesnt_match">Entered access code didn\'t match the initial access code</string>
+    <string name="common_create">Create</string>
+    <string name="common_submit">Submit</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_wallet_info_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
+    <string name="onboarding_wallet_info_subtitle_third">You will be able to set an access code to protect your wallets.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
+    <string name="welcome_interrupted_backup_alert_discard">Discard</string>
+    <string name="welcome_interrupted_backup_discard_title">This is an irreversible action</string>
+    <string name="welcome_interrupted_backup_discard_message">If you will discard the backup now, then you will have to reset the cards to factory settings to start over again</string>
+    <string name="welcome_interrupted_backup_discard_resume">Resume backup</string>
+    <string name="welcome_interrupted_backup_discard_discard">Discard</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
+    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %s\n%s\n\nAmount: %s\nFee: %s\nTotal: %s\nBalance: %s</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%s\n\nNETWORK: %s\n\nURL: %s</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_scan_new_code">Scan new code</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">This card can\'t be used to establish WalletConnect session</string>
+    <string name="wallet_connect_same_wcuri">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %s, requesting to\nsign BNB transaction.\n\n%s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %s\nTo: %s\nAmount: %s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %s\nPrice: %s\nAmount to receive: %s\nAmount to pay: %s</string>
+    <string name="feedback_subject_rate_negative">My suggestions</string>
+    <string name="feedback_subject_scan_failed">Can\'t scan a card</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_support">Feedback</string>
+    <string name="feedback_preface_rate_negative">Tell us what functions you are missing, and we will try to help you.</string>
+    <string name="feedback_preface_scan_failed">Please tell us what card do you have</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</string>
+    <string name="feedback_preface_support">Hi support team,</string>
+    <string name="feedback_data_collection_message">The following information is optional. You can erase it if you don\'t want to share it.</string>
+    <string name="send_total_subtitle_fiat_format">≈ %s (inkl. Gebühr: %s)</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="common_error">Fehler</string>
+    <string name="common_ok">OK</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Biometrics will be requested instead of the access code for interactions with your wallet</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-de/strings_plurals.xml b/core/res/src/main/res/values-de/strings_plurals.xml
new file mode 100644
index 0000000000..0d9fa7c350
--- /dev/null
+++ b/core/res/src/main/res/values-de/strings_plurals.xml
@@ -0,0 +1,16 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="one">%d card</item>
+        <item quantity="other">%d cards</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d token</item>
+        <item quantity="other">%d tokens</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-fr/strings_blockchain.xml b/core/res/src/main/res/values-fr/strings-blockchain.xml
similarity index 75%
rename from app/src/main/res/values-fr/strings_blockchain.xml
rename to core/res/src/main/res/values-fr/strings-blockchain.xml
index 197f42551c..4c4fa1b8ff 100644
--- a/app/src/main/res/values-fr/strings_blockchain.xml
+++ b/core/res/src/main/res/values-fr/strings-blockchain.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Solde insuffisant</string>
     <string name="send_error_blockchain_internal">Erreur interne de la blockchain</string>
-    <string name="send_error_invalid_fee_value">Commission non valide</string>
     <string name="send_error_dust_amount_format">Le montant minimal est de %s</string>
     <string name="send_error_dust_change">Le reste est trop petit</string>
+    <string name="common_fee_error">Échec de réception des commissions</string>
+    <string name="send_error_insufficient_balance">Solde insuffisant</string>
+    <string name="send_error_invalid_fee_value">Commission non valid</string>
     <string name="send_error_no_target_account">Le compte cible n\'a pas été créé. Le montant à envoyer doit être de %s + commissions ou plus</string>
-    <string name="send_error_no_account_xlm">Pour créer un compte, envoyez 1+ XLM à cette adresse</string>
-    <string name="send_error_fee_request_failed">Échec de réception des commissions</string>
     <string name="send_error_unknown">Erreur inconnue</string>
-    <string name="send_validation_invalid_address">Adresse incorrecte</string>
+    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
     <string name="send_validation_invalid_amount">Somme incorrecte</string>
     <string name="send_validation_amount_exceeds_balance">Le montant dépasse le solde</string>
     <string name="send_validation_invalid_total">Le total dépasse le solde</string>
@@ -17,7 +16,8 @@
     <string name="xtz_withdrawal_message_warning">Pour ne pas payer une commission élevée la prochaine fois que vous rechargez votre portefeuille, veuillez réduire le montant de %s XTZ</string>
     <string name="xtz_withdrawal_message_reduce">Réduire de %s XTZ</string>
     <string name="xtz_withdrawal_message_ignore">Non, envoyer toute la somme</string>
-    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
-    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
     <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</string>
+    <string name="no_account_generic">Pour créer un compte, téléchargez %s+ %s</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
 </resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-fr/strings.xml b/core/res/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000000..237e0965f6
--- /dev/null
+++ b/core/res/src/main/res/values-fr/strings.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_3_cards">3 cards</string>
+    <string name="shop_2_cards">2 cards</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_total">Total</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="story_meet_title">Meet\nTangem</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_backup_title">Ultra Secure Backup</string>
+    <string name="story_backup_description_1">Up to</string>
+    <string name="story_backup_description_2_bold">3 physical cards</string>
+    <string name="story_backup_description_3">to one wallet</string>
+    <string name="story_currencies_title">Thousands of Currencies</string>
+    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
+    <string name="story_web3_title">DeFi Compatible</string>
+    <string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
+    <string name="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
+    <string name="home_button_order">Order</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
+    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
+    <string name="common_attention">Attention</string>
+    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
+    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="custom_token_contract_address_input_title">Contract address</string>
+    <string name="custom_token_creation_error_required_field">Required field</string>
+    <string name="custom_token_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_wrong_decimals">Decimal number must be a valid integer, no higher than %d</string>
+    <string name="custom_token_creation_error_invalid_contract_address">Contract address is invalid</string>
+    <string name="custom_token_creation_error_invalid_derivation_path">Derivation path is invalid</string>
+    <string name="custom_token_validation_error_not_found">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
+    <string name="custom_token_validation_error_already_added">This token/network has already been added to your list</string>
+    <string name="custom_token_decimals_input_title">Decimals</string>
+    <string name="custom_token_network_input_title">Network</string>
+    <string name="custom_token_network_input_not_selected">Not selected</string>
+    <string name="custom_token_name_input_placeholder">E.g. USD Coin</string>
+    <string name="custom_token_name_input_title">Name</string>
+    <string name="custom_token_token_symbol_input_placeholder">E.g. USDC</string>
+    <string name="custom_token_token_symbol_input_title">Token symbol</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="main_page_balance">Total balance</string>
+    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
+    <string name="main_tokens">Tokens</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="token_item_no_rate">No rate</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_alert_hide">Hide</string>
+    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="common_retry">Réessayer</string>
+    <string name="details_chat">Chat</string>
+    <string name="wallet_currency_subtitle">%s network</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_yes">Yes</string>
+    <string name="common_no">No</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_change_access_code">Change Access Code</string>
+    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
+    <string name="common_continue">Continue</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="scan_card_settings_title">Get your card ready!</string>
+    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet.</string>
+    <string name="scan_card_settings_button">Scan Card</string>
+    <string name="app_settings_title">App Settings</string>
+    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
+    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
+    <string name="app_settings_saved_access_codes">Save Access Code</string>
+    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
+    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
+    <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet or use the card to recover the access code.</string>
+    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</string>
+    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scannez la carte</string>
+    <string name="save_user_wallet_agreement_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card</string>
+    <string name="save_user_wallet_agreement_code_title">Access code</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
+    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
+    <string name="send_extras_hint_destination_tag">Tag</string>
+    <string name="send_extras_hint_memo">Memo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_kyc_start">Verify your identity</string>
+    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
+    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
+    <string name="onboarding_chat_button_title">Support</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="details_referral_title">Referral program</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_currencies_description_prefix">Will get</string>
+    <string name="referral_point_currencies_description_suffix">for each wallet bought by your friend on your %s network address%s</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_friends_bought_title">Your friends bought</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_button_participate">Participate</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="common_balance">Solde : %s</string>
+    <string name="common_share">Share</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_success">Avec succès</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_swap_of_to">Swap of %s to</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="referral_error_failed_to_load_info">Failed to load the information about the referral program. Please try again later.</string>
+    <string name="referral_error_failed_to_load_info_with_reason">Failed to load the information about the referral program. Reason: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="send_validation_invalid_address">Adresse incorrecte</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="common_delete">Supprimer</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">It looks like you have biometric authentication disabled, it is necessary to save wallets</string>
+    <string name="common_enable">Enable</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</string>
+    <string name="app_name">Tangem</string>
+    <string name="common_save_changes">Sauvegarder les modifications</string>
+    <string name="common_warning">Alerte</string>
+    <string name="common_done">Exécuté</string>
+    <string name="common_cancel">Annuler</string>
+    <string name="common_accept">J\'accepte</string>
+    <string name="common_camera_denied_alert_message">Vous n\'avez pas octroyé l\'accès à votre caméra, veuillez modifier vos paramètres de confidentialité</string>
+    <string name="wallet_button_send">Envoyer</string>
+    <string name="wallet_button_create_wallet">Créer un portefeuille</string>
+    <string name="wallet_title">Tangem</string>
+    <string name="wallet_balance_verified">Solde confirmé</string>
+    <string name="wallet_balance_loading">Solde est en cours de téléchargement …</string>
+    <string name="wallet_error_no_account">Compte n\'est pas créé</string>
+    <string name="wallet_error_empty_card">Carte vide</string>
+    <string name="wallet_error_empty_card_subtitle">Créez un portefeuille pour commencer à utiliser votre carte Tangem</string>
+    <string name="wallet_error_unsupported_blockchain">Cette carte n\'est pas prise en charge</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">Votre carte Tangem a été créée pour fonctionner avec une autre application. Regardez le nom et les instructions sur votre carte et installez l\'application pertinente</string>
+    <string name="wallet_balance_tx_in_progress">Transaction en cours…</string>
+    <string name="wallet_pending_tx_receiving">Réception</string>
+    <string name="wallet_pending_tx_receiving_address_format">de %s</string>
+    <string name="wallet_pending_tx_sending">Envoi</string>
+    <string name="wallet_pending_tx_sending_address_format">jusqu\'à %s</string>
+    <string name="wallet_address_button_explore">Explorer l\'adresse</string>
+    <string name="wallet_address_button_create_payid">Créer PayString</string>
+    <string name="wallet_create_payid">Créer PayString</string>
+    <string name="wallet_create_payid_hint">Dénomination PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_info">Votre PayString est une information qui vous est propre, comme un numéro de téléphone, une adresse du courrier électronique ou un ABN.</string>
+    <string name="wallet_create_payid_error_message">Mauvaise réponse lors de la création de PayString</string>
+    <string name="wallet_create_payid_error_already_created">Ce PayString existe déjà. Essayez une autre variante.</string>
+    <string name="send_destination_hint_address_payid">Adresse ou PayString</string>
+    <string name="send_destination_hint_address">Adresse</string>
+    <string name="send_title">Envoyer</string>
+    <string name="send_network_fee_title">Commissions du réseau</string>
+    <string name="send_amount_label">Somme</string>
+    <string name="send_fee_label">Commissions</string>
+    <string name="send_total_label">Total</string>
+    <string name="send_max_amount_label">Somme maximale</string>
+    <string name="send_fee_picker_low">Bas</string>
+    <string name="send_fee_picker_normal">Normal</string>
+    <string name="send_fee_picker_priority">Priorité</string>
+    <string name="send_fee_include_description">Inclure les commissions</string>
+    <string name="send_total_subtitle_format">Sera envoyé %s</string>
+    <string name="send_total_subtitle_asset_format">Sera envoyé %s et %s</string>
+    <string name="send_transaction_success">La transaction a été signée avec succès et envoyée au nœud de blockchain. Le solde du portefeuille sera mis à jour après un certain temps</string>
+    <string name="details_title">Référénces</string>
+    <string name="details_row_title_cid">ID de la carte</string>
+    <string name="details_row_title_issuer">Emetteur</string>
+    <string name="details_row_title_signed_hashes">Signé</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
+    <string name="details_row_title_currency">Monnaie de l\'application</string>
+    <string name="details_manage_security_long_tap">Tenez la carte fermement</string>
+    <string name="details_manage_security_long_tap_description">Ce mécanisme protège contre les attaques sans contact sur la carte. Il y a un délai entre la réception et l\'exécution de la commande. Après la première transaction signée, ce téléphone sera associé à la carte et les transactions seront signées immédiatement.</string>
+    <string name="details_manage_security_passcode">Mot de passe</string>
+    <string name="details_manage_security_passcode_description">Avant d\'exécuter une commande qui modifie l\'état de la carte, vous devrez entrer un mot de passe.</string>
+    <string name="details_manage_security_access_code">Code d\'accès</string>
+    <string name="details_manage_security_access_code_description">Vous devrez entrer le mot de passe correct avant de scanner la carte</string>
+    <string name="alert_card_signed_transactions">Cette carte a déjà été rechargée et a signé des transactions avant. Envisagez la possibilité de retirer tous les fonds immédiatement si vous avez reçu cette carte d\'une source non fiable.</string>
+    <string name="alert_unsupported_card">Cette carte n\'est pas conçue pour fonctionner avec Tangem</string>
+    <string name="alert_developer_card">La carte que vous avez scannée est une carte de développement. Ne l\'acceptez pas comme paiement.</string>
+    <string name="initial_message_sign_header">Touchez pour signer</string>
+    <string name="initial_message_create_wallet_body">To create the wallet tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="initial_message_change_access_code_body">Touchez, pour modifier le code d\'accès</string>
+    <string name="initial_message_change_passcode_body">Touchez, pour modifier le mot de passe</string>
+    <string name="disclaimer_title">Conditions d\'utilisation</string>
+    <string name="wallet_notification_no_internet">Pas de connexion internet</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString non pris en charge par la blockchain</string>
+    <string name="send_error_payid_not_registered">PayString non enregistré</string>
+    <string name="send_error_payid_request_failed">La demande de PayString a échoué</string>
+    <string name="send_error_address_same_as_wallet">L\'adresse est la même que celle de votre portefeuille</string>
+    <string name="wallet_notification_address_copied">L\'adresse a été copiée avec succès</string>
+    <string name="wallet_create_payid_empty">Saisissez d\'abord le PayString requis</string>
+    <string name="initial_message_scan_header">Posez pour scanner</string>
+    <string name="initial_message_tap_header">Posez la carte</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_error_empty_twin_card">Create twin wallet</string>
+    <string name="wallet_error_empty_twin_card_subtitle"> Generate wallet keys on both cards to start using your Twins</string>
+    <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">This action is irreversible. You will not have access to the old wallet.</string>
+    <string name="twins_recreate_title_format">Scan the #%s twin card</string>
+    <string name="twins_recreate_title_preparing">Preparing card</string>
+    <string name="twins_recreate_title_creating_wallet">Creating wallet</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
+    <string name="common_start">Start</string>
+    <string name="common_add">Add</string>
+    <string name="common_search">Search</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
+    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_important_security_info">Important security information \u26A0</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_low_signatures_format">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_reject">Reject</string>
+    <string name="warning_testnet_card_message">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="error_update_app">Oops, the current version of the application is not ready to work with this card, please check for updates.</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
+    <string name="onboarding_top_up_header">Top up your wallet</string>
+    <string name="onboarding_top_up_body">To get started, simply top up the wallet with any amount</string>
+    <string name="onboarding_top_up_body_no_account_error">To get started, simply top up the wallet with more than %s %s</string>
+    <string name="onboarding_top_up_button_but_crypto">Buy crypto</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_balance_title">Balance</string>
+    <string name="address_qr_code_message_format">Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
+    <string name="warning_button_ok">Ok, je l\'ai!</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_button_backup_now">Backup now</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_add_backup_card">Add a backup card</string>
+    <string name="onboarding_button_backup_card_format">Scan the card #%d</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">You\'ve added one backup card. When backup process is finished you can\'t add more backup cards. If you have one more card, add it to backup. Do you like to continue the backup process?</string>
+    <string name="onboarding_access_code_intro_title">Create Access Code</string>
+    <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
+    <string name="onboarding_access_code_feature_1_title">Protect</string>
+    <string name="onboarding_access_code_feature_2_title">Personalize</string>
+    <string name="onboarding_access_code_feature_3_title">Restore</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
+    <string name="onboarding_access_codes_doesnt_match">Entered access code didn\'t match the initial access code</string>
+    <string name="common_create">Create</string>
+    <string name="common_submit">Submit</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_wallet_info_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
+    <string name="onboarding_wallet_info_subtitle_third">You will be able to set an access code to protect your wallets.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
+    <string name="welcome_interrupted_backup_alert_discard">Discard</string>
+    <string name="welcome_interrupted_backup_discard_title">This is an irreversible action</string>
+    <string name="welcome_interrupted_backup_discard_message">If you will discard the backup now, then you will have to reset the cards to factory settings to start over again</string>
+    <string name="welcome_interrupted_backup_discard_resume">Resume backup</string>
+    <string name="welcome_interrupted_backup_discard_discard">Discard</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
+    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %s\n%s\n\nAmount: %s\nFee: %s\nTotal: %s\nBalance: %s</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%s\n\nNETWORK: %s\n\nURL: %s</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_scan_new_code">Scan new code</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">This card can\'t be used to establish WalletConnect session</string>
+    <string name="wallet_connect_same_wcuri">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %s, requesting to\nsign BNB transaction.\n\n%s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %s\nTo: %s\nAmount: %s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %s\nPrice: %s\nAmount to receive: %s\nAmount to pay: %s</string>
+    <string name="feedback_subject_rate_negative">My suggestions</string>
+    <string name="feedback_subject_scan_failed">Can\'t scan a card</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_support">Feedback</string>
+    <string name="feedback_preface_rate_negative">Tell us what functions you are missing, and we will try to help you.</string>
+    <string name="feedback_preface_scan_failed">Please tell us what card do you have</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</string>
+    <string name="feedback_preface_support">Hi support team,</string>
+    <string name="feedback_data_collection_message">The following information is optional. You can erase it if you don\'t want to share it.</string>
+    <string name="send_total_subtitle_fiat_format">≈ %s (incl. les commissions : %s)</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="common_error">Erreur</string>
+    <string name="common_ok">OK</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Biometrics will be requested instead of the access code for interactions with your wallet</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-fr/strings_plurals.xml b/core/res/src/main/res/values-fr/strings_plurals.xml
new file mode 100644
index 0000000000..622131bdfd
--- /dev/null
+++ b/core/res/src/main/res/values-fr/strings_plurals.xml
@@ -0,0 +1,19 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="one">%d card</item>
+        <item quantity="many">%d cards</item>
+        <item quantity="other">%d cards</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d token</item>
+        <item quantity="many">%d tokens</item>
+        <item quantity="other">%d tokens</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="many">%d wallets</item>
+        <item quantity="other">%d wallets</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-it/strings_blockchain.xml b/core/res/src/main/res/values-it/strings-blockchain.xml
similarity index 70%
rename from app/src/main/res/values-it/strings_blockchain.xml
rename to core/res/src/main/res/values-it/strings-blockchain.xml
index 92df7b9703..2b0cbcb901 100644
--- a/app/src/main/res/values-it/strings_blockchain.xml
+++ b/core/res/src/main/res/values-it/strings-blockchain.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Saldo insufficiente</string>
     <string name="send_error_blockchain_internal">Errore interno della blockchain</string>
-    <string name="send_error_invalid_fee_value">Commissione non valida</string>
     <string name="send_error_dust_amount_format">L\'importo minimo è di %s</string>
     <string name="send_error_dust_change">L\'importo residuo è molto basso</string>
+    <string name="common_fee_error">Impossibile ottenere la commissione</string>
+    <string name="send_error_insufficient_balance">Saldo insufficiente</string>
+    <string name="send_error_invalid_fee_value">Commissione non valida</string>
+    <string name="send_error_no_target_account">Il conto totale non è stato creato L\'importo da inviare deve essere %s + commissione o maggiore</string>
     <string name="send_error_unknown">Errore sconosciuto</string>
-    <string name="send_validation_amount_exceeds_balance">L\'importo supera il saldo</string>
-    <string name="send_error_no_target_account">Per creare un account, invia %s a questo indirizzo</string>
-    <string name="send_error_fee_request_failed">Impossibile ottenere la commissione</string>
-    <string name="send_error_no_account_xlm">Per creare un account, invia 1+ XLM a questo indirizzo</string>
-    <string name="send_validation_invalid_address">Indirizzo non valido</string>
+    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
     <string name="send_validation_invalid_amount">Importo non valido</string>
+    <string name="send_validation_amount_exceeds_balance">L\'importo supera il saldo</string>
     <string name="send_validation_invalid_total">Il totale supera il saldo</string>
     <string name="send_validation_invalid_fee">La commissione supera il saldo</string>
     <string name="xtz_withdrawal_message_warning">Per evitare di pagare una commissione maggiore la prossima volta che ricarichi il tuo portafoglio, riduci l\'importo di %s XTZ</string>
     <string name="xtz_withdrawal_message_reduce">Riduci di %s XTZ</string>
     <string name="xtz_withdrawal_message_ignore">No, invia l\'intero importo</string>
-    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
-    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
     <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</string>
+    <string name="no_account_generic">Scarica %s+ %s per creare un account</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
 </resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-it/strings.xml b/core/res/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000000..d6b0c63ee0
--- /dev/null
+++ b/core/res/src/main/res/values-it/strings.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_3_cards">3 cards</string>
+    <string name="shop_2_cards">2 cards</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_total">Total</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="story_meet_title">Meet\nTangem</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_backup_title">Ultra Secure Backup</string>
+    <string name="story_backup_description_1">Up to</string>
+    <string name="story_backup_description_2_bold">3 physical cards</string>
+    <string name="story_backup_description_3">to one wallet</string>
+    <string name="story_currencies_title">Thousands of Currencies</string>
+    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
+    <string name="story_web3_title">DeFi Compatible</string>
+    <string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
+    <string name="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
+    <string name="home_button_order">Order</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
+    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
+    <string name="common_attention">Attention</string>
+    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
+    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="custom_token_contract_address_input_title">Contract address</string>
+    <string name="custom_token_creation_error_required_field">Required field</string>
+    <string name="custom_token_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_wrong_decimals">Decimal number must be a valid integer, no higher than %d</string>
+    <string name="custom_token_creation_error_invalid_contract_address">Contract address is invalid</string>
+    <string name="custom_token_creation_error_invalid_derivation_path">Derivation path is invalid</string>
+    <string name="custom_token_validation_error_not_found">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
+    <string name="custom_token_validation_error_already_added">This token/network has already been added to your list</string>
+    <string name="custom_token_decimals_input_title">Decimals</string>
+    <string name="custom_token_network_input_title">Network</string>
+    <string name="custom_token_network_input_not_selected">Not selected</string>
+    <string name="custom_token_name_input_placeholder">E.g. USD Coin</string>
+    <string name="custom_token_name_input_title">Name</string>
+    <string name="custom_token_token_symbol_input_placeholder">E.g. USDC</string>
+    <string name="custom_token_token_symbol_input_title">Token symbol</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="main_page_balance">Total balance</string>
+    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
+    <string name="main_tokens">Tokens</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="token_item_no_rate">No rate</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_alert_hide">Hide</string>
+    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="common_retry">Riprova</string>
+    <string name="details_chat">Chat</string>
+    <string name="wallet_currency_subtitle">%s network</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_yes">Yes</string>
+    <string name="common_no">No</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_change_access_code">Change Access Code</string>
+    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
+    <string name="common_continue">Continue</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="scan_card_settings_title">Get your card ready!</string>
+    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet.</string>
+    <string name="scan_card_settings_button">Scan Card</string>
+    <string name="app_settings_title">App Settings</string>
+    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
+    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
+    <string name="app_settings_saved_access_codes">Save Access Code</string>
+    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
+    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
+    <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet or use the card to recover the access code.</string>
+    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</string>
+    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scansiona carta</string>
+    <string name="save_user_wallet_agreement_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card</string>
+    <string name="save_user_wallet_agreement_code_title">Access code</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
+    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
+    <string name="send_extras_hint_destination_tag">Tag</string>
+    <string name="send_extras_hint_memo">Memo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_kyc_start">Verify your identity</string>
+    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
+    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
+    <string name="onboarding_chat_button_title">Support</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="details_referral_title">Referral program</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_currencies_description_prefix">Will get</string>
+    <string name="referral_point_currencies_description_suffix">for each wallet bought by your friend on your %s network address%s</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_friends_bought_title">Your friends bought</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_button_participate">Participate</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="common_balance">Saldo: %s</string>
+    <string name="common_share">Share</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_success">Con successo</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_swap_of_to">Swap of %s to</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="referral_error_failed_to_load_info">Failed to load the information about the referral program. Please try again later.</string>
+    <string name="referral_error_failed_to_load_info_with_reason">Failed to load the information about the referral program. Reason: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="send_validation_invalid_address">Indirizzo non valido</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="common_delete">Rimuovere</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">It looks like you have biometric authentication disabled, it is necessary to save wallets</string>
+    <string name="common_enable">Enable</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</string>
+    <string name="app_name">Tangem</string>
+    <string name="common_save_changes">Mantieni le modifiche</string>
+    <string name="common_warning">Avviso</string>
+    <string name="common_done">Fatto</string>
+    <string name="common_cancel">Annulla</string>
+    <string name="common_accept">Accetta</string>
+    <string name="common_camera_denied_alert_message">Non hai fornito l\'accesso alla tua videocamera, modifica le tue impostazioni sulla privacy</string>
+    <string name="wallet_button_send">Invia</string>
+    <string name="wallet_button_create_wallet">Crea portafoglio</string>
+    <string name="wallet_title">Tangem</string>
+    <string name="wallet_balance_verified">Saldo verificato</string>
+    <string name="wallet_balance_loading">Il saldo sta per essere caricato…</string>
+    <string name="wallet_error_no_account">Conto non creato</string>
+    <string name="wallet_error_empty_card">Carta vuota</string>
+    <string name="wallet_error_empty_card_subtitle">Crea un portafoglio per iniziare ad utilizzare la tua carta Tangem </string>
+    <string name="wallet_error_unsupported_blockchain">Questa carta non è supportata</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle"> La tua carta Tangem è stata creata per funzionare con un\'altra applicazione. Leggere il nome e le istruzioni sulla carta e installare l\'applicazione corretta</string>
+    <string name="wallet_balance_tx_in_progress">Transazione in corso…</string>
+    <string name="wallet_pending_tx_receiving">Riceviu</string>
+    <string name="wallet_pending_tx_receiving_address_format">da %s</string>
+    <string name="wallet_pending_tx_sending">Inviau</string>
+    <string name="wallet_pending_tx_sending_address_format">su %s</string>
+    <string name="wallet_address_button_explore">Cerca indirizzo</string>
+    <string name="wallet_address_button_create_payid">Crea PayString</string>
+    <string name="wallet_create_payid">Crea PayString</string>
+    <string name="wallet_create_payid_hint">Nome PayString</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_info">Il tuo PayString – informazioni per te uniche, come il tuo numero di telefono, indirizzo email o ABN.</string>
+    <string name="wallet_create_payid_error_message">Errore di risposta durante la creazione del PayString</string>
+    <string name="wallet_create_payid_error_already_created">Questo PayString esiste già. Scegline un altro.</string>
+    <string name="send_destination_hint_address_payid">Indirizzo o PayString</string>
+    <string name="send_destination_hint_address">Indirizzo</string>
+    <string name="send_title">Invia</string>
+    <string name="send_network_fee_title">Costi della rete</string>
+    <string name="send_amount_label">Importo</string>
+    <string name="send_fee_label">Commissione</string>
+    <string name="send_total_label">Totale</string>
+    <string name="send_max_amount_label">Importo totale</string>
+    <string name="send_fee_picker_low">Insufficiente</string>
+    <string name="send_fee_picker_normal">Normale</string>
+    <string name="send_fee_picker_priority">Prioritario</string>
+    <string name="send_fee_include_description">Includi commissione</string>
+    <string name="send_total_subtitle_format">Sarà inviato %s</string>
+    <string name="send_total_subtitle_asset_format">Sarà inviato %s e %s</string>
+    <string name="send_transaction_success">La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo</string>
+    <string name="details_title">Requisiti</string>
+    <string name="details_row_title_cid">ID carta</string>
+    <string name="details_row_title_issuer">Emittente</string>
+    <string name="details_row_title_signed_hashes">Firmato</string>
+    <string name="details_row_subtitle_signed_hashes_format">Hash %s</string>
+    <string name="details_row_title_currency">Valuta dell\'applicazione</string>
+    <string name="details_manage_security_long_tap">Mantenimento della carta</string>
+    <string name="details_manage_security_long_tap_description">Questo meccanismo protegge dagli avvicinamenti senza contatto sulla carta. Attiva un ritardo tra la ricezione e l\'esecuzione di un comando. Dopo la prima transazione firmata, questo telefono verrà associato alla carta e le transazioni verranno firmate immediatamente.</string>
+    <string name="details_manage_security_passcode">Password</string>
+    <string name="details_manage_security_passcode_description">Dovrai inserire una password prima di eseguire qualsiasi comando che modifichi lo stato della carta.</string>
+    <string name="details_manage_security_access_code">Codice di accesso</string>
+    <string name="details_manage_security_access_code_description">Prima di scansionare la carta sarà necessario inserire il codice di accesso corretto</string>
+    <string name="alert_card_signed_transactions">Questa carta è già stata ricaricata e ha firmato transazioni in passato. Valuta la possibilità di prelevare immediatamente tutti i fondi se hai ricevuto questa carta da una fonte inaffidabile.</string>
+    <string name="alert_unsupported_card">Questa carta non è progettata per funzionare con Tangem</string>
+    <string name="alert_developer_card">La carta che hai scansionato è una carta di sviluppo. Non utilizzarla come strumento di pagamento.</string>
+    <string name="initial_message_sign_header">Avvicina per firmare</string>
+    <string name="initial_message_create_wallet_body">To create the wallet tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="initial_message_change_access_code_body">Avvicina per modificare il codice di accesso</string>
+    <string name="initial_message_change_passcode_body">Avvicina per modificare la password</string>
+    <string name="disclaimer_title">Termini del servizio</string>
+    <string name="wallet_notification_no_internet">Nessuna connessione a Internet</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString non supportato dalla blockchain</string>
+    <string name="send_error_payid_not_registered">PayString non registrato</string>
+    <string name="send_error_payid_request_failed">Richiesta PayString fallita</string>
+    <string name="send_error_address_same_as_wallet">L\'indirizzo corrisponde all\'indirizzo del tuo portafoglio</string>
+    <string name="wallet_notification_address_copied">L\'indirizzo è stato copiato con successo</string>
+    <string name="wallet_create_payid_empty">Inserire prima il PayString desiderato</string>
+    <string name="initial_message_scan_header">Avvicina per scansionare</string>
+    <string name="initial_message_tap_header">Avvicina la carta</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_error_empty_twin_card">Create twin wallet</string>
+    <string name="wallet_error_empty_twin_card_subtitle"> Generate wallet keys on both cards to start using your Twins</string>
+    <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">This action is irreversible. You will not have access to the old wallet.</string>
+    <string name="twins_recreate_title_format">Scan the #%s twin card</string>
+    <string name="twins_recreate_title_preparing">Preparing card</string>
+    <string name="twins_recreate_title_creating_wallet">Creating wallet</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
+    <string name="common_start">Start</string>
+    <string name="common_add">Add</string>
+    <string name="common_search">Search</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
+    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_important_security_info">Important security information \u26A0</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_low_signatures_format">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_reject">Reject</string>
+    <string name="warning_testnet_card_message">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="error_update_app">Oops, the current version of the application is not ready to work with this card, please check for updates.</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
+    <string name="onboarding_top_up_header">Top up your wallet</string>
+    <string name="onboarding_top_up_body">To get started, simply top up the wallet with any amount</string>
+    <string name="onboarding_top_up_body_no_account_error">To get started, simply top up the wallet with more than %s %s</string>
+    <string name="onboarding_top_up_button_but_crypto">Buy crypto</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_balance_title">Balance</string>
+    <string name="address_qr_code_message_format">Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
+    <string name="warning_button_ok">Ok, ho capito!</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_button_backup_now">Backup now</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_add_backup_card">Add a backup card</string>
+    <string name="onboarding_button_backup_card_format">Scan the card #%d</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">You\'ve added one backup card. When backup process is finished you can\'t add more backup cards. If you have one more card, add it to backup. Do you like to continue the backup process?</string>
+    <string name="onboarding_access_code_intro_title">Create Access Code</string>
+    <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
+    <string name="onboarding_access_code_feature_1_title">Protect</string>
+    <string name="onboarding_access_code_feature_2_title">Personalize</string>
+    <string name="onboarding_access_code_feature_3_title">Restore</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
+    <string name="onboarding_access_codes_doesnt_match">Entered access code didn\'t match the initial access code</string>
+    <string name="common_create">Create</string>
+    <string name="common_submit">Submit</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_wallet_info_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
+    <string name="onboarding_wallet_info_subtitle_third">You will be able to set an access code to protect your wallets.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
+    <string name="welcome_interrupted_backup_alert_discard">Discard</string>
+    <string name="welcome_interrupted_backup_discard_title">This is an irreversible action</string>
+    <string name="welcome_interrupted_backup_discard_message">If you will discard the backup now, then you will have to reset the cards to factory settings to start over again</string>
+    <string name="welcome_interrupted_backup_discard_resume">Resume backup</string>
+    <string name="welcome_interrupted_backup_discard_discard">Discard</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
+    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %s\n%s\n\nAmount: %s\nFee: %s\nTotal: %s\nBalance: %s</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%s\n\nNETWORK: %s\n\nURL: %s</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_scan_new_code">Scan new code</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">This card can\'t be used to establish WalletConnect session</string>
+    <string name="wallet_connect_same_wcuri">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %s, requesting to\nsign BNB transaction.\n\n%s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %s\nTo: %s\nAmount: %s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %s\nPrice: %s\nAmount to receive: %s\nAmount to pay: %s</string>
+    <string name="feedback_subject_rate_negative">My suggestions</string>
+    <string name="feedback_subject_scan_failed">Can\'t scan a card</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_support">Feedback</string>
+    <string name="feedback_preface_rate_negative">Tell us what functions you are missing, and we will try to help you.</string>
+    <string name="feedback_preface_scan_failed">Please tell us what card do you have</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</string>
+    <string name="feedback_preface_support">Hi support team,</string>
+    <string name="feedback_data_collection_message">The following information is optional. You can erase it if you don\'t want to share it.</string>
+    <string name="send_total_subtitle_fiat_format">≈ %s (inc. commissione: %s)</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="common_error">Errore</string>
+    <string name="common_ok">OK</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Biometrics will be requested instead of the access code for interactions with your wallet</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-it/strings_plurals_final.xml b/core/res/src/main/res/values-it/strings_plurals_final.xml
new file mode 100644
index 0000000000..0d9fa7c350
--- /dev/null
+++ b/core/res/src/main/res/values-it/strings_plurals_final.xml
@@ -0,0 +1,16 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="one">%d card</item>
+        <item quantity="other">%d cards</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d token</item>
+        <item quantity="other">%d tokens</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <item quantity="one">%d wallet</item>
+        <item quantity="other">%d wallets</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-ru/strings_blockchain.xml b/core/res/src/main/res/values-ru/strings-blockchain.xml
similarity index 57%
rename from app/src/main/res/values-ru/strings_blockchain.xml
rename to core/res/src/main/res/values-ru/strings-blockchain.xml
index 9ccdfd276e..31f48e58f7 100644
--- a/app/src/main/res/values-ru/strings_blockchain.xml
+++ b/core/res/src/main/res/values-ru/strings-blockchain.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Недостаточный баланс</string>
     <string name="send_error_blockchain_internal">Внутренняя ошибка блокчейна</string>
-    <string name="send_error_invalid_fee_value">Неверная комиссия</string>
     <string name="send_error_dust_amount_format">Минимальная сумма: %s</string>
     <string name="send_error_dust_change">Сдача слишком мала</string>
-    <string name="send_error_no_account_xlm">Для создания учетной записи отправьте 1+ XLM на этот адрес</string>
-    <string name="send_error_fee_request_failed">Не удалось получить комиссию</string>
-    <string name="send_error_no_target_account">Целевая учетная запись не создана. Сумма для отправки должна быть %s + плата за создание или больше</string>
+    <string name="common_fee_error">Не удалось получить комиссию</string>
+    <string name="send_error_insufficient_balance">Недостаточный баланс</string>
+    <string name="send_error_invalid_fee_value">Неверная комиссия</string>
+    <string name="send_error_no_target_account">Аккаунт получателя не создан. Сумма для отправки должна быть %s + комиссия или больше</string>
     <string name="send_error_unknown">Неизвестная ошибка</string>
-    <string name="send_validation_invalid_address">Неверный адрес</string>
+    <string name="send_error_minimum_balance_format">Минимальный баланс: %s</string>
     <string name="send_validation_invalid_amount">Недопустимая сумма</string>
-    <string name="send_validation_amount_exceeds_balance">Сумма превышает баланс</string>
-    <string name="send_validation_invalid_total">Общая сумма превышает баланс</string>
-    <string name="send_validation_invalid_fee">Комиссия превышает баланс</string>
+    <string name="send_validation_amount_exceeds_balance">Сумма превышает остаток</string>
+    <string name="send_validation_invalid_total">Отправляемая сумма превышает остаток</string>
+    <string name="send_validation_invalid_fee">Комиссия превышает остаток</string>
     <string name="xtz_withdrawal_message_warning">Чтобы не платить повышенную комиссию при следующем пополнении кошелька, уменьшите сумму на %s XTZ</string>
     <string name="xtz_withdrawal_message_reduce">Уменьшить на %s XTZ</string>
     <string name="xtz_withdrawal_message_ignore">Нет, отправить все</string>
-    <string name="send_error_minimum_balance_format">Минимальный баланс: %s</string>
-    <string name="warning_existential_deposit_message">Сеть %s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %s, он будет деактивирован, а все оставшиеся средства будут уничтожены.</string>
     <string name="no_account_polkadot">Аккаунт получателя не активирован. Отправьте %s или более для активации аккаунта.</string>
+    <string name="no_account_generic">Пополните счет на %s+ %s, чтобы создать аккаунт</string>
+    <string name="address_type_default">По умолчанию</string>
+    <string name="address_type_legacy">Устаревший</string>
 </resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000000..177687671b
--- /dev/null
+++ b/core/res/src/main/res/values-ru/strings.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_3_cards">3 карты</string>
+    <string name="shop_2_cards">2 карты</string>
+    <string name="shop_shipping">Доставка</string>
+    <string name="shop_free">Бесплатно</string>
+    <string name="shop_i_have_a_promo_code">У меня есть промо-код…</string>
+    <string name="shop_total">Итого</string>
+    <string name="shop_other_payment_methods">Другие способы оплаты</string>
+    <string name="shop_buy_now">Купить сейчас</string>
+    <string name="story_meet_title">Встречайте\nTangem</string>
+    <string name="story_meet_buy">Покупайте</string>
+    <string name="story_meet_store">Храните</string>
+    <string name="story_meet_send">Отправляйте</string>
+    <string name="story_meet_pay">Расплачивайтесь</string>
+    <string name="story_meet_exchange">Обменивайте</string>
+    <string name="story_meet_lend">Вкладывайте</string>
+    <string name="story_meet_borrow">Занимайте</string>
+    <string name="story_awe_title">Революционный аппаратный кошелек</string>
+    <string name="story_awe_description">Держите свои криптосбережения в безопасности. Приватные ключи надежно хранятся на карте.</string>
+    <string name="story_backup_title">Все ключи в безопасности</string>
+    <string name="story_backup_description_1">До</string>
+    <string name="story_backup_description_2_bold">трех карт</string>
+    <string name="story_backup_description_3">с одним кошельком</string>
+    <string name="story_currencies_title">Тысячи криптовалют</string>
+    <string name="story_currencies_description">Аппаратный кошелек для ваших биткоинов, эфира и многих других валют одновременно — все в одной карте</string>
+    <string name="story_web3_title">Поддержка DeFi</string>
+    <string name="story_web3_description">Обменивайте, покупайте NFT, получайте займы и делайте вклады в более чем 100 различных децентрализованных сервисах</string>
+    <string name="story_finish_title">Кошелек для каждого</string>
+    <string name="story_finish_description">Используйте его на ходу, в любом месте, в любое время. Без проводов и батареек. Как только понадобится крипта, просто приложите карту к телефону.</string>
+    <string name="home_button_order">Купить</string>
+    <string name="search_tokens_title">Поиск токенов</string>
+    <string name="alert_demo_message">Приложение работает в демонстрационном режиме. Средства на всех счетах ненастоящие.</string>
+    <string name="alert_demo_feature_disabled">Эта функция недоступна в демонстрационном режиме</string>
+    <string name="token_details_send_blocked_fee_format">Недостаточно средств для комиссии на вашем %s кошельке для отправки транзакции. Сначала пополните свой %s кошелек.</string>
+    <string name="currency_subtitle_expanded">Доступные сети</string>
+    <string name="wallet_connect_network_not_found_format">Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново.</string>
+    <string name="common_attention">Внимание</string>
+    <string name="alert_manage_tokens_addresses_message">Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства.</string>
+    <string name="alert_manage_tokens_unsupported_message">Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки.</string>
+    <string name="contract_address_copied_message">Адрес контракта скопирован!</string>
+    <string name="custom_token_contract_address_input_title">Адрес контракта</string>
+    <string name="custom_token_creation_error_required_field">Обязательное поле</string>
+    <string name="custom_token_creation_error_network_not_selected">Пожалуйста, выберите сеть</string>
+    <string name="custom_token_creation_error_wrong_decimals">Количество знаков после запятой должно быть корректным числом не больше %d</string>
+    <string name="custom_token_creation_error_invalid_contract_address">Адрес контракта некорректен</string>
+    <string name="custom_token_creation_error_invalid_derivation_path">Путь деривации некорректен</string>
+    <string name="custom_token_validation_error_not_found">Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить</string>
+    <string name="custom_token_validation_error_already_added">Этот токен/сеть уже находится в вашем списке</string>
+    <string name="custom_token_decimals_input_title">Знаков после запятой</string>
+    <string name="custom_token_network_input_title">Сеть</string>
+    <string name="custom_token_network_input_not_selected">Не выбрано</string>
+    <string name="custom_token_name_input_placeholder">Например, USD Coin</string>
+    <string name="custom_token_name_input_title">Название токена</string>
+    <string name="custom_token_token_symbol_input_placeholder">Например, USDC</string>
+    <string name="custom_token_token_symbol_input_title">Символ токена</string>
+    <string name="custom_token_derivation_path_input_title">Деривация по BIP44</string>
+    <string name="custom_token_derivation_path_default">По-умолчанию</string>
+    <string name="common_server_unavailable">Сервер недоступен, повторите попытку позднее</string>
+    <string name="main_page_balance">Баланс</string>
+    <string name="main_processing_full_amount">В сумме учтены не все монеты</string>
+    <string name="main_tokens">Токены</string>
+    <string name="main_manage_tokens">Управление токенами</string>
+    <string name="token_item_no_rate">Нет цены</string>
+    <string name="wallet_balance_blockchain_unreachable">Сеть недоступна</string>
+    <string name="token_details_hide_token">Скрыть токен</string>
+    <string name="token_details_hide_alert_title">Скрыть %s</string>
+    <string name="token_details_hide_alert_hide">Скрыть</string>
+    <string name="token_details_hide_alert_message">Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами.</string>
+    <string name="token_details_unable_hide_alert_title">Невозможно скрыть %s</string>
+    <string name="token_details_unable_hide_alert_message">Токен %s является основной валютой в сети %s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети.</string>
+    <string name="main_no_backup_warning_title">Бэкап кошелька не был произведен</string>
+    <string name="main_no_backup_warning_subtitle">Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру</string>
+    <string name="common_retry">Повторить</string>
+    <string name="details_chat">Чат</string>
+    <string name="wallet_currency_subtitle">Сеть %s</string>
+    <string name="common_understand">Я понял</string>
+    <string name="common_yes">Да</string>
+    <string name="common_no">Нет</string>
+    <string name="russian_bank_card_warning_title">Карты банков РФ в данный момент не принимаются</string>
+    <string name="russian_bank_card_warning_subtitle">У вас есть карта банка другой страны или платежной системы UnionPay?</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">Сеть не поддерживается. Пожалуйста, выберите другую сеть.</string>
+    <string name="card_settings_title">Настройки карты</string>
+    <string name="card_settings_security_mode">Тип безопасности</string>
+    <string name="card_settings_change_access_code">Смена кода доступа</string>
+    <string name="card_settings_change_access_code_footer">Код доступа будет изменен только на данной карте</string>
+    <string name="common_continue">Продолжить</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="scan_card_settings_title">Приготовьте свою карту</string>
+    <string name="scan_card_settings_message">Отсканируйте карту, чтобы изменить ее настройки. Изменения затронут только ту карту, которую вы отсканировали, и не повлияют на другие карты, привязанные к вашему кошельку.</string>
+    <string name="scan_card_settings_button">Сканировать</string>
+    <string name="app_settings_title">Настройки приложения</string>
+    <string name="app_settings_saved_wallet">Cохранение кошелька</string>
+    <string name="app_settings_saved_wallet_footer">Подключите функцию привязки карты в приложении, а также возможность биометрической аутентификации. Подпись транзакции все так же потребует карту.</string>
+    <string name="app_settings_saved_access_codes">Сохранение кода доступа</string>
+    <string name="app_settings_saved_access_codes_footer">Подключите функцию хранения кодов доступа от карт на телефоне в зашифрованном виде, и при работе с картой вместо кода доступа будет запрашиваться биометрическая аутентификация.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">При отключении функции сохранения кошелька все ранее сохраненные кошельки будут удалены.</string>
+    <string name="app_settings_off_saved_access_code_alert_message">Все сохраненные коды доступа будут удалены. Вам потребуется вводить код доступа при работе с кошельком.</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_connect_subtitle">Подключение к Dapps</string>
+    <string name="reset_card_without_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька на этой карте, а также отвязыванию карты из приложения. Кошелек невозможно будет восстановить.</string>
+    <string name="reset_card_with_backup_to_factory_message">Сброс к заводским настройкам приведет к полному удалению кошелька на этой карте, а также отвязыванию карты из приложения. Кошелек невозможно будет восстановить или использовать данную карту для восстановления кода доступа.</string>
+    <string name="reset_card_to_factory_warning_message">Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку</string>
+    <string name="reset_card_to_factory_button_title">Сбросить карту</string>
+    <string name="card_settings_reset_card_to_factory">Сброс к заводским настройкам</string>
+    <string name="wallet_connect_select_network">Выберите сеть</string>
+    <string name="main_scan_card_warning_view_title">Отсканируйте карту</string>
+    <string name="main_scan_card_warning_view_subtitle">Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту</string>
+    <string name="wallet_connect_error_unsupported_dapp">Cоединение с этим Dapp сервисом не может быть установлено из-за его технической реализации.</string>
+    <string name="welcome_unlock_title">C возвращением!</string>
+    <string name="welcome_unlock_description">Используйте %s или код доступа для входа в приложение</string>
+    <string name="welcome_unlock">Войти с %s</string>
+    <string name="welcome_unlock_card">Сканировать карту</string>
+    <string name="save_user_wallet_agreement_access_title">Доступ в приложение</string>
+    <string name="save_user_wallet_agreement_access_description">Войдите в приложение и следите за своим балансом без сканирования карты</string>
+    <string name="save_user_wallet_agreement_code_title">Код доступа</string>
+    <string name="save_user_wallet_agreement_notice">Обратите внимание, что для совершения транзакции с вашими средствами по-прежнему потребуется ваша карта</string>
+    <string name="user_wallet_list_title">Мои кошельки</string>
+    <string name="user_wallet_list_multi_header">Мультивалютные</string>
+    <string name="user_wallet_list_single_header">Одновалютные</string>
+    <string name="user_wallet_list_add_button">Добавить новый кошелек</string>
+    <string name="user_wallet_list_rename_popup_title">Переименование кошелька</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Имя кошелька</string>
+    <string name="user_wallet_list_unlock_all">Разблокировать все с %s</string>
+    <string name="send_extras_error_invalid_destination_tag">Недопустимый Tag. Он не будет добавлен в транзакцию.</string>
+    <string name="send_extras_error_invalid_memo">Недопустимый Memo. Он не будет добавлен в транзакцию.</string>
+    <string name="send_extras_hint_destination_tag">Tag</string>
+    <string name="send_extras_hint_memo">Memo</string>
+    <string name="saltpay_error_empty_backup_title">Внимание</string>
+    <string name="saltpay_error_empty_backup_message">Приложите карту с логотипом Visa</string>
+    <string name="saltpay_error_no_gas_title">Недостаточно средств для активации</string>
+    <string name="saltpay_error_no_gas_message">Пожалуйста обратитесь в службу поддержки</string>
+    <string name="saltpay_error_pin_weak_title">Ввод одинаковых цифр является не безопасным</string>
+    <string name="saltpay_error_pin_weak_message">Данный Код доступа может быть легко взломан</string>
+    <string name="onboarding_navbar_pin">Код доступа</string>
+    <string name="onboarding_navbar_register_wallet">Подключиться</string>
+    <string name="onboarding_navbar_kyc_start">Верификация клиента</string>
+    <string name="onboarding_navbar_kyc_progress">Подтвердите свою личность</string>
+    <string name="onboarding_button_pin">Установить Код доступа</string>
+    <string name="onboarding_button_register_wallet">Зарегистрироваться</string>
+    <string name="onboarding_button_kyc_start">Верифицировать (Utorg)</string>
+    <string name="onboarding_button_kyc_waiting">Обновить</string>
+    <string name="onboarding_title_register_wallet">Подключите свою карту</string>
+    <string name="onboarding_title_kyc_start">Подтвердите свою личность</string>
+    <string name="onboarding_title_kyc_waiting">Подтверждение личности в процессе</string>
+    <string name="onboarding_subtitle_register_wallet">Подключите вашу карту к децентрализованной платежной системе</string>
+    <string name="onboarding_subtitle_kyc_start">Для начала работы с картой вам необходимо завершить процесс подтверждения личности</string>
+    <string name="onboarding_subtitle_kyc_waiting">Пожалуйста дождитесь завершения процесса подтверждения личности. Вы будете уведомлены через e-mail. Обычно это занимает не более часа. Вы можете закрыть приложение и вернуться позже.</string>
+    <string name="onboarding_title_pin">Код доступа</string>
+    <string name="onboarding_subtitle_pin">Установите Код доступа для вашей SaltPay карты</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Чат поддержки</string>
+    <string name="registration_task_alert_message">Пожалуйста, удерживайте карту до завершения операции</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">Для начала процесса бэкапа вам необходимо добавить Tangem карту</string>
+    <string name="onboarding_saltpay_title_no_backup_card">Бэкап карта не добавлена</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Бэкап карта создана</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Завершите процесс бэкапа создав код доступа</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Приготовьте SaltPay карту</string>
+    <string name="onboarding_saltpay_button_backup_origin">Приложите SaltPay карту</string>
+    <string name="onboarding_saltpay_title_backup_card">Приложите Tangem карту</string>
+    <string name="onboarding_chat_button_title">Чат</string>
+    <string name="onboarding_title_claim">Запросить %s</string>
+    <string name="onboarding_subtitle_claim">Для начала работы просто запросите начисление wxDai на свой кошелек</string>
+    <string name="onboarding_button_claim">Запросить</string>
+    <string name="onboarding_subtitle_success_claim">Поздравляем! Ваша платежная крипто карта теперь активирована!</string>
+    <string name="onboarding_title_claim_progress">Запрашивается</string>
+    <string name="onboarding_subtitle_claim_progress">Это займет несколько секунд</string>
+    <string name="onboarding_title_kyc_retry">Что-то пошло не так</string>
+    <string name="onboarding_subtitle_kyc_retry">Более подробная информация отправлена на ваш адрес электронной почты.</string>
+    <string name="onboarding_exit_alert_title">Вы хотите выйти из процесса активации?</string>
+    <string name="onboarding_exit_alert_message">В этом случае вам будет необходимо начать процесс заново.</string>
+    <string name="error_wrong_wallet_tapped">Вы использовали карту от другого кошелька. Приложите карту, связанную с этим кошельком.</string>
+    <string name="details_referral_title">Реферальная программа</string>
+    <string name="referral_title">Приведи друга в Tangem</string>
+    <string name="referral_point_currencies_title">Вы</string>
+    <string name="referral_point_currencies_description_prefix">Получите</string>
+    <string name="referral_point_currencies_description_suffix">на ваш адрес в сети %s%s за каждый кошелек, который купит ваш друг</string>
+    <string name="referral_point_discount_title">Ваш друг</string>
+    <string name="referral_point_discount_description_prefix">Получит</string>
+    <string name="referral_point_discount_description_value">%s скидку</string>
+    <string name="referral_point_discount_description_suffix">при покупке карточки на сайте tangem.com</string>
+    <string name="referral_friends_bought_title">Ваши друзья купили</string>
+    <string name="referral_promo_code_title">Ваш персональный код</string>
+    <string name="referral_button_participate">Участвовать</string>
+    <string name="common_terms_and_conditions">условия участия</string>
+    <string name="referral_tos_not_enroled_prefix">Нажимая на эту кнопку вы принимаете</string>
+    <string name="referral_tos_enroled_prefix">Вы приняли</string>
+    <string name="referral_tos_suffix">в реферальной программе</string>
+    <string name="internal_error_wallet_manager_not_found">Внутренняя ошибка: не удается найти менеджер кошельков</string>
+    <string name="common_balance">Баланс: %s</string>
+    <string name="common_share">Поделиться</string>
+    <string name="common_copy">Копировать</string>
+    <string name="common_success">Успешно</string>
+    <string name="swapping_permission_header">Дать разрешение</string>
+    <string name="swapping_permission_subheader">Чтобы продолжить, вам нужно разрешить смарт-контракту 1inch использовать ваш %s</string>
+    <string name="swapping_permission_rows_amount">Количество %s</string>
+    <string name="swapping_permission_rows_your_wallet">Ваш кошелек</string>
+    <string name="swapping_permission_rows_spender">Отправитель</string>
+    <string name="swapping_permission_buttons_approve">Подтвердить</string>
+    <string name="swapping_swap_of_to">Обмен %s на</string>
+    <string name="swapping_swap">Обмен</string>
+    <string name="swapping_insufficient_funds">Недостаточно средств</string>
+    <string name="swapping_give_permission">Дать разрешение</string>
+    <string name="swapping_permit_and_swap">Разрешить и обменять</string>
+    <string name="referral_error_failed_to_load_info">Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже.</string>
+    <string name="referral_error_failed_to_load_info_with_reason">Не удалось загрузить информацию по реферальной программе. Причина: %s. Пожалуйста, попробуйте позже.</string>
+    <string name="referral_error_failed_to_participate">Не удалось обработать вашу заявку на участие. Причина: %s. Пожалуйста, попробуйте позже. Если проблема сохранится, вы можете обратиться в техподдержку.</string>
+    <string name="referral_promo_code_copied">Персональный код скопирован!</string>
+    <string name="referral_share_link">Купи Tangem Wallet со скидкой!\n%s</string>
+    <string name="warning_existential_deposit_message">Сеть %s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %s, он будет деактивирован, а все оставшиеся средства будут уничтожены.</string>
+    <string name="send_validation_invalid_address">Неверный адрес</string>
+    <string name="user_wallet_list_error_wallet_already_saved">Этот кошелек уже был сохранен, вы можете добавить другой</string>
+    <string name="common_delete">Удалить</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Включите биометрическую аутентификацию</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">Похоже, что у вас отключена биометрическая аутентификация, она необходима для сохранения кошельков</string>
+    <string name="common_enable">Включить</string>
+    <string name="user_wallet_list_editing_count">%d выбрано</string>
+    <string name="common_biometric_authentication">биометрическую аутентификацию</string>
+    <string name="common_biometrics">биометрией</string>
+    <string name="app_name">Tangem</string>
+    <string name="common_save_changes">Сохранить изменения</string>
+    <string name="common_warning">Предупреждение</string>
+    <string name="common_done">Готово</string>
+    <string name="common_cancel">Отмена</string>
+    <string name="common_accept">Принять</string>
+    <string name="common_camera_denied_alert_message">Вы не предоставили доступ к камере, пожалуйста, измените настройки конфиденциальности.</string>
+    <string name="wallet_button_send">Отправить</string>
+    <string name="wallet_button_create_wallet">Создать кошелек</string>
+    <string name="wallet_title">Tangem</string>
+    <string name="wallet_balance_verified">Подтвержденный баланс</string>
+    <string name="wallet_balance_loading">Баланс загружается…</string>
+    <string name="wallet_error_no_account">Аккаунт не создан</string>
+    <string name="wallet_error_empty_card">Карта пуста</string>
+    <string name="wallet_error_empty_card_subtitle">Создайте кошелек, чтобы начать пользоваться картой Tangem</string>
+    <string name="wallet_error_unsupported_blockchain">Эта карта не поддерживается</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">Ваша карта Tangem предназначена для работы с другим приложением. Пожалуйста, ознакомьтесь с названием и инструкциями на вашей карте и установите правильное приложение.</string>
+    <string name="wallet_balance_tx_in_progress">Транзакция подтверждается…</string>
+    <string name="wallet_pending_tx_receiving">Получение</string>
+    <string name="wallet_pending_tx_receiving_address_format">от %s</string>
+    <string name="wallet_pending_tx_sending">Отправка</string>
+    <string name="wallet_pending_tx_sending_address_format">к %s</string>
+    <string name="wallet_address_button_explore">Проверить адрес</string>
+    <string name="wallet_address_button_create_payid">Создать PayString</string>
+    <string name="wallet_create_payid">Создать PayString</string>
+    <string name="wallet_create_payid_hint">PayString имя</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_info">Ваша PayString — это уникальная для вас информация, такая как номер телефона, электронная почта или ABN</string>
+    <string name="wallet_create_payid_error_message">Ошибка при создании PayString</string>
+    <string name="wallet_create_payid_error_already_created">Такой PayString уже существует. Попробуйте другой.</string>
+    <string name="send_destination_hint_address_payid">Адрес или PayString</string>
+    <string name="send_destination_hint_address">Адрес</string>
+    <string name="send_title">Отправить</string>
+    <string name="send_network_fee_title">Сетевая комиссия</string>
+    <string name="send_amount_label">Сумма</string>
+    <string name="send_fee_label">Комиссия</string>
+    <string name="send_total_label">Всего</string>
+    <string name="send_max_amount_label">Максимальная сумма</string>
+    <string name="send_fee_picker_low">Низкая</string>
+    <string name="send_fee_picker_normal">Нормальная</string>
+    <string name="send_fee_picker_priority">Приоритетная</string>
+    <string name="send_fee_include_description">Включая комиссию</string>
+    <string name="send_total_subtitle_format">%s будет отправлено</string>
+    <string name="send_total_subtitle_asset_format">%s и %s будет отправлено</string>
+    <string name="send_transaction_success">Транзакция успешно подписана и отправлена в блокчейн. Баланс будет обновлен через некоторое время</string>
+    <string name="details_title">Подробности</string>
+    <string name="details_row_title_cid">Номер карты</string>
+    <string name="details_row_title_issuer">Эмитент</string>
+    <string name="details_row_title_signed_hashes">Подписано</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s хэшей</string>
+    <string name="details_row_title_currency">Валюта приложения</string>
+    <string name="details_manage_security_long_tap">Задержка сканирования</string>
+    <string name="details_manage_security_long_tap_description">Этот механизм защищает карту от бесконтактных атак. Между сканированием карты и выполнением команды будет добавлена задержка.</string>
+    <string name="details_manage_security_passcode">Пароль</string>
+    <string name="details_manage_security_passcode_description">Перед выполнением любой команды, влекущей за собой изменение состояния карты, вам необходимо будет ввести пароль.</string>
+    <string name="details_manage_security_access_code">Код доступа</string>
+    <string name="details_manage_security_access_code_description">Перед сканированием карты вам нужно будет ввести правильный код доступа.</string>
+    <string name="alert_card_signed_transactions">Эта карта ранее пополнялась и подписывала транзакции. Выведите средства как можно быстрее, если вы получили эту карту из ненадежного источника. Если это ваша карта, то не о чем беспокоиться.</string>
+    <string name="alert_unsupported_card">Эта карта не предназначена для работы с этим приложением</string>
+    <string name="alert_developer_card">Карта, которую вы отсканировали, является картой разработчика. Не принимайте её в качестве оплаты.</string>
+    <string name="initial_message_sign_header">Нажмите, чтобы подписать</string>
+    <string name="initial_message_create_wallet_body">Чтобы создать кошелек, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="initial_message_change_access_code_body">Чтобы изменить код доступа, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="initial_message_change_passcode_body">Чтобы изменить пароль, приложите карту как показано выше и не убирайте до окончания операции</string>
+    <string name="disclaimer_title">Условия использования</string>
+    <string name="wallet_notification_no_internet">Нет соединения с интернетом</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString не поддерживается блокчейном</string>
+    <string name="send_error_payid_not_registered">PayString не зарегистрирован</string>
+    <string name="send_error_payid_request_failed">Не удалось выполнить запрос PayString</string>
+    <string name="send_error_address_same_as_wallet">Адрес совпадает с адресом кошелька</string>
+    <string name="wallet_notification_address_copied">Адрес скопирован в буфер обмена</string>
+    <string name="wallet_create_payid_empty">Сначала введите желаемую PayString</string>
+    <string name="initial_message_scan_header">Приложите, чтобы отсканировать</string>
+    <string name="initial_message_tap_header">Приложите карту</string>
+    <string name="scan_card_error">Ошибка сканирования карты. Попробуй снова.</string>
+    <string name="wallet_button_buy">Купить</string>
+    <string name="wallet_button_sell">Продать</string>
+    <string name="wallet_button_trade">Обменять</string>
+    <string name="wallet_error_empty_twin_card">Создать кошелек</string>
+    <string name="wallet_error_empty_twin_card_subtitle">Сгенерируйте ключи кошелька на обеих картах, чтобы начать использовать свои Twin карты</string>
+    <string name="twins_onboarding_subtitle">Один кошелек. Две карты.</string>
+    <string name="twins_onboarding_description_format">Это карта, которую вы держите в руках. У парной карты номер %s.\n\nОбе карты можно использовать для вывода средств из этого кошелька.</string>
+    <string name="details_row_title_card_tou">Условия использования карты</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">Это действие необратимо. У вас не будет доступа к старому кошельку.</string>
+    <string name="twins_recreate_title_format">Отсканируйте twin-карту #%s</string>
+    <string name="twins_recreate_title_preparing">Подготовка карты</string>
+    <string name="twins_recreate_title_creating_wallet">Создание кошелька</string>
+    <string name="twins_recreate_button_format">Сканировать карту #%s</string>
+    <string name="twin_error_same_card">Вы отсканировали ту же карту. Для создания twin-кошелька вам необходимо отсканировать карту с номером %d</string>
+    <string name="common_start">Начать</string>
+    <string name="common_add">Добавить</string>
+    <string name="common_search">Искать</string>
+    <string name="details_row_title_send_feedback">Отправить отзыв</string>
+    <string name="alert_failed_to_send_transaction_title">Не могу отправить транзакцию</string>
+    <string name="alert_failed_to_send_transaction_message">Причина: %s</string>
+    <string name="alert_troubleshooting_scan_card_title">У вас возникли трудности со сканированием карты?</string>
+    <string name="alert_button_request_support">Обратиться в поддержку</string>
+    <string name="alert_button_send_feedback">Отправить отзыв</string>
+    <string name="warning_button_really_cool">Очень круто!</string>
+    <string name="warning_button_can_be_better">Можно лучше</string>
+    <string name="warning_rate_app_title">Один вопрос</string>
+    <string name="warning_rate_app_message">Как вам Tangem?</string>
+    <string name="add_custom_token_title" translatable="false">Добавить токен</string>
+    <string name="token_details_send_blocked_tx_format">Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства</string>
+    <string name="warning_failed_to_verify_card_title">Проверка подлинности не удалась</string>
+    <string name="warning_failed_to_verify_card_message">Эта карта может быть производственным образцом или подделкой</string>
+    <string name="warning_important_security_info">Важная информация о безопасности \u26A0</string>
+    <string name="warning_signed_tx_previously">Эта карта подписывала транзакции в прошлом</string>
+    <string name="warning_button_learn_more">Узнать больше</string>
+    <string name="warning_low_signatures_format">На этой карте осталось только %s подписей. Вы должны вывести все свои средства.</string>
+    <string name="common_disconnect">Отключить</string>
+    <string name="common_sign">Подписать</string>
+    <string name="common_sign_and_send">Подписать и отправить</string>
+    <string name="common_reject">Отклонить</string>
+    <string name="warning_testnet_card_message">Это тестовая карта. Не принимайте её в качестве оплаты. Эта карта должна использоваться только в целях тестирования и разработки.</string>
+    <string name="wallet_choose_trade_action">Вы хотите купить или продать криптовалюту?</string>
+    <string name="error_update_app">К сожалению, текущая версия приложения не готова к работе с этой картой, проверьте наличие обновлений</string>
+    <string name="onboarding_title">Активация карты</string>
+    <string name="onboarding_button_what_does_it_mean">Как это работает?</string>
+    <string name="onboarding_button_receive_crypto">Получить криптовалюту</string>
+    <string name="onboarding_create_wallet_header">Создать кошелек</string>
+    <string name="onboarding_create_wallet_body">Давайте сгенерируем все ключи на вашей карте и создадим безопасный кошелек</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Создать кошелек</string>
+    <string name="onboarding_top_up_header">Пополните свой кошелек</string>
+    <string name="onboarding_top_up_body">Пополните кошелек на любую сумму, чтобы начать пользоваться картой</string>
+    <string name="onboarding_top_up_body_no_account_error">Пополните кошелек более чем на %s %s, чтобы начать пользоваться картой</string>
+    <string name="onboarding_top_up_button_but_crypto">Купить криптовалюту</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Показать адрес кошелька</string>
+    <string name="onboarding_done_header">Успешно!</string>
+    <string name="onboarding_done_body">Ваша карта активирована и готова к использованию</string>
+    <string name="onboarding_balance_title">Баланс</string>
+    <string name="address_qr_code_message_format">Отправляйте только %s (%s) в сети %s на этот адрес. Использование другой сети может привести к утрате средств.</string>
+    <string name="onboarding_twins_interrupt_warning">Если процесc создания кошелька каким-либо образом прервется, вам придется начинать сначала.</string>
+    <string name="onboarding_twin_exit_warning">Процесс связывания карт частично завершен. Вы не можете выйти из него сейчас.</string>
+    <string name="warning_button_ok">Понятно!</string>
+    <string name="onboarding_getting_started">Подготовка</string>
+    <string name="onboarding_button_backup_now">Создать резервную копию</string>
+    <string name="onboarding_button_skip_backup">Пропустить</string>
+    <string name="onboarding_button_finalize_backup">Завершите процесс резервного копирования</string>
+    <string name="onboarding_button_add_backup_card">Добавить резервную карту</string>
+    <string name="onboarding_button_backup_card_format">Сканировать карту #%d</string>
+    <string name="onboarding_button_scan_origin_card">Сканировать основную карту</string>
+    <string name="onboarding_title_no_backup_cards">Нет резервных карт</string>
+    <string name="onboarding_title_scan_origin_card">Подготовьте свою карту</string>
+    <string name="onboarding_title_one_backup_card">Добавлена одна резервная карта</string>
+    <string name="onboarding_title_two_backup_cards">Добавлены две резервные карты</string>
+    <string name="onboarding_title_backup_card_format">Резервная карта #%d</string>
+    <string name="onboarding_subtitle_no_backup_cards">Чтобы начать процесс резервного копирования, добавьте одну или две резервные карты.</string>
+    <string name="onboarding_subtitle_scan_origin_card">Подготовьте основную карту</string>
+    <string name="onboarding_subtitle_one_backup_card">Вы можете добавить еще одну карту или завершить процесс резервного копирования</string>
+    <string name="onboarding_subtitle_two_backup_cards">Добавлено максимальное количество карт. Завершите процесс резервного копирования.</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">Вы добавили одну резервную карту. После того, как процесс будет завершен, Вы больше не сможете добавить карт. Если у Вас есть еще одна карта, добавьте ее в резервную копию. Хотите продолжить?</string>
+    <string name="onboarding_access_code_intro_title">Создайте код доступа</string>
+    <string name="onboarding_access_code_repeat_code_title">Повторно введите код доступа</string>
+    <string name="onboarding_access_code_feature_1_title">Защита</string>
+    <string name="onboarding_access_code_feature_2_title">Персонализация</string>
+    <string name="onboarding_access_code_feature_3_title">Восстановление</string>
+    <string name="onboarding_access_code_feature_1_description">Вам необходимо установить единый код доступа для защиты всех ваших карт.</string>
+    <string name="onboarding_access_code_feature_2_description">Позже вы сможете установить индивидуальный код доступа для каждой карты.</string>
+    <string name="onboarding_access_code_feature_3_description">Код доступа можно восстановить с помощью привязанной карты. Не храните все карты в одном месте.</string>
+    <string name="onboarding_access_code_hint">Выберите любое слово, фразу или число в качестве кода доступа.</string>
+    <string name="onboarding_access_code_too_short">Код доступа должен состоять не менее чем из 4 символов.</string>
+    <string name="onboarding_access_codes_doesnt_match">Введенные коды доступа не совпадают</string>
+    <string name="common_create">Создать</string>
+    <string name="common_submit">Отправить</string>
+    <string name="onboarding_navbar_title_creating_backup">Резервная копия</string>
+    <string name="onboarding_backup_exit_warning">Процесс резервного копирования почти завершен. Вы не можете выйти из него сейчас.</string>
+    <string name="onboarding_wallet_info_title_first">Резервная копия карты</string>
+    <string name="onboarding_wallet_info_title_second">Идентичные карты</string>
+    <string name="onboarding_wallet_info_title_third">Код доступа</string>
+    <string name="onboarding_wallet_info_title_fourth">Восстановление кода доступа</string>
+    <string name="onboarding_wallet_info_subtitle_first">Вы можете сделать резервную копию своих ключей на одной или двух других пустых картах Wallet.</string>
+    <string name="onboarding_wallet_info_subtitle_second">Все резервные карты являются полнофункциональными и содержат одинаковые ключи.</string>
+    <string name="onboarding_wallet_info_subtitle_third">Вы сможете установить код доступа для защиты своих кошельков.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Код доступа можно восстановить с помощью одной из резервных карт.</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Ваша карта настроена и готова к использованию.</string>
+    <string name="details_row_title_create_backup">Добавить еще карты</string>
+    <string name="welcome_interrupted_backup_alert_message">Вы не закончили резервное копирование. Хотите продолжить?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Да, возобновить</string>
+    <string name="welcome_interrupted_backup_alert_discard">Отказаться</string>
+    <string name="welcome_interrupted_backup_discard_title">Это необратимое действие</string>
+    <string name="welcome_interrupted_backup_discard_message">Если сейчас отказаться, то придётся сбрасывать карты до заводских настроек, чтобы начать заново</string>
+    <string name="welcome_interrupted_backup_discard_resume">Возобновить резервное копирование</string>
+    <string name="welcome_interrupted_backup_discard_discard">Отказаться</string>
+    <string name="onboarding_button_backup_origin">Сканировать основную карту</string>
+    <string name="onboarding_button_continue_wallet">Перейти к моему кошельку</string>
+    <string name="send_title_currency_format">Отправка %s</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Подготовьте резервную карту с номером %s</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Подготовьте основную карту с номером %s</string>
+    <string name="solana_rent_warning">Сеть Solana взимает арендную плату в размере %s каждые 2 дня. Аккаунты, которые не могут позволить себе арендную плату, удаляются из сети. Пополните свой счет более чем на %s, чтобы не платить арендную плату.</string>
+    <string name="alert_signed_hashes_message">Эта карта не является платежным средством. В настоящее время мы не можем сопоставить количество подписей на карте с информацией в блокчейне. Это нормально, но в редких случаях может означать, что предыдущий владелец удерживает подписанную транзакцию от публикации, что является поводом для беспокойства.\nНе принимайте эту карту в качестве физического платежа от кого-то, кому вы не доверяете.\nВо всех остальных отношениях эта карта совершенно безопасна.\nTangem — единственный аппаратный кошелек, предлагающий защиту методом подсчета подписей.</string>
+    <string name="wallet_connect_create_tx_message">Запрос на создание транзакции для %s\n%s\n\nСумма: %s\nКомиссия: %s\nВсего: %s\nБаланс: %s</string>
+    <string name="wallet_connect_request_session_start">Запрос на открытие сессии для\n%s\n\nСЕТЬ: %s\n\nURL: %s</string>
+    <string name="wallet_connect_sessions_title">Сессии WalletConnect</string>
+    <string name="wallet_connect_no_sessions_title">Упс. Нет сессий.</string>
+    <string name="wallet_connect_no_sessions_message">Нет открытых сессий WalletConnect</string>
+    <string name="wallet_connect_open_session">Открытая сессия</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Невозможно отправить транзакцию. Недостаточно средств.</string>
+    <string name="wallet_connect_alert_sign_message">Запрос на подпись сообщения.\n\n%s</string>
+    <string name="wallet_connect_clipboard_alert">Буфер обмена содержит код WalletConnect. Использовать скопированное значение или отсканировать QR-код</string>
+    <string name="wallet_connect_paste_from_clipboard">Вставить из буфера обмена</string>
+    <string name="wallet_connect_scan_new_code">Сканировать новый код</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">Эту карту нельзя использовать с WalletConnect.</string>
+    <string name="wallet_connect_same_wcuri">Операция не может быть завершена. \n\nВы уже установили сеанс WalletConnect с этими параметрами.</string>
+    <string name="wallet_connect_error_timeout">Не удалось установить сессию WalletConnect за отведённое время. Пожалуйста, повторите попытку позже.</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %s, запрос на\nподпись транзакции с BNB.\n\n%s</string>
+    <string name="wallet_connect_bnb_transaction_message">Детали транзакции:\nОт: %s\nК: %s\nСумма: %s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Торговый ордер на %s\nЦена: %s\nСумма к получению: %s\nСумма к оплате: %s</string>
+    <string name="feedback_subject_rate_negative">Мои предложения</string>
+    <string name="feedback_subject_scan_failed">Не могу отсканировать карту</string>
+    <string name="feedback_subject_tx_failed">Не могу отправить транзакцию</string>
+    <string name="feedback_subject_support_tangem">Обращение в поддержку Tangem</string>
+    <string name="feedback_subject_support">Обращение в поддержку</string>
+    <string name="feedback_preface_rate_negative">Расскажите, каких функций вам не хватает, и мы постараемся вам помочь.</string>
+    <string name="feedback_preface_scan_failed">Скажите, пожалуйста, какая у вас карта?</string>
+    <string name="feedback_preface_tx_failed">Пожалуйста, расскажите нам больше о вашей проблеме. Каждая маленькая деталь может помочь.</string>
+    <string name="feedback_preface_support">Привет, команда поддержки,</string>
+    <string name="feedback_data_collection_message">Информация ниже не является обязательной. Вы можете стереть её, если хотите.</string>
+    <string name="send_total_subtitle_fiat_format">≈ %s (вкл. комиссию: %s)</string>
+    <string name="common_origin_card">Основная карта</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Блокчейн недоступен. Попробуй позже.</string>
+    <string name="common_error">Ошибка</string>
+    <string name="common_ok">Ок</string>
+    <string name="wallet_connect_error_failed_to_connect">Не удалось установить сессию WalletConnect. Пожалуйста, повторите попытку позже.</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Вы хотите использовать биометрию?</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Для операций с вашим кошельком будет запрашиваться биометрия вместо кода доступа карты</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Использовать биометрию</string>
+    <string name="app_settings_enable_biometrics_title">Включите биометрическую аутентификацию</string>
+    <string name="app_settings_enable_biometrics_description">Перейдите в настройки, чтобы включить биометрическую аутентификацию в приложении Tangem App</string>
+    <string name="wallet_balance_missing_derivation">Отсканируйте карту</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values-ru/strings_plurals_final.xml b/core/res/src/main/res/values-ru/strings_plurals_final.xml
new file mode 100644
index 0000000000..ae295e5b79
--- /dev/null
+++ b/core/res/src/main/res/values-ru/strings_plurals_final.xml
@@ -0,0 +1,22 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="one">%d карта</item>
+        <item quantity="few">%d карты</item>
+        <item quantity="many">%d карт</item>
+        <item quantity="other">%d карт</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="one">%d токен</item>
+        <item quantity="few">%d токена</item>
+        <item quantity="many">%d токенов</item>
+        <item quantity="other">%d токенов</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <item quantity="one">%d кошелек</item>
+        <item quantity="few">%d кошелька</item>
+        <item quantity="many">%d кошельков</item>
+        <item quantity="other">%d кошельков</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values/strings_blockchain.xml b/core/res/src/main/res/values/strings-blockchain.xml
similarity index 63%
rename from app/src/main/res/values/strings_blockchain.xml
rename to core/res/src/main/res/values/strings-blockchain.xml
index 8014c2a199..50a4278791 100644
--- a/app/src/main/res/values/strings_blockchain.xml
+++ b/core/res/src/main/res/values/strings-blockchain.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="send_error_insufficient_balance">Insufficient balance</string>
     <string name="send_error_blockchain_internal">Blockchain internal error</string>
-    <string name="send_error_invalid_fee_value">Invalid Fee</string>
     <string name="send_error_dust_amount_format">Minimum amount is %s</string>
     <string name="send_error_dust_change">Change is too small</string>
-    <string name="send_error_no_account_xlm">To create account send 1+ XLM to this address</string>
-    <string name="send_error_fee_request_failed">Failed to get fee</string>
-    <string name="send_error_no_target_account">Target account is not created. Amount to send should be %s + fee or more to create</string>
+    <string name="common_fee_error">Failed to get fee</string>
+    <string name="send_error_insufficient_balance">Insufficient balance</string>
+    <string name="send_error_invalid_fee_value">Invalid Fee</string>
+    <string name="send_error_no_target_account">Target account is not created. Amount to send should be %s + fee or more</string>
     <string name="send_error_unknown">Unknown error</string>
-    <string name="send_validation_invalid_address">Invalid address</string>
+    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
     <string name="send_validation_invalid_amount">Invalid amount</string>
-    <string name="send_validation_amount_exceeds_balance">Amount Exceeds Balance</string>
-    <string name="send_validation_invalid_total">Total Exceeds Balance</string>
-    <string name="send_validation_invalid_fee">Fee Exceeds Balance</string>
+    <string name="send_validation_amount_exceeds_balance">Amount exceeds balance</string>
+    <string name="send_validation_invalid_total">Total amount exceeds balance</string>
+    <string name="send_validation_invalid_fee">Fee exceeds balance</string>
     <string name="xtz_withdrawal_message_warning">To avoid paying an increased commission the next time you top up your wallet, reduce the amount by %s XTZ</string>
     <string name="xtz_withdrawal_message_reduce">Reduce by %s XTZ</string>
     <string name="xtz_withdrawal_message_ignore">No, send all</string>
-    <string name="send_error_minimum_balance_format">Minimum balance is %s</string>
-    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
     <string name="no_account_polkadot">Destination account is not active. Send %s or more to activate the account.</string>
+    <string name="no_account_generic">Load %s+ %s to create account</string>
+    <string name="address_type_default">Default</string>
+    <string name="address_type_legacy">Legacy</string>
 </resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..f2d00c18af
--- /dev/null
+++ b/core/res/src/main/res/values/strings.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <string name="shop_one_wallet">Tangem Wallet</string>
+    <string name="shop_3_cards">3 cards</string>
+    <string name="shop_2_cards">2 cards</string>
+    <string name="shop_shipping">Shipping</string>
+    <string name="shop_free">Free</string>
+    <string name="shop_i_have_a_promo_code">I have a promo code…</string>
+    <string name="shop_total">Total</string>
+    <string name="shop_other_payment_methods">Other payment methods</string>
+    <string name="shop_buy_now">Buy now</string>
+    <string name="story_meet_title">Meet\nTangem</string>
+    <string name="story_meet_buy">Buy</string>
+    <string name="story_meet_store">Store</string>
+    <string name="story_meet_send">Send</string>
+    <string name="story_meet_pay">Pay</string>
+    <string name="story_meet_exchange">Exchange</string>
+    <string name="story_meet_lend">Lend</string>
+    <string name="story_meet_borrow">Borrow</string>
+    <string name="story_awe_title">Revolutionary Hardware Wallet</string>
+    <string name="story_awe_description">Store your crypto assets secure while keeping private keys contained in your card</string>
+    <string name="story_backup_title">Ultra Secure Backup</string>
+    <string name="story_backup_description_1">Up to</string>
+    <string name="story_backup_description_2_bold">3 physical cards</string>
+    <string name="story_backup_description_3">to one wallet</string>
+    <string name="story_currencies_title">Thousands of Currencies</string>
+    <string name="story_currencies_description">A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card</string>
+    <string name="story_web3_title">DeFi Compatible</string>
+    <string name="story_web3_description">Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services</string>
+    <string name="story_finish_title">The Wallet for Everyone</string>
+    <string name="story_finish_description">Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto.</string>
+    <string name="home_button_order">Order</string>
+    <string name="search_tokens_title">Search tokens</string>
+    <string name="alert_demo_message">You are currently running in Demo mode. All funds are not real.</string>
+    <string name="alert_demo_feature_disabled">This feature is disabled in Demo mode</string>
+    <string name="token_details_send_blocked_fee_format">Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first.</string>
+    <string name="currency_subtitle_expanded">Available networks</string>
+    <string name="wallet_connect_network_not_found_format">%s network not found. Please, add it first and try again.</string>
+    <string name="common_attention">Attention</string>
+    <string name="alert_manage_tokens_addresses_message">Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds.</string>
+    <string name="alert_manage_tokens_unsupported_message">Tokens in Solana network are not supported by this card due to firmware limitation.</string>
+    <string name="contract_address_copied_message">Contract address copied!</string>
+    <string name="custom_token_contract_address_input_title">Contract address</string>
+    <string name="custom_token_creation_error_required_field">Required field</string>
+    <string name="custom_token_creation_error_network_not_selected">Please select the network</string>
+    <string name="custom_token_creation_error_wrong_decimals">Decimal number must be a valid integer, no higher than %d</string>
+    <string name="custom_token_creation_error_invalid_contract_address">Contract address is invalid</string>
+    <string name="custom_token_creation_error_invalid_derivation_path">Derivation path is invalid</string>
+    <string name="custom_token_validation_error_not_found">Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing.</string>
+    <string name="custom_token_validation_error_already_added">This token/network has already been added to your list</string>
+    <string name="custom_token_decimals_input_title">Decimals</string>
+    <string name="custom_token_network_input_title">Network</string>
+    <string name="custom_token_network_input_not_selected">Not selected</string>
+    <string name="custom_token_name_input_placeholder">E.g. USD Coin</string>
+    <string name="custom_token_name_input_title">Name</string>
+    <string name="custom_token_token_symbol_input_placeholder">E.g. USDC</string>
+    <string name="custom_token_token_symbol_input_title">Token symbol</string>
+    <string name="custom_token_derivation_path_input_title">BIP44 coin type</string>
+    <string name="custom_token_derivation_path_default">Default</string>
+    <string name="common_server_unavailable">The server is not available, please try again later</string>
+    <string name="main_page_balance">Total balance</string>
+    <string name="main_processing_full_amount">The amount does not include some of your funds</string>
+    <string name="main_tokens">Tokens</string>
+    <string name="main_manage_tokens">Manage tokens</string>
+    <string name="token_item_no_rate">No rate</string>
+    <string name="wallet_balance_blockchain_unreachable">Network is unreachable</string>
+    <string name="token_details_hide_token">Hide token</string>
+    <string name="token_details_hide_alert_title">Hide %s</string>
+    <string name="token_details_hide_alert_hide">Hide</string>
+    <string name="token_details_hide_alert_message">You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page.</string>
+    <string name="token_details_unable_hide_alert_title">Unable to hide %s</string>
+    <string name="token_details_unable_hide_alert_message">The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list.</string>
+    <string name="main_no_backup_warning_title">Your wallet has not been backed up</string>
+    <string name="main_no_backup_warning_subtitle">To protect your assets, we advise you to carry out this procedure</string>
+    <string name="common_retry">Retry</string>
+    <string name="details_chat">Chat</string>
+    <string name="wallet_currency_subtitle">%s network</string>
+    <string name="common_understand">I understand</string>
+    <string name="common_yes">Yes</string>
+    <string name="common_no">No</string>
+    <string name="russian_bank_card_warning_title">Russian bank cards are not accepted at the moment</string>
+    <string name="russian_bank_card_warning_subtitle">Do you have a bank card of another country or a UnionPay card?</string>
+    <string name="wallet_connect_scanner_error_unsupported_network">This network is not supported. Please select another network.</string>
+    <string name="card_settings_title">Card Settings</string>
+    <string name="card_settings_security_mode">Security Mode</string>
+    <string name="card_settings_change_access_code">Change Access Code</string>
+    <string name="card_settings_change_access_code_footer">Access code will be changed on this card only</string>
+    <string name="common_continue">Continue</string>
+    <string name="chat_bot_name">Tangem Bot</string>
+    <string name="scan_card_settings_title">Get your card ready!</string>
+    <string name="scan_card_settings_message">Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet.</string>
+    <string name="scan_card_settings_button">Scan Card</string>
+    <string name="app_settings_title">App Settings</string>
+    <string name="app_settings_saved_wallet">Keep the wallet in the app</string>
+    <string name="app_settings_saved_wallet_footer">Enable to link all the wallets to Tangem app. Biometric authentication will be required for unlocking the app. Transaction signing requires tapping your Tangem card.</string>
+    <string name="app_settings_saved_access_codes">Save Access Code</string>
+    <string name="app_settings_saved_access_codes_footer">Biometric authentication will be requested instead of the access code for interactions with your card.</string>
+    <string name="app_settings_off_saved_wallet_alert_message">Removing the saved card deletes all the saved wallets and their access codes.</string>
+    <string name="app_settings_off_saved_access_code_alert_message">This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code.</string>
+    <string name="wallet_connect_title">WalletConnect</string>
+    <string name="wallet_connect_subtitle">Connect to Dapps</string>
+    <string name="reset_card_without_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet.</string>
+    <string name="reset_card_with_backup_to_factory_message">Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet or use the card to recover the access code.</string>
+    <string name="reset_card_to_factory_warning_message">I understand that after performing this action, I will no longer have access to the current wallet</string>
+    <string name="reset_card_to_factory_button_title">Reset the Card</string>
+    <string name="card_settings_reset_card_to_factory">Reset to Factory Settings</string>
+    <string name="wallet_connect_select_network">Select network</string>
+    <string name="main_scan_card_warning_view_title">Scan your card</string>
+    <string name="main_scan_card_warning_view_subtitle">To access all the networks you need to scan the card</string>
+    <string name="wallet_connect_error_unsupported_dapp">Connection with this Dapp cannot be established due to its technical implementation.</string>
+    <string name="welcome_unlock_title">Welcome back!</string>
+    <string name="welcome_unlock_description">Use %s or scan a card to access the app</string>
+    <string name="welcome_unlock">Log in with %s</string>
+    <string name="welcome_unlock_card">Scan card</string>
+    <string name="save_user_wallet_agreement_access_title">Access the app</string>
+    <string name="save_user_wallet_agreement_access_description">Log into the app and check your balance without scanning the card</string>
+    <string name="save_user_wallet_agreement_code_title">Access code</string>
+    <string name="save_user_wallet_agreement_notice">Note that making a transaction with your funds will still require your card</string>
+    <string name="user_wallet_list_title">My Wallets</string>
+    <string name="user_wallet_list_multi_header">Multi-currency</string>
+    <string name="user_wallet_list_single_header">Single-currency</string>
+    <string name="user_wallet_list_add_button">Add new wallet</string>
+    <string name="user_wallet_list_rename_popup_title">Rename Wallet</string>
+    <string name="user_wallet_list_rename_popup_placeholder">Wallet name</string>
+    <string name="user_wallet_list_unlock_all">Unlock all with %s</string>
+    <string name="send_extras_error_invalid_destination_tag">Invalid Tag. It won\'t be added to the transaction.</string>
+    <string name="send_extras_error_invalid_memo">Invalid Memo. It won\'t be added to the transaction.</string>
+    <string name="send_extras_hint_destination_tag">Tag</string>
+    <string name="send_extras_hint_memo">Memo</string>
+    <string name="saltpay_error_empty_backup_title">Attention</string>
+    <string name="saltpay_error_empty_backup_message">Tap the card with the visa logo</string>
+    <string name="saltpay_error_no_gas_title">No funds for activation</string>
+    <string name="saltpay_error_no_gas_message">Please contact support</string>
+    <string name="saltpay_error_pin_weak_title">Four identical digits isn\'t safe</string>
+    <string name="saltpay_error_pin_weak_message">Such a PIN can be brute-forced easily</string>
+    <string name="onboarding_navbar_pin">Pin code</string>
+    <string name="onboarding_navbar_register_wallet">Connect</string>
+    <string name="onboarding_navbar_kyc_start">KYC</string>
+    <string name="onboarding_navbar_kyc_progress">Verify your identity</string>
+    <string name="onboarding_button_pin">Set PIN code</string>
+    <string name="onboarding_button_register_wallet">Register</string>
+    <string name="onboarding_button_kyc_start">Verify via Utorg</string>
+    <string name="onboarding_button_kyc_waiting">Refresh</string>
+    <string name="onboarding_title_register_wallet">Connect your card</string>
+    <string name="onboarding_title_kyc_start">Verify your identity</string>
+    <string name="onboarding_title_kyc_waiting">KYC is in progress</string>
+    <string name="onboarding_subtitle_register_wallet">Connect your card to the decentralized payment system</string>
+    <string name="onboarding_subtitle_kyc_start">To start using your card you have to pass the KYC process</string>
+    <string name="onboarding_subtitle_kyc_waiting">Please wait until the verification is completed. You\'ll be notified via email. Usually it takes up to 1 hour. You can close the app and come back later.</string>
+    <string name="onboarding_title_pin">PIN Code</string>
+    <string name="onboarding_subtitle_pin">Set PIN code for your SaltPay card</string>
+    <string name="onboarding_supplement_button_kyc_waiting">Chat with support</string>
+    <string name="registration_task_alert_message">Please hold the card until the operation complete</string>
+    <string name="onboarding_saltpay_subtitle_no_backup_cards">To start the backup process you have to add Tangem card as your backup</string>
+    <string name="onboarding_saltpay_title_no_backup_card">No backup card</string>
+    <string name="onboarding_saltpay_title_one_backup_card">Backup card ready</string>
+    <string name="onboarding_saltpay_subtitle_one_backup_card">Finalize the backup process by creating an access code</string>
+    <string name="onboarding_saltpay_title_prepare_origin">Prepare the SaltPay card</string>
+    <string name="onboarding_saltpay_button_backup_origin">Tap the SaltPay card</string>
+    <string name="onboarding_saltpay_title_backup_card">Tap the Tangem card</string>
+    <string name="onboarding_chat_button_title">Support</string>
+    <string name="onboarding_title_claim">Claim %s</string>
+    <string name="onboarding_subtitle_claim">To get started, simply claim wxDAI to your wallet</string>
+    <string name="onboarding_button_claim">Claim</string>
+    <string name="onboarding_subtitle_success_claim">Congratulations! Your first payment crypto card has been activated!</string>
+    <string name="onboarding_title_claim_progress">Claiming</string>
+    <string name="onboarding_subtitle_claim_progress">It will take a few seconds</string>
+    <string name="onboarding_title_kyc_retry">Something went wrong</string>
+    <string name="onboarding_subtitle_kyc_retry">Please check your email for further instructions</string>
+    <string name="onboarding_exit_alert_title">Do you want to exit the activation process?</string>
+    <string name="onboarding_exit_alert_message">In this case, you will need to start from the beginning.</string>
+    <string name="error_wrong_wallet_tapped">You have used a card from another wallet. Tap the card associated with this wallet</string>
+    <string name="details_referral_title">Referral program</string>
+    <string name="referral_title">Refer your friends to Tangem</string>
+    <string name="referral_point_currencies_title">You</string>
+    <string name="referral_point_currencies_description_prefix">Will get</string>
+    <string name="referral_point_currencies_description_suffix">for each wallet bought by your friend on your %s network address%s</string>
+    <string name="referral_point_discount_title">Your friend</string>
+    <string name="referral_point_discount_description_prefix">Will get a</string>
+    <string name="referral_point_discount_description_value">%s discount</string>
+    <string name="referral_point_discount_description_suffix">when buying a card on tangem.com</string>
+    <string name="referral_friends_bought_title">Your friends bought</string>
+    <string name="referral_promo_code_title">Your personal code</string>
+    <string name="referral_button_participate">Participate</string>
+    <string name="common_terms_and_conditions">terms and conditions</string>
+    <string name="referral_tos_not_enroled_prefix">By tapping this button you accept</string>
+    <string name="referral_tos_enroled_prefix">You\'ve accepted</string>
+    <string name="referral_tos_suffix">of the referral program</string>
+    <string name="internal_error_wallet_manager_not_found">Internal error: wallet manager not found</string>
+    <string name="common_balance">Balance: %s</string>
+    <string name="common_share">Share</string>
+    <string name="common_copy">Copy</string>
+    <string name="common_success">Success</string>
+    <string name="swapping_permission_header">Give Permission</string>
+    <string name="swapping_permission_subheader">To continue you need to allow 1inch smart contracts to use your %s</string>
+    <string name="swapping_permission_rows_amount">Amount %s</string>
+    <string name="swapping_permission_rows_your_wallet">Your Wallet</string>
+    <string name="swapping_permission_rows_spender">Spender</string>
+    <string name="swapping_permission_buttons_approve">Approve</string>
+    <string name="swapping_swap_of_to">Swap of %s to</string>
+    <string name="swapping_swap">Swap</string>
+    <string name="swapping_insufficient_funds">Insufficient funds</string>
+    <string name="swapping_give_permission">Give Permission</string>
+    <string name="swapping_permit_and_swap">Permit and Swap</string>
+    <string name="referral_error_failed_to_load_info">Failed to load the information about the referral program. Please try again later.</string>
+    <string name="referral_error_failed_to_load_info_with_reason">Failed to load the information about the referral program. Reason: %s. Please try again later.</string>
+    <string name="referral_error_failed_to_participate">Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support.</string>
+    <string name="referral_promo_code_copied">Personal code copied!</string>
+    <string name="referral_share_link">Buy Tangem Wallet with discount!\n%s</string>
+    <string name="warning_existential_deposit_message">%s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed.</string>
+    <string name="send_validation_invalid_address">Invalid address</string>
+    <string name="user_wallet_list_error_wallet_already_saved">This wallet has already been saved, you can add another one</string>
+    <string name="common_delete">Delete</string>
+    <string name="details_row_privacy_policy">Privacy policy</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_title">Enable biometric authorization</string>
+    <string name="save_user_wallet_agreement_enroll_biometrics_description">It looks like you have biometric authentication disabled, it is necessary to save wallets</string>
+    <string name="common_enable">Enable</string>
+    <string name="user_wallet_list_editing_count">%d selected</string>
+    <string name="common_biometric_authentication">biometric authentication</string>
+    <string name="common_biometrics">biometrics</string>
+    <string name="app_name">Tangem</string>
+    <string name="common_save_changes">Save changes</string>
+    <string name="common_warning">Warning</string>
+    <string name="common_done">Done</string>
+    <string name="common_cancel">Cancel</string>
+    <string name="common_accept">Accept</string>
+    <string name="common_camera_denied_alert_message">You have not given access to your camera, please adjust your privacy settings</string>
+    <string name="wallet_button_send">Send</string>
+    <string name="wallet_button_create_wallet">Create wallet</string>
+    <string name="wallet_title">Tangem</string>
+    <string name="wallet_balance_verified">Verified Balance</string>
+    <string name="wallet_balance_loading">Balance is loading…</string>
+    <string name="wallet_error_no_account">Account is not created</string>
+    <string name="wallet_error_empty_card">Empty card</string>
+    <string name="wallet_error_empty_card_subtitle">Create wallet to start using Tangem card</string>
+    <string name="wallet_error_unsupported_blockchain">This card is not supported</string>
+    <string name="wallet_error_unsupported_blockchain_subtitle">Your Tangem card was made to work with a different application. Please see the name and instructions on your card, and install the correct app</string>
+    <string name="wallet_balance_tx_in_progress">Transaction is in progress…</string>
+    <string name="wallet_pending_tx_receiving">Receiving</string>
+    <string name="wallet_pending_tx_receiving_address_format">from %s</string>
+    <string name="wallet_pending_tx_sending">Sending</string>
+    <string name="wallet_pending_tx_sending_address_format">to %s</string>
+    <string name="wallet_address_button_explore">Explore address</string>
+    <string name="wallet_address_button_create_payid">Create PayString</string>
+    <string name="wallet_create_payid">Create PayString</string>
+    <string name="wallet_create_payid_hint">PayString name</string>
+    <string name="wallet_create_payid_domain">$payid.tangem.com</string>
+    <string name="wallet_create_payid_info">Your PayString is information unique to you, like your phone number, email or ABN.</string>
+    <string name="wallet_create_payid_error_message">Error response while creating PayString</string>
+    <string name="wallet_create_payid_error_already_created">This PayString already exists. Try a different one.</string>
+    <string name="send_destination_hint_address_payid">Address or PayString</string>
+    <string name="send_destination_hint_address">Address</string>
+    <string name="send_title">Send</string>
+    <string name="send_network_fee_title">Network fee</string>
+    <string name="send_amount_label">Amount</string>
+    <string name="send_fee_label">Fee</string>
+    <string name="send_total_label">Total</string>
+    <string name="send_max_amount_label">Maximum amount</string>
+    <string name="send_fee_picker_low">Low</string>
+    <string name="send_fee_picker_normal">Normal</string>
+    <string name="send_fee_picker_priority">Priority</string>
+    <string name="send_fee_include_description">Include fee</string>
+    <string name="send_total_subtitle_format">%s will be sent</string>
+    <string name="send_total_subtitle_asset_format">%s and %s will be sent</string>
+    <string name="send_transaction_success">Transaction has been successfully signed and sent to the blockchain node. Wallet balance will be updated in a while</string>
+    <string name="details_title">Details</string>
+    <string name="details_row_title_cid">Card ID</string>
+    <string name="details_row_title_issuer">Issuer</string>
+    <string name="details_row_title_signed_hashes">Signed</string>
+    <string name="details_row_subtitle_signed_hashes_format">%s hashes</string>
+    <string name="details_row_title_currency">App Currency</string>
+    <string name="details_manage_security_long_tap">Long Tap</string>
+    <string name="details_manage_security_long_tap_description">This mechanism protects against proximity attacks on a card. It will enforce a delay between reception and execution of a command.</string>
+    <string name="details_manage_security_passcode">Passcode</string>
+    <string name="details_manage_security_passcode_description">Before executing any command entailing a change of the card state, you will have to enter the passcode.</string>
+    <string name="details_manage_security_access_code">Access code</string>
+    <string name="details_manage_security_access_code_description">You will have to submit the correct access code before scanning the card</string>
+    <string name="alert_card_signed_transactions">This card has been already topped up and signed transactions in the past. Consider immediate withdrawal of all funds if you have received this card from an untrusted source. If it\'s your card, there is nothing to worry about.</string>
+    <string name="alert_unsupported_card">This card is not designed to work with this app</string>
+    <string name="alert_developer_card">The card you scanned is a development card. Don\'t accept it as a payment.</string>
+    <string name="initial_message_sign_header">Tap to sign</string>
+    <string name="initial_message_create_wallet_body">To create the wallet tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="initial_message_change_access_code_body">To change the access code tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="initial_message_change_passcode_body">To change the passcode tap the card as shown above and do not remove until the end of the operation</string>
+    <string name="disclaimer_title">Terms of Service</string>
+    <string name="wallet_notification_no_internet">No internet connection</string>
+    <string name="send_error_payid_unsupported_by_blockchain">PayString unsupported by blockchain</string>
+    <string name="send_error_payid_not_registered">PayString not registered</string>
+    <string name="send_error_payid_request_failed">PayString request failed</string>
+    <string name="send_error_address_same_as_wallet">Address is the same as wallet address</string>
+    <string name="wallet_notification_address_copied">Address was copied to clipboard</string>
+    <string name="wallet_create_payid_empty">Enter desired PayString first</string>
+    <string name="initial_message_scan_header">Tap to scan</string>
+    <string name="initial_message_tap_header">Tap the card</string>
+    <string name="scan_card_error">Scan card failed. Try again</string>
+    <string name="wallet_button_buy">Buy</string>
+    <string name="wallet_button_sell">Sell</string>
+    <string name="wallet_button_trade">Exchange</string>
+    <string name="wallet_error_empty_twin_card">Create twin wallet</string>
+    <string name="wallet_error_empty_twin_card_subtitle"> Generate wallet keys on both cards to start using your Twins</string>
+    <string name="twins_onboarding_subtitle">One wallet. Two cards.</string>
+    <string name="twins_onboarding_description_format">This one that you are holding in your hands and the other one with number %s.\n\nBoth cards can be used to extract funds from this wallet.</string>
+    <string name="details_row_title_card_tou">Card terms of use</string>
+    <string name="twins_recreate_toolbar">Tangem Twin</string>
+    <string name="twins_recreate_warning">This action is irreversible. You will not have access to the old wallet.</string>
+    <string name="twins_recreate_title_format">Scan the #%s twin card</string>
+    <string name="twins_recreate_title_preparing">Preparing card</string>
+    <string name="twins_recreate_title_creating_wallet">Creating wallet</string>
+    <string name="twins_recreate_button_format">Scan the card #%s</string>
+    <string name="twin_error_same_card">You\'ve scanned the same card. To create a twin wallet you need to scan the card with number %d</string>
+    <string name="common_start">Start</string>
+    <string name="common_add">Add</string>
+    <string name="common_search">Search</string>
+    <string name="details_row_title_send_feedback">Send Feedback</string>
+    <string name="alert_failed_to_send_transaction_title">Can\'t send a transaction</string>
+    <string name="alert_failed_to_send_transaction_message">Reason: %s</string>
+    <string name="alert_troubleshooting_scan_card_title">Are you having difficulty scanning your card?</string>
+    <string name="alert_button_request_support">Request support</string>
+    <string name="alert_button_send_feedback">Send feedback</string>
+    <string name="warning_button_really_cool">Really cool!</string>
+    <string name="warning_button_can_be_better">Can be better</string>
+    <string name="warning_rate_app_title">One question</string>
+    <string name="warning_rate_app_message">How do you like Tangem?</string>
+    <string name="add_custom_token_title">Add custom token</string>
+    <string name="token_details_send_blocked_tx_format">Please wait for %s transaction to complete to be able to send funds</string>
+    <string name="warning_failed_to_verify_card_title">Authenticity check failed</string>
+    <string name="warning_failed_to_verify_card_message">This card might be a production sample or counterfeit</string>
+    <string name="warning_important_security_info">Important security information \u26A0</string>
+    <string name="warning_signed_tx_previously">This card has signed transactions in the past</string>
+    <string name="warning_button_learn_more">Learn more</string>
+    <string name="warning_low_signatures_format">There are only %s signatures available on this card. You must withdraw all of your funds.</string>
+    <string name="common_disconnect">Disconnect</string>
+    <string name="common_sign">Sign</string>
+    <string name="common_sign_and_send">Sign and send</string>
+    <string name="common_reject">Reject</string>
+    <string name="warning_testnet_card_message">This is a Testnet card. Don\'t accept it as a payment. This card must only be used for testing and development purposes.</string>
+    <string name="wallet_choose_trade_action">Do you want to buy or sell crypto?</string>
+    <string name="error_update_app">Oops, the current version of the application is not ready to work with this card, please check for updates.</string>
+    <string name="onboarding_title">Activating card</string>
+    <string name="onboarding_button_what_does_it_mean">How does it work?</string>
+    <string name="onboarding_button_receive_crypto">Receive crypto</string>
+    <string name="onboarding_create_wallet_header">Create a wallet</string>
+    <string name="onboarding_create_wallet_body">Let\'s generate all the keys on your card and create a secure wallet</string>
+    <string name="onboarding_create_wallet_button_create_wallet">Create wallet</string>
+    <string name="onboarding_top_up_header">Top up your wallet</string>
+    <string name="onboarding_top_up_body">To get started, simply top up the wallet with any amount</string>
+    <string name="onboarding_top_up_body_no_account_error">To get started, simply top up the wallet with more than %s %s</string>
+    <string name="onboarding_top_up_button_but_crypto">Buy crypto</string>
+    <string name="onboarding_top_up_button_show_wallet_address">Show the wallet\'s address</string>
+    <string name="onboarding_done_header">Success!</string>
+    <string name="onboarding_done_body">Your card is activated and ready to be used</string>
+    <string name="onboarding_balance_title">Balance</string>
+    <string name="address_qr_code_message_format">Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds.</string>
+    <string name="onboarding_twins_interrupt_warning">If the process of creating the wallet gets interrupted in any way, you\'ll have to start over.</string>
+    <string name="onboarding_twin_exit_warning">The twinning process is partly complete. You can\'t exit it now.</string>
+    <string name="warning_button_ok">Ok, Got it!</string>
+    <string name="onboarding_getting_started">Getting started</string>
+    <string name="onboarding_button_backup_now">Backup now</string>
+    <string name="onboarding_button_skip_backup">Skip for later</string>
+    <string name="onboarding_button_finalize_backup">Finalize the backup process</string>
+    <string name="onboarding_button_add_backup_card">Add a backup card</string>
+    <string name="onboarding_button_backup_card_format">Scan the card #%d</string>
+    <string name="onboarding_button_scan_origin_card">Scan primary card</string>
+    <string name="onboarding_title_no_backup_cards">No backup cards</string>
+    <string name="onboarding_title_scan_origin_card">Prepare your card</string>
+    <string name="onboarding_title_one_backup_card">One backup card added</string>
+    <string name="onboarding_title_two_backup_cards">Two backup cards added</string>
+    <string name="onboarding_title_backup_card_format">Backup card #%d</string>
+    <string name="onboarding_subtitle_no_backup_cards">To start the backup process add up to two backup cards.</string>
+    <string name="onboarding_subtitle_scan_origin_card">Prepare the primary card</string>
+    <string name="onboarding_subtitle_one_backup_card">You can add one more card or finalize the backup process</string>
+    <string name="onboarding_subtitle_two_backup_cards">Max number of cards added. Finalize the backup process.</string>
+    <string name="onboarding_alert_message_not_max_backup_cards_added">You\'ve added one backup card. When backup process is finished you can\'t add more backup cards. If you have one more card, add it to backup. Do you like to continue the backup process?</string>
+    <string name="onboarding_access_code_intro_title">Create Access Code</string>
+    <string name="onboarding_access_code_repeat_code_title">Re-enter your Access Code</string>
+    <string name="onboarding_access_code_feature_1_title">Protect</string>
+    <string name="onboarding_access_code_feature_2_title">Personalize</string>
+    <string name="onboarding_access_code_feature_3_title">Restore</string>
+    <string name="onboarding_access_code_feature_1_description">You have to set up a single access code to protect all your wallets.</string>
+    <string name="onboarding_access_code_feature_2_description">You can set an individual access code on each card later.</string>
+    <string name="onboarding_access_code_feature_3_description">The access code can be restored with a linked card, don\'t keep all cards in one place.</string>
+    <string name="onboarding_access_code_hint">Choose any word, phrase, or number you want as your access code.</string>
+    <string name="onboarding_access_code_too_short">Access code must be at least 4 characters long</string>
+    <string name="onboarding_access_codes_doesnt_match">Entered access code didn\'t match the initial access code</string>
+    <string name="common_create">Create</string>
+    <string name="common_submit">Submit</string>
+    <string name="onboarding_navbar_title_creating_backup">Creating a backup</string>
+    <string name="onboarding_backup_exit_warning">The backup process is partly complete. You can\'t exit it now.</string>
+    <string name="onboarding_wallet_info_title_first">Backup wallet</string>
+    <string name="onboarding_wallet_info_title_second">Identical cards</string>
+    <string name="onboarding_wallet_info_title_third">Access code</string>
+    <string name="onboarding_wallet_info_title_fourth">Access code restore</string>
+    <string name="onboarding_wallet_info_subtitle_first">You can backup your keys up to two other blank Tangem Wallet cards.</string>
+    <string name="onboarding_wallet_info_subtitle_second">All the backup cards can be used as full-functional with the identical keys.</string>
+    <string name="onboarding_wallet_info_subtitle_third">You will be able to set an access code to protect your wallets.</string>
+    <string name="onboarding_wallet_info_subtitle_fourth">Access code can be restored with one of backup cards.</string>
+    <string name="onboarding_subtitle_success_tangem_wallet_onboarding">Your wallet card is configured and ready for use.</string>
+    <string name="details_row_title_create_backup">Link More Cards</string>
+    <string name="welcome_interrupted_backup_alert_message">You have an interrupted backup. Do you want to resume?</string>
+    <string name="welcome_interrupted_backup_alert_resume">Yes, resume</string>
+    <string name="welcome_interrupted_backup_alert_discard">Discard</string>
+    <string name="welcome_interrupted_backup_discard_title">This is an irreversible action</string>
+    <string name="welcome_interrupted_backup_discard_message">If you will discard the backup now, then you will have to reset the cards to factory settings to start over again</string>
+    <string name="welcome_interrupted_backup_discard_resume">Resume backup</string>
+    <string name="welcome_interrupted_backup_discard_discard">Discard</string>
+    <string name="onboarding_button_backup_origin">Scan the primary card</string>
+    <string name="onboarding_button_continue_wallet">Continue to my wallet</string>
+    <string name="send_title_currency_format">Sending %s</string>
+    <string name="onboarding_subtitle_scan_backup_card_format">Prepare the backup card with number %s</string>
+    <string name="onboarding_subtitle_scan_primary_card_format">Prepare the primary card with number %s</string>
+    <string name="solana_rent_warning">Solana network charges a rent of %s every 2 days. Accounts that can\'t afford the rent are purged from the network. Deposit your account with more than %s to use it for free.</string>
+    <string name="alert_signed_hashes_message">This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection.</string>
+    <string name="wallet_connect_create_tx_message">Request to create transaction for %s\n%s\n\nAmount: %s\nFee: %s\nTotal: %s\nBalance: %s</string>
+    <string name="wallet_connect_request_session_start">Request to start a session for\n%s\n\nNETWORK: %s\n\nURL: %s</string>
+    <string name="wallet_connect_sessions_title">WalletConnect Sessions</string>
+    <string name="wallet_connect_no_sessions_title">Ooops. No Sessions.</string>
+    <string name="wallet_connect_no_sessions_message">No opened WalletConnect sessions</string>
+    <string name="wallet_connect_open_session">Open session</string>
+    <string name="wallet_connect_create_tx_not_enough_funds">Can\'t send transaction. Not enough funds.</string>
+    <string name="wallet_connect_alert_sign_message">Requesting to sign a message.\n\n%s</string>
+    <string name="wallet_connect_clipboard_alert">Clipboard contain WalletConnect code. Use copied value or scan QR-code</string>
+    <string name="wallet_connect_paste_from_clipboard">Paste from clipboard</string>
+    <string name="wallet_connect_scan_new_code">Scan new code</string>
+    <string name="wallet_connect_scanner_error_not_valid_card">This card can\'t be used to establish WalletConnect session</string>
+    <string name="wallet_connect_same_wcuri">The operation couldn\'t be completed. \n\nYou have already established a WalletConnect session with this parameters.</string>
+    <string name="wallet_connect_error_timeout">Failed to establish WalletConnect session: timeout error. Please, try again later.</string>
+    <string name="wallet_connect_bnb_sign_message">Dapp %s, requesting to\nsign BNB transaction.\n\n%s</string>
+    <string name="wallet_connect_bnb_transaction_message">Transaction details:\nFrom: %s\nTo: %s\nAmount: %s</string>
+    <string name="wallet_connect_bnb_trade_order_message">Trade order for %s\nPrice: %s\nAmount to receive: %s\nAmount to pay: %s</string>
+    <string name="feedback_subject_rate_negative">My suggestions</string>
+    <string name="feedback_subject_scan_failed">Can\'t scan a card</string>
+    <string name="feedback_subject_tx_failed">Can\'t send a transaction</string>
+    <string name="feedback_subject_support_tangem">Tangem feedback</string>
+    <string name="feedback_subject_support">Feedback</string>
+    <string name="feedback_preface_rate_negative">Tell us what functions you are missing, and we will try to help you.</string>
+    <string name="feedback_preface_scan_failed">Please tell us what card do you have</string>
+    <string name="feedback_preface_tx_failed">Please tell us more about your issue. Every small detail can help.</string>
+    <string name="feedback_preface_support">Hi support team,</string>
+    <string name="feedback_data_collection_message">The following information is optional. You can erase it if you don\'t want to share it.</string>
+    <string name="send_total_subtitle_fiat_format">≈ %s (inc. fee: %s)</string>
+    <string name="common_origin_card">Primary Card</string>
+    <string name="wallet_balance_blockchain_unreachable_try_later">Blockchain is unreachable. Try later</string>
+    <string name="common_error">Error</string>
+    <string name="common_ok">OK</string>
+    <string name="wallet_connect_error_failed_to_connect">Failed to establish WalletConnect session. Please, try again later.</string>
+    <string name="save_user_wallet_agreement_header_biometrics">Would you like to use biometrics?</string>
+    <string name="save_user_wallet_agreement_code_description_biometrics">Biometrics will be requested instead of the access code for interactions with your wallet</string>
+    <string name="save_user_wallet_agreement_allow_biometrics">Allow to use biometrics</string>
+    <string name="app_settings_enable_biometrics_title">Enable biometric authentication</string>
+    <string name="app_settings_enable_biometrics_description">Go to settings to enable biometric authentication in the Tangem App</string>
+    <string name="wallet_balance_missing_derivation">Scan the card</string>
+
+    <!-- Special string -->
+    <string name="common_custom_string">%s</string>
+</resources>
\ No newline at end of file
diff --git a/core/res/src/main/res/values/strings_plurals.xml b/core/res/src/main/res/values/strings_plurals.xml
new file mode 100644
index 0000000000..72449e9325
--- /dev/null
+++ b/core/res/src/main/res/values/strings_plurals.xml
@@ -0,0 +1,20 @@
+<resources>
+    <plurals name="card_label_card_count">
+        <item quantity="zero">%d card</item>
+        <item quantity="one">%d card</item>
+        <item quantity="two">%d cards</item>
+        <item quantity="other">%d cards</item>
+    </plurals>
+
+    <plurals name="tokens_count">
+        <item quantity="zero">%d tokens</item>
+        <item quantity="one">%d token</item>
+        <item quantity="two">%d tokens</item>
+        <item quantity="other">%d tokens</item>
+    </plurals>
+
+    <plurals name="referral_wallets_purchased_count">
+        <item quantity="zero">%d wallets</item>
+        <item quantity="one">%d wallet</item>
+    </plurals>
+</resources>
diff --git a/core/ui/.gitignore b/core/ui/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/ui/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
new file mode 100644
index 0000000000..2ab555ec1d
--- /dev/null
+++ b/core/ui/build.gradle.kts
@@ -0,0 +1,60 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+android {
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
+
+dependencies {
+    /** AndroidX libraries */
+    implementation(AndroidX.fragmentKtx)
+
+    /** Compose */
+    implementation(Compose.foundation)
+    implementation(Compose.material)
+    implementation(Compose.uiTooling)
+
+    /** Other libraries */
+    implementation(Library.accompanistSystemUiController)
+    implementation(Library.materialComponent)
+
+    implementation(project(":core:res"))
+}
\ No newline at end of file
diff --git a/core/ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..c5a36c7e17
--- /dev/null
+++ b/core/ui/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.core.ui" />
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/Buttons.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Buttons.kt
new file mode 100644
index 0000000000..80ca296491
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Buttons.kt
@@ -0,0 +1,614 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonColors
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.ButtonElevation
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemTypography
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=97%3A103&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun TextButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.None,
+        onClick = onClick,
+        enabled = enabled,
+        showProgress = false,
+        colors = TangemButtonsDefaults.defaultTextButtonColors,
+        size = TangemButtonSize.Text,
+    )
+}
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=97%3A62&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun TextButtonIconLeft(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: Painter,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        enabled = enabled,
+        showProgress = false,
+        colors = TangemButtonsDefaults.defaultTextButtonColors,
+        size = TangemButtonSize.Text,
+    )
+}
+
+@Composable
+fun WarningTextButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.None,
+        onClick = onClick,
+        enabled = enabled,
+        showProgress = false,
+        colors = TangemButtonsDefaults.warningTextButtonColors,
+        size = TangemButtonSize.Text,
+    )
+}
+
+@Composable
+fun PrimaryButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.None,
+        onClick = onClick,
+        colors = TangemButtonsDefaults.primaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=68%3A47&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun PrimaryButtonIconRight(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: Painter,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Right(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.primaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=233%3A258&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun PrimaryButtonIconLeft(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: Painter,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.primaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+@Composable
+fun SecondaryButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.None,
+        onClick = onClick,
+        colors = TangemButtonsDefaults.secondaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=99%3A50&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun SecondaryButtonIconRight(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: Painter,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Right(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.secondaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=233%3A262&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun SecondaryButtonIconLeft(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: Painter,
+    showProgress: Boolean = false,
+    enabled: Boolean = true,
+    onClick: () -> Unit,
+) {
+    TangemButton(
+        modifier = modifier,
+        text = text,
+        icon = TangemButtonIcon.Left(icon),
+        onClick = onClick,
+        colors = TangemButtonsDefaults.secondaryButtonColors,
+        enabled = enabled,
+        showProgress = showProgress,
+    )
+}
+
+// region Defaults
+@Composable
+private fun TangemButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    icon: TangemButtonIcon,
+    onClick: () -> Unit,
+    colors: ButtonColors,
+    showProgress: Boolean,
+    enabled: Boolean,
+    size: TangemButtonSize = TangemButtonSize.Default,
+    elevation: ButtonElevation = TangemButtonsDefaults.elevation,
+) {
+    Button(
+        modifier = modifier
+            .width(IntrinsicSize.Min)
+            .height(IntrinsicSize.Min)
+            .heightIn(size.toHeightDp()),
+        onClick = {
+            if (!showProgress) {
+                onClick()
+            }
+        },
+        enabled = enabled,
+        elevation = elevation,
+        shape = size.toShape(),
+        colors = colors,
+    ) {
+        ButtonContent(
+            text = text,
+            buttonIcon = icon,
+            colors = colors,
+            showProgress = showProgress,
+            enabled = enabled,
+        )
+    }
+}
+
+@Composable
+private fun ButtonContent(
+    text: String,
+    buttonIcon: TangemButtonIcon,
+    colors: ButtonColors,
+    enabled: Boolean,
+    showProgress: Boolean,
+) {
+    val icon = @Composable { painter: Painter ->
+        Icon(
+            modifier = Modifier.size(TangemTheme.dimens.size20),
+            painter = painter,
+            tint = colors.contentColor(enabled = enabled).value,
+            contentDescription = null,
+        )
+    }
+
+    if (showProgress) Box(
+        modifier = Modifier.wrapContentSize(),
+    ) {
+        CircularProgressIndicator(
+            modifier = Modifier
+                .align(Alignment.Center)
+                .size(TangemTheme.dimens.size24),
+            color = colors.contentColor(enabled = enabled).value,
+            strokeWidth = TangemTheme.dimens.size4,
+        )
+    } else Row {
+        if (buttonIcon is TangemButtonIcon.Left) {
+            icon(buttonIcon.painter)
+            Spacer(modifier = Modifier.width(TangemTheme.dimens.size8))
+        }
+        Text(
+            text = text,
+            style = TangemTypography.button,
+            color = colors.contentColor(enabled = enabled).value,
+        )
+        if (buttonIcon is TangemButtonIcon.Right) {
+            Spacer(modifier = Modifier.width(TangemTheme.dimens.size8))
+            icon(buttonIcon.painter)
+        }
+    }
+}
+
+sealed interface TangemButtonIcon {
+    val painter: Painter?
+
+    @Immutable
+    data class Left(override val painter: Painter) : TangemButtonIcon
+
+    @Immutable
+    data class Right(override val painter: Painter) : TangemButtonIcon
+
+    object None : TangemButtonIcon {
+        override val painter: Painter? = null
+    }
+}
+
+enum class TangemButtonSize {
+    Default,
+    Text,
+}
+
+@Composable
+private fun TangemButtonSize.toHeightDp(): Dp = when (this) {
+    TangemButtonSize.Default -> TangemTheme.dimens.size48
+    TangemButtonSize.Text -> TangemTheme.dimens.size40
+}
+
+@Composable
+private fun TangemButtonSize.toShape(): Shape = when (this) {
+    TangemButtonSize.Default -> TangemTheme.shapes.roundedCornersMedium
+    TangemButtonSize.Text -> TangemTheme.shapes.roundedCornersSmall
+}
+
+object TangemButtonsDefaults {
+    val elevation: ButtonElevation
+        @Composable get() = ButtonDefaults
+            .elevation(
+                defaultElevation = TangemTheme.dimens.elevation0,
+                pressedElevation = TangemTheme.dimens.elevation0,
+            )
+
+    val primaryButtonColors: ButtonColors
+        @Composable get() = TangemButtonColors(
+            backgroundColor = TangemTheme.colors.button.primary,
+            contentColor = TangemTheme.colors.text.primary2,
+            disabledBackgroundColor = TangemTheme.colors.button.disabled,
+            disabledContentColor = TangemTheme.colors.text.disabled,
+        )
+
+    val secondaryButtonColors: ButtonColors
+        @Composable get() = TangemButtonColors(
+            backgroundColor = TangemTheme.colors.button.secondary,
+            contentColor = TangemTheme.colors.text.primary1,
+            disabledBackgroundColor = TangemTheme.colors.button.disabled,
+            disabledContentColor = TangemTheme.colors.text.disabled,
+        )
+
+    val defaultTextButtonColors: ButtonColors
+        @Composable get() = TangemButtonColors(
+            backgroundColor = Color.Transparent,
+            contentColor = TangemTheme.colors.text.secondary,
+            disabledBackgroundColor = Color.Transparent,
+            disabledContentColor = TangemTheme.colors.text.disabled,
+        )
+
+    val warningTextButtonColors: ButtonColors
+        @Composable get() = TangemButtonColors(
+            backgroundColor = Color.Transparent,
+            contentColor = TangemTheme.colors.text.warning,
+            disabledBackgroundColor = Color.Transparent,
+            disabledContentColor = TangemTheme.colors.text.disabled,
+        )
+}
+
+@Immutable
+private open class TangemButtonColors(
+    private val backgroundColor: Color,
+    private val contentColor: Color,
+    private val disabledBackgroundColor: Color,
+    private val disabledContentColor: Color,
+) : ButtonColors {
+    @Composable
+    override fun backgroundColor(enabled: Boolean): State<Color> {
+        return rememberUpdatedState(newValue = if (enabled) backgroundColor else disabledBackgroundColor)
+    }
+
+    @Composable
+    override fun contentColor(enabled: Boolean): State<Color> {
+        return rememberUpdatedState(newValue = if (enabled) contentColor else disabledContentColor)
+    }
+}
+// endregion Defaults
+
+// region Preview
+@Composable
+private fun PrimaryButtonSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        PrimaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            showProgress = true,
+            text = "Manage tokens",
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButtonIconRight(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButtonIconLeft(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButtonIconRight(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        PrimaryButtonIconLeft(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun PrimaryButtonPreview_Light() {
+    TangemTheme {
+        PrimaryButtonSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun PrimaryButtonPreview_Dark() {
+    TangemTheme(isDark = true) {
+        PrimaryButtonSample()
+    }
+}
+
+@Composable
+private fun SecondaryButtonSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        SecondaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            showProgress = true,
+            text = "Manage tokens",
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButtonIconRight(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButtonIconLeft(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButton(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButtonIconRight(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        SecondaryButtonIconLeft(
+            modifier = Modifier.fillMaxWidth(),
+            text = "Manage tokens",
+            icon = painterResource(id = R.drawable.ic_tangem),
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SecondaryButtonPreview_Light() {
+    TangemTheme {
+        SecondaryButtonSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun SecondaryButtonPreview_Dark() {
+    TangemTheme(isDark = true) {
+        SecondaryButtonSample()
+    }
+}
+
+@Composable
+private fun TextButtonSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary),
+    ) {
+        TextButton(
+            text = "Enabled",
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        TextButtonIconLeft(
+            text = "Enabled",
+            icon = painterResource(id = R.drawable.ic_plus),
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        TextButton(
+            text = "Enabled",
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        TextButtonIconLeft(
+            text = "Enabled",
+            icon = painterResource(id = R.drawable.ic_plus),
+            enabled = false,
+            onClick = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = TangemTheme.dimens.spacing8))
+        WarningTextButton(
+            text = "Delete",
+            onClick = { /* no-op */ },
+        )
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun TextButtonPreview_Light() {
+    TangemTheme {
+        TextButtonSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun TextButtonPreview_Dark() {
+    TangemTheme(isDark = true) {
+        TextButtonSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/ButtonsDeprecated.kt b/core/ui/src/main/java/com/tangem/core/ui/components/ButtonsDeprecated.kt
new file mode 100644
index 0000000000..7fec4a465d
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/ButtonsDeprecated.kt
@@ -0,0 +1,185 @@
+package com.tangem.core.ui.components
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.ButtonColorType
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.buttonColor
+import com.tangem.core.ui.res.textColor
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryStartIconButton_Enabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryStartIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = true, onClicked = {})
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryStartIconButton_Enabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryStartIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = true, onClicked = {})
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryStartIconButton_Disabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem,
+            enabled = false,
+            onClicked = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryStartIconButton_Disabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryStartIconButton(
+            text = "Manage tokens",
+            iconResId = R.drawable.ic_tangem,
+            enabled = false,
+            onClicked = {},
+        )
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryEndIconButton_Enabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryEndIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = true, onClicked = {})
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryEndIconButton_Enabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryEndIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = true, onClicked = {})
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryEndIconButton_Disabled_InLightTheme() {
+    TangemTheme(isDark = false) {
+        PrimaryEndIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = false, onClicked = {})
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_PrimaryEndIconButton_Disabled_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        PrimaryEndIconButton(text = "Manage tokens", iconResId = R.drawable.ic_tangem, enabled = false, onClicked = {})
+    }
+}
+
+/**
+ * Primary button with an icon at the beginning of the layout
+ *
+ * @param modifier  button modifier
+ * @param text      button text
+ * @param iconResId button icon res id
+ * @param enabled   controls the enabled state of the button
+ * @param onClicked the lambda to be invoked when this button is pressed
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=233%3A258&t=WdN5XpixzZLlQAZO-4"
+ * >Figma component</a>
+ */
+@Deprecated("Use PrimaryButtonIconRight instead")
+@Composable
+fun PrimaryStartIconButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    @DrawableRes iconResId: Int,
+    enabled: Boolean = true,
+    onClicked: () -> Unit,
+) {
+    PrimaryButtonRow(modifier = modifier, enabled = enabled, onClicked = onClicked) {
+        Icon(
+            painter = painterResource(id = iconResId),
+            contentDescription = null,
+        )
+        Spacer(modifier = Modifier.width(dimensionResource(R.dimen.spacing8)))
+        Text(text = text)
+    }
+}
+
+/**
+ * Primary button with an icon at the end of the layout
+ *
+ * @param modifier  button modifier
+ * @param text      button text
+ * @param iconResId button icon res id
+ * @param enabled   controls the enabled state of the button
+ * @param onClicked the lambda to be invoked when this button is pressed
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=68%3A47&t=WdN5XpixzZLlQAZO-4"
+ * >Figma component</a>
+ */
+@Deprecated("Use PrimaryButtonIconLeft instead")
+@Composable
+fun PrimaryEndIconButton(
+    modifier: Modifier = Modifier,
+    text: String,
+    @DrawableRes iconResId: Int,
+    enabled: Boolean = true,
+    onClicked: () -> Unit,
+) {
+    PrimaryButtonRow(modifier = modifier, enabled = enabled, onClicked = onClicked) {
+        Text(text = text)
+        Spacer(modifier = Modifier.width(dimensionResource(R.dimen.spacing8)))
+        Icon(
+            painter = painterResource(id = iconResId),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+private fun PrimaryButtonRow(
+    modifier: Modifier,
+    enabled: Boolean,
+    onClicked: () -> Unit,
+    content: @Composable (RowScope.() -> Unit),
+) {
+    Button(
+        onClick = onClicked,
+        modifier = modifier
+            .fillMaxWidth()
+            .height(dimensionResource(R.dimen.size48)),
+        enabled = enabled,
+        shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+        colors = ButtonDefaults.buttonColors(
+            backgroundColor = MaterialTheme.colors.buttonColor(type = ButtonColorType.PRIMARY),
+            contentColor = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY2),
+            disabledBackgroundColor = MaterialTheme.colors.buttonColor(type = ButtonColorType.DISABLED),
+            disabledContentColor = MaterialTheme.colors.textColor(type = TextColorType.DISABLED),
+        ),
+        content = content,
+    )
+}
\ 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
new file mode 100644
index 0000000000..90d5ee1ce4
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Cards.kt
@@ -0,0 +1,79 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.textColor
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_SimpleInfoCard_InLightTheme() {
+    TangemTheme(isDark = false) {
+        SmallInfoCard(startText = "Balance", endText = "0.4405434 BTC")
+    }
+}
+
+@Preview(widthDp = 328, heightDp = 48, showBackground = true)
+@Composable
+fun Preview_SimpleInfoCard_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        SmallInfoCard(startText = "Balance", endText = "0.4405434 BTC")
+    }
+}
+
+/**
+ * Small card with text information attached to the edges
+ *
+ * @param startText text information attached to the left edge
+ * @param endText   text information attached to the right edge
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=290%3A339&t=WdN5XpixzZLlQAZO-4"
+ * >Figma component</a>
+ */
+@Composable
+fun SmallInfoCard(startText: String, endText: String) {
+    Surface(
+        shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+        color = MaterialTheme.colors.secondary,
+        elevation = TangemTheme.dimens.elevation2,
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(TangemTheme.dimens.size48)
+                .padding(
+                    horizontal = TangemTheme.dimens.spacing16,
+                    vertical = TangemTheme.dimens.spacing12,
+                ),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = startText,
+                color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY),
+                maxLines = 1,
+                style = MaterialTheme.typography.subtitle2
+            )
+            Text(
+                text = endText,
+                color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
+                maxLines = 1,
+                style = MaterialTheme.typography.body2
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt b/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt
similarity index 57%
rename from app/src/main/java/com/tangem/tap/common/compose/Spacer.kt
rename to core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt
index ce0b190598..fcc5dc2d24 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/Spacer.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/Spacers.kt
@@ -1,23 +1,41 @@
-package com.tangem.tap.common.compose
+@file:Suppress("unused")
 
+package com.tangem.core.ui.components
+
+import androidx.annotation.DimenRes
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
-/**
-[REDACTED_AUTHOR]
- */
-// ***************************** Horizontal
+@Composable
+fun VerticalSpacer(@DimenRes spaceResId: Int) {
+    Spacer(modifier = Modifier.height(dimensionResource(id = spaceResId)))
+}
+
+@Composable
+fun HorizontalSpacer(@DimenRes spaceResId: Int) {
+    Spacer(modifier = Modifier.width(dimensionResource(id = spaceResId)))
+}
+
+// region Horizontal
 @Composable
 fun SpacerH(height: Dp, modifier: Modifier = Modifier) {
     Spacer(modifier = modifier.height(height))
 }
 
+@Composable
+fun SpacerH2(modifier: Modifier = Modifier) {
+    SpacerH(2.dp, modifier)
+}
+
 @Composable
 fun SpacerH4(modifier: Modifier = Modifier) {
     SpacerH(4.dp, modifier)
@@ -28,6 +46,11 @@ fun SpacerH8(modifier: Modifier = Modifier) {
     SpacerH(8.dp, modifier)
 }
 
+@Composable
+fun SpacerH12(modifier: Modifier = Modifier) {
+    SpacerH(12.dp, modifier)
+}
+
 @Composable
 fun SpacerH16(modifier: Modifier = Modifier) {
     SpacerH(16.dp, modifier)
@@ -38,12 +61,30 @@ fun SpacerH24(modifier: Modifier = Modifier) {
     SpacerH(24.dp, modifier)
 }
 
+@Composable
+fun SpacerH28(modifier: Modifier = Modifier) {
+    SpacerH(28.dp, modifier)
+}
+
 @Composable
 fun SpacerH32(modifier: Modifier = Modifier) {
     SpacerH(32.dp, modifier)
 }
 
-// ***************************** Vertical
+// TODO: Refactor with context receivers
+@Composable
+fun ColumnScope.SpacerHMax(modifier: Modifier = Modifier) {
+    Spacer(modifier = modifier.weight(1f))
+}
+
+// TODO: Refactor with context receivers
+@Composable
+fun ColumnScope.SpacerHHalf(modifier: Modifier = Modifier) {
+    Spacer(modifier = modifier.weight(.5f))
+}
+// endregion Horizontal
+
+// region Vertical
 @Composable
 fun SpacerW(width: Dp, modifier: Modifier = Modifier) {
     Spacer(modifier = modifier.width(width))
@@ -54,6 +95,11 @@ fun SpacerW4(modifier: Modifier = Modifier) {
     SpacerW(4.dp, modifier)
 }
 
+@Composable
+fun SpacerW6(modifier: Modifier = Modifier) {
+    SpacerW(6.dp, modifier)
+}
+
 @Composable
 fun SpacerW8(modifier: Modifier = Modifier) {
     SpacerW(8.dp, modifier)
@@ -74,7 +120,14 @@ fun SpacerW32(modifier: Modifier = Modifier) {
     SpacerW(32.dp, modifier)
 }
 
-// ***************************** Size
+// TODO: Refactor with context receivers
+@Composable
+fun RowScope.SpacerWMax(modifier: Modifier = Modifier) {
+    Spacer(modifier = modifier.weight(1f))
+}
+// endregion Vertical
+
+// region Size
 @Composable
 fun SpacerS(size: Dp, modifier: Modifier = Modifier) {
     Spacer(modifier = modifier.size(size))
@@ -103,4 +156,5 @@ fun SpacerS24(modifier: Modifier = Modifier) {
 @Composable
 fun SpacerS32(modifier: Modifier = Modifier) {
     SpacerS(32.dp, modifier)
-}
\ No newline at end of file
+}
+// endregion Size
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/SystemBarsEffect.kt b/core/ui/src/main/java/com/tangem/core/ui/components/SystemBarsEffect.kt
new file mode 100644
index 0000000000..34ac768e47
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/SystemBarsEffect.kt
@@ -0,0 +1,14 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import com.google.accompanist.systemuicontroller.SystemUiController
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+
+@Composable
+fun SystemBarsEffect(
+    block: SystemUiController.() -> Unit,
+) {
+    val systemUiController = rememberSystemUiController()
+    SideEffect { block(systemUiController) }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..f14d87c904
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/TextFields.kt
@@ -0,0 +1,414 @@
+package com.tangem.core.ui.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.InteractionSource
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsFocusedAsState
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TextFieldColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TangemTypography
+
+/**
+ * [Show in Figma](https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=213%3A218&t=TmfD6UBHPg9uYfev-4)
+ * */
+@Composable
+fun OutlineTextField(
+    modifier: Modifier = Modifier,
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    label: String? = null,
+    placeholder: String? = null,
+    caption: String? = null,
+    enabled: Boolean = true,
+    isError: Boolean = false,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    keyboardActions: KeyboardActions = KeyboardActions(),
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+) {
+    TangemTextField(
+        modifier = modifier,
+        value = value,
+        onValueChange = onValueChange,
+        singleLine = true,
+        label = label,
+        placeholder = placeholder,
+        caption = caption,
+        enabled = enabled,
+        isError = isError,
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions,
+        interactionSource = interactionSource,
+    )
+}
+
+// region Defaults
+@Composable
+private fun TangemTextField(
+    modifier: Modifier = Modifier,
+    value: TextFieldValue,
+    singleLine: Boolean,
+    onValueChange: (TextFieldValue) -> Unit,
+    label: String? = null,
+    placeholder: String? = null,
+    caption: String? = null,
+    enabled: Boolean = true,
+    isError: Boolean = false,
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    keyboardActions: KeyboardActions = KeyboardActions(),
+    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
+    colors: TangemTextFieldColors = TangemTextFieldsDefault.defaultTextFieldColors,
+    size: TangemTextFieldSize = TangemTextFieldSize.Default,
+    onClear: () -> Unit = { onValueChange(TextFieldValue()) },
+) {
+    Column(modifier = modifier) {
+        OutlinedTextField(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(IntrinsicSize.Min)
+                .heightIn(size.toHeightDp()),
+            value = value,
+            textStyle = TangemTypography.body1,
+            onValueChange = onValueChange,
+            singleLine = singleLine,
+            enabled = enabled,
+            isError = isError,
+            visualTransformation = visualTransformation,
+            keyboardActions = keyboardActions,
+            keyboardOptions = keyboardOptions,
+            interactionSource = interactionSource,
+            shape = size.toShape(),
+            colors = colors,
+            label = {
+                if (!label.isNullOrEmpty()) {
+                    Text(
+                        text = label,
+                        style = TangemTypography.caption,
+                        color = colors.labelColor(
+                            enabled = enabled,
+                            error = isError,
+                            interactionSource = interactionSource,
+                        ).value,
+                    )
+                }
+            },
+            placeholder = {
+                if (!placeholder.isNullOrEmpty()) {
+                    Text(
+                        text = placeholder,
+                        style = TangemTypography.body1,
+                        color = colors.placeholderColor(enabled = enabled).value,
+                    )
+                }
+            },
+            trailingIcon = {
+                val iconRes by rememberUpdatedState(
+                    newValue = if (isError) R.drawable.ic_alert else R.drawable.ic_close,
+                )
+                IconButton(
+                    modifier = Modifier.size(32.dp),
+                    onClick = onClear,
+                    enabled = !isError && enabled,
+                ) {
+                    Icon(
+                        modifier = Modifier.size(24.dp),
+                        painter = painterResource(id = iconRes),
+                        tint = colors.trailingIconColor(enabled = enabled, isError = isError).value,
+                        contentDescription = "Clear input",
+                    )
+                }
+            },
+        )
+
+        AnimatedVisibility(
+            visible = !caption.isNullOrEmpty(),
+            enter = fadeIn(),
+            exit = fadeOut(),
+        ) {
+            if (caption.isNullOrEmpty()) return@AnimatedVisibility
+            Column {
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp),
+                    text = caption,
+                    style = TangemTypography.body1,
+                    color = colors.captionColor(enabled = enabled, isError = isError).value,
+                )
+            }
+        }
+    }
+}
+
+private enum class TangemTextFieldSize {
+    Default
+}
+
+@Composable
+private fun TangemTextFieldSize.toHeightDp(): Dp = when (this) {
+    TangemTextFieldSize.Default -> TangemTheme.dimens.size56
+}
+
+@Composable
+private fun TangemTextFieldSize.toShape(): Shape = when (this) {
+    TangemTextFieldSize.Default -> TangemTheme.shapes.roundedCornersSmall2
+}
+
+private object TangemTextFieldsDefault {
+    val defaultTextFieldColors: TangemTextFieldColors
+        @Composable @Stable get() = TangemTextFieldColors(
+            textColor = TangemTheme.colors.text.primary1,
+            disabledTextColor = TangemTheme.colors.text.disabled,
+            backgroundColor = Color.Transparent,
+            cursorColor = TangemTheme.colors.icon.primary1,
+            errorCursorColor = TangemTheme.colors.icon.warning,
+            focusedIndicatorColor = TangemTheme.colors.icon.primary1,
+            unfocusedIndicatorColor = TangemTheme.colors.stroke.primary,
+            disabledIndicatorColor = TangemTheme.colors.stroke.primary,
+            errorIndicatorColor = TangemTheme.colors.icon.warning,
+            leadingIconColor = TangemTheme.colors.icon.informative,
+            disabledLeadingIconColor = Color.Transparent,
+            errorLeadingIconColor = TangemTheme.colors.icon.warning,
+            trailingIconColor = TangemTheme.colors.icon.informative,
+            disabledTrailingIconColor = Color.Transparent,
+            errorTrailingIconColor = TangemTheme.colors.icon.warning,
+            focusedLabelColor = TangemTheme.colors.text.primary1,
+            unfocusedLabelColor = TangemTheme.colors.text.secondary,
+            disabledLabelColor = TangemTheme.colors.text.disabled,
+            errorLabelColor = TangemTheme.colors.icon.warning,
+            placeholderColor = TangemTheme.colors.text.secondary,
+            disabledPlaceholderColor = TangemTheme.colors.text.disabled,
+            captionColor = TangemTheme.colors.text.tertiary,
+            disabledCaptionColor = TangemTheme.colors.text.disabled,
+            errorCaptionColor = TangemTheme.colors.icon.warning,
+        )
+}
+
+@Immutable
+private data class TangemTextFieldColors(
+    private val textColor: Color,
+    private val disabledTextColor: Color,
+    private val cursorColor: Color,
+    private val errorCursorColor: Color,
+    private val focusedIndicatorColor: Color,
+    private val unfocusedIndicatorColor: Color,
+    private val errorIndicatorColor: Color,
+    private val disabledIndicatorColor: Color,
+    private val leadingIconColor: Color,
+    private val disabledLeadingIconColor: Color,
+    private val errorLeadingIconColor: Color,
+    private val trailingIconColor: Color,
+    private val disabledTrailingIconColor: Color,
+    private val errorTrailingIconColor: Color,
+    private val backgroundColor: Color,
+    private val focusedLabelColor: Color,
+    private val unfocusedLabelColor: Color,
+    private val disabledLabelColor: Color,
+    private val errorLabelColor: Color,
+    private val placeholderColor: Color,
+    private val disabledPlaceholderColor: Color,
+    private val captionColor: Color,
+    private val disabledCaptionColor: Color,
+    private val errorCaptionColor: Color,
+) : TextFieldColors {
+
+    @Composable
+    override fun leadingIconColor(enabled: Boolean, isError: Boolean): State<Color> {
+        return rememberUpdatedState(
+            when {
+                !enabled -> disabledLeadingIconColor
+                isError -> errorLeadingIconColor
+                else -> leadingIconColor
+            },
+        )
+    }
+
+    @Composable
+    override fun trailingIconColor(enabled: Boolean, isError: Boolean): State<Color> {
+        return rememberUpdatedState(
+            when {
+                !enabled -> disabledTrailingIconColor
+                isError -> errorTrailingIconColor
+                else -> trailingIconColor
+            },
+        )
+    }
+
+    @Composable
+    override fun indicatorColor(
+        enabled: Boolean,
+        isError: Boolean,
+        interactionSource: InteractionSource,
+    ): State<Color> {
+        val focused by interactionSource.collectIsFocusedAsState()
+
+        val targetValue = when {
+            !enabled -> disabledIndicatorColor
+            isError -> errorIndicatorColor
+            focused -> focusedIndicatorColor
+            else -> unfocusedIndicatorColor
+        }
+        return if (enabled) {
+            animateColorAsState(targetValue, tween(durationMillis = 120))
+        } else {
+            rememberUpdatedState(targetValue)
+        }
+    }
+
+    @Composable
+    override fun backgroundColor(enabled: Boolean): State<Color> {
+        return rememberUpdatedState(backgroundColor)
+    }
+
+    @Composable
+    override fun placeholderColor(enabled: Boolean): State<Color> {
+        return rememberUpdatedState(if (enabled) placeholderColor else disabledPlaceholderColor)
+    }
+
+    @Composable
+    override fun labelColor(
+        enabled: Boolean,
+        error: Boolean,
+        interactionSource: InteractionSource,
+    ): State<Color> {
+        val focused by interactionSource.collectIsFocusedAsState()
+
+        val targetValue = when {
+            !enabled -> disabledLabelColor
+            error -> errorLabelColor
+            focused -> focusedLabelColor
+            else -> unfocusedLabelColor
+        }
+        return rememberUpdatedState(targetValue)
+    }
+
+    @Composable
+    override fun textColor(enabled: Boolean): State<Color> {
+        return rememberUpdatedState(if (enabled) textColor else disabledTextColor)
+    }
+
+    @Composable
+    override fun cursorColor(isError: Boolean): State<Color> {
+        return rememberUpdatedState(if (isError) errorCursorColor else cursorColor)
+    }
+
+    @Composable
+    fun captionColor(enabled: Boolean, isError: Boolean): State<Color> {
+        return rememberUpdatedState(
+            newValue = when {
+                !enabled -> disabledCaptionColor
+                isError -> errorCaptionColor
+                else -> captionColor
+            },
+        )
+    }
+}
+// endregion Defaults
+
+// region Preview
+@Composable
+private fun OutlineTextFieldSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary)
+            .padding(horizontal = 16.dp),
+    ) {
+        val text = TextFieldValue(text = "Input")
+        OutlineTextField(
+            value = text,
+            onValueChange = { /* no-op */ },
+        )
+        Divider(modifier = Modifier.padding(vertical = 8.dp))
+        OutlineTextField(
+            value = text,
+            onValueChange = { /* no-op */ },
+            label = "Default",
+            placeholder = "Placeholder",
+            caption = "Supporting text",
+        )
+        Divider(modifier = Modifier.padding(vertical = 8.dp))
+        OutlineTextField(
+            value = text,
+            onValueChange = { /* no-op */ },
+            enabled = false,
+            label = "Disabled",
+            placeholder = "Placeholder",
+            caption = "Supporting text",
+        )
+        Divider(modifier = Modifier.padding(vertical = 8.dp))
+        OutlineTextField(
+            value = text,
+            onValueChange = { /* no-op */ },
+            isError = true,
+            label = "Error",
+            placeholder = "Placeholder",
+            caption = "Supporting text",
+        )
+        Divider(modifier = Modifier.padding(vertical = 8.dp))
+        OutlineTextField(
+            value = TextFieldValue(),
+            onValueChange = { /* no-op */ },
+            label = "Default without value",
+            placeholder = "Placeholder",
+            caption = "Supporting text",
+        )
+        Divider(modifier = Modifier.padding(vertical = 8.dp))
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun OutlineTextFieldPreview_Light() {
+    TangemTheme {
+        OutlineTextFieldSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun OutlineTextFieldPreview_Dark() {
+    TangemTheme(isDark = true) {
+        OutlineTextFieldSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithAdditionalButtons.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithAdditionalButtons.kt
new file mode 100644
index 0000000000..6416a8343f
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithAdditionalButtons.kt
@@ -0,0 +1,169 @@
+package com.tangem.core.ui.components.appbar
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.components.appbar.models.AdditionalButton
+import com.tangem.core.ui.res.IconColorType
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.iconColor
+import com.tangem.core.ui.res.textColor
+
+/**
+ * App bar with title and two additional buttons
+ *
+ * @param startButton button information attached to the left edge
+ * @param endButton   button information attached to the right edge
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=50%3A403&t=tRQ4KlzkjV7TCLZl-4">
+ * Figma Component</a>
+ */
+@Composable
+fun AppBarWithAdditionalButtons(
+    text: String,
+    startButton: AdditionalButton? = null,
+    endButton: AdditionalButton? = null,
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(TangemTheme.dimens.size56)
+            .padding(all = TangemTheme.dimens.spacing16),
+    ) {
+        if (startButton != null) {
+            IconButton(modifier = Modifier.align(Alignment.CenterStart), onClick = startButton.onIconClicked) {
+                Icon(
+                    painter = painterResource(id = startButton.iconRes),
+                    contentDescription = null,
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    tint = MaterialTheme.colors.iconColor(type = IconColorType.PRIMARY1),
+                )
+            }
+        }
+
+        Text(
+            text = text,
+            modifier = Modifier.align(Alignment.Center),
+            color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
+            maxLines = 1,
+            style = MaterialTheme.typography.subtitle1,
+        )
+
+        if (endButton != null) {
+            IconButton(modifier = Modifier.align(Alignment.CenterEnd), onClick = endButton.onIconClicked) {
+                Icon(
+                    painter = painterResource(id = endButton.iconRes),
+                    contentDescription = null,
+                    modifier = Modifier.size(TangemTheme.dimens.size24),
+                    tint = MaterialTheme.colors.iconColor(type = IconColorType.PRIMARY1),
+                )
+            }
+        }
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithAdditionalButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan,
+                onIconClicked = {},
+            ),
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithAdditionalButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan,
+                onIconClicked = {},
+            ),
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithOnlyStartButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithOnlyStartButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            startButton = AdditionalButton(
+                iconRes = R.drawable.ic_scan,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithOnlyEndButtons_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun Preview_AppBarWithOnlyEndButtons_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithAdditionalButtons(
+            text = "Tangem",
+            endButton = AdditionalButton(
+                iconRes = R.drawable.ic_more_vertical,
+                onIconClicked = {},
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
new file mode 100644
index 0000000000..3f4c5efa9e
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/AppBarWithBackButton.kt
@@ -0,0 +1,74 @@
+package com.tangem.core.ui.components.appbar
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+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.layout.size
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * App bar with back button and optional title
+ *
+ * @param text        optional title
+ * @param onBackClick the lambda to be invoked when this icon is pressed
+ *
+ * @see <a href = "https://www.figma.com/file/14ISV23YB1yVW1uNVwqrKv/Android?node-id=123%3A287&t=WdN5XpixzZLlQAZO-4"
+ * >Figma component</a>
+ */
+@Composable
+fun AppBarWithBackButton(text: String? = null, onBackClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .background(MaterialTheme.colors.primary)
+            .fillMaxWidth()
+            .padding(all = dimensionResource(R.dimen.spacing16)),
+        horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing16)),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_back),
+            contentDescription = null,
+            modifier = Modifier
+                .size(size = dimensionResource(R.dimen.size24))
+                .clickable { onBackClick() },
+            tint = MaterialTheme.colors.onPrimary,
+        )
+        if (!text.isNullOrBlank()) {
+            Text(
+                text = text,
+                color = MaterialTheme.colors.onPrimary,
+                maxLines = 1,
+                style = MaterialTheme.typography.subtitle1,
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun PreviewAppBarWithBackButtonInLightTheme() {
+    TangemTheme(isDark = false) {
+        AppBarWithBackButton(text = "Title", onBackClick = {})
+    }
+}
+
+@Preview(widthDp = 360, heightDp = 56, showBackground = true)
+@Composable
+fun PreviewAppBarWithBackButtonInDarkTheme() {
+    TangemTheme(isDark = true) {
+        AppBarWithBackButton(text = "Title", onBackClick = {})
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/AdditionalButton.kt b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/AdditionalButton.kt
new file mode 100644
index 0000000000..2517f5ef41
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/appbar/models/AdditionalButton.kt
@@ -0,0 +1,8 @@
+package com.tangem.core.ui.components.appbar.models
+
+import androidx.annotation.DrawableRes
+
+data class AdditionalButton(
+    @DrawableRes val iconRes: Int,
+    val onIconClicked: () -> Unit,
+)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/atoms/BottomSheetIndicator.kt b/core/ui/src/main/java/com/tangem/core/ui/components/atoms/BottomSheetIndicator.kt
new file mode 100644
index 0000000000..907e68d0a2
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/atoms/BottomSheetIndicator.kt
@@ -0,0 +1,61 @@
+package com.tangem.core.ui.components.atoms
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.IconColorType
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.iconColor
+
+/**
+ * Bottom sheet indicator
+ *
+ * @see <a href="https://www.figma.com/file/17JyRbuUEZ42DluaFEuGQk/Atoms?node-id=135%3A25&t=3dvxYMZBox4jxJc1-4">
+ * Figma Component</a>
+ */
+@Deprecated(message = "Use Hand component instead")
+@Composable
+fun BottomSheetIndicator() {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(TangemTheme.dimens.size20),
+        contentAlignment = Alignment.Center,
+    ) {
+        Box(
+            modifier = Modifier
+                .width(TangemTheme.dimens.size32)
+                .height(TangemTheme.dimens.size4)
+                .background(
+                    color = MaterialTheme.colors.iconColor(type = IconColorType.INACTIVE),
+                    shape = RoundedCornerShape(TangemTheme.dimens.radius2),
+                ),
+        )
+    }
+}
+
+@Preview(heightDp = 20, showBackground = true)
+@Composable
+fun Preview_BottomSheetIndicator_InLightTheme() {
+    TangemTheme(isDark = false) {
+        BottomSheetIndicator()
+    }
+}
+
+@Preview(heightDp = 20, showBackground = true)
+@Composable
+fun Preview_BottomSheetIndicator_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        BottomSheetIndicator()
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/atoms/Hand.kt b/core/ui/src/main/java/com/tangem/core/ui/components/atoms/Hand.kt
new file mode 100644
index 0000000000..e3ade6def9
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/atoms/Hand.kt
@@ -0,0 +1,72 @@
+package com.tangem.core.ui.components.atoms
+
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.res.TangemTheme
+
+/**
+ * [Show in Figma](https://www.figma.com/file/17JyRbuUEZ42DluaFEuGQk/Atoms?node-id=135%3A25&t=Jo68S6ilyewVU8MV-4)
+ * */
+@Composable
+fun Hand(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .padding(vertical = TangemTheme.dimens.spacing8)
+            .fillMaxWidth(),
+        contentAlignment = Alignment.Center,
+    ) {
+        Box(
+            modifier = Modifier
+                .width(TangemTheme.dimens.size32)
+                .height(TangemTheme.dimens.size4)
+                .background(
+                    color = TangemTheme.colors.icon.inactive,
+                    shape = TangemTheme.shapes.roundedCornersSmall,
+                ),
+        )
+    }
+}
+
+// region Preview
+@Composable
+private fun HandSample(
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .background(TangemTheme.colors.background.primary)
+            .padding(TangemTheme.dimens.spacing12),
+        verticalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Hand()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun HandPreview_Light() {
+    TangemTheme {
+        HandSample()
+    }
+}
+
+@Preview(showBackground = true, widthDp = 360)
+@Composable
+private fun HandPreview_Dark() {
+    TangemTheme(isDark = true) {
+        HandSample()
+    }
+}
+// endregion Preview
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt
new file mode 100644
index 0000000000..35dab6bca0
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeBottomSheetFragment.kt
@@ -0,0 +1,79 @@
+package com.tangem.core.ui.fragments
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.FloatRange
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.tangem.core.ui.R
+import com.tangem.core.ui.res.TangemTheme
+
+abstract class ComposeBottomSheetFragment<ScreenState> : BottomSheetDialogFragment() {
+    open val initialBottomSheetState = BottomSheetBehavior.STATE_EXPANDED
+
+    @FloatRange(from = 0.0, to = 1.0)
+    open val expandedHeightFraction: Float? = null
+
+    override fun getTheme(): Int = R.style.AppTheme_TransparentBottomSheetDialog
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        return createComposeView(inflater.context)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+
+        (dialog as BottomSheetDialog).behavior.apply {
+            state = initialBottomSheetState
+            skipCollapsed = true
+        }
+
+        return dialog
+    }
+
+    private fun createComposeView(context: Context): View {
+        return ComposeView(context).apply {
+            setContent {
+                TangemTheme {
+                    ScreenContent(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .let {
+                                if (expandedHeightFraction != null) it.fillMaxHeight(expandedHeightFraction!!) else it
+                            }
+                            .background(
+                                color = TangemTheme.colors.background.plain,
+                                shape = TangemTheme.shapes.bottomSheet,
+                            ),
+                        state = provideState().value,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    protected abstract fun provideState(): State<ScreenState>
+
+    @Composable
+    protected abstract fun ScreenContent(
+        modifier: Modifier,
+        state: ScreenState,
+    )
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeFragment.kt b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeFragment.kt
new file mode 100644
index 0000000000..863f22f185
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/fragments/ComposeFragment.kt
@@ -0,0 +1,57 @@
+package com.tangem.core.ui.fragments
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
+import com.tangem.core.ui.components.SystemBarsEffect
+import com.tangem.core.ui.res.TangemTheme
+
+abstract class ComposeFragment<ScreenState> : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        return createComposeView(inflater.context)
+    }
+
+    private fun createComposeView(context: Context): View {
+        return ComposeView(context).apply {
+            setContent {
+                TangemTheme {
+                    val backgroundColor = TangemTheme.colors.background.primary
+                    SystemBarsEffect {
+                        setSystemBarsColor(
+                            color = backgroundColor,
+                        )
+                    }
+
+                    ScreenContent(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .background(color = backgroundColor),
+                        state = provideState().value,
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    protected abstract fun provideState(): State<ScreenState>
+
+    @Composable
+    protected abstract fun ScreenContent(
+        modifier: Modifier,
+        state: ScreenState,
+    )
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/fragments/FragmentExt.kt b/core/ui/src/main/java/com/tangem/core/ui/fragments/FragmentExt.kt
new file mode 100644
index 0000000000..0de62569bb
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/fragments/FragmentExt.kt
@@ -0,0 +1,14 @@
+package com.tangem.core.ui.fragments
+
+import android.view.WindowManager
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+
+fun Fragment.setStatusBarColor(@ColorRes colorResId: Int) {
+    with(requireActivity().window) {
+        clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        statusBarColor = ContextCompat.getColor(requireContext(), colorResId)
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/ButtonColor.kt b/core/ui/src/main/java/com/tangem/core/ui/res/ButtonColor.kt
new file mode 100644
index 0000000000..427be16fe5
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/ButtonColor.kt
@@ -0,0 +1,24 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.material.Colors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.res.TangemColorPalette.Dark5
+import com.tangem.core.ui.res.TangemColorPalette.Dark6
+import com.tangem.core.ui.res.TangemColorPalette.DarkGreen
+import com.tangem.core.ui.res.TangemColorPalette.Light1
+import com.tangem.core.ui.res.TangemColorPalette.Light2
+import com.tangem.core.ui.res.TangemColorPalette.MagicMint
+import com.tangem.core.ui.res.TangemColorPalette.Meadow
+
+@Deprecated("Use TangemTheme.colors")
+enum class ButtonColorType(val lightColor: Color, val darkColor: Color) {
+    PRIMARY(lightColor = Dark6, darkColor = Light1),
+    SECONDARY(lightColor = Light2, darkColor = Dark5),
+    DISABLED(lightColor = Light2, darkColor = Dark6),
+    POSITIVE(lightColor = Meadow, darkColor = Meadow),
+    POSITIVE_DISABLED(lightColor = MagicMint, darkColor = DarkGreen)
+}
+
+@Composable
+fun Colors.buttonColor(type: ButtonColorType): Color = if (isSystemInDarkTheme) type.darkColor else type.lightColor
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/IconColor.kt b/core/ui/src/main/java/com/tangem/core/ui/res/IconColor.kt
new file mode 100644
index 0000000000..11dab52a7b
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/IconColor.kt
@@ -0,0 +1,31 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.material.Colors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.res.TangemColorPalette.Amaranth
+import com.tangem.core.ui.res.TangemColorPalette.Black
+import com.tangem.core.ui.res.TangemColorPalette.Dark1
+import com.tangem.core.ui.res.TangemColorPalette.Dark2
+import com.tangem.core.ui.res.TangemColorPalette.Dark4
+import com.tangem.core.ui.res.TangemColorPalette.Dark6
+import com.tangem.core.ui.res.TangemColorPalette.Light4
+import com.tangem.core.ui.res.TangemColorPalette.Light5
+import com.tangem.core.ui.res.TangemColorPalette.Meadow
+import com.tangem.core.ui.res.TangemColorPalette.Tangerine
+import com.tangem.core.ui.res.TangemColorPalette.White
+
+@Deprecated("Use TangemTheme.colors")
+enum class IconColorType(val lightColor: Color, val darkColor: Color) {
+    PRIMARY1(lightColor = Black, darkColor = White),
+    PRIMARY2(lightColor = White, darkColor = Dark6),
+    SECONDARY(lightColor = Dark2, darkColor = Dark1),
+    INFORMATIVE(lightColor = Light5, darkColor = Dark2),
+    INACTIVE(lightColor = Light4, darkColor = Dark4),
+    ACCENT(lightColor = Meadow, darkColor = Meadow),
+    WARNING(lightColor = Amaranth, darkColor = Amaranth),
+    ATTENTION(lightColor = Tangerine, darkColor = Tangerine)
+}
+
+@Composable
+fun Colors.iconColor(type: IconColorType): Color = if (isSystemInDarkTheme) type.darkColor else type.lightColor
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
new file mode 100644
index 0000000000..5f9617639f
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColorPalette.kt
@@ -0,0 +1,48 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.ui.graphics.Color
+
+@Suppress("unused")
+object TangemColorPalette {
+    // region Base
+    val Black = Color(0xFF000000)
+    val White = Color(0xFFFFFFFF)
+    // endregion Base
+
+    // region Dark
+    val Dark1 = Color(0xFF919191)
+    val Dark2 = Color(0xFF656565)
+    val Dark3 = Color(0xFF494949)
+    val Dark4 = Color(0xFF3B3B3B)
+    val Dark5 = Color(0xFF303030)
+    val Dark6 = Color(0xFF1E1E1E)
+    // endregion Dark
+
+    // region Light
+    val Light1 = Color(0xFFF5F5F5)
+    val Light2 = Color(0xFFEBEBEB)
+    val Light3 = Color(0xFFD3D3D3)
+    val Light4 = Color(0xFFC9C9C9)
+    val Light5 = Color(0xFFB0B0B0)
+    // endregion Light
+
+    // region Green
+    val Meadow = Color(0xFF1ACE80)
+    val MagicMint = Color(0xFFA3EBCC)
+    val DarkGreen = Color(0xFF06311F)
+    // endregion Green
+
+    // region Blue
+    val Cobalt = Color(0xFF0029FF)
+    val Azure = Color(0xFF007AFF)
+    // endregion Blue
+
+    // region Red
+    val Amaranth = Color(0xFFDE1010)
+    val Flamingo = Color(0xFFED7979)
+    // endregion Red
+
+    // region Yellow
+    val Tangerine = Color(0xFFFFB71B)
+    // endregion Yellow
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
new file mode 100644
index 0000000000..371e70d22e
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemColors.kt
@@ -0,0 +1,237 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+
+@Suppress("unused", "MemberVisibilityCanBePrivate")
+@Stable
+class TangemColors internal constructor(
+    text: Text,
+    icon: Icon,
+    button: Button,
+    background: Background,
+    control: Control,
+    stroke: Stroke,
+    field: Field,
+) {
+    var text by mutableStateOf(text)
+        private set
+    var icon by mutableStateOf(icon)
+        private set
+    var button by mutableStateOf(button)
+        private set
+    var background by mutableStateOf(background)
+        private set
+    var control by mutableStateOf(control)
+        private set
+    var stroke by mutableStateOf(stroke)
+        private set
+    var field by mutableStateOf(field)
+        private set
+
+    @Stable
+    class Text internal constructor(
+        primary1: Color,
+        primary2: Color,
+        secondary: Color,
+        tertiary: Color,
+        disabled: Color,
+        accent: Color = TangemColorPalette.Meadow,
+        warning: Color = TangemColorPalette.Amaranth,
+        attention: Color = TangemColorPalette.Tangerine,
+        constantWhite: Color = TangemColorPalette.White,
+    ) {
+        var primary1 by mutableStateOf(primary1)
+            private set
+        var primary2 by mutableStateOf(primary2)
+            private set
+        var secondary by mutableStateOf(secondary)
+            private set
+        var tertiary by mutableStateOf(tertiary)
+            private set
+        var disabled by mutableStateOf(disabled)
+            private set
+        var accent by mutableStateOf(accent)
+            private set
+        var warning by mutableStateOf(warning)
+            private set
+        var attention by mutableStateOf(attention)
+            private set
+        var constantWhite by mutableStateOf(constantWhite)
+            private set
+
+        fun update(other: Text) {
+            primary1 = other.primary1
+            primary2 = other.primary2
+            secondary = other.secondary
+            tertiary = other.tertiary
+            disabled = other.disabled
+            accent = other.accent
+        }
+    }
+
+    @Stable
+    class Icon internal constructor(
+        primary1: Color,
+        primary2: Color,
+        secondary: Color,
+        informative: Color,
+        inactive: Color,
+        accent: Color = TangemColorPalette.Meadow,
+        warning: Color = TangemColorPalette.Amaranth,
+        attention: Color = TangemColorPalette.Tangerine,
+    ) {
+        var primary1 by mutableStateOf(primary1)
+            private set
+        var primary2 by mutableStateOf(primary2)
+            private set
+        var secondary by mutableStateOf(secondary)
+            private set
+        var informative by mutableStateOf(informative)
+            private set
+        var inactive by mutableStateOf(inactive)
+            private set
+        var accent by mutableStateOf(accent)
+            private set
+        var warning by mutableStateOf(warning)
+            private set
+        var attention by mutableStateOf(attention)
+            private set
+
+        fun update(other: Icon) {
+            primary1 = other.primary1
+            primary2 = other.primary2
+            secondary = other.secondary
+            informative = other.informative
+            inactive = other.inactive
+            accent = other.accent
+            warning = other.warning
+            attention = other.attention
+        }
+    }
+
+    @Stable
+    class Button internal constructor(
+        primary: Color,
+        secondary: Color,
+        disabled: Color,
+        positive: Color = TangemColorPalette.Meadow,
+        positiveDisabled: Color,
+    ) {
+        var primary by mutableStateOf(primary)
+            private set
+        var secondary by mutableStateOf(secondary)
+            private set
+        var disabled by mutableStateOf(disabled)
+            private set
+        var positive by mutableStateOf(positive)
+            private set
+        var positiveDisabled by mutableStateOf(positiveDisabled)
+            private set
+
+        fun update(other: Button) {
+            primary = other.primary
+            secondary = other.secondary
+            disabled = other.disabled
+            positive = other.positive
+            positiveDisabled = other.positiveDisabled
+        }
+    }
+
+    @Stable
+    class Background internal constructor(
+        primary: Color,
+        secondary: Color,
+        plain: Color,
+        action: Color,
+        fade: Color,
+    ) {
+        var primary by mutableStateOf(primary)
+            private set
+        var secondary by mutableStateOf(secondary)
+            private set
+        var plain by mutableStateOf(plain)
+            private set
+        var action by mutableStateOf(action)
+            private set
+        var fade by mutableStateOf(fade)
+            private set
+
+        fun update(other: Background) {
+            primary = other.primary
+            secondary = other.secondary
+            plain = other.plain
+            action = other.action
+            fade = other.fade
+        }
+    }
+
+    @Stable
+    class Control internal constructor(
+        checked: Color,
+        unchecked: Color,
+        key: Color,
+    ) {
+        var checked by mutableStateOf(checked)
+            private set
+        var unchecked by mutableStateOf(unchecked)
+            private set
+        var key by mutableStateOf(key)
+            private set
+
+        fun update(other: Control) {
+            checked = other.checked
+            unchecked = other.unchecked
+            key = other.key
+        }
+    }
+
+    @Stable
+    class Stroke internal constructor(
+        primary: Color,
+        secondary: Color,
+        transparency: Color,
+    ) {
+        var primary by mutableStateOf(primary)
+            private set
+        var secondary by mutableStateOf(secondary)
+            private set
+        var transparency by mutableStateOf(transparency)
+            private set
+
+        fun update(other: Stroke) {
+            primary = other.primary
+            secondary = other.secondary
+            transparency = other.transparency
+        }
+    }
+
+    @Stable
+    class Field internal constructor(
+        primary: Color,
+        focused: Color,
+    ) {
+        var primary by mutableStateOf(primary)
+            private set
+        var focused by mutableStateOf(focused)
+            private set
+
+        fun update(other: Field) {
+            primary = other.primary
+            focused = other.focused
+        }
+    }
+
+    fun update(other: TangemColors) {
+        text.update(other.text)
+        icon.update(other.icon)
+        button.update(other.button)
+        background.update(other.background)
+        control.update(other.control)
+        stroke.update(other.stroke)
+        field.update(other.field)
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
new file mode 100644
index 0000000000..38321bcba1
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemDimens.kt
@@ -0,0 +1,71 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Immutable
+data class TangemDimens internal constructor(
+    // region Elevation
+    val elevation0: Dp = 0.dp,
+    val elevation1: Dp = 1.dp,
+    val elevation2: Dp = 2.dp,
+    val elevation3: Dp = 3.dp,
+    val elevation4: Dp = 4.dp,
+    val elevation6: Dp = 6.dp,
+    val elevation8: Dp = 8.dp,
+    val elevation12: Dp = 12.dp,
+    val elevation16: Dp = 16.dp,
+    val elevation24: Dp = 24.dp,
+    // endregion Elevation
+    // region Radius
+    val radius2: Dp = 2.dp,
+    val radius4: Dp = 4.dp,
+    val radius6: Dp = 6.dp,
+    val radius8: Dp = 8.dp,
+    val radius12: Dp = 12.dp,
+    val radius16: Dp = 16.dp,
+    val radius28: Dp = 28.dp,
+    // endregion Radius
+    // region Size
+    val size0: Dp = 0.dp,
+    val size4: Dp = 4.dp,
+    val size8: Dp = 8.dp,
+    val size12: Dp = 12.dp,
+    val size16: Dp = 16.dp,
+    val size18: Dp = 18.dp,
+    val size20: Dp = 20.dp,
+    val size24: Dp = 24.dp,
+    val size28: Dp = 28.dp,
+    val size32: Dp = 32.dp,
+    val size40: Dp = 40.dp,
+    val size42: Dp = 42.dp,
+    val size44: Dp = 44.dp,
+    val size48: Dp = 48.dp,
+    val size56: Dp = 56.dp,
+    val size62: Dp = 62.dp,
+    val size84: Dp = 84.dp,
+    val size86: Dp = 86.dp,
+    val size96: Dp = 96.dp,
+    val size102: Dp = 102.dp,
+    val size164: Dp = 164.dp,
+    val size200: Dp = 200.dp,
+    // endregion Size
+    // region Spacing
+    val spacing2: Dp = 2.dp,
+    val spacing4: Dp = 4.dp,
+    val spacing8: Dp = 8.dp,
+    val spacing10: Dp = 10.dp,
+    val spacing12: Dp = 12.dp,
+    val spacing14: Dp = 14.dp,
+    val spacing16: Dp = 16.dp,
+    val spacing20: Dp = 20.dp,
+    val spacing24: Dp = 24.dp,
+    val spacing32: Dp = 32.dp,
+    val spacing34: Dp = 34.dp,
+    val spacing44: Dp = 44.dp,
+    val spacing50: Dp = 50.dp,
+    val spacing54: Dp = 54.dp,
+    val spacing56: Dp = 56.dp,
+    // endregion Spacing
+)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt
new file mode 100644
index 0000000000..57bd37658f
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemShapes.kt
@@ -0,0 +1,25 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Immutable
+import androidx.compose.ui.graphics.Shape
+
+@Immutable
+data class TangemShapes internal constructor(
+    val roundedCornersSmall: Shape,
+    val roundedCornersSmall2: Shape,
+    val roundedCornersMedium: Shape,
+    val roundedCornersLarge: Shape,
+    val bottomSheet: Shape,
+) {
+    constructor(dimens: TangemDimens) : this(
+        roundedCornersSmall = RoundedCornerShape(size = dimens.radius2),
+        roundedCornersSmall2 = RoundedCornerShape(size = dimens.radius4),
+        roundedCornersMedium = RoundedCornerShape(size = dimens.radius12),
+        roundedCornersLarge = RoundedCornerShape(size = dimens.radius28),
+        bottomSheet = RoundedCornerShape(
+            topStart = dimens.radius16,
+            topEnd = dimens.radius16,
+        ),
+    )
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..8ff81a2640
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt
@@ -0,0 +1,200 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.material.Colors
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ProvideTextStyle
+import androidx.compose.material.Typography
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.staticCompositionLocalOf
+
+internal val isSystemInDarkTheme: Boolean = false // TODO: use isSystemInDarkTheme() for automatic color detection
+
+@Composable
+fun TangemTheme(
+    isDark: Boolean = false,
+    typography: Typography = TangemTheme.typography,
+    dimens: TangemDimens = TangemTheme.dimens,
+    content: @Composable () -> Unit,
+) {
+    val themeColors = if (isDark) darkThemeColors() else lightThemeColors()
+    val rememberedColors = remember { themeColors }
+        .also { it.update(themeColors) }
+
+    val shapes = remember { TangemShapes(dimens) }
+
+    MaterialTheme(
+        colors = materialThemeColors(colors = themeColors, isDark = isDark),
+        typography = typography,
+    ) {
+        CompositionLocalProvider(
+            LocalTangemColors provides rememberedColors,
+            LocalTangemTypography provides typography,
+            LocalTangemDimens provides dimens,
+            LocalTangemShapes provides shapes,
+        ) {
+            ProvideTextStyle(
+                value = TangemTheme.typography.body1,
+                content = content,
+            )
+        }
+    }
+}
+
+object TangemTheme {
+    val colors: TangemColors
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalTangemColors.current
+
+    val typography: Typography
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalTangemTypography.current
+
+    val dimens: TangemDimens
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalTangemDimens.current
+
+    val shapes: TangemShapes
+        @Composable
+        @ReadOnlyComposable
+        get() = LocalTangemShapes.current
+}
+
+@Stable
+@Composable
+private fun materialThemeColors(
+    colors: TangemColors,
+    isDark: Boolean,
+): Colors {
+    return Colors(
+        primary = colors.background.primary,
+        primaryVariant = colors.background.secondary,
+        secondary = colors.button.primary,
+        secondaryVariant = colors.text.accent,
+        background = colors.background.primary,
+        surface = colors.background.plain,
+        error = colors.text.warning,
+        onPrimary = colors.text.primary1,
+        onSecondary = colors.text.primary1,
+        onBackground = colors.text.primary1,
+        onSurface = colors.text.primary1,
+        onError = colors.text.primary2,
+        isLight = !isDark,
+    )
+}
+
+@Composable
+private fun lightThemeColors(): TangemColors {
+    return TangemColors(
+        text = TangemColors.Text(
+            primary1 = TangemColorPalette.Dark6,
+            primary2 = TangemColorPalette.White,
+            secondary = TangemColorPalette.Dark2,
+            tertiary = TangemColorPalette.Dark1,
+            disabled = TangemColorPalette.Light4,
+        ),
+        icon = TangemColors.Icon(
+            primary1 = TangemColorPalette.Black,
+            primary2 = TangemColorPalette.White,
+            secondary = TangemColorPalette.Dark2,
+            informative = TangemColorPalette.Light5,
+            inactive = TangemColorPalette.Light4,
+        ),
+        button = TangemColors.Button(
+            primary = TangemColorPalette.Dark6,
+            secondary = TangemColorPalette.Light2,
+            disabled = TangemColorPalette.Light2,
+            positiveDisabled = TangemColorPalette.MagicMint,
+        ),
+        background = TangemColors.Background(
+            primary = TangemColorPalette.White,
+            secondary = TangemColorPalette.Light1,
+            plain = TangemColorPalette.White,
+            action = TangemColorPalette.Black,
+            fade = TangemColorPalette.White,
+        ),
+        control = TangemColors.Control(
+            checked = TangemColorPalette.Meadow,
+            unchecked = TangemColorPalette.Light2,
+            key = TangemColorPalette.White,
+        ),
+        stroke = TangemColors.Stroke(
+            primary = TangemColorPalette.Light2,
+            secondary = TangemColorPalette.Dark4,
+            transparency = TangemColorPalette.White,
+        ),
+        field = TangemColors.Field(
+            primary = TangemColorPalette.Light1,
+            focused = TangemColorPalette.Light2,
+        ),
+    )
+}
+
+@Composable
+private fun darkThemeColors(): TangemColors {
+    return TangemColors(
+        text = TangemColors.Text(
+            primary1 = TangemColorPalette.White,
+            primary2 = TangemColorPalette.Dark6,
+            secondary = TangemColorPalette.Light5,
+            tertiary = TangemColorPalette.Dark1,
+            disabled = TangemColorPalette.Dark3,
+        ),
+        icon = TangemColors.Icon(
+            primary1 = TangemColorPalette.White,
+            primary2 = TangemColorPalette.Dark6,
+            secondary = TangemColorPalette.Dark1,
+            informative = TangemColorPalette.Dark2,
+            inactive = TangemColorPalette.Dark4,
+        ),
+        button = TangemColors.Button(
+            primary = TangemColorPalette.Light1,
+            secondary = TangemColorPalette.Dark5,
+            disabled = TangemColorPalette.Dark6,
+            positiveDisabled = TangemColorPalette.DarkGreen,
+        ),
+        background = TangemColors.Background(
+            primary = TangemColorPalette.Dark6,
+            secondary = TangemColorPalette.Black,
+            plain = TangemColorPalette.Black,
+            action = TangemColorPalette.Light4,
+            fade = TangemColorPalette.Black,
+        ),
+        control = TangemColors.Control(
+            checked = TangemColorPalette.Meadow,
+            unchecked = TangemColorPalette.Dark4,
+            key = TangemColorPalette.Light1,
+        ),
+        stroke = TangemColors.Stroke(
+            primary = TangemColorPalette.Dark5,
+            secondary = TangemColorPalette.Dark1,
+            transparency = TangemColorPalette.Dark6,
+        ),
+        field = TangemColors.Field(
+            primary = TangemColorPalette.Dark5,
+            focused = TangemColorPalette.Dark4,
+        ),
+    )
+}
+
+private val LocalTangemColors = staticCompositionLocalOf<TangemColors> {
+    error("No TangemColors provided")
+}
+
+private val LocalTangemTypography = staticCompositionLocalOf {
+    TangemTypography
+}
+
+private val LocalTangemDimens = staticCompositionLocalOf {
+    TangemDimens()
+}
+
+private val LocalTangemShapes = staticCompositionLocalOf<TangemShapes> {
+    error("No TangemShapes provided")
+}
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
new file mode 100644
index 0000000000..89ec283924
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
@@ -0,0 +1,82 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.material.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.ExperimentalUnitApi
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.sp
+import com.tangem.core.ui.R
+
+private val RobotoFamily = FontFamily(
+    Font(R.font.roboto_regular, FontWeight.Normal),
+    Font(R.font.roboto_medium, FontWeight.Medium),
+)
+
+@OptIn(ExperimentalUnitApi::class)
+val TangemTypography = Typography(
+    defaultFontFamily = RobotoFamily,
+    h1 = TextStyle(
+        fontSize = 34.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(0f, TextUnitType.Sp),
+        lineHeight = TextUnit(44f, TextUnitType.Sp),
+    ),
+    h2 = TextStyle(
+        fontSize = 24.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(0.18f, TextUnitType.Sp),
+        lineHeight = TextUnit(32f, TextUnitType.Sp),
+    ),
+    h3 = TextStyle(
+        fontSize = 20.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(0.15f, TextUnitType.Sp),
+        lineHeight = TextUnit(24f, TextUnitType.Sp),
+    ),
+    subtitle1 = TextStyle(
+        fontSize = 16.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(0.15f, TextUnitType.Sp),
+        lineHeight = TextUnit(24f, TextUnitType.Sp),
+    ),
+    subtitle2 = TextStyle(
+        fontSize = 14.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(0.5f, TextUnitType.Sp),
+        lineHeight = TextUnit(24f, TextUnitType.Sp),
+    ),
+    body1 = TextStyle(
+        fontSize = 16.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(0.5f, TextUnitType.Sp),
+        lineHeight = TextUnit(24f, TextUnitType.Sp),
+    ),
+    body2 = TextStyle(
+        fontSize = 14.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(0.25f, TextUnitType.Sp),
+        lineHeight = TextUnit(20f, TextUnitType.Sp),
+    ),
+    button = TextStyle(
+        fontSize = 14.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(0.1f, TextUnitType.Sp),
+        lineHeight = TextUnit(16f, TextUnitType.Sp),
+    ),
+    caption = TextStyle(
+        fontSize = 12.sp,
+        fontWeight = FontWeight.Normal,
+        letterSpacing = TextUnit(0.4f, TextUnitType.Sp),
+        lineHeight = TextUnit(16f, TextUnitType.Sp),
+    ),
+    overline = TextStyle(
+        fontSize = 10.sp,
+        fontWeight = FontWeight.Medium,
+        letterSpacing = TextUnit(1.5f, TextUnitType.Sp),
+        lineHeight = TextUnit(16f, TextUnitType.Sp),
+    ),
+)
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TextColor.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TextColor.kt
new file mode 100644
index 0000000000..0fce11d9e7
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/res/TextColor.kt
@@ -0,0 +1,31 @@
+package com.tangem.core.ui.res
+
+import androidx.compose.material.Colors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import com.tangem.core.ui.res.TangemColorPalette.Amaranth
+import com.tangem.core.ui.res.TangemColorPalette.Dark1
+import com.tangem.core.ui.res.TangemColorPalette.Dark2
+import com.tangem.core.ui.res.TangemColorPalette.Dark3
+import com.tangem.core.ui.res.TangemColorPalette.Dark6
+import com.tangem.core.ui.res.TangemColorPalette.Light4
+import com.tangem.core.ui.res.TangemColorPalette.Light5
+import com.tangem.core.ui.res.TangemColorPalette.Meadow
+import com.tangem.core.ui.res.TangemColorPalette.Tangerine
+import com.tangem.core.ui.res.TangemColorPalette.White
+
+@Deprecated("Use TangemTheme.colors")
+enum class TextColorType(val lightColor: Color, val darkColor: Color) {
+    PRIMARY1(lightColor = Dark6, darkColor = White),
+    PRIMARY2(lightColor = White, darkColor = Dark6),
+    SECONDARY(lightColor = Dark2, darkColor = Light5),
+    TERTIARY(lightColor = Dark1, darkColor = Dark1),
+    DISABLED(lightColor = Light4, darkColor = Dark3),
+    ACCENT(lightColor = Meadow, darkColor = Meadow),
+    WARNING(lightColor = Amaranth, darkColor = Amaranth),
+    ATTENTION(lightColor = Tangerine, darkColor = Tangerine),
+    CONSTANT_WHITE(lightColor = White, darkColor = White)
+}
+
+@Composable
+fun Colors.textColor(type: TextColorType): Color = if (isSystemInDarkTheme) type.darkColor else type.lightColor
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/OneTouchClickListener.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/OneTouchClickListener.kt
new file mode 100644
index 0000000000..210c57805c
--- /dev/null
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/OneTouchClickListener.kt
@@ -0,0 +1,25 @@
+package com.tangem.core.ui.utils
+
+import android.os.SystemClock
+import android.view.View
+
+/**
+ * Implementation of click listener for preventing multiple click events
+ *
+ * @property action action that called when a view has been clicked
+ */
+class OneTouchClickListener(private val action: () -> Unit) : View.OnClickListener {
+
+    private var lastClickTimeMs: Long = 0L
+
+    override fun onClick(v: View?) {
+        if (SystemClock.elapsedRealtime() - lastClickTimeMs > CLICK_DELAY_MS) {
+            lastClickTimeMs = SystemClock.elapsedRealtime()
+            action()
+        }
+    }
+
+    companion object {
+        private const val CLICK_DELAY_MS = 500L
+    }
+}
\ No newline at end of file
diff --git a/core/ui/src/main/res/drawable/ic_alert.xml b/core/ui/src/main/res/drawable/ic_alert.xml
new file mode 100644
index 0000000000..1d855289ee
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_alert.xml
@@ -0,0 +1,10 @@
+<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="#000000"
+        android:pathData="M11,15H13V17H11V15ZM11,7H13V13H11V7ZM12,2C6.47,2 2,6.5 2,12C2,14.652 3.054,17.196 4.929,19.071C5.858,20 6.96,20.736 8.173,21.239C9.386,21.741 10.687,22 12,22C14.652,22 17.196,20.946 19.071,19.071C20.946,17.196 22,14.652 22,12C22,10.687 21.741,9.386 21.239,8.173C20.736,6.96 20,5.858 19.071,4.929C18.142,4 17.04,3.264 15.827,2.761C14.614,2.259 13.313,2 12,2ZM12,20C9.878,20 7.843,19.157 6.343,17.657C4.843,16.157 4,14.122 4,12C4,9.878 4.843,7.843 6.343,6.343C7.843,4.843 9.878,4 12,4C14.122,4 16.157,4.843 17.657,6.343C19.157,7.843 20,9.878 20,12C20,14.122 19.157,16.157 17.657,17.657C16.157,19.157 14.122,20 12,20Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_alert_circle_24.xml b/core/ui/src/main/res/drawable/ic_alert_circle_24.xml
new file mode 100644
index 0000000000..278bfde255
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_alert_circle_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M13,13H11V7H13M13,17H11V15H13M12,2C10.687,2 9.386,2.259 8.173,2.761C6.96,3.264 5.858,4 4.929,4.929C3.054,6.804 2,9.348 2,12C2,14.652 3.054,17.196 4.929,19.071C5.858,20 6.96,20.736 8.173,21.239C9.386,21.741 10.687,22 12,22C14.652,22 17.196,20.946 19.071,19.071C20.946,17.196 22,14.652 22,12C22,10.687 21.741,9.386 21.239,8.173C20.736,6.96 20,5.858 19.071,4.929C18.142,4 17.04,3.264 15.827,2.761C14.614,2.259 13.313,2 12,2Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_back.xml b/core/ui/src/main/res/drawable/ic_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back.xml
rename to core/ui/src/main/res/drawable/ic_back.xml
diff --git a/core/ui/src/main/res/drawable/ic_close.xml b/core/ui/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000000..ffc64fb7a8
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<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="#000000"
+        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_copy.xml b/core/ui/src/main/res/drawable/ic_copy.xml
new file mode 100644
index 0000000000..d01cdf9823
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_copy.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,21H8V7H19V21ZM19,5H8C7.47,5 6.961,5.211 6.586,5.586C6.211,5.961 6,6.47 6,7V21C6,21.53 6.211,22.039 6.586,22.414C6.961,22.789 7.47,23 8,23H19C19.53,23 20.039,22.789 20.414,22.414C20.789,22.039 21,21.53 21,21V7C21,6.47 20.789,5.961 20.414,5.586C20.039,5.211 19.53,5 19,5ZM16,1H4C3.47,1 2.961,1.211 2.586,1.586C2.211,1.961 2,2.47 2,3V17H4V3H16V1Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_discount.xml b/core/ui/src/main/res/drawable/ic_discount.xml
new file mode 100644
index 0000000000..5045eccd5b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_discount.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+    <path
+        android:pathData="M22.04,10.71V6H17.34L14,2.69L10.71,6H6V10.71L2.69,14L6,17.34V22.04H10.71L14,25.35L17.34,22.04H22.04V17.34L25.35,14L22.04,10.71ZM10.83,9.05C11.81,9.05 12.6,9.84 12.6,10.83C12.6,11.299 12.413,11.75 12.082,12.082C11.75,12.413 11.299,12.6 10.83,12.6C9.84,12.6 9.05,11.81 9.05,10.83C9.05,9.84 9.84,9.05 10.83,9.05ZM17.22,19C16.24,19 15.45,18.2 15.45,17.22C15.45,16.751 15.637,16.3 15.968,15.968C16.3,15.637 16.751,15.45 17.22,15.45C18.2,15.45 19,16.24 19,17.22C19,17.692 18.813,18.145 18.479,18.479C18.145,18.813 17.692,19 17.22,19ZM10.5,19.03L9,17.53L17.53,9L19.03,10.5L10.5,19.03Z"
+        android:fillColor="#000000" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_face_recognition_24.xml b/core/ui/src/main/res/drawable/ic_face_recognition_24.xml
new file mode 100644
index 0000000000..a0b2816482
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_face_recognition_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M9,11.75C8.668,11.75 8.351,11.882 8.116,12.116C7.882,12.351 7.75,12.668 7.75,13C7.75,13.332 7.882,13.649 8.116,13.884C8.351,14.118 8.668,14.25 9,14.25C9.164,14.25 9.327,14.218 9.478,14.155C9.63,14.092 9.768,14 9.884,13.884C10,13.768 10.092,13.63 10.155,13.478C10.218,13.327 10.25,13.164 10.25,13C10.25,12.836 10.218,12.673 10.155,12.522C10.092,12.37 10,12.232 9.884,12.116C9.768,12 9.63,11.908 9.478,11.845C9.327,11.782 9.164,11.75 9,11.75ZM15,11.75C14.668,11.75 14.351,11.882 14.116,12.116C13.882,12.351 13.75,12.668 13.75,13C13.75,13.332 13.882,13.649 14.116,13.884C14.351,14.118 14.668,14.25 15,14.25C15.332,14.25 15.649,14.118 15.884,13.884C16.118,13.649 16.25,13.332 16.25,13C16.25,12.668 16.118,12.351 15.884,12.116C15.649,11.882 15.332,11.75 15,11.75ZM12,2C10.687,2 9.386,2.259 8.173,2.761C6.96,3.264 5.858,4 4.929,4.929C3.054,6.804 2,9.348 2,12C2,14.652 3.054,17.196 4.929,19.071C5.858,20 6.96,20.736 8.173,21.239C9.386,21.741 10.687,22 12,22C14.652,22 17.196,20.946 19.071,19.071C20.946,17.196 22,14.652 22,12C22,10.687 21.741,9.386 21.239,8.173C20.736,6.96 20,5.858 19.071,4.929C18.142,4 17.04,3.264 15.827,2.761C14.614,2.259 13.313,2 12,2ZM12,20C9.878,20 7.843,19.157 6.343,17.657C4.843,16.157 4,14.122 4,12C3.97,11.71 3.97,11.43 4,11.14C6.38,10.1 8.27,8.17 9.26,5.77C11.13,8.42 14.17,10 17.42,10C18.18,10 18.93,9.91 19.67,9.74C20.92,14 18.5,18.43 14.26,19.67C13.5,19.89 12.76,20 12,20ZM0,2C0,1.47 0.211,0.961 0.586,0.586C0.961,0.211 1.47,0 2,0L6,0V2H2V6H0V2ZM24,22C24,22.53 23.789,23.039 23.414,23.414C23.039,23.789 22.53,24 22,24H18V22H22V18H24V22ZM2,24C1.47,24 0.961,23.789 0.586,23.414C0.211,23.039 0,22.53 0,22V18H2V22H6V24H2ZM22,0C22.53,0 23.039,0.211 23.414,0.586C23.789,0.961 24,1.47 24,2V6H22V2H18V0H22Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/core/ui/src/main/res/drawable/ic_lock_24.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_lock.xml
rename to core/ui/src/main/res/drawable/ic_lock_24.xml
diff --git a/core/ui/src/main/res/drawable/ic_more_vertical.xml b/core/ui/src/main/res/drawable/ic_more_vertical.xml
new file mode 100644
index 0000000000..9f5887ceb4
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_more_vertical.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,8C13.1,8 14,7.1 14,6C14,4.9 13.1,4 12,4C10.9,4 10,4.9 10,6C10,7.1 10.9,8 12,8ZM12,10C10.9,10 10,10.9 10,12C10,13.1 10.9,14 12,14C13.1,14 14,13.1 14,12C14,10.9 13.1,10 12,10ZM12,16C10.9,16 10,16.9 10,18C10,19.1 10.9,20 12,20C13.1,20 14,19.1 14,18C14,16.9 13.1,16 12,16Z"
+        android:fillColor="#000"
+        android:fillType="evenOdd" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_plus.xml b/core/ui/src/main/res/drawable/ic_plus.xml
new file mode 100644
index 0000000000..b85852c706
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_plus.xml
@@ -0,0 +1,10 @@
+<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="#000000"
+        android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_scan.xml b/core/ui/src/main/res/drawable/ic_scan.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_scan.xml
rename to core/ui/src/main/res/drawable/ic_scan.xml
index 1e4cd949d6..31f4345be7 100644
--- a/app/src/main/res/drawable/ic_scan.xml
+++ b/core/ui/src/main/res/drawable/ic_scan.xml
@@ -2,7 +2,7 @@
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <group>
-        <clip-path android:pathData="M0,0h24v24h-24z"/>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
         <path android:fillColor="#000000" android:pathData="M2,4H6V2H2C1.47,2 0.961,2.211 0.586,2.586C0.211,2.961 0,3.47 0,4L0,8H2V4ZM22,2H18V4H22V8H24V4C24,3.47 23.789,2.961 23.414,2.586C23.039,2.211 22.53,2 22,2ZM2,16H0V20C0,20.53 0.211,21.039 0.586,21.414C0.961,21.789 1.47,22 2,22H6V20H2V16ZM22,20H18V22H22C22.53,22 23.039,21.789 23.414,21.414C23.789,21.039 24,20.53 24,20V16H22V20ZM4,8V16C4,16.53 4.211,17.039 4.586,17.414C4.961,17.789 5.47,18 6,18H18C18.53,18 19.039,17.789 19.414,17.414C19.789,17.039 20,16.53 20,16V8C20,7.47 19.789,6.961 19.414,6.586C19.039,6.211 18.53,6 18,6H6C5.47,6 4.961,6.211 4.586,6.586C4.211,6.961 4,7.47 4,8ZM6,16V12H18V16H6ZM18,8V10H6V8H18Z"/>
     </group>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_share.xml b/core/ui/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000000..e35c52d223
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8C18.796,8 19.559,7.684 20.121,7.121C20.684,6.559 21,5.796 21,5C21,4.204 20.684,3.441 20.121,2.879C19.559,2.316 18.796,2 18,2C17.204,2 16.441,2.316 15.879,2.879C15.316,3.441 15,4.204 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9C5.204,9 4.441,9.316 3.879,9.879C3.316,10.441 3,11.204 3,12C3,12.796 3.316,13.559 3.879,14.121C4.441,14.684 5.204,15 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19C20.92,18.226 20.612,17.483 20.065,16.935C19.517,16.388 18.774,16.08 18,16.08Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tangem.xml b/core/ui/src/main/res/drawable/ic_tangem.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tangem.xml
rename to core/ui/src/main/res/drawable/ic_tangem.xml
diff --git a/core/ui/src/main/res/drawable/ic_tether.xml b/core/ui/src/main/res/drawable/ic_tether.xml
new file mode 100644
index 0000000000..e3f94b5dbb
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_tether.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+    <group>
+        <clip-path android:pathData="M0,0h28v28h-28z" />
+        <path
+            android:pathData="M8.821,17.869C9.035,16.016 9.741,14.312 10.803,12.892C10.407,13.076 9.929,13.195 9.38,13.241V14H8.552V13.247C6.83,13.134 5.744,12.22 5.738,10.863H7.015C7.077,11.556 7.657,12.04 8.552,12.142V9.483L8.015,9.346C6.67,9.017 5.935,8.234 5.935,7.093C5.935,5.749 6.929,4.852 8.552,4.709V3.902H9.38V4.709C10.941,4.84 11.966,5.766 12.003,7.063H10.744C10.719,6.424 10.176,5.922 9.38,5.826V8.342L9.941,8.467C11.454,8.82 12.163,9.561 12.163,10.768C12.163,11.028 12.13,11.27 12.065,11.493C13.628,10.047 15.64,9.079 17.869,8.822C17.808,3.939 13.831,0 8.935,0C4,0 0,4 0,8.935C0,13.831 3.939,17.808 8.821,17.869ZM17.776,10.222C13.873,10.786 10.786,13.873 10.222,17.776L17.776,10.222ZM8.552,8.174C7.688,8.007 7.225,7.589 7.225,6.991C7.225,6.352 7.781,5.862 8.552,5.82V8.174ZM9.38,12.154V9.632C10.404,9.83 10.88,10.236 10.88,10.905C10.88,11.646 10.33,12.1 9.38,12.154Z"
+            android:fillColor="#000000"
+            android:fillType="evenOdd" />
+        <path
+            android:pathData="M10.13,19.066C10.13,14.132 14.13,10.131 19.064,10.131C23.998,10.131 27.999,14.132 27.999,19.066C27.999,24 23.998,28.001 19.064,28.001C14.13,28.001 10.13,24 10.13,19.066ZM19.527,17.526L20.48,14.823L19.066,14.323L17.782,17.962L15.337,18.573L15.701,20.028L17.183,19.658L16.23,22.36C16.149,22.589 16.184,22.844 16.325,23.043C16.465,23.241 16.694,23.36 16.937,23.36H22.61V21.86H17.997L18.928,19.222L21.374,18.61L21.01,17.155L19.527,17.526Z"
+            android:fillColor="#000000"
+            android:fillType="evenOdd" />
+    </group>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ill_businessman_3d.webp b/core/ui/src/main/res/drawable/ill_businessman_3d.webp
new file mode 100644
index 0000000000..a018c1b5bb
Binary files /dev/null and b/core/ui/src/main/res/drawable/ill_businessman_3d.webp differ
diff --git a/core/ui/src/main/res/font/roboto_medium.ttf b/core/ui/src/main/res/font/roboto_medium.ttf
new file mode 100644
index 0000000000..ac0f908b9c
Binary files /dev/null and b/core/ui/src/main/res/font/roboto_medium.ttf differ
diff --git a/core/ui/src/main/res/font/roboto_regular.ttf b/core/ui/src/main/res/font/roboto_regular.ttf
new file mode 100644
index 0000000000..ddf4bfacb3
Binary files /dev/null and b/core/ui/src/main/res/font/roboto_regular.ttf differ
diff --git a/app/src/main/res/transition/fade.xml b/core/ui/src/main/res/transition/fade.xml
similarity index 100%
rename from app/src/main/res/transition/fade.xml
rename to core/ui/src/main/res/transition/fade.xml
diff --git a/app/src/main/res/transition/slide_right.xml b/core/ui/src/main/res/transition/slide_right.xml
similarity index 100%
rename from app/src/main/res/transition/slide_right.xml
rename to core/ui/src/main/res/transition/slide_right.xml
diff --git a/core/ui/src/main/res/values/dimens.xml b/core/ui/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..60c2e660fb
--- /dev/null
+++ b/core/ui/src/main/res/values/dimens.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- region Elevation -->
+    <dimen name="elevation1">1dp</dimen>
+    <dimen name="elevation2">2dp</dimen>
+    <dimen name="elevation3">3dp</dimen>
+    <dimen name="elevation4">4dp</dimen>
+    <dimen name="elevation6">6dp</dimen>
+    <dimen name="elevation8">8dp</dimen>
+    <dimen name="elevation12">12dp</dimen>
+    <dimen name="elevation16">16dp</dimen>
+    <dimen name="elevation24">24dp</dimen>
+    <!-- endregion Elevation -->
+
+    <!-- region Radius -->
+    <dimen name="radius2">2dp</dimen>
+    <dimen name="radius6">6dp</dimen>
+    <dimen name="radius8">8dp</dimen>
+    <dimen name="radius12">12dp</dimen>
+    <dimen name="radius16">16dp</dimen>
+    <!-- endregion Radius -->
+
+    <!--  region Size  -->
+    <dimen name="size0">0dp</dimen>
+    <dimen name="size4">4dp</dimen>
+    <dimen name="size11">11dp</dimen>
+    <dimen name="size16">16dp</dimen>
+    <dimen name="size20">20dp</dimen>
+    <dimen name="size24">24dp</dimen>
+    <dimen name="size28">28dp</dimen>
+    <dimen name="size32">32dp</dimen>
+    <dimen name="size40">40dp</dimen>
+    <dimen name="size48">48dp</dimen>
+    <dimen name="size56">56dp</dimen>
+    <dimen name="size84">84dp</dimen>
+    <dimen name="size86">86dp</dimen>
+    <dimen name="size102">102dp</dimen>
+    <dimen name="size164">164dp</dimen>
+    <dimen name="size200">200dp</dimen>
+    <!--  endregion Size  -->
+
+    <!--  region Spacing  -->
+    <dimen name="spacing2">2dp</dimen>
+    <dimen name="spacing4">4dp</dimen>
+    <dimen name="spacing8">8dp</dimen>
+    <dimen name="spacing10">10dp</dimen>
+    <dimen name="spacing12">12dp</dimen>
+    <dimen name="spacing14">14dp</dimen>
+    <dimen name="spacing16">16dp</dimen>
+    <dimen name="spacing24">24dp</dimen>
+    <dimen name="spacing32">32dp</dimen>
+    <dimen name="spacing44">44dp</dimen>
+    <dimen name="spacing50">50dp</dimen>
+    <dimen name="spacing54">54dp</dimen>
+    <dimen name="spacing56">56dp</dimen>
+    <dimen name="spacing92">92dp</dimen>
+    <!--  endregion Spacing  -->
+</resources>
\ No newline at end of file
diff --git a/core/ui/src/main/res/values/styles.xml b/core/ui/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..001815837e
--- /dev/null
+++ b/core/ui/src/main/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.TransparentBottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/TransparentBottomSheetDialog</item>
+        <item name="backgroundTint">@android:color/transparent</item>
+    </style>
+
+    <style name="TransparentBottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet">
+        <item name="backgroundTint">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/core/utils/.gitignore b/core/utils/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/utils/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/utils/build.gradle.kts b/core/utils/build.gradle.kts
new file mode 100644
index 0000000000..9f88778542
--- /dev/null
+++ b/core/utils/build.gradle.kts
@@ -0,0 +1,20 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+    kotlin("kapt")
+}
+
+dependencies {
+
+    /** DI */
+    implementation(Library.hiltCore)
+    kapt(Library.hiltKapt)
+
+    /** Coroutines */
+    implementation(Library.coroutine)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file
diff --git a/core/utils/src/main/AndroidManifest.xml b/core/utils/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..02f6bf24ad
--- /dev/null
+++ b/core/utils/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.utils" />
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/Extensions.kt b/core/utils/src/main/java/com/tangem/utils/Extensions.kt
new file mode 100644
index 0000000000..de72e53d54
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/Extensions.kt
@@ -0,0 +1,9 @@
+package com.tangem.utils
+
+inline fun <reified T : Enum<T>> safeValueOf(type: String, default: T): T {
+    return try {
+        java.lang.Enum.valueOf(T::class.java, type)
+    } catch (e: IllegalArgumentException) {
+        default
+    }
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/converter/Converter.kt b/core/utils/src/main/java/com/tangem/utils/converter/Converter.kt
new file mode 100644
index 0000000000..6af667ae08
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/converter/Converter.kt
@@ -0,0 +1,8 @@
+package com.tangem.utils.converter
+
+interface Converter<I, O> {
+    fun convert(value: I): O
+    fun convertList(input: List<I>): List<O> {
+        return input.map { convert(it) }
+    }
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineDispatcherProvider.kt b/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineDispatcherProvider.kt
new file mode 100644
index 0000000000..952424e215
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineDispatcherProvider.kt
@@ -0,0 +1,20 @@
+package com.tangem.utils.coroutines
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import javax.inject.Inject
+
+interface CoroutineDispatcherProvider {
+    val main: CoroutineDispatcher
+    val io: CoroutineDispatcher
+}
+
+class AppCoroutineDispatcherProvider @Inject constructor() : CoroutineDispatcherProvider {
+    override val main: CoroutineDispatcher = Dispatchers.Main
+    override val io: CoroutineDispatcher = Dispatchers.IO
+}
+
+class TestingCoroutineDispatcherProvider(
+    override val main: CoroutineDispatcher = Dispatchers.Unconfined,
+    override val io: CoroutineDispatcher = Dispatchers.Unconfined,
+) : CoroutineDispatcherProvider
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineExt.kt b/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineExt.kt
new file mode 100644
index 0000000000..87097ce482
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/coroutines/CoroutineExt.kt
@@ -0,0 +1,10 @@
+package com.tangem.utils.coroutines
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+suspend fun <R> runCatching(dispatcher: CoroutineDispatcher, block: suspend () -> R): Result<R> {
+    return runCatching {
+        withContext(dispatcher) { block() }
+    }
+}
\ No newline at end of file
diff --git a/core/utils/src/main/java/com/tangem/utils/di/CoroutineDispatcherProviderModule.kt b/core/utils/src/main/java/com/tangem/utils/di/CoroutineDispatcherProviderModule.kt
new file mode 100644
index 0000000000..df85354292
--- /dev/null
+++ b/core/utils/src/main/java/com/tangem/utils/di/CoroutineDispatcherProviderModule.kt
@@ -0,0 +1,16 @@
+package com.tangem.utils.di
+
+import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface CoroutineDispatcherProviderModule {
+
+    @Binds
+    fun bindCoroutineDispatcherProvider(coroutineDispatcherProvider: AppCoroutineDispatcherProvider): CoroutineDispatcherProvider
+}
\ No newline at end of file
diff --git a/dependencies.gradle b/dependencies.gradle
deleted file mode 100644
index 9233ced603..0000000000
--- a/dependencies.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-ext.versions = [
-    kotlin               : '1.6.10',
-    build_gradle         : '7.1.3',
-    tangem_card_sdk      : 'develop-165',
-    // tangem_card_sdk      : '0.0.1',
-    tangem_blockchain_sdk: 'AND-2752-build-149-hot-fix-for-3.55-150',
-    // tangem_blockchain_sdk: '0.0.1',
-]
-
-ext.environmentConfig = [
-        environment      : "ENVIRONMENT",
-        testActionEnabled: "TEST_ACTION_ENABLED",
-        logEnabled       : "LOG_ENABLED",
-]
diff --git a/domain/build.gradle b/domain/build.gradle
deleted file mode 100644
index 83c9fe6ff1..0000000000
--- a/domain/build.gradle
+++ /dev/null
@@ -1,88 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-apply from: '../dependencies.gradle'
-
-android {
-    compileSdk 31
-
-    defaultConfig {
-        minSdk 21
-        targetSdk 31
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-        buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
-        buildConfigField 'Boolean', environmentConfig.logEnabled, 'false'
-    }
-
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'false'
-        }
-        debug {
-            debuggable true
-            minifyEnabled false
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'true'
-        }
-        debug_beta {
-            initWith release
-            buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true'
-            buildConfigField 'Boolean', environmentConfig.logEnabled, 'true'
-        }
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-//    composeOptions {
-//        kotlinCompilerExtensionVersion '1.1.0'
-//    }
-    packagingOptions {
-        exclude 'lib/x86_64/darwin/libscrypt.dylib'
-        exclude 'lib/x86_64/freebsd/libscrypt.so'
-        exclude 'lib/x86_64/linux/libscrypt.so'
-    }
-}
-
-dependencies {
-    implementation implementation(project(path: ':network'))
-    implementation implementation(project(path: ':common'))
-
-    implementation "com.tangem:blockchain:${versions.tangem_blockchain_sdk}"
-    implementation "com.tangem.tangem-sdk-kotlin:core:${versions.tangem_card_sdk}"
-    implementation "com.tangem.tangem-sdk-kotlin:android:${versions.tangem_card_sdk}"
-
-    // Kotlin coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-
-    // State management
-    implementation "org.rekotlin:rekotlin:1.0.4"
-
-    // Network
-    //TODO: it must depends from network module
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
-    implementation 'com.squareup.moshi:moshi:1.12.0'
-    implementation "com.squareup.moshi:moshi-kotlin:1.12.0"
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
-
-    // Logs
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-
-    // Tests
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "com.google.truth:truth:1.1.3"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
new file mode 100644
index 0000000000..e365d69c25
--- /dev/null
+++ b/domain/build.gradle.kts
@@ -0,0 +1,102 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    compileSdk = AppConfig.compileSdkVersion
+
+    defaultConfig {
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("prod"),
+                    Field.TestActionEnabled(false),
+                    Field.LogEnabled(false),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+
+        debug {
+            isMinifyEnabled = false
+
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("prod"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    packagingOptions {
+        resources.excludes += "lib/x86_64/darwin/libscrypt.dylib"
+        resources.excludes += "lib/x86_64/freebsd/libscrypt.so"
+        resources.excludes += "lib/x86_64/linux/libscrypt.so"
+    }
+}
+
+dependencies {
+    implementation(project(":core:datasource"))
+    implementation(project(":common"))
+
+    /** Tangem libraries */
+    implementation(Tangem.blockchain) {
+        exclude(module = "joda-time")
+    }
+    implementation(Tangem.cardCore)
+    implementation(Tangem.cardAndroid) {
+        exclude(module = "joda-time")
+    }
+
+    /** Other libraries */
+    implementation(Library.reKotlin)
+    //TODO: refactoring: remove it when all network services moved to the datasource module
+    implementation(Library.retrofit)
+    implementation(Library.retrofitMoshiConverter)
+    implementation(Library.moshi)
+    implementation(Library.moshiKotlin)
+    implementation(Library.okHttpLogging)
+    implementation(Library.timber)
+    implementation(Library.coroutine)
+
+    /** Testing libraries */
+    testImplementation(Test.junit)
+    testImplementation(Test.truth)
+    androidTestImplementation(Test.junitAndroidExt)
+    androidTestImplementation(Test.espresso)
+}
\ No newline at end of file
diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro
index 481bb43481..ff59496d81 100644
--- a/domain/proguard-rules.pro
+++ b/domain/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/domain/src/main/java/com/tangem/domain/DomainDialog.kt b/domain/src/main/java/com/tangem/domain/DomainDialog.kt
index bc7d30a7da..22e0ae8e28 100644
--- a/domain/src/main/java/com/tangem/domain/DomainDialog.kt
+++ b/domain/src/main/java/com/tangem/domain/DomainDialog.kt
@@ -1,7 +1,7 @@
 package com.tangem.domain
 
 import com.tangem.common.extensions.VoidCallback
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 
 /**
 [REDACTED_AUTHOR]
diff --git a/domain/src/main/java/com/tangem/domain/common/CardDTO.kt b/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
new file mode 100644
index 0000000000..58df56c687
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/CardDTO.kt
@@ -0,0 +1,300 @@
+package com.tangem.domain.common
+
+import com.squareup.moshi.JsonClass
+import com.tangem.common.card.Card
+import com.tangem.common.card.CardWallet
+import com.tangem.common.card.EllipticCurve
+import com.tangem.common.card.EncryptionMode
+import com.tangem.common.hdWallet.DerivationPath
+import com.tangem.common.hdWallet.ExtendedPublicKey
+import com.tangem.operations.attestation.Attestation
+import java.util.*
+import com.tangem.common.card.FirmwareVersion as SdkFirmwareVersion
+
+/**
+ * [Card] copy
+ * */
+@JsonClass(generateAdapter = true)
+data class CardDTO(
+    val cardId: String,
+    val batchId: String,
+    val cardPublicKey: ByteArray,
+    val firmwareVersion: FirmwareVersion,
+    val manufacturer: Manufacturer,
+    val issuer: Issuer,
+    val settings: Settings,
+    val linkedTerminalStatus: LinkedTerminalStatus,
+    val isAccessCodeSet: Boolean,
+    val isPasscodeSet: Boolean?,
+    val supportedCurves: List<EllipticCurve>,
+    val wallets: List<Wallet>,
+    val attestation: Attestation,
+    val backupStatus: BackupStatus?,
+) {
+    constructor(card: Card) : this(
+        cardId = card.cardId,
+        batchId = card.batchId,
+        cardPublicKey = card.cardPublicKey,
+        firmwareVersion = FirmwareVersion(card.firmwareVersion),
+        manufacturer = Manufacturer(card.manufacturer),
+        issuer = Issuer(card.issuer),
+        settings = Settings(card.settings),
+        linkedTerminalStatus = LinkedTerminalStatus.fromSdkStatus(card.linkedTerminalStatus),
+        isAccessCodeSet = card.isAccessCodeSet,
+        isPasscodeSet = card.isPasscodeSet,
+        supportedCurves = card.supportedCurves,
+        wallets = card.wallets.map { Wallet(it) },
+        attestation = card.attestation,
+        backupStatus = BackupStatus.fromSdkStatus(card.backupStatus),
+    )
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is CardDTO) return false
+
+        if (cardId != other.cardId) return false
+        if (batchId != other.batchId) return false
+        if (!cardPublicKey.contentEquals(other.cardPublicKey)) return false
+        if (firmwareVersion != other.firmwareVersion) return false
+        if (manufacturer != other.manufacturer) return false
+        if (issuer != other.issuer) return false
+        if (settings != other.settings) return false
+        if (linkedTerminalStatus != other.linkedTerminalStatus) return false
+        if (isAccessCodeSet != other.isAccessCodeSet) return false
+        if (isPasscodeSet != other.isPasscodeSet) return false
+        if (supportedCurves != other.supportedCurves) return false
+        if (wallets != other.wallets) return false
+        if (attestation != other.attestation) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = cardId.hashCode()
+        result = 31 * result + batchId.hashCode()
+        result = 31 * result + cardPublicKey.contentHashCode()
+        result = 31 * result + firmwareVersion.hashCode()
+        result = 31 * result + manufacturer.hashCode()
+        result = 31 * result + issuer.hashCode()
+        result = 31 * result + settings.hashCode()
+        result = 31 * result + linkedTerminalStatus.hashCode()
+        result = 31 * result + isAccessCodeSet.hashCode()
+        result = 31 * result + (isPasscodeSet?.hashCode() ?: 0)
+        result = 31 * result + supportedCurves.hashCode()
+        result = 31 * result + wallets.hashCode()
+        result = 31 * result + attestation.hashCode()
+        return result
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Settings(
+        val securityDelay: Int,
+        val maxWalletsCount: Int,
+        val isSettingAccessCodeAllowed: Boolean,
+        val isSettingPasscodeAllowed: Boolean,
+        val isResettingUserCodesAllowed: Boolean,
+        val isLinkedTerminalEnabled: Boolean,
+        val isBackupAllowed: Boolean,
+        val supportedEncryptionModes: List<EncryptionMode>,
+        val isFilesAllowed: Boolean,
+        val isHDWalletAllowed: Boolean,
+    ) {
+        constructor(settings: Card.Settings) : this(
+            securityDelay = settings.securityDelay,
+            maxWalletsCount = settings.maxWalletsCount,
+            isSettingAccessCodeAllowed = settings.isSettingAccessCodeAllowed,
+            isSettingPasscodeAllowed = settings.isSettingPasscodeAllowed,
+            isResettingUserCodesAllowed = settings.isResettingUserCodesAllowed,
+            isLinkedTerminalEnabled = settings.isLinkedTerminalEnabled,
+            isBackupAllowed = settings.isBackupAllowed,
+            supportedEncryptionModes = settings.supportedEncryptionModes,
+            isFilesAllowed = settings.isFilesAllowed,
+            isHDWalletAllowed = settings.isHDWalletAllowed,
+        )
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class FirmwareVersion(
+        val major: Int,
+        val minor: Int,
+        val patch: Int,
+        val type: SdkFirmwareVersion.FirmwareType,
+    ) : Comparable<SdkFirmwareVersion> {
+        constructor(firmwareVersion: SdkFirmwareVersion) : this(
+            major = firmwareVersion.major,
+            minor = firmwareVersion.minor,
+            patch = firmwareVersion.patch,
+            type = firmwareVersion.type,
+        )
+
+        val stringValue: String
+            get() = StringBuilder()
+                .append("$major.$minor")
+                .append(if (patch != 0) ".$patch" else "")
+                .append(type.rawValue ?: "")
+                .toString()
+
+        override fun compareTo(other: SdkFirmwareVersion): Int = when {
+            major != other.major -> major.compareTo(other.major)
+            minor != other.minor -> minor.compareTo(other.minor)
+            else -> patch.compareTo(other.patch)
+        }
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Manufacturer(
+        val name: String,
+        val manufactureDate: Date,
+        val signature: ByteArray?,
+    ) {
+        constructor(manufacturer: Card.Manufacturer) : this(
+            name = manufacturer.name,
+            manufactureDate = manufacturer.manufactureDate,
+            signature = manufacturer.signature,
+        )
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is Manufacturer) return false
+
+            if (name != other.name) return false
+            if (manufactureDate != other.manufactureDate) return false
+            if (signature != null) {
+                if (other.signature == null) return false
+                if (!signature.contentEquals(other.signature)) return false
+            } else if (other.signature != null) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = name.hashCode()
+            result = 31 * result + manufactureDate.hashCode()
+            result = 31 * result + (signature?.contentHashCode() ?: 0)
+            return result
+        }
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Issuer(
+        val name: String,
+        val publicKey: ByteArray,
+    ) {
+        constructor(issuer: Card.Issuer) : this(
+            name = issuer.name,
+            publicKey = issuer.publicKey,
+        )
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is Issuer) return false
+
+            if (name != other.name) return false
+            if (!publicKey.contentEquals(other.publicKey)) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = name.hashCode()
+            result = 31 * result + publicKey.contentHashCode()
+            return result
+        }
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Wallet(
+        val publicKey: ByteArray,
+        val chainCode: ByteArray?,
+        val curve: EllipticCurve,
+        val settings: CardWallet.Settings,
+        val totalSignedHashes: Int?,
+        val remainingSignatures: Int?,
+        val index: Int,
+        val hasBackup: Boolean,
+        val derivedKeys: Map<DerivationPath, ExtendedPublicKey>,
+        val extendedPublicKey: ExtendedPublicKey?,
+    ) {
+        constructor(wallet: CardWallet) : this(
+            publicKey = wallet.publicKey,
+            chainCode = wallet.chainCode,
+            curve = wallet.curve,
+            settings = wallet.settings,
+            totalSignedHashes = wallet.totalSignedHashes,
+            remainingSignatures = wallet.remainingSignatures,
+            index = wallet.index,
+            hasBackup = wallet.hasBackup,
+            derivedKeys = wallet.derivedKeys,
+            extendedPublicKey = wallet.extendedPublicKey,
+        )
+
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (other !is Wallet) return false
+
+            if (!publicKey.contentEquals(other.publicKey)) return false
+            if (chainCode != null) {
+                if (other.chainCode == null) return false
+                if (!chainCode.contentEquals(other.chainCode)) return false
+            } else if (other.chainCode != null) return false
+            if (curve != other.curve) return false
+            if (settings != other.settings) return false
+            if (totalSignedHashes != other.totalSignedHashes) return false
+            if (remainingSignatures != other.remainingSignatures) return false
+            if (index != other.index) return false
+            if (hasBackup != other.hasBackup) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = publicKey.contentHashCode()
+            result = 31 * result + (chainCode?.contentHashCode() ?: 0)
+            result = 31 * result + curve.hashCode()
+            result = 31 * result + settings.hashCode()
+            result = 31 * result + (totalSignedHashes ?: 0)
+            result = 31 * result + (remainingSignatures ?: 0)
+            result = 31 * result + index
+            result = 31 * result + hasBackup.hashCode()
+            return result
+        }
+    }
+
+    enum class LinkedTerminalStatus {
+        Current,
+        Other,
+        None;
+
+        companion object {
+            internal fun fromSdkStatus(sdkStatus: Card.LinkedTerminalStatus): LinkedTerminalStatus {
+                return when (sdkStatus) {
+                    Card.LinkedTerminalStatus.Current -> Current
+                    Card.LinkedTerminalStatus.Other -> Other
+                    Card.LinkedTerminalStatus.None -> None
+                }
+            }
+        }
+    }
+
+    sealed class BackupStatus {
+        data class CardLinked(val cardCount: Int) : BackupStatus()
+
+        data class Active(val cardCount: Int) : BackupStatus()
+
+        object NoBackup : BackupStatus()
+
+        val isActive: Boolean
+            get() = this is Active || this is CardLinked
+
+        companion object {
+            internal fun fromSdkStatus(sdkStatus: Card.BackupStatus?): BackupStatus? {
+                return when (sdkStatus) {
+                    is Card.BackupStatus.NoBackup -> NoBackup
+                    is Card.BackupStatus.CardLinked -> CardLinked(sdkStatus.cardCount)
+                    is Card.BackupStatus.Active -> Active(sdkStatus.cardCount)
+                    null -> null
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/CardInfo.kt b/domain/src/main/java/com/tangem/domain/common/CardInfo.kt
new file mode 100644
index 0000000000..7953c475ac
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/CardInfo.kt
@@ -0,0 +1,14 @@
+package com.tangem.domain.common
+
+import com.tangem.common.card.WalletData
+import com.tangem.operations.backup.PrimaryCard
+import com.tangem.operations.derivation.ExtendedPublicKeysMap
+
+data class CardInfo(
+    val card: CardDTO,
+    val productType: ProductType,
+    val walletData: WalletData?,
+    val secondTwinPublicKey: String?,
+    val derivedKeys: Map<KeyWalletPublicKey, ExtendedPublicKeysMap>,
+    val primaryCard: PrimaryCard?,
+)
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt b/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
index ea2c525405..cfcd3089ff 100644
--- a/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
+++ b/domain/src/main/java/com/tangem/domain/common/ScanResponse.kt
@@ -2,7 +2,6 @@ package com.tangem.domain.common
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
-import com.tangem.common.card.Card
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.WalletData
 import com.tangem.common.extensions.ByteArrayKey
@@ -24,7 +23,7 @@ import com.tangem.operations.derivation.ExtendedPublicKeysMap
 [REDACTED_AUTHOR]
  */
 data class ScanResponse(
-    val card: Card,
+    val card: CardDTO,
     val productType: ProductType,
     val walletData: WalletData?,
     val secondTwinPublicKey: String? = null,
@@ -69,7 +68,7 @@ data class ScanResponse(
         return hasDerivation(blockchain, DerivationPath(rawDerivationPath))
     }
 
-    fun hasDerivation(blockchain: Blockchain, derivationPath: DerivationPath): Boolean {
+    private fun hasDerivation(blockchain: Blockchain, derivationPath: DerivationPath): Boolean {
         val isTestnet = card.isTestCard || blockchain.isTestnet()
         return when {
             Blockchain.secp256k1Blockchains(isTestnet).contains(blockchain) -> {
@@ -82,7 +81,7 @@ data class ScanResponse(
         }
     }
 
-    fun hasDerivation(curve: EllipticCurve, derivationPath: DerivationPath): Boolean {
+    private fun hasDerivation(curve: EllipticCurve, derivationPath: DerivationPath): Boolean {
         val foundWallet = card.wallets.firstOrNull { it.curve == curve }
             ?: return false
         val extendedPublicKeysMap = derivedKeys[foundWallet.publicKey.toMapKey()] ?: return false
@@ -95,13 +94,4 @@ enum class ProductType {
     Note, Twins, Wallet, SaltPay, Start2Coin
 }
 
-val Card.productType: ProductType
-    get() = when {
-        isTangemTwins -> ProductType.Twins
-        isTangemNote -> ProductType.Note
-        isSaltPay -> ProductType.SaltPay
-        isStart2Coin -> ProductType.Start2Coin
-        else -> ProductType.Wallet
-    }
-
 typealias KeyWalletPublicKey = ByteArrayKey
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt b/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
index 69ec26308b..21fa7e169f 100644
--- a/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
+++ b/domain/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
@@ -17,18 +17,32 @@ object TapWorkarounds {
         return cardIssuer?.lowercase(Locale.US) == START_2_COIN_ISSUER
     }
 
-    val Card.isStart2Coin: Boolean
+    val CardDTO.isTangemTwins: Boolean
+        get() = TwinsHelper.getTwinCardNumber(cardId) != null
+
+    //TODO: replace by reading files from a card
+    val CardDTO.isTangemNote: Boolean
+        get() = tangemNoteBatches.contains(batchId)
+
+    val CardDTO.isStart2Coin: Boolean
         get() = isStart2CoinIssuer(issuer.name)
 
-    val Card.isTestCard: Boolean
+    val CardDTO.isSaltPay: Boolean
+        get() = isSaltPayVisa || isSaltPayWallet
+
+    val CardDTO.isSaltPayVisa: Boolean
+        get() = SaltPayWorkaround.isVisaBatchId(batchId)
+
+    val CardDTO.isSaltPayWallet: Boolean
+        get() = SaltPayWorkaround.isWalletCardId(cardId)
+
+    val CardDTO.isTestCard: Boolean
         get() = batchId == TEST_CARD_BATCH && cardId.startsWith(TEST_CARD_ID_STARTS_WITH)
 
-    val Card.useOldStyleDerivation: Boolean
+    val CardDTO.useOldStyleDerivation: Boolean
         get() = batchId == "AC01" || batchId == "AC02" || batchId == "CB95"
-
-    val Card.derivationStyle: DerivationStyle?
+    val CardDTO.derivationStyle: DerivationStyle?
         get() = if (!settings.isHDWalletAllowed) {
-            Int.MAX_VALUE
             null
         } else if (useOldStyleDerivation) {
             DerivationStyle.LEGACY
@@ -36,15 +50,18 @@ object TapWorkarounds {
             DerivationStyle.NEW
         }
 
-    val Card.isNotSupportedInThatRelease: Boolean
+    val CardDTO.isExcluded: Boolean
+        get() {
+            val excludedBatch = excludedBatches.contains(batchId)
+            val excludedIssuerName = excludedIssuers.contains(issuer.name.uppercase(Locale.ROOT))
+            return excludedBatch || excludedIssuerName
+        }
+
+    val CardDTO.isNotSupportedInThatRelease: Boolean
         get() = false
 
-    val Card.isTangemTwins: Boolean
-        get() = TwinsHelper.getTwinCardNumber(cardId) != null
-
-    //TODO: replace by reading files from a card
-    val Card.isTangemNote: Boolean
-        get() = tangemNoteBatches.contains(batchId)
+    fun CardDTO.getTangemNoteBlockchain(): Blockchain? =
+        tangemNoteBatches[batchId] ?: if (isSaltPay) Blockchain.Gnosis else null
 
     private val tangemNoteBatches = mapOf(
         "AB01" to Blockchain.Bitcoin,
@@ -63,24 +80,6 @@ object TapWorkarounds {
 
     fun Card.getTangemNoteBlockchain(): Blockchain? = tangemNoteBatches[batchId] ?: null
 
-
-    val Card.isSaltPay: Boolean
-        get() = isSaltPayVisa || isSaltPayWallet
-
-    val Card.isSaltPayVisa: Boolean
-        get() = SaltPayWorkaround.isVisaBatchId(batchId)
-
-    val Card.isSaltPayWallet: Boolean
-        get() = SaltPayWorkaround.isWalletCardId(cardId)
-
-
-    val Card.isExcluded: Boolean
-        get() {
-            val excludedBatch = excludedBatches.contains(batchId)
-            val excludedIssuerName = excludedIssuers.contains(issuer.name.uppercase(Locale.ROOT))
-            return excludedBatch || excludedIssuerName
-        }
-
     private val excludedBatches = listOf(
         "0027",
         "0030",
diff --git a/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt b/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt
index e6f9c23475..a1ded44422 100644
--- a/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt
+++ b/domain/src/main/java/com/tangem/domain/common/TwinsHelper.kt
@@ -1,6 +1,5 @@
 package com.tangem.domain.common
 
-import com.tangem.common.card.Card
 import com.tangem.crypto.CryptoUtils
 
 class TwinsHelper {
@@ -15,18 +14,10 @@ class TwinsHelper {
             return CryptoUtils.verify(cardWalletPublicKey, publicKey, signedKey)
         }
 
-        fun getTwinCardNumber(cardId: String): TwinCardNumber? {
-            return when {
-                firstCardSeries.map { cardId.startsWith(it) }.contains(true) -> {
-                    TwinCardNumber.First
-                }
-                secondCardSeries.map { cardId.startsWith(it) }.contains(true) -> {
-                    TwinCardNumber.Second
-                }
-                else -> {
-                    null
-                }
-            }
+        fun getTwinCardNumber(cardId: String): TwinCardNumber? = when {
+            firstCardSeries.any(cardId::startsWith) -> TwinCardNumber.First
+            secondCardSeries.any(cardId::startsWith) -> TwinCardNumber.Second
+            else -> null
         }
 
         fun getPairCardSeries(cardId: String): String? {
@@ -65,14 +56,14 @@ enum class TwinCardNumber(val number: Int) {
 }
 
 @Deprecated("Use ScanResponse.isTangemTwin")
-fun Card.isTangemTwin(): Boolean {
+fun CardDTO.isTangemTwin(): Boolean {
     return TwinsHelper.getTwinCardNumber(cardId) != null
 }
 
-fun Card.getTwinCardNumber(): TwinCardNumber? {
+fun CardDTO.getTwinCardNumber(): TwinCardNumber? {
     return TwinsHelper.getTwinCardNumber(this.cardId)
 }
 
-fun Card.getTwinCardIdForUser(): String {
+fun CardDTO.getTwinCardIdForUser(): String {
     return TwinsHelper.getTwinCardIdForUser(this.cardId)
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt b/domain/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
index acc0fc7bf0..bd7a3d7643 100644
--- a/domain/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
+++ b/domain/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt
@@ -1,9 +1,9 @@
 package com.tangem.domain.common.extensions
 
 import com.tangem.blockchain.common.Blockchain
-import com.tangem.common.card.Card
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.card.FirmwareVersion
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 
 /**
@@ -12,11 +12,12 @@ import com.tangem.domain.common.TapWorkarounds.isTestCard
 val FirmwareVersion.Companion.SolanaTokensAvailable
     get() = FirmwareVersion(4, 52)
 
-fun Card.supportedBlockchains(): List<Blockchain> {
+fun CardDTO.supportedBlockchains(): List<Blockchain> {
     val supportedBlockchains = when {
         firmwareVersion < FirmwareVersion.MultiWalletAvailable -> {
             Blockchain.fromCurve(EllipticCurve.Secp256k1)
         }
+
         else -> {
             (Blockchain.fromCurve(EllipticCurve.Secp256k1) + Blockchain.fromCurve(EllipticCurve.Ed25519)).distinct()
         }
@@ -26,7 +27,7 @@ fun Card.supportedBlockchains(): List<Blockchain> {
         .filter { it.isSupportedInApp() }
 }
 
-fun Card.supportedTokens(): List<Blockchain> {
+fun CardDTO.supportedTokens(): List<Blockchain> {
     val tokensSupportedByBlockchain = supportedBlockchains().filter { it.canHandleTokens() }.toMutableList()
     val tokensSupportedByCard = when {
         firmwareVersion >= FirmwareVersion.SolanaTokensAvailable -> tokensSupportedByBlockchain
@@ -41,10 +42,10 @@ fun Card.supportedTokens(): List<Blockchain> {
     return filtered
 }
 
-fun Card.canHandleBlockchain(blockchain: Blockchain): Boolean {
+fun CardDTO.canHandleBlockchain(blockchain: Blockchain): Boolean {
     return this.supportedBlockchains().contains(blockchain)
 }
 
-fun Card.canHandleToken(blockchain: Blockchain): Boolean {
+fun CardDTO.canHandleToken(blockchain: Blockchain): Boolean {
     return this.supportedTokens().contains(blockchain)
 }
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt b/domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt
index 3304349b69..925eaa5f82 100644
--- a/domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt
+++ b/domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt
@@ -1,8 +1,8 @@
 package com.tangem.domain.common.extensions
 
 import com.tangem.common.services.Result
-import com.tangem.network.api.tangemTech.CoinsResponse
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
 
 suspend fun TangemTechService.getTokens(
     contractAddress: String,
diff --git a/domain/src/main/java/com/tangem/domain/common/util/UserWalletId.kt b/domain/src/main/java/com/tangem/domain/common/util/UserWalletId.kt
new file mode 100644
index 0000000000..abf878da69
--- /dev/null
+++ b/domain/src/main/java/com/tangem/domain/common/util/UserWalletId.kt
@@ -0,0 +1,33 @@
+package com.tangem.domain.common.util
+
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toHexString
+
+class UserWalletId(
+    val stringValue: String,
+) {
+    val value = stringValue.hexToBytes()
+
+    constructor(value: ByteArray?) : this(
+        stringValue = value?.toHexString() ?: "",
+    )
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is UserWalletId) return false
+
+        if (stringValue != other.stringValue) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return stringValue.hashCode()
+    }
+
+    override fun toString(): String {
+        return with(stringValue) {
+            "UserWalletId(${take(3)}...${takeLast(3)})"
+        }
+    }
+}
\ No newline at end of file
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
index a502ae5041..98a63b6565 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
@@ -2,8 +2,8 @@ package com.tangem.domain.features.addCustomToken
 
 import com.tangem.common.services.Result
 import com.tangem.domain.common.extensions.getTokens
-import com.tangem.network.api.tangemTech.CoinsResponse
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.TangemTechService
 
 /**
 [REDACTED_AUTHOR]
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt
index 6949c1de51..3a5946f963 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenAction.kt
@@ -8,7 +8,7 @@ import com.tangem.domain.common.form.Field
 import com.tangem.domain.common.form.FieldId
 import com.tangem.domain.features.addCustomToken.CustomCurrency
 import com.tangem.domain.features.addCustomToken.CustomTokenFieldId
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 import org.rekotlin.Action
 
 /**
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
index 2b56a47f90..3a48aa34a7 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
@@ -56,7 +56,7 @@ import com.tangem.domain.redux.domainStore
 import com.tangem.domain.redux.extensions.dispatchOnMain
 import com.tangem.domain.redux.global.DomainGlobalAction
 import com.tangem.domain.redux.global.DomainGlobalState
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
index 28b821f2ab..978232de57 100644
--- a/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
+++ b/domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenState.kt
@@ -2,10 +2,10 @@ package com.tangem.domain.features.addCustomToken.redux
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.DerivationStyle
-import com.tangem.common.card.Card
 import com.tangem.common.json.MoshiJsonConverter
 import com.tangem.domain.AddCustomTokenError
 import com.tangem.domain.DomainWrapped
+import com.tangem.domain.common.CardDTO
 import com.tangem.domain.common.TapWorkarounds.isTestCard
 import com.tangem.domain.common.extensions.isSupportedInApp
 import com.tangem.domain.common.extensions.supportedBlockchains
@@ -37,7 +37,7 @@ import com.tangem.domain.features.addCustomToken.TokenDerivationPathField
 import com.tangem.domain.features.addCustomToken.TokenField
 import com.tangem.domain.redux.DomainState
 import com.tangem.domain.redux.state.StringActionStateConverter
-import com.tangem.network.api.tangemTech.CoinsResponse
+import com.tangem.datasource.api.tangemTech.CoinsResponse
 import org.rekotlin.Action
 import org.rekotlin.StateType
 
@@ -133,7 +133,7 @@ data class AddCustomTokenState(
         null
     }
 
-    fun reset(card: Card): AddCustomTokenState {
+    fun reset(card: CardDTO): AddCustomTokenState {
         return this.copy(
             appSavedCurrencies = null,
             onTokenAddCallback = null,
@@ -159,7 +159,7 @@ data class AddCustomTokenState(
             .getConvertedData()
     }
 
-    fun getNetworks(card: Card, type: CustomTokenType): List<Blockchain> {
+    fun getNetworks(card: CardDTO, type: CustomTokenType): List<Blockchain> {
         return getNetworksList(card, type)
     }
 
@@ -189,7 +189,7 @@ data class AddCustomTokenState(
             }.derivationPath(derivationStyleToUse)
         }
 
-        internal fun createFormFields(card: Card, type: CustomTokenType): List<DataField<*>> {
+        internal fun createFormFields(card: CardDTO, type: CustomTokenType): List<DataField<*>> {
             return listOf(
                 TokenField(ContractAddress),
                 TokenBlockchainField(Network, getNetworksList(card, type)),
@@ -204,7 +204,7 @@ data class AddCustomTokenState(
          * Serves to determine the networks (blockchains & tokens) that can be selected by Form.Networks.
          * Blockchain.Unknown - is the default selection
          */
-        private fun getNetworksList(card: Card, type: CustomTokenType): List<Blockchain> {
+        private fun getNetworksList(card: CardDTO, type: CustomTokenType): List<Blockchain> {
             val evmBlockchains = Blockchain.values()
                 .filter { it.isEvm() }
                 .filter { card.isTestCard == it.isTestnet() }
@@ -239,7 +239,7 @@ data class AddCustomTokenState(
             )
         }
 
-        private fun getSupportedDerivations(card: Card): List<Blockchain> {
+        private fun getSupportedDerivations(card: CardDTO): List<Blockchain> {
             val evmBlockchains = Blockchain.values()
                 .filter { card.isTestCard == it.isTestnet() && it.isEvm() }
                 .filter { it.isSupportedInApp() }
diff --git a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
index d80b0bab73..a0d0cb833b 100644
--- a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
+++ b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalHub.kt
@@ -5,7 +5,7 @@ import com.tangem.common.extensions.toHexString
 import com.tangem.domain.redux.BaseStoreHub
 import com.tangem.domain.redux.DomainState
 import com.tangem.domain.redux.ReStoreReducer
-import com.tangem.network.common.CardPublicKeyHttpInterceptor
+import com.tangem.datasource.api.common.CardPublicKeyHttpInterceptor
 import org.rekotlin.Action
 
 /**
diff --git a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
index b420816c55..a013b2128f 100644
--- a/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
+++ b/domain/src/main/java/com/tangem/domain/redux/global/DomainGlobalState.kt
@@ -3,8 +3,8 @@ package com.tangem.domain.redux.global
 import com.tangem.domain.DomainDialog
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.common.ScanResponse
-import com.tangem.network.api.paymentology.PaymentologyApiService
-import com.tangem.network.api.tangemTech.TangemTechService
+import com.tangem.datasource.api.paymentology.PaymentologyApiService
+import com.tangem.datasource.api.tangemTech.TangemTechService
 
 /**
 [REDACTED_AUTHOR]
@@ -19,6 +19,8 @@ data class DomainGlobalState(
 )
 
 data class NetworkServices(
-    val tangemTechService: TangemTechService = TangemTechService(LogConfig.network.tangemTechService),
-    val paymentologyService: PaymentologyApiService = PaymentologyApiService(LogConfig.network.paymentologyApiService),
+    val tangemTechService: TangemTechService = TangemTechService(
+        LogConfig.network.tangemTechService),
+    val paymentologyService: PaymentologyApiService = PaymentologyApiService(
+        LogConfig.network.paymentologyApiService),
 )
diff --git a/features/referral/data/.gitignore b/features/referral/data/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/referral/data/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/referral/data/build.gradle.kts b/features/referral/data/build.gradle.kts
new file mode 100644
index 0000000000..510d84817c
--- /dev/null
+++ b/features/referral/data/build.gradle.kts
@@ -0,0 +1,54 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
+
+dependencies {
+
+    /** Project*/
+    implementation(project(":core:datasource"))
+    implementation(project(":core:utils"))
+    implementation(project(":features:referral:domain"))
+
+    /** Time */
+    implementation(Library.jodatime)
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+}
\ No newline at end of file
diff --git a/features/referral/data/src/main/AndroidManifest.xml b/features/referral/data/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..6f8fe3941b
--- /dev/null
+++ b/features/referral/data/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.feature.referral.data" />
\ No newline at end of file
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
new file mode 100644
index 0000000000..7e468c0500
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/converters/ReferralConverter.kt
@@ -0,0 +1,61 @@
+package com.tangem.feature.referral.converters
+
+import com.tangem.datasource.api.referral.models.ReferralResponse
+import com.tangem.datasource.api.referral.models.Token
+import com.tangem.feature.referral.domain.models.DiscountType
+import com.tangem.feature.referral.domain.models.ReferralData
+import com.tangem.feature.referral.domain.models.ReferralInfo
+import com.tangem.feature.referral.domain.models.TokenData
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.safeValueOf
+import org.joda.time.format.ISODateTimeFormat
+import javax.inject.Inject
+
+class ReferralConverter @Inject constructor() : Converter<ReferralResponse, ReferralData> {
+
+    override fun convert(value: ReferralResponse): ReferralData {
+        val conditions = value.conditions
+        val referral = value.referral
+        val tokenConverter = TokenConverter()
+        return if (referral != null) {
+            ReferralData.ParticipantData(
+                award = conditions.award,
+                discount = conditions.discount.amount,
+                discountType = safeValueOf(conditions.discount.discountType.uppercase(), DiscountType.PERCENTAGE),
+                tosLink = conditions.tosLink,
+                tokens = tokenConverter.convertList(conditions.awards.map { it.token }),
+                referral = ReferralInfo(
+                    shareLink = referral.shareLink,
+                    address = referral.address,
+                    promocode = referral.promocode,
+                    walletsPurchased = referral.walletsPurchased,
+                    termsAcceptedAt = referral.termsAcceptedAt?.let {
+                        ISODateTimeFormat.dateTimeParser().parseDateTime(referral.termsAcceptedAt)
+                    },
+                ),
+            )
+        } else {
+            ReferralData.NonParticipantData(
+                award = conditions.award,
+                discount = conditions.discount.amount,
+                discountType = safeValueOf(conditions.discount.discountType.uppercase(), DiscountType.PERCENTAGE),
+                tosLink = conditions.tosLink,
+                tokens = tokenConverter.convertList(conditions.awards.map { it.token }),
+            )
+        }
+    }
+}
+
+private class TokenConverter : Converter<Token, TokenData> {
+
+    override fun convert(value: Token): TokenData {
+        return TokenData(
+            id = value.id,
+            name = value.name,
+            symbol = value.symbol,
+            networkId = value.networkId,
+            contractAddress = value.contractAddress,
+            decimalCount = value.decimalCount,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
new file mode 100644
index 0000000000..789d5d3bc8
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/data/ReferralRepositoryImpl.kt
@@ -0,0 +1,42 @@
+package com.tangem.feature.referral.data
+
+import com.tangem.datasource.api.referral.ReferralApi
+import com.tangem.datasource.api.referral.models.StartReferralBody
+import com.tangem.feature.referral.converters.ReferralConverter
+import com.tangem.feature.referral.domain.ReferralRepository
+import com.tangem.feature.referral.domain.models.ReferralData
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+
+internal class ReferralRepositoryImpl(
+    private val referralApi: ReferralApi,
+    private val referralConverter: ReferralConverter,
+    private val coroutineDispatcher: CoroutineDispatcherProvider,
+) : ReferralRepository {
+
+    override suspend fun getReferralStatus(walletId: String): ReferralData {
+        return withContext(coroutineDispatcher.io) {
+            referralConverter.convert(referralApi.getReferralStatus(walletId))
+        }
+    }
+
+    override suspend fun startReferral(
+        walletId: String,
+        networkId: String,
+        tokenId: String,
+        address: String,
+    ): ReferralData {
+        return withContext(coroutineDispatcher.io) {
+            referralConverter.convert(
+                referralApi.startReferral(
+                    StartReferralBody(
+                        walletId = walletId,
+                        networkId = networkId,
+                        tokenId = tokenId,
+                        address = address,
+                    ),
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/data/src/main/java/com/tangem/feature/referral/di/ReferralRepositoryModule.kt b/features/referral/data/src/main/java/com/tangem/feature/referral/di/ReferralRepositoryModule.kt
new file mode 100644
index 0000000000..7a88c423cc
--- /dev/null
+++ b/features/referral/data/src/main/java/com/tangem/feature/referral/di/ReferralRepositoryModule.kt
@@ -0,0 +1,29 @@
+package com.tangem.feature.referral.di
+
+import com.tangem.datasource.api.referral.ReferralApi
+import com.tangem.feature.referral.converters.ReferralConverter
+import com.tangem.feature.referral.data.ReferralRepositoryImpl
+import com.tangem.feature.referral.domain.ReferralRepository
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class ReferralRepositoryModule {
+
+    @Provides
+    @Singleton
+    fun provideReferralRepository(
+        referralApi: ReferralApi,
+        referralConverter: ReferralConverter,
+        coroutineDispatcherProvider: CoroutineDispatcherProvider,
+    ): ReferralRepository {
+        return ReferralRepositoryImpl(
+            referralApi, referralConverter, coroutineDispatcherProvider,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/domain/.gitignore b/features/referral/domain/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/referral/domain/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/referral/domain/build.gradle.kts b/features/referral/domain/build.gradle.kts
new file mode 100644
index 0000000000..fe5dace957
--- /dev/null
+++ b/features/referral/domain/build.gradle.kts
@@ -0,0 +1,24 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+    kotlin("kapt")
+}
+
+dependencies {
+
+    /** Libs */
+    implementation(project(":core:utils"))
+    implementation(project(":libs:crypto"))
+
+    /** Time */
+    implementation(Library.jodatime)
+
+    /** DI */
+    implementation(Library.hiltCore)
+    kapt(Library.hiltKapt)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file
diff --git a/features/referral/domain/src/main/AndroidManifest.xml b/features/referral/domain/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..ace8d8e355
--- /dev/null
+++ b/features/referral/domain/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.feature.referral.domain" />
\ No newline at end of file
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
new file mode 100644
index 0000000000..a59b0e3b56
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractor.kt
@@ -0,0 +1,10 @@
+package com.tangem.feature.referral.domain
+
+import com.tangem.feature.referral.domain.models.ReferralData
+
+interface ReferralInteractor {
+
+    suspend fun getReferralStatus(): ReferralData
+
+    suspend fun startReferral(): ReferralData
+}
\ 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
new file mode 100644
index 0000000000..bf17471c70
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralInteractorImpl.kt
@@ -0,0 +1,54 @@
+package com.tangem.feature.referral.domain
+
+import com.tangem.feature.referral.domain.converter.TokensConverter
+import com.tangem.feature.referral.domain.models.ReferralData
+import com.tangem.feature.referral.domain.models.TokenData
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.UserWalletManager
+import com.tangem.lib.crypto.models.Currency
+
+internal class ReferralInteractorImpl(
+    private val repository: ReferralRepository,
+    private val derivationManager: DerivationManager,
+    private val userWalletManager: UserWalletManager,
+    private val tokensConverter: TokensConverter,
+) : ReferralInteractor {
+
+    private val tokensForReferral = mutableListOf<TokenData>()
+
+    override suspend fun getReferralStatus(): ReferralData {
+        val refStatus = repository.getReferralStatus(userWalletManager.getWalletId())
+        saveRefTokens(refStatus.tokens)
+        return refStatus
+    }
+
+    override suspend fun startReferral(): ReferralData {
+        if (tokensForReferral.isNotEmpty()) {
+            val currency = tokensConverter.convert(tokensForReferral.first())
+            deriveOrAddTokens(currency)
+            val publicAddress = userWalletManager.getWalletAddress(currency)
+            return repository.startReferral(
+                walletId = userWalletManager.getWalletId(),
+                networkId = currency.networkId,
+                tokenId = currency.id,
+                address = publicAddress,
+            )
+        } else {
+            error("tokens for ref is empty")
+        }
+    }
+
+    private suspend fun deriveOrAddTokens(currency: Currency) {
+        if (!derivationManager.hasDerivation(currency.networkId)) {
+            derivationManager.deriveMissingBlockchains(currency)
+        }
+        if (!userWalletManager.isTokenAdded(currency)) {
+            userWalletManager.addToken(currency)
+        }
+    }
+
+    private fun saveRefTokens(tokens: List<TokenData>) {
+        tokensForReferral.clear()
+        tokensForReferral.addAll(tokens)
+    }
+}
\ No newline at end of file
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt
new file mode 100644
index 0000000000..a329077747
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/ReferralRepository.kt
@@ -0,0 +1,17 @@
+package com.tangem.feature.referral.domain
+
+import com.tangem.feature.referral.domain.models.ReferralData
+
+interface ReferralRepository {
+
+    /** Returns data object of [ReferralData] depends on user program status */
+    suspend fun getReferralStatus(walletId: String): ReferralData
+
+    /** Starts user referral program */
+    suspend fun startReferral(
+        walletId: String,
+        networkId: String,
+        tokenId: String,
+        address: String,
+    ): ReferralData
+}
\ No newline at end of file
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/converter/TokensConverter.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/converter/TokensConverter.kt
new file mode 100644
index 0000000000..2f756567f1
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/converter/TokensConverter.kt
@@ -0,0 +1,33 @@
+package com.tangem.feature.referral.domain.converter
+
+import com.tangem.feature.referral.domain.models.TokenData
+import com.tangem.lib.crypto.models.Currency
+import com.tangem.lib.crypto.models.NativeToken
+import com.tangem.lib.crypto.models.NonNativeToken
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class TokensConverter @Inject constructor() : Converter<TokenData, Currency> {
+
+    override fun convert(value: TokenData): Currency {
+        return if (value.decimalCount != null &&
+            value.contractAddress != null
+        ) {
+            NonNativeToken(
+                id = value.id,
+                name = value.name,
+                symbol = value.symbol,
+                networkId = value.networkId,
+                contractAddress = value.contractAddress,
+                decimalCount = value.decimalCount,
+            )
+        } else {
+            NativeToken(
+                id = value.id,
+                name = value.name,
+                symbol = value.symbol,
+                networkId = value.networkId,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/di/ReferralDomainModule.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/di/ReferralDomainModule.kt
new file mode 100644
index 0000000000..0f0c22b0f0
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/di/ReferralDomainModule.kt
@@ -0,0 +1,31 @@
+package com.tangem.feature.referral.domain.di
+
+import com.tangem.feature.referral.domain.ReferralInteractor
+import com.tangem.feature.referral.domain.ReferralInteractorImpl
+import com.tangem.feature.referral.domain.ReferralRepository
+import com.tangem.feature.referral.domain.converter.TokensConverter
+import com.tangem.lib.crypto.DerivationManager
+import com.tangem.lib.crypto.UserWalletManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class ReferralDomainModule {
+
+    @Provides
+    @Singleton
+    fun provideReferralInteractor(
+        referralRepository: ReferralRepository,
+        derivationManager: DerivationManager,
+        userWalletManager: UserWalletManager,
+        tokensConverter: TokensConverter,
+    ): ReferralInteractor {
+        return ReferralInteractorImpl(
+            referralRepository, derivationManager, userWalletManager, tokensConverter,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt
new file mode 100644
index 0000000000..f5cc061cb0
--- /dev/null
+++ b/features/referral/domain/src/main/java/com/tangem/feature/referral/domain/models/ReferralData.kt
@@ -0,0 +1,52 @@
+package com.tangem.feature.referral.domain.models
+
+import org.joda.time.DateTime
+
+sealed interface ReferralData {
+
+    val award: Int
+    val discount: Int
+    val discountType: DiscountType
+    val tosLink: String
+    val tokens: List<TokenData>
+
+    /** Data class that used if user is participant of program */
+    data class ParticipantData(
+        override val award: Int,
+        override val discount: Int,
+        override val discountType: DiscountType,
+        override val tosLink: String,
+        override val tokens: List<TokenData>,
+        val referral: ReferralInfo,
+    ) : ReferralData
+
+    /** Data class that used if user is not participant of program */
+    data class NonParticipantData(
+        override val award: Int,
+        override val discount: Int,
+        override val discountType: DiscountType,
+        override val tosLink: String,
+        override val tokens: List<TokenData>,
+    ) : ReferralData
+}
+
+data class TokenData(
+    val id: String,
+    val name: String,
+    val symbol: String,
+    val networkId: String,
+    val contractAddress: String?,
+    val decimalCount: Int?,
+)
+
+data class ReferralInfo(
+    val shareLink: String,
+    val address: String,
+    val promocode: String,
+    val walletsPurchased: Int,
+    val termsAcceptedAt: DateTime?,
+)
+
+enum class DiscountType {
+    PERCENTAGE, VALUE
+}
\ No newline at end of file
diff --git a/features/referral/presentation/.gitignore b/features/referral/presentation/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/referral/presentation/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/referral/presentation/build.gradle.kts b/features/referral/presentation/build.gradle.kts
new file mode 100644
index 0000000000..a94eecb86b
--- /dev/null
+++ b/features/referral/presentation/build.gradle.kts
@@ -0,0 +1,74 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
+
+dependencies {
+    /** Core modules */
+    implementation(project(":core:res"))
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+
+    /** AndroidX */
+    implementation(AndroidX.appCompat)
+    implementation(AndroidX.fragmentKtx)
+    implementation(AndroidX.lifecycleViewModelKtx)
+
+    /** Compose */
+    implementation(Compose.foundation)
+    implementation(Compose.material)
+    implementation(Compose.uiTooling)
+
+    /** Domain */
+    implementation(project(":features:referral:domain"))
+
+    /** Other libraries */
+    implementation(Library.composeShimmer)
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/AndroidManifest.xml b/features/referral/presentation/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..4c5a0a1f54
--- /dev/null
+++ b/features/referral/presentation/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.feature.referral.presentation" />
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
new file mode 100644
index 0000000000..6af2cc4e25
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ReferralFragment.kt
@@ -0,0 +1,39 @@
+package com.tangem.feature.referral
+
+import android.os.Bundle
+import android.transition.TransitionInflater
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import androidx.core.view.WindowCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import com.tangem.feature.referral.presentation.R
+import com.tangem.feature.referral.router.ReferralRouter
+import com.tangem.feature.referral.ui.ReferralScreen
+import com.tangem.feature.referral.viewmodels.ReferralViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import java.lang.ref.WeakReference
+
+@AndroidEntryPoint
+class ReferralFragment : Fragment() {
+    private val viewModel by viewModels<ReferralViewModel>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val inflater = TransitionInflater.from(requireContext())
+        enterTransition = inflater.inflateTransition(R.transition.fade)
+        exitTransition = inflater.inflateTransition(R.transition.fade)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        activity?.window?.let { WindowCompat.setDecorFitsSystemWindows(it, true) }
+        viewModel.setRouter(ReferralRouter(fragmentManager = WeakReference(parentFragmentManager)))
+        return ComposeView(inflater.context).apply {
+            setContent {
+                ReferralScreen(stateHolder = viewModel.uiState)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
new file mode 100644
index 0000000000..11ecb1e075
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/models/ReferralStateHolder.kt
@@ -0,0 +1,45 @@
+package com.tangem.feature.referral.models
+
+internal data class ReferralStateHolder(
+    val headerState: HeaderState,
+    val referralInfoState: ReferralInfoState,
+    val errorSnackbar: ErrorSnackbar? = null,
+) {
+
+    data class HeaderState(val onBackClicked: () -> Unit)
+
+    sealed interface ReferralInfoContentState {
+        val award: String
+        val networkName: String
+        val discount: String
+        val url: String
+    }
+
+    sealed interface ReferralInfoState {
+        data class ParticipantContent(
+            override val award: String,
+            override val networkName: String,
+            val address: String,
+            override val discount: String,
+            val purchasedWalletCount: Int,
+            val code: String,
+            val shareLink: String,
+            override val url: String,
+        ) : ReferralInfoState, ReferralInfoContentState
+
+        data class NonParticipantContent(
+            override val award: String,
+            override val networkName: String,
+            override val discount: String,
+            override val url: String,
+            val onParticipateClicked: () -> Unit,
+        ) : ReferralInfoState, ReferralInfoContentState
+
+        object Loading : ReferralInfoState
+    }
+
+    data class ErrorSnackbar(
+        val throwable: Throwable,
+        val onOkClicked: () -> Unit,
+    )
+}
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/router/ReferralRouter.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/router/ReferralRouter.kt
new file mode 100644
index 0000000000..ecd73795bf
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/router/ReferralRouter.kt
@@ -0,0 +1,11 @@
+package com.tangem.feature.referral.router
+
+import androidx.fragment.app.FragmentManager
+import java.lang.ref.WeakReference
+
+internal class ReferralRouter(private val fragmentManager: WeakReference<FragmentManager>) {
+
+    fun back() {
+        fragmentManager.get()?.popBackStack()
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
new file mode 100644
index 0000000000..5f15d77781
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementBottomSheetContent.kt
@@ -0,0 +1,80 @@
+package com.tangem.feature.referral.ui
+
+import android.view.ViewGroup.LayoutParams
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.tangem.core.ui.components.appbar.AppBarWithAdditionalButtons
+import com.tangem.core.ui.components.atoms.BottomSheetIndicator
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.presentation.R
+
+/**
+ * Bottom sheet content with referral program terms of use
+ *
+ * @param url link to the html page
+ */
+@Composable
+internal fun AgreementBottomSheetContent(url: String) {
+    Column(
+        modifier = Modifier
+            .background(color = MaterialTheme.colors.secondary)
+            .fillMaxWidth()
+            .height(LocalConfiguration.current.screenHeightDp.dp - TangemTheme.dimens.spacing16),
+    ) {
+        BottomSheetIndicator()
+        Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
+            AppBarWithAdditionalButtons(text = stringResource(id = R.string.details_referral_title))
+            AgreementHtmlView(url = url)
+        }
+    }
+}
+
+@Composable
+private fun AgreementHtmlView(url: String) {
+    AndroidView(
+        modifier = Modifier.background(MaterialTheme.colors.secondary),
+        factory = {
+            WebView(it).apply {
+                layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+                webViewClient = WebViewClient()
+                settings.apply {
+                    javaScriptEnabled = false
+                    allowFileAccess = false
+                }
+                loadUrl(url)
+            }
+        },
+        update = { it.loadUrl(url) },
+    )
+}
+
+@Preview
+@Composable
+fun Preview_AgreementBottomSheet_InLightTheme() {
+    TangemTheme(isDark = false) {
+        AgreementBottomSheetContent(url = "https://tangem.com/en/")
+    }
+}
+
+@Preview
+@Composable
+fun Preview_AgreementBottomSheet_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        AgreementBottomSheetContent(url = "https://tangem.com/en/")
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
new file mode 100644
index 0000000000..cb77fb06d7
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/AgreementText.kt
@@ -0,0 +1,77 @@
+package com.tangem.feature.referral.ui
+
+import androidx.annotation.StringRes
+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.text.ClickableText
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+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.withStyle
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.textColor
+import com.tangem.feature.referral.presentation.R
+
+@Composable
+internal fun AgreementText(@StringRes firstPartResId: Int, onClicked: () -> Unit) {
+    val agreementText = annotatedAgreementString(firstPart = stringResource(firstPartResId))
+    ClickableText(
+        text = agreementText,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = TangemTheme.dimens.spacing54),
+        style = MaterialTheme.typography.caption.copy(textAlign = TextAlign.Center),
+        maxLines = 2,
+        onClick = {
+            val clickableSpanStyle = requireNotNull(agreementText.spanStyles.getOrNull(1))
+            if (it in clickableSpanStyle.start..clickableSpanStyle.end) {
+                onClicked()
+            }
+        },
+    )
+}
+
+@Composable
+private fun annotatedAgreementString(firstPart: String): AnnotatedString {
+    return buildAnnotatedString {
+        withStyle(SpanStyle(color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY))) {
+            append("$firstPart ")
+        }
+        withStyle(SpanStyle(color = MaterialTheme.colors.textColor(type = TextColorType.ACCENT))) {
+            append(stringResource(id = R.string.common_terms_and_conditions))
+        }
+        withStyle(SpanStyle(color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY))) {
+            append(" ${stringResource(id = R.string.referral_tos_suffix)}")
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_AgreementText_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Box(modifier = Modifier.background(MaterialTheme.colors.primary)) {
+            AgreementText(firstPartResId = R.string.referral_tos_not_enroled_prefix, onClicked = {})
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_AgreementText_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Box(modifier = Modifier.background(MaterialTheme.colors.primary)) {
+            AgreementText(firstPartResId = R.string.referral_tos_not_enroled_prefix, onClicked = {})
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/NonParticipateBottomBlock.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/NonParticipateBottomBlock.kt
new file mode 100644
index 0000000000..29e86058e8
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/NonParticipateBottomBlock.kt
@@ -0,0 +1,50 @@
+package com.tangem.feature.referral.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.tangem.core.ui.components.PrimaryEndIconButton
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.feature.referral.presentation.R
+
+@Composable
+internal fun NonParticipateBottomBlock(onAgreementClicked: () -> Unit, onParticipateClicked: () -> Unit) {
+    Column {
+        AgreementText(
+            firstPartResId = R.string.referral_tos_not_enroled_prefix,
+            onClicked = onAgreementClicked,
+        )
+        PrimaryEndIconButton(
+            modifier = Modifier.padding(all = TangemTheme.dimens.spacing16),
+            text = stringResource(id = R.string.referral_button_participate),
+            iconResId = R.drawable.ic_tangem,
+            onClicked = onParticipateClicked,
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_NonParticipateBottomBlock_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(MaterialTheme.colors.primary)) {
+            NonParticipateBottomBlock(onAgreementClicked = {}, onParticipateClicked = {})
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_NonParticipateBottomBlock_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Column(Modifier.background(MaterialTheme.colors.primary)) {
+            NonParticipateBottomBlock(onAgreementClicked = {}, onParticipateClicked = {})
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
new file mode 100644
index 0000000000..0027b80634
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt
@@ -0,0 +1,172 @@
+package com.tangem.feature.referral.ui
+
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+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.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.content.ContextCompat.startActivity
+import com.tangem.core.ui.components.PrimaryStartIconButton
+import com.tangem.core.ui.components.SmallInfoCard
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.textColor
+import com.tangem.feature.referral.presentation.R
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+internal fun ParticipateBottomBlock(
+    purchasedWalletCount: Int,
+    code: String,
+    shareLink: String,
+    onAgreementClicked: () -> Unit,
+    showCopySnackbar: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .padding(
+                top = TangemTheme.dimens.spacing24,
+                bottom = TangemTheme.dimens.spacing16,
+            )
+            .padding(horizontal = TangemTheme.dimens.spacing16),
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+    ) {
+        SmallInfoCard(
+            startText = stringResource(id = R.string.referral_friends_bought_title),
+            endText = pluralStringResource(
+                id = R.plurals.referral_wallets_purchased_count,
+                count = purchasedWalletCount,
+                purchasedWalletCount
+            ),
+        )
+        PersonalCodeCard(code = code)
+        AdditionalButtons(code = code, shareLink = shareLink, showCopySnackbar = showCopySnackbar)
+        AgreementText(firstPartResId = R.string.referral_tos_enroled_prefix, onClicked = onAgreementClicked)
+    }
+}
+
+@Composable
+private fun PersonalCodeCard(code: String) {
+    Column(
+        modifier = Modifier
+            .shadow(
+                elevation = TangemTheme.dimens.elevation2,
+                shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+            )
+            .background(
+                color = MaterialTheme.colors.secondary,
+                shape = RoundedCornerShape(TangemTheme.dimens.radius12),
+            )
+            .fillMaxWidth()
+            .padding(vertical = TangemTheme.dimens.spacing12),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing4),
+    ) {
+        Text(
+            text = stringResource(id = R.string.referral_promo_code_title),
+            color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY),
+            maxLines = 1,
+            style = MaterialTheme.typography.subtitle2,
+        )
+        Text(
+            text = code,
+            color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
+            maxLines = 1,
+            style = MaterialTheme.typography.h2,
+        )
+    }
+}
+
+@Composable
+private fun AdditionalButtons(code: String, shareLink: String, showCopySnackbar: () -> Unit) {
+    val clipboardManager = LocalClipboardManager.current
+    val hapticFeedback = LocalHapticFeedback.current
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing16),
+    ) {
+        PrimaryStartIconButton(
+            modifier = Modifier.weight(1f),
+            text = stringResource(id = R.string.common_copy),
+            iconResId = R.drawable.ic_copy,
+            onClicked = {
+                hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                clipboardManager.setText(AnnotatedString(code))
+                showCopySnackbar()
+            },
+        )
+
+        val context = LocalContext.current
+        PrimaryStartIconButton(
+            modifier = Modifier.weight(1f),
+            text = stringResource(id = R.string.common_share),
+            iconResId = R.drawable.ic_share,
+            onClicked = {
+                hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
+                context.shareText(context.getString(R.string.referral_share_link, shareLink))
+            },
+        )
+    }
+}
+
+private fun Context.shareText(text: String) {
+    val sendIntent: Intent = Intent().apply {
+        action = Intent.ACTION_SEND
+        putExtra(Intent.EXTRA_TEXT, text)
+        type = "text/plain"
+    }
+    val shareIntent = Intent.createChooser(sendIntent, null)
+    startActivity(this, shareIntent, null)
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ParticipateBottomBlock_InLightTheme() {
+    TangemTheme(isDark = false) {
+        Column(Modifier.background(MaterialTheme.colors.primary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 3,
+                code = "x4JdK",
+                shareLink = "",
+                onAgreementClicked = {},
+                showCopySnackbar = {},
+            )
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ParticipateBottomBlock_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        Column(Modifier.background(MaterialTheme.colors.primary)) {
+            ParticipateBottomBlock(
+                purchasedWalletCount = 3,
+                code = "x4JdK",
+                shareLink = "",
+                onAgreementClicked = {},
+                showCopySnackbar = {},
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
new file mode 100644
index 0000000000..39d5296a12
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ReferralScreen.kt
@@ -0,0 +1,577 @@
+package com.tangem.feature.referral.ui
+
+import androidx.annotation.DrawableRes
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.LocalOverscrollConfiguration
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.BottomSheetScaffold
+import androidx.compose.material.BottomSheetState
+import androidx.compose.material.BottomSheetValue
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Snackbar
+import androidx.compose.material.SnackbarDuration
+import androidx.compose.material.SnackbarHost
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.SnackbarResult
+import androidx.compose.material.Text
+import androidx.compose.material.rememberBottomSheetScaffoldState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+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.draw.shadow
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+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.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.tangem.core.ui.components.VerticalSpacer
+import com.tangem.core.ui.components.appbar.AppBarWithBackButton
+import com.tangem.core.ui.res.ButtonColorType
+import com.tangem.core.ui.res.IconColorType
+import com.tangem.core.ui.res.TangemColorPalette
+import com.tangem.core.ui.res.TangemColorPalette.Black
+import com.tangem.core.ui.res.TangemTheme
+import com.tangem.core.ui.res.TextColorType
+import com.tangem.core.ui.res.buttonColor
+import com.tangem.core.ui.res.iconColor
+import com.tangem.core.ui.res.textColor
+import com.tangem.feature.referral.models.ReferralStateHolder
+import com.tangem.feature.referral.models.ReferralStateHolder.ErrorSnackbar
+import com.tangem.feature.referral.models.ReferralStateHolder.ReferralInfoContentState
+import com.tangem.feature.referral.models.ReferralStateHolder.ReferralInfoState
+import com.tangem.feature.referral.presentation.R
+import com.valentinilk.shimmer.shimmer
+import kotlinx.coroutines.launch
+
+/**
+ * Referral program screen for participant and non-participant
+ *
+ * @param stateHolder state holder
+ */
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+internal fun ReferralScreen(stateHolder: ReferralStateHolder) {
+    val coroutineScope = rememberCoroutineScope()
+    val bottomSheetScaffoldState = rememberBottomSheetScaffoldState(
+        bottomSheetState = BottomSheetState(BottomSheetValue.Collapsed),
+    )
+
+    TangemTheme {
+        BottomSheetScaffold(
+            sheetContent = {
+                AgreementBottomSheetContent(
+                    url = when (val state = stateHolder.referralInfoState) {
+                        is ReferralInfoState.NonParticipantContent -> state.url
+                        is ReferralInfoState.ParticipantContent -> state.url
+                        is ReferralInfoState.Loading -> ""
+                    },
+                )
+            },
+            scaffoldState = bottomSheetScaffoldState,
+            sheetShape = RoundedCornerShape(
+                topStart = TangemTheme.dimens.radius16,
+                topEnd = TangemTheme.dimens.radius16,
+            ),
+            sheetElevation = TangemTheme.dimens.elevation24,
+            sheetPeekHeight = TangemTheme.dimens.size0,
+            content = {
+                ReferralContent(
+                    stateHolder = stateHolder,
+                    onAgreementClicked = {
+                        coroutineScope.launch {
+                            if (bottomSheetScaffoldState.bottomSheetState.isCollapsed) {
+                                bottomSheetScaffoldState.bottomSheetState.expand()
+                            } else {
+                                bottomSheetScaffoldState.bottomSheetState.collapse()
+                            }
+                        }
+                    },
+                )
+            },
+        )
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+private fun ReferralContent(stateHolder: ReferralStateHolder, onAgreementClicked: () -> Unit) {
+    val isCopyButtonPressed = remember { mutableStateOf(false) }
+
+    Box {
+        CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
+            LazyColumn(
+                modifier = Modifier
+                    .background(color = MaterialTheme.colors.primary)
+                    .fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                stickyHeader {
+                    AppBarWithBackButton(
+                        text = stringResource(R.string.details_referral_title),
+                        onBackClick = stateHolder.headerState.onBackClicked,
+                    )
+                }
+                item { Header() }
+                item {
+                    ReferralInfo(
+                        stateHolder = stateHolder,
+                        onAgreementClicked = onAgreementClicked,
+                        showCopySnackbar = { isCopyButtonPressed.value = true },
+                    )
+                }
+            }
+        }
+
+        ErrorSnackbarHost(errorSnackbar = stateHolder.errorSnackbar)
+        CopySnackbarHost(isCopyButtonPressed = isCopyButtonPressed)
+    }
+}
+
+@Composable
+private fun Header() {
+    Column {
+        Image(
+            painter = painterResource(R.drawable.ill_businessman_3d),
+            contentDescription = null,
+            modifier = Modifier
+                .padding(horizontal = TangemTheme.dimens.spacing32)
+                .fillMaxWidth()
+                .height(dimensionResource(R.dimen.size200)),
+        )
+        VerticalSpacer(spaceResId = R.dimen.spacing24)
+        Text(
+            text = stringResource(id = R.string.referral_title),
+            modifier = Modifier.padding(horizontal = dimensionResource(R.dimen.spacing50)),
+            color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
+            textAlign = TextAlign.Center,
+            maxLines = 2,
+            style = MaterialTheme.typography.h2,
+        )
+        VerticalSpacer(spaceResId = R.dimen.spacing16)
+    }
+}
+
+@Composable
+private fun ReferralInfo(
+    stateHolder: ReferralStateHolder,
+    onAgreementClicked: () -> Unit,
+    showCopySnackbar: () -> Unit,
+) {
+    when (val state = stateHolder.referralInfoState) {
+        is ReferralInfoState.ParticipantContent -> {
+            Conditions(state = state)
+            ParticipateBottomBlock(
+                purchasedWalletCount = state.purchasedWalletCount,
+                code = state.code,
+                shareLink = state.shareLink,
+                onAgreementClicked = onAgreementClicked,
+                showCopySnackbar = showCopySnackbar,
+            )
+        }
+        is ReferralInfoState.NonParticipantContent -> {
+            Conditions(state = state)
+            VerticalSpacer(spaceResId = R.dimen.spacing44)
+            NonParticipateBottomBlock(
+                onAgreementClicked = onAgreementClicked,
+                onParticipateClicked = state.onParticipateClicked,
+            )
+        }
+        is ReferralInfoState.Loading -> {
+            LoadingCondition(iconResId = R.drawable.ic_tether)
+            VerticalSpacer(spaceResId = R.dimen.spacing32)
+            LoadingCondition(iconResId = R.drawable.ic_discount)
+        }
+    }
+}
+
+@Composable
+private fun Conditions(state: ReferralInfoContentState) {
+    ConditionForYou(state = state)
+    VerticalSpacer(spaceResId = R.dimen.spacing32)
+    ConditionForYourFriend(discount = state.discount)
+}
+
+@Composable
+private fun ConditionForYou(state: ReferralInfoContentState) {
+    Condition(iconResId = R.drawable.ic_tether) {
+        when (state) {
+            is ReferralInfoState.ParticipantContent -> InfoForYou(
+                award = state.award,
+                networkName = state.networkName,
+                address = state.address,
+            )
+            is ReferralInfoState.NonParticipantContent -> InfoForYou(
+                award = state.award,
+                networkName = state.networkName,
+            )
+        }
+    }
+}
+
+@Composable
+private fun ConditionForYourFriend(discount: String) {
+    Condition(iconResId = R.drawable.ic_discount) {
+        InfoForYourFriend(discount = discount)
+    }
+}
+
+@Composable
+private fun LoadingCondition(@DrawableRes iconResId: Int) {
+    Condition(iconResId = iconResId) {
+        ShimmerInfo()
+    }
+}
+
+@Composable
+private fun Condition(@DrawableRes iconResId: Int, infoBlock: @Composable () -> Unit) {
+    Row(
+        modifier = Modifier.padding(horizontal = TangemTheme.dimens.spacing16),
+        horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12),
+        verticalAlignment = Alignment.Top,
+    ) {
+        Box(
+            modifier = Modifier
+                .background(
+                    color = MaterialTheme.colors.buttonColor(type = ButtonColorType.SECONDARY),
+                    shape = RoundedCornerShape(TangemTheme.dimens.radius16),
+                )
+                .size(TangemTheme.dimens.size56),
+            contentAlignment = Alignment.Center,
+        ) {
+            Icon(
+                painter = painterResource(id = iconResId),
+                contentDescription = null,
+                modifier = Modifier.size(TangemTheme.dimens.size28),
+                tint = MaterialTheme.colors.iconColor(type = IconColorType.PRIMARY1),
+            )
+        }
+        infoBlock()
+    }
+}
+
+@Composable
+private fun InfoForYou(award: String, networkName: String, address: String? = null) {
+    ConditionInfo(title = stringResource(id = R.string.referral_point_currencies_title)) {
+        Text(
+            text = buildAnnotatedString {
+                append(stringResource(id = R.string.referral_point_currencies_description_prefix))
+                withStyle(SpanStyle(color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1))) {
+                    append(" $award ")
+                }
+                append(
+                    String.format(
+                        stringResource(id = R.string.referral_point_currencies_description_suffix),
+                        networkName,
+                        if (!address.isNullOrBlank()) " $address" else "",
+                    ),
+                )
+            },
+            color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY),
+            style = MaterialTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun InfoForYourFriend(discount: String) {
+    ConditionInfo(title = stringResource(id = R.string.referral_point_discount_title)) {
+        Text(
+            text = buildString {
+                append(stringResource(id = R.string.referral_point_discount_description_prefix))
+                append(
+                    String.format(
+                        stringResource(id = R.string.referral_point_discount_description_value),
+                        " $discount",
+                    ),
+                )
+                append(" ")
+                append(stringResource(id = R.string.referral_point_discount_description_suffix))
+            },
+            color = MaterialTheme.colors.textColor(type = TextColorType.TERTIARY),
+            style = MaterialTheme.typography.body2,
+        )
+    }
+}
+
+@Composable
+private fun ConditionInfo(title: String, subtitleContent: @Composable () -> Unit) {
+    Column(verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing2)) {
+        Text(
+            text = title,
+            color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY1),
+            style = MaterialTheme.typography.subtitle1,
+        )
+        subtitleContent()
+    }
+}
+
+@Composable
+private fun ShimmerInfo() {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = TangemTheme.dimens.spacing4)
+            .shimmer(),
+        verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing10),
+    ) {
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(TangemTheme.dimens.radius6))
+                .width(TangemTheme.dimens.size102)
+                .height(TangemTheme.dimens.size16)
+                .background(TangemColorPalette.White),
+        )
+        Box(
+            modifier = Modifier
+                .clip(RoundedCornerShape(TangemTheme.dimens.radius6))
+                .width(TangemTheme.dimens.size40)
+                .height(TangemTheme.dimens.size12)
+                .background(TangemColorPalette.White),
+        )
+    }
+}
+
+// TODO() Replace component with component from ds
+@Composable
+private fun ErrorSnackbarHost(errorSnackbar: ErrorSnackbar?) {
+    if (errorSnackbar != null) {
+        val snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }
+        val coroutineScope = rememberCoroutineScope()
+
+        SnackbarHost(
+            hostState = snackbarHostState,
+            modifier = Modifier.padding(top = TangemTheme.dimens.spacing56),
+            snackbar = {
+                Snackbar(
+                    snackbarData = it,
+                    modifier = Modifier.fillMaxWidth(),
+                    actionOnNewLine = true,
+                    shape = RoundedCornerShape(size = TangemTheme.dimens.radius8),
+                    backgroundColor = Black,
+                    contentColor = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY2),
+                    actionColor = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY2),
+                    elevation = TangemTheme.dimens.elevation3,
+                )
+            },
+        )
+
+        val message = if (errorSnackbar.throwable.cause != null) {
+            String.format(
+                format = stringResource(id = R.string.referral_error_failed_to_load_info_with_reason),
+                errorSnackbar.throwable.cause,
+            )
+        } else {
+            stringResource(id = R.string.referral_error_failed_to_load_info)
+        }
+        val actionLabel = stringResource(id = R.string.warning_button_ok)
+
+        SideEffect {
+            coroutineScope.launch {
+                val result = snackbarHostState.showSnackbar(
+                    message = message,
+                    actionLabel = actionLabel,
+                    duration = SnackbarDuration.Indefinite,
+                )
+                if (result == SnackbarResult.ActionPerformed) {
+                    errorSnackbar.onOkClicked()
+                }
+            }
+        }
+    }
+}
+
+// TODO() Replace component with component from ds
+@Composable
+private fun CopySnackbarHost(isCopyButtonPressed: MutableState<Boolean>) {
+    if (isCopyButtonPressed.value) {
+        val snackbarHostState by remember { mutableStateOf(SnackbarHostState()) }
+        val coroutineScope = rememberCoroutineScope()
+
+        var snackbarSize by remember { mutableStateOf(0) }
+        val width = LocalConfiguration.current.screenWidthDp.dp
+        val snackbarWidth = with(LocalDensity.current) { snackbarSize.toDp() }
+
+        SnackbarHost(
+            hostState = snackbarHostState,
+            modifier = Modifier
+                .padding(top = TangemTheme.dimens.spacing56, start = (width - snackbarWidth).div(2))
+                .fillMaxWidth(),
+            snackbar = {
+                Box(
+                    modifier = Modifier
+                        .onSizeChanged { snackbarSize = it.width }
+                        .background(Black, RoundedCornerShape(size = TangemTheme.dimens.radius8))
+                        .shadow(
+                            TangemTheme.dimens.elevation3,
+                            RoundedCornerShape(size = TangemTheme.dimens.radius8),
+                        )
+                        .padding(
+                            horizontal = TangemTheme.dimens.spacing16,
+                            vertical = TangemTheme.dimens.spacing14,
+                        ),
+                ) {
+                    Text(
+                        text = it.message,
+                        color = MaterialTheme.colors.textColor(type = TextColorType.PRIMARY2),
+                        style = MaterialTheme.typography.body2,
+                    )
+                }
+            },
+        )
+
+        val message = stringResource(id = R.string.referral_promo_code_copied)
+        SideEffect {
+            coroutineScope.launch {
+                snackbarHostState.showSnackbar(
+                    message = message,
+                    duration = SnackbarDuration.Short,
+                )
+                isCopyButtonPressed.value = false
+            }
+        }
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_Participant_InLightTheme() {
+    TangemTheme(isDark = false) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.ParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    address = "ma80...zk8q2",
+                    discount = "10%",
+                    purchasedWalletCount = 3,
+                    code = "x4JdK",
+                    shareLink = "",
+                    url = "",
+                ),
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_Participant_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.ParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    address = "ma80...zk8q2",
+                    discount = "10%",
+                    purchasedWalletCount = 3,
+                    code = "x4JdK",
+                    shareLink = "",
+                    url = "",
+                ),
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_NonParticipant_InLightTheme() {
+    TangemTheme(isDark = false) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.NonParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    discount = "10%",
+                    url = "",
+                    onParticipateClicked = {},
+                ),
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_NonParticipant_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.NonParticipantContent(
+                    award = "10 USDT",
+                    networkName = "Tron",
+                    discount = "10%",
+                    url = "",
+                    onParticipateClicked = {},
+                ),
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_Loading_InLightTheme() {
+    TangemTheme(isDark = false) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.Loading,
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
+
+@Preview(widthDp = 360, showBackground = true)
+@Composable
+fun Preview_ReferralScreen_Loading_InDarkTheme() {
+    TangemTheme(isDark = true) {
+        ReferralScreen(
+            stateHolder = ReferralStateHolder(
+                headerState = ReferralStateHolder.HeaderState(onBackClicked = {}),
+                referralInfoState = ReferralInfoState.Loading,
+                errorSnackbar = null,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
new file mode 100644
index 0000000000..21bd4b1057
--- /dev/null
+++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/viewmodels/ReferralViewModel.kt
@@ -0,0 +1,116 @@
+package com.tangem.feature.referral.viewmodels
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.tangem.feature.referral.domain.ReferralInteractor
+import com.tangem.feature.referral.domain.models.DiscountType
+import com.tangem.feature.referral.domain.models.ReferralData
+import com.tangem.feature.referral.domain.models.ReferralInfo
+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.router.ReferralRouter
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.coroutines.runCatching
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import kotlin.properties.Delegates
+
+@HiltViewModel
+internal class ReferralViewModel @Inject constructor(
+    private val referralInteractor: ReferralInteractor,
+    private val dispatchers: CoroutineDispatcherProvider,
+) : ViewModel() {
+
+    var uiState: ReferralStateHolder by mutableStateOf(createInitiallyUiState())
+        private set
+
+    private var referralRouter: ReferralRouter by Delegates.notNull()
+
+    init {
+        loadReferralData()
+    }
+
+    fun setRouter(router: ReferralRouter) {
+        referralRouter = router
+        uiState = uiState.copy(headerState = ReferralStateHolder.HeaderState(onBackClicked = router::back))
+    }
+
+    private fun createInitiallyUiState() = ReferralStateHolder(
+        headerState = ReferralStateHolder.HeaderState(onBackClicked = { }),
+        referralInfoState = ReferralInfoState.Loading,
+        errorSnackbar = null,
+    )
+
+    private fun loadReferralData() {
+        uiState = uiState.copy(referralInfoState = ReferralInfoState.Loading)
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) { referralInteractor.getReferralStatus() }
+                .onSuccess(::showContent)
+                .onFailure(::showErrorSnackbar)
+        }
+    }
+
+    private fun participate() {
+        uiState = uiState.copy(referralInfoState = ReferralInfoState.Loading)
+        viewModelScope.launch(dispatchers.main) {
+            runCatching(dispatchers.io) { referralInteractor.startReferral() }
+                .onSuccess(::showContent)
+                .onFailure(::showErrorSnackbar)
+        }
+    }
+
+    private fun showContent(referralData: ReferralData) {
+        uiState = uiState.copy(referralInfoState = referralData.convertToReferralInfoState())
+    }
+
+    private fun showErrorSnackbar(throwable: Throwable) {
+        uiState = uiState.copy(
+            errorSnackbar = ErrorSnackbar(throwable = throwable, onOkClicked = referralRouter::back),
+        )
+    }
+
+    private fun ReferralData.convertToReferralInfoState(): ReferralInfoState = when (this) {
+        is ReferralData.ParticipantData -> ReferralInfoState.ParticipantContent(
+            award = getAwardValue(),
+            networkName = getNetworkName(),
+            address = referral.getAddressValue(),
+            discount = getDiscountValue(),
+            purchasedWalletCount = referral.walletsPurchased,
+            code = referral.promocode,
+            shareLink = referral.shareLink,
+            url = tosLink,
+        )
+        is ReferralData.NonParticipantData -> ReferralInfoState.NonParticipantContent(
+            award = getAwardValue(),
+            networkName = getNetworkName(),
+            discount = getDiscountValue(),
+            url = tosLink,
+            onParticipateClicked = ::participate,
+        )
+    }
+
+    private fun ReferralData.getAwardValue(): String = "$award ${getToken().symbol}"
+
+    private fun ReferralData.getNetworkName(): String = getToken().networkId.replaceFirstChar(Char::uppercase)
+
+    private fun ReferralInfo.getAddressValue(): String {
+        check(address.length > 5) { "Invalid address" }
+        return address.substring(startIndex = 0, endIndex = 4) + "..." +
+            address.substring(startIndex = address.length - 5, endIndex = address.length)
+    }
+
+    private fun ReferralData.getDiscountValue(): String {
+        val discountSymbol = when (discountType) {
+            DiscountType.PERCENTAGE -> "%"
+            DiscountType.VALUE -> error("Value doesn't support")
+        }
+        return "$discount $discountSymbol"
+    }
+
+    private fun ReferralData.getToken() = requireNotNull(tokens.firstOrNull()) { "Token list is empty" }
+}
\ No newline at end of file
diff --git a/features/swap/data/.gitignore b/features/swap/data/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/swap/data/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/swap/data/build.gradle.kts b/features/swap/data/build.gradle.kts
new file mode 100644
index 0000000000..0d610522bf
--- /dev/null
+++ b/features/swap/data/build.gradle.kts
@@ -0,0 +1,51 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
+
+dependencies {
+
+    /** Project*/
+    implementation(project(":core:datasource"))
+    implementation(project(":core:utils"))
+    implementation(project(":features:swap:domain"))
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/AndroidManifest.xml b/features/swap/data/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..5981b0aeee
--- /dev/null
+++ b/features/swap/data/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.feature.swap.data" />
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
new file mode 100644
index 0000000000..2095876a1b
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
@@ -0,0 +1,82 @@
+package com.tangem.feature.swap
+
+import com.tangem.datasource.api.oneinch.OneInchApi
+import com.tangem.datasource.api.tangemTech.TangemTechApi
+import com.tangem.feature.swap.converters.ApproveConverter
+import com.tangem.feature.swap.converters.QuotesConverter
+import com.tangem.feature.swap.converters.SwapConverter
+import com.tangem.feature.swap.converters.TokensConverter
+import com.tangem.feature.swap.domain.SwapRepository
+import com.tangem.feature.swap.domain.models.ApproveModel
+import com.tangem.feature.swap.domain.models.Currency
+import com.tangem.feature.swap.domain.models.QuoteModel
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class SwapRepositoryImpl @Inject constructor(
+    private val tangemTechApi: TangemTechApi,
+    private val oneInchApi: OneInchApi,
+    private val tokensConverter: TokensConverter,
+    private val quotesConverter: QuotesConverter,
+    private val swapConverter: SwapConverter,
+    private val approveConverter: ApproveConverter,
+    private val coroutineDispatcher: CoroutineDispatcherProvider,
+) : SwapRepository {
+
+    override suspend fun getExchangeableTokens(networkId: String): List<Currency> {
+        return withContext(coroutineDispatcher.io) {
+            tokensConverter.convertList(tangemTechApi.coins(exchangeable = true, networkIds = networkId).coins)
+        }
+    }
+
+    override suspend fun findBestQuote(fromTokenAddress: String, toTokenAddress: String, amount: String): QuoteModel {
+        return withContext(coroutineDispatcher.io) {
+            quotesConverter.convert(
+                oneInchApi.quote(
+                    fromTokenAddress = fromTokenAddress,
+                    toTokenAddress = toTokenAddress,
+                    amount = amount,
+                ),
+            )
+        }
+    }
+
+    override suspend fun addressForTrust(): String {
+        return withContext(coroutineDispatcher.io) {
+            oneInchApi.approveSpender().address
+        }
+    }
+
+    override suspend fun dataToApprove(tokenAddress: String, amount: String): ApproveModel {
+        return withContext(coroutineDispatcher.io) {
+            approveConverter.convert(oneInchApi.approveTransaction(tokenAddress, amount))
+        }
+    }
+
+    override suspend fun checkTokensSpendAllowance(tokenAddress: String, walletAddress: String): String {
+        return withContext(coroutineDispatcher.io) {
+            oneInchApi.approveAllowance(tokenAddress, walletAddress).allowance
+        }
+    }
+
+    override suspend fun prepareSwapTransaction(
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+        fromAddress: String,
+        slippage: Int,
+    ) {
+        return withContext(coroutineDispatcher.io) {
+            swapConverter.convert(
+                oneInchApi.swap(
+                    fromTokenAddress = fromTokenAddress,
+                    toTokenAddress = toTokenAddress,
+                    amount = amount,
+                    fromAddress = fromAddress,
+                    slippage = slippage,
+                ),
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt
new file mode 100644
index 0000000000..4d3574869d
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ApproveConverter.kt
@@ -0,0 +1,17 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.oneinch.models.ApproveCalldataResponse
+import com.tangem.feature.swap.domain.models.ApproveModel
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class ApproveConverter @Inject constructor() : Converter<ApproveCalldataResponse, ApproveModel> {
+
+    override fun convert(value: ApproveCalldataResponse): ApproveModel {
+        return ApproveModel(
+            data = value.data,
+            gasPrice = value.gasPrice,
+            toAddress = value.toAddress,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/QuotesConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/QuotesConverter.kt
new file mode 100644
index 0000000000..52723c6596
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/QuotesConverter.kt
@@ -0,0 +1,16 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.oneinch.models.QuoteResponse
+import com.tangem.feature.swap.domain.models.QuoteModel
+import com.tangem.utils.converter.Converter
+
+class QuotesConverter : Converter<QuoteResponse, QuoteModel> {
+
+    override fun convert(value: QuoteResponse): QuoteModel {
+        return QuoteModel(
+            fromTokenAmount = value.fromTokenAmount,
+            toTokenAmount = value.toTokenAmount,
+            estimatedGas = value.estimatedGas,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapConverter.kt
new file mode 100644
index 0000000000..244ae4f2a0
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/SwapConverter.kt
@@ -0,0 +1,24 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.oneinch.models.SwapResponse
+import com.tangem.feature.swap.domain.models.SwapTransactionModel
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class SwapConverter @Inject constructor() : Converter<SwapResponse, SwapTransactionModel> {
+
+    override fun convert(value: SwapResponse): SwapTransactionModel {
+        return SwapTransactionModel(
+            fromTokenAddress = value.fromToken.address,
+            toTokenAddress = value.toToken.address,
+            toTokenAmount = value.fromTokenAmount,
+            fromTokenAmount = value.toTokenAmount,
+            fromWalletAddress = value.transaction.fromAddress,
+            toWalletAddress = value.transaction.toAddress,
+            data = value.transaction.data,
+            value = value.transaction.value,
+            gasPrice = value.transaction.gasPrice,
+            gas = value.transaction.gas,
+        )
+    }
+}
\ No newline at end of file
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/TokensConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/TokensConverter.kt
new file mode 100644
index 0000000000..c5414d666c
--- /dev/null
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/TokensConverter.kt
@@ -0,0 +1,32 @@
+package com.tangem.feature.swap.converters
+
+import com.tangem.datasource.api.tangemTech.CoinsResponse
+import com.tangem.feature.swap.domain.models.Currency
+import com.tangem.utils.converter.Converter
+import javax.inject.Inject
+
+class TokensConverter @Inject constructor() : Converter<CoinsResponse.Coin, Currency> {
+
+    override fun convert(value: CoinsResponse.Coin): Currency {
+        val network = value.networks.first()
+        return if (network.contractAddress != null && network.decimalCount != null) {
+            Currency.NonNativeToken(
+                id = value.id,
+                name = value.name,
+                symbol = value.symbol,
+                networkId = network.networkId,
+                contractAddress = network.contractAddress!!,
+                decimalCount = network.decimalCount!!.intValueExact(),
+                logoUrl = "",//todo add logo
+            )
+        } else {
+            Currency.NativeToken(
+                id = value.id,
+                name = value.name,
+                symbol = value.symbol,
+                networkId = network.networkId,
+                logoUrl = "", //todo add logo
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/features/swap/domain/.gitignore b/features/swap/domain/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/swap/domain/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/swap/domain/build.gradle.kts b/features/swap/domain/build.gradle.kts
new file mode 100644
index 0000000000..e8259cee84
--- /dev/null
+++ b/features/swap/domain/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
new file mode 100644
index 0000000000..eebb325e5e
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapInteractor.kt
@@ -0,0 +1,4 @@
+package com.tangem.feature.swap.domain
+
+interface SwapInteractor {
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
new file mode 100644
index 0000000000..963f87bfdb
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/SwapRepository.kt
@@ -0,0 +1,52 @@
+package com.tangem.feature.swap.domain
+
+import com.tangem.feature.swap.domain.models.ApproveModel
+import com.tangem.feature.swap.domain.models.Currency
+import com.tangem.feature.swap.domain.models.QuoteModel
+
+interface SwapRepository {
+
+    suspend fun getExchangeableTokens(networkId: String): List<Currency>
+
+    suspend fun findBestQuote(
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+    ): QuoteModel
+
+    /**
+     * Returns address of 1inch router that must be trusted
+     *
+     * @return address
+     */
+    suspend fun addressForTrust(): String
+
+    /**
+     * Generate "data" for calling contract in order to allow 1inch spend funds
+     *
+     * @param tokenAddress token you want to exchange
+     * @param amount number of tokens is allowed. By default infinite
+     */
+    suspend fun dataToApprove(
+        tokenAddress: String,
+        amount: String,
+    ): ApproveModel
+
+    /**
+     * Get the number of tokens that the 1inch router is allowed to spend
+     *
+     * @param tokenAddress Token address you want to exchange
+     * @param walletAddress address for which you want to check
+     *
+     * @return amount of tokens allowed to spend
+     */
+    suspend fun checkTokensSpendAllowance(tokenAddress: String, walletAddress: String): String
+
+    suspend fun prepareSwapTransaction(
+        fromTokenAddress: String,
+        toTokenAddress: String,
+        amount: String,
+        fromAddress: String,
+        slippage: Int,
+    )
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ApproveModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ApproveModel.kt
new file mode 100644
index 0000000000..2fce5634f9
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/ApproveModel.kt
@@ -0,0 +1,14 @@
+package com.tangem.feature.swap.domain.models
+
+/**
+ * Approve model
+ *
+ * @property data The encoded data to call the approve method on the swapped token contract
+ * @property gasPrice Gas price for fast transaction processing
+ * @property toAddress Token address that will be allowed to exchange through 1inch router
+ */
+data class ApproveModel(
+    val data: String,
+    val gasPrice: String,
+    val toAddress: String,
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/Currency.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/Currency.kt
new file mode 100644
index 0000000000..05fe0cad3b
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/Currency.kt
@@ -0,0 +1,28 @@
+package com.tangem.feature.swap.domain.models
+
+sealed class Currency(
+    open val id: String,
+    open val name: String,
+    open val symbol: String,
+    open val networkId: String,
+    open val logoUrl: String,
+) {
+
+    data class NativeToken(
+        override val id: String,
+        override val name: String,
+        override val symbol: String,
+        override val networkId: String,
+        override val logoUrl: String,
+    ) : Currency(id, name, symbol, networkId, logoUrl)
+
+    data class NonNativeToken(
+        override val id: String,
+        override val name: String,
+        override val symbol: String,
+        override val networkId: String,
+        override val logoUrl: String,
+        val contractAddress: String,
+        val decimalCount: Int,
+    ) : Currency(id, name, symbol, networkId, logoUrl)
+}
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/QuoteModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/QuoteModel.kt
new file mode 100644
index 0000000000..e71378fd22
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/QuoteModel.kt
@@ -0,0 +1,7 @@
+package com.tangem.feature.swap.domain.models
+
+data class QuoteModel(
+    val fromTokenAmount: String,
+    val toTokenAmount: String,
+    val estimatedGas: Int
+)
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapTransactionModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapTransactionModel.kt
new file mode 100644
index 0000000000..f36d74eb61
--- /dev/null
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/SwapTransactionModel.kt
@@ -0,0 +1,29 @@
+package com.tangem.feature.swap.domain.models
+
+/**
+ * Swap transaction model
+ *
+ * @property fromTokenAddress token from which want to convert
+ * @property toTokenAddress token to want to convert
+ * @property toTokenAmount amount "target" token
+ * @property fromTokenAmount amount "initial" token
+ * @property fromWalletAddress wallet from address (transactions will be sent from this address)
+ * @property toWalletAddress transactions will be sent to our(1inch) contract address
+ * @property data The encoded data to call the approve method on the swapped token contract
+ * @property value  Native token value in WEI (for approve is always 0)
+ * @property gasPrice maximum amount of gas for a swap default: 11500000; max: 11500000
+ * @property gas estimated amount of the gas limit, increase this value by 25%
+ * @constructor Create empty Swap transaction model
+ */
+data class SwapTransactionModel(
+    val fromTokenAddress: String,
+    val toTokenAddress: String,
+    val toTokenAmount: String,
+    val fromTokenAmount: String,
+    val fromWalletAddress: String,
+    val toWalletAddress: String,
+    val data: String,
+    val value: String,
+    val gasPrice: String,
+    val gas: String,
+)
\ No newline at end of file
diff --git a/features/swap/presentation/.gitignore b/features/swap/presentation/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/features/swap/presentation/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/features/swap/presentation/build.gradle.kts b/features/swap/presentation/build.gradle.kts
new file mode 100644
index 0000000000..82e54a8b08
--- /dev/null
+++ b/features/swap/presentation/build.gradle.kts
@@ -0,0 +1,73 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    kotlin("kapt")
+    id("com.google.dagger.hilt.android")
+}
+
+android {
+
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = Versions.compose
+    }
+}
+
+dependencies {
+    /** Core modules */
+    implementation(project(":core:utils"))
+    implementation(project(":core:ui"))
+
+    /** AndroidX */
+    implementation(AndroidX.appCompat)
+    implementation(AndroidX.fragmentKtx)
+    implementation(AndroidX.lifecycleViewModelKtx)
+
+    /** Compose */
+    implementation(Compose.foundation)
+    implementation(Compose.material)
+    implementation(Compose.uiTooling)
+
+    /** Domain */
+    implementation(project(":features:swap:domain"))
+
+    /** Other libraries */
+    implementation(Library.composeShimmer)
+
+    /** DI */
+    implementation(Library.hilt)
+    kapt(Library.hiltKapt)
+}
\ No newline at end of file
diff --git a/features/swap/presentation/src/main/AndroidManifest.xml b/features/swap/presentation/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..927ad53a71
--- /dev/null
+++ b/features/swap/presentation/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.feature.swap.presentation" />
\ No newline at end of file
diff --git a/libs/auth/.gitignore b/libs/auth/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/libs/auth/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/libs/auth/build.gradle.kts b/libs/auth/build.gradle.kts
new file mode 100644
index 0000000000..b8dd6f840d
--- /dev/null
+++ b/libs/auth/build.gradle.kts
@@ -0,0 +1,37 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+}
+
+android {
+
+    defaultConfig {
+        compileSdk = AppConfig.compileSdkVersion
+        minSdk = AppConfig.minSdkVersion
+        targetSdk = AppConfig.targetSdkVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+        isCoreLibraryDesugaringEnabled = false
+    }
+
+    buildTypes {
+        create("debug_beta") {
+            initWith(getByName("release"))
+            BuildConfigFieldFactory(
+                fields = listOf(
+                    Field.Environment("release"),
+                    Field.TestActionEnabled(true),
+                    Field.LogEnabled(true),
+                ),
+                builder = ::buildConfigField,
+            ).create()
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/auth/src/main/AndroidManifest.xml b/libs/auth/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..e314bdebe7
--- /dev/null
+++ b/libs/auth/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.lib.auth" />
\ No newline at end of file
diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/AuthProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/AuthProvider.kt
new file mode 100644
index 0000000000..1323079ec6
--- /dev/null
+++ b/libs/auth/src/main/java/com/tangem/lib/auth/AuthProvider.kt
@@ -0,0 +1,14 @@
+package com.tangem.lib.auth
+
+/**
+ * Provides auth for tangemTech API
+ */
+interface AuthProvider {
+
+    /**
+     * Returns authToken for tangem tech api
+     */
+    fun getCardPublicKey(): String
+
+    fun getCardId(): String
+}
\ No newline at end of file
diff --git a/libs/crypto/.gitignore b/libs/crypto/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/libs/crypto/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/libs/crypto/build.gradle.kts b/libs/crypto/build.gradle.kts
new file mode 100644
index 0000000000..de1a6876a4
--- /dev/null
+++ b/libs/crypto/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+}
+
+dependencies {
+
+    /** Coroutines */
+    implementation(Library.coroutine)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file
diff --git a/libs/crypto/src/main/AndroidManifest.xml b/libs/crypto/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..1fd7238d41
--- /dev/null
+++ b/libs/crypto/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.tangem.lib.crypto" />
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt
new file mode 100644
index 0000000000..b9b2cfecea
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/DerivationManager.kt
@@ -0,0 +1,18 @@
+package com.tangem.lib.crypto
+
+import com.tangem.lib.crypto.models.Currency
+
+interface DerivationManager {
+
+    /**
+     * Derives missing blockchain and returns flag true if did it successfully
+     *
+     * @param currency to derive (Native token or not)
+     */
+    suspend fun deriveMissingBlockchains(currency: Currency): Boolean
+
+    /**
+     * Checks that given [networkId] has derivations
+     */
+    fun hasDerivation(networkId: String): Boolean
+}
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
new file mode 100644
index 0000000000..6df9887170
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/UserWalletManager.kt
@@ -0,0 +1,40 @@
+package com.tangem.lib.crypto
+
+import com.tangem.lib.crypto.models.Currency
+
+/**
+ * Provider for user tokens data
+ */
+interface UserWalletManager {
+
+    /**
+     * Returns all user tokens (merged from local and backend)
+     */
+    suspend fun getUserTokens(): List<Currency>
+
+    /**
+     * Returns user walletId
+     */
+    fun getWalletId(): String
+
+    /**
+     * Checks that token added to user wallet
+     *
+     * @param currency to receive referral payments
+     */
+    suspend fun isTokenAdded(currency: Currency): Boolean
+
+    /**
+     * Adds token to wallet if its not
+     *
+     * @param currency to add to wallet
+     */
+    fun addToken(currency: Currency)
+
+    /**
+     * Returns wallet public address for token
+     *
+     * @param currency for which find address
+     */
+    fun getWalletAddress(currency: Currency): String
+}
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/Currency.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/Currency.kt
new file mode 100644
index 0000000000..82afac8e25
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/Currency.kt
@@ -0,0 +1,12 @@
+package com.tangem.lib.crypto.models
+
+/**
+ * Currency data class that can be native blockchain Token
+ * or custom Token (used in this lib to replace and divide logic Currency from app module)
+ */
+abstract class Currency(
+    open val id: String,
+    open val name: String,
+    open val symbol: String,
+    open val networkId: String,
+)
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NativeToken.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NativeToken.kt
new file mode 100644
index 0000000000..f8ab7464d6
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NativeToken.kt
@@ -0,0 +1,8 @@
+package com.tangem.lib.crypto.models
+
+data class NativeToken(
+    override val id: String,
+    override val name: String,
+    override val symbol: String,
+    override val networkId: String,
+) : Currency(id, name, symbol, networkId)
\ No newline at end of file
diff --git a/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NonNativeToken.kt b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NonNativeToken.kt
new file mode 100644
index 0000000000..a2d812cd1b
--- /dev/null
+++ b/libs/crypto/src/main/java/com/tangem/lib/crypto/models/NonNativeToken.kt
@@ -0,0 +1,10 @@
+package com.tangem.lib.crypto.models
+
+class NonNativeToken(
+    override val id: String,
+    override val name: String,
+    override val symbol: String,
+    override val networkId: String,
+    val contractAddress: String,
+    val decimalCount: Int,
+) : Currency(id, name, symbol, networkId)
\ No newline at end of file
diff --git a/network/build.gradle b/network/build.gradle
deleted file mode 100644
index e7fccceda6..0000000000
--- a/network/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'org.jetbrains.kotlin.jvm'
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencies {
-    implementation implementation(project(path: ':common'))
-
-    // Tangem sdk's
-    implementation "com.tangem.tangem-sdk-kotlin:core:${versions.tangem_card_sdk}"
-
-    // Kotlin coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-
-    // Logs
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-
-    // Network
-    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
-    implementation("com.squareup.okhttp3:okhttp")
-    implementation("com.squareup.okhttp3:logging-interceptor")
-    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
-    implementation 'com.squareup.moshi:moshi:1.13.0'
-    implementation "com.squareup.moshi:moshi-kotlin:1.13.0"
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/MoshiConverter.kt b/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
deleted file mode 100644
index 1f967032e3..0000000000
--- a/network/src/main/java/com/tangem/network/common/MoshiConverter.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.tangem.network.common
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.common.json.TangemSdkAdapter
-import retrofit2.Converter
-import retrofit2.converter.moshi.MoshiConverterFactory
-import java.math.BigDecimal
-
-/**
-[REDACTED_AUTHOR]
- */
-class MoshiConverter {
-
-    companion object {
-        fun createFactory(moshi: Moshi = defaultMoshi()): Converter.Factory = MoshiConverterFactory.create(moshi)
-
-        fun defaultMoshi(): Moshi = Moshi.Builder()
-            .add(BigDecimalAdapter)
-            .add(KotlinJsonAdapterFactory())
-            .add(TangemSdkAdapter.DerivationPathAdapter())
-            .add(TangemSdkAdapter.DerivationNodeAdapter())
-            .build()
-
-        fun sdkMoshi(): Moshi = MoshiJsonConverter.INSTANCE.moshi
-    }
-}
-
-object BigDecimalAdapter {
-    @FromJson
-    fun fromJson(string: String) = BigDecimal(string)
-
-    @ToJson
-    fun toJson(value: BigDecimal) = value.toString()
-}
\ No newline at end of file
diff --git a/network/src/main/java/com/tangem/network/common/NetworError.kt b/network/src/main/java/com/tangem/network/common/NetworError.kt
deleted file mode 100644
index dfe852ecc9..0000000000
--- a/network/src/main/java/com/tangem/network/common/NetworError.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.tangem.network.common
-
-import com.tangem.common.module.ModuleError
-import com.tangem.common.module.ModuleErrorCode
-import com.tangem.common.module.ModuleMessage
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed interface NetworkModuleMessage : ModuleMessage
-
-sealed class NetworkError(
-    subCode: Int,
-    override val message: String,
-    override val data: Any?,
-) : NetworkModuleMessage, ModuleError() {
-    override val code: Int = ModuleErrorCode.NETWORK + subCode
-
-    companion object {
-        // base code used for all error in the module
-        // const val CODE_ANY_OTHER = 100..199, 200..299
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 9b33b9462c..0000000000
--- a/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-include ':app'
-include ':domain'
-include ':network'
-include ':common'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000000..028fd3f613
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,24 @@
+include(":app")
+include(":domain")
+include(":common")
+
+// region Core modules
+include(":core:datasource")
+include(":core:res")
+include(":core:utils")
+include(":core:ui")
+// endregion Core modules
+
+// region Libs modules
+include(":libs:crypto")
+include(":libs:auth")
+// endregion Libs modules
+
+// region Feature modules
+include(":features:referral:data")
+include(":features:referral:domain")
+include(":features:referral:presentation")
+include(":features:swap:data")
+include(":features:swap:domain")
+include(":features:swap:presentation")
+// endregion Feature modules
\ No newline at end of file